Second Life viewer sources 1.14.0.0

922 files changed, 50501 insertions, 42121 deletions

diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
index f94f661..2aeee01 100644
--- a/linden/indra/SConstruct
+++ b/linden/indra/SConstruct
@@ -11,7 +11,7 @@
 #
 #    scons -h
 #
-#  Written by Tom Yedwab, 6/2006.
+#  Originally written by Tom Yedwab, 6/2006.
 #
 #################################################
 
@@ -54,6 +54,8 @@ opts.Add(EnumOption('BTARGET', 'Set build target', 'server',
                         allowed_values=('client', 'server', 'all')))
 opts.Add(EnumOption('DISTCC', 'Enabled distcc', 'yes',
                         allowed_values=('yes', 'no')))
+opts.Add(EnumOption('MOZLIB', 'Enabled llmozlib/mozilla support', 'yes',
+                        allowed_values=('yes', 'no')))
 opts.Add(EnumOption('COLORGCC', 'Enabled colorgcc', 'yes',
                         allowed_values=('yes', 'no')))
 opts.Add(EnumOption('GRID', 'Client package\'s default grid', 'default',
@@ -68,6 +70,7 @@ build_param = ARGUMENTS.get('BUILD', 'releasefordownload')
 arch = ARGUMENTS.get('ARCH', 'i686')
 target_param = ARGUMENTS.get('BTARGET', 'server')
 enable_distcc = ARGUMENTS.get('DISTCC', 'yes')
+enable_mozlib = ARGUMENTS.get('MOZLIB', 'yes')
 enable_colorgcc = ARGUMENTS.get('COLORGCC', 'yes')
 grid = ARGUMENTS.get('GRID', 'default')
 # OPENSOURCE: do not edit the following line:
@@ -123,7 +126,7 @@ for build_target in targets:
         client_external_libs = []
         system_link_flags = ''
 
-        if platform != 'linux' and build_target == 'client':
+        if platform != 'linux' and build_target == 'client' and enable_mozlib == 'yes':
 
                 ### Mozilla include directories ###
 
@@ -189,6 +192,14 @@ for build_target in targets:
                         include_dirs += [ '../libraries/' + system_str + '/include/atk-1.0' ]
                         include_dirs += [ '../libraries/' + system_str + '/include/ELFIO' ]
                         include_dirs += [ '../libraries/' + system_str + '/include/llfreetype2' ]
+
+                        # llmozlib stuff
+                        if enable_mozlib == 'yes':
+                                flags += '-DLL_LIBXUL_ENABLED=1 '
+                                client_external_libs += [ 'llmozlib' ]
+                                client_external_libs += [ 'mozjs', 'nspr4', 'plc4', 'plds4', 'profdirserviceprovider_s', 'xpcom', 'xul' ]
+                        else:
+                                flags += '-DLL_LIBXUL_ENABLED=0 '
         else:
                 # Mac-only flags
                 flags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -O2 -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -DLL_DARWIN=1 -Wmost -Wno-sign-compare -Wno-switch -fpch-preprocess -F./newview/build/Deployment -fconstant-cfstrings -ffor-scope -Wno-reorder -isysroot /Developer/SDKs/MacOSX10.3.9.sdk '
@@ -287,10 +298,10 @@ for build_target in targets:
 
         ### Load a files.lst and files.PLATFORM.lst for each module ###
 
-        def load_files(module):
+        def load_files(module, source_fname):
                 new_list = []
                 try:
-                        list_file = open('./' + module + '/files.lst', 'r')
+                        list_file = open('./' + module + '/' + source_fname, 'r')
                         list = Split(list_file.read())
                         for x in list:
                                 file = os.path.join(build_dir, x)
@@ -301,8 +312,9 @@ for build_target in targets:
                                 else:
                                         new_list.append(file)
                         list_file.close()
-                except IOError:
-                        print 'Error: no files.lst exists for module ' + module
+                except IOError, val:
+                        print 'Error: unable to open file list',source_fname,
+                        print 'for module', module + ":", val
                         return []
 
                 try:
@@ -319,8 +331,13 @@ for build_target in targets:
 
         ### Create a static library from the module ###
 
-        def create_static_module_from_dir(input_dir, mod_name, local_flags="", extra_depends=None):
-                files_list = load_files(input_dir)
+        def create_static_module_from_dir(
+                input_dir,
+                mod_name,
+                local_flags="",
+                source_files = 'files.lst',
+                extra_depends=None):
+                files_list = load_files(input_dir, source_files)
                 BuildDir(build_dir + '/' + input_dir, input_dir)
                 local_env = env.Copy(CPPFLAGS = env['CPPFLAGS'] + ' ' + local_flags)
                 if extra_depends:
@@ -329,11 +346,15 @@ for build_target in targets:
                 tgt = local_env.StaticLibrary(lib_dir + '/' + mod_name, files_list)
                 Default(tgt)
 
-        def create_static_module(module, local_flags="", extra_depends=None):
-                create_static_module_from_dir(module, module, local_flags, extra_depends)
+        def create_static_module(module, local_flags="", source_files = 'files.lst', extra_depends=None):
+                create_static_module_from_dir(module, module, local_flags, source_files, extra_depends)
 
-        def create_dynamic_module(module, local_flags="", module_libs = None):
-                files_list = load_files(module)
+        def create_dynamic_module(
+                module,
+                local_flags="",
+                module_libs = None,
+                source_files = 'files.lst'):
+                files_list = load_files(module, source_files)
                 BuildDir(build_dir + '/' + module, module)
                 local_env = env.Copy(CPPFLAGS = env['CPPFLAGS'] + ' ' + local_flags)
                 tgt = local_env.SharedLibrary(lib_dir + '/' + module, files_list, LIBS = module_libs)
@@ -341,8 +362,9 @@ for build_target in targets:
 
         ### Create an executable from the module ###
 
-        def create_executable(exec_file, module, module_libs):
-                files_list = load_files(module)
+        def create_executable(
+                exec_file, module, module_libs, source_files = 'files.lst'):
+                files_list = load_files(module, source_files)
                 BuildDir(build_dir + '/' + module, module)
                 tgt = env.Program(exec_file, files_list, LIBS = module_libs)
                 Default(tgt)
@@ -365,7 +387,7 @@ for build_target in targets:
         create_static_module('llxml')
         create_static_module('lscript', extra_depends=build_dir + '/lscript/lscript_compile/indra.y.h')
 
-        net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
+        net_external_libs = [ 'curl', 'cares', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
         common_external_libs = net_external_libs + [ 'xmlrpc', 'expat', 'z' ]
 
         if build_target == 'client':
@@ -375,6 +397,7 @@ for build_target in targets:
                         #############################
                         output_crashlogger_bin = 'linux_crash_logger/linux-crash-logger-' + arch + '-bin'
                         external_libs = net_external_libs + [ 'db-4.2', 'gtk-x11-2.0' ]
+                        external_libs.remove('cares')
                         internal_libs = [ 'llvfs', 'llmath', 'llcommon' ]
                         create_executable(output_crashlogger_bin + '-globalsyms', 'linux_crash_logger', internal_libs + external_libs)
                         env.Command(output_crashlogger_bin, output_crashlogger_bin + '-globalsyms', hidesyms_cmd)
@@ -393,6 +416,7 @@ for build_target in targets:
                 output_bin = 'newview/secondlife-' + arch + '-bin'
 
                 external_libs = client_external_libs + common_external_libs + [ 'freetype', 'jpeg', 'SDL', 'GL', 'GLU', 'ogg', 'vorbisenc', 'vorbisfile', 'vorbis', 'fmod-3.75', 'db-4.2', 'openjpeg' ]
+                external_libs.remove('cares')
 
                 internal_libs = [ 'lscript', 'llwindow', 'llrender', 'llprimitive',
                                  'llmedia', 'llinventory', 
@@ -402,6 +426,7 @@ for build_target in targets:
 
                 create_executable(output_bin + '-globalsyms', 'newview', internal_libs + external_libs)
                 env.Command(output_bin, output_bin + '-globalsyms', hidesyms_cmd)
+                Default(output_bin)
 
                 if buildtype == 'releasefordownload':
 
@@ -412,13 +437,15 @@ for build_target in targets:
                         if platform == 'linux':
                                 env.Command(output_bin + '-stripped', output_bin, strip_cmd)
                                 env.Command(output_crashlogger_bin + '-stripped', output_crashlogger_bin, strip_cmd)
-                                manifest_file = 'linux_tools/client-manifest-' + arch
                                 product_name = 'SecondLife_' + arch + '_' + version_major + "_" + version_minor + "_" + version_patch + "_" + version_build
-                                if grid != 'default':
+                                if grid not in ['default', 'agni']:
                                         product_name += "_" + grid.upper()
                                 package_name = product_name + '.tar.bz2'
-                                cmd = 'rm -rf newview/' + product_name + '* && newview/linux_tools/package-client.sh ' + manifest_file + ' ' + product_name + ' ' + grid
-                                env.Command('newview/' + package_name, 'newview/' + manifest_file, cmd)
+                                cmd = 'rm -rf newview/%(pn)s* && newview/viewer_manifest.py --grid=%(grid)s --installer_name=%(pn)s --arch=%(arch)s' % {
+                                        'pn': product_name,
+                                        'grid':grid,
+                                        'arch':arch}
+                                env.Command('newview/' + package_name, 'newview/viewer_manifest.py', cmd)
                                 Depends('newview/' + package_name, output_bin + '-stripped')
                                 Depends('newview/' + package_name, output_crashlogger_bin + '-stripped')
                                 Default('newview/' + package_name)
@@ -524,21 +551,51 @@ for build_target in targets:
                 create_executable('newsim/simulator' + file_suffix, 'newsim', 
                                                         internal_libs + external_libs)
 
+                # texture upload verifier
+                external_libs = common_external_libs + [ 'kdu', 'dl' ]
+                internal_libs = [
+                        'llimage',
+                        'llkdustatic',
+                        'llinventory',
+                        'llmessage',
+                        'llvfs',
+                        'llxml',
+                        'llcommon',
+                        'llmath' ]
+                create_executable(
+                        'web/doc/asset-upload/plugins/verify-texture',
+                        'web/doc/asset-upload/plugins',
+                        internal_libs + external_libs,
+                        'verify-texture.lst')
+
+                # notecard upload verifier
+                create_executable(
+                        'web/doc/asset-upload/plugins/verify-notecard',
+                        'web/doc/asset-upload/plugins',
+                        internal_libs + external_libs,
+                        'verify-notecard.lst')
+
+                # LSL compiler plugin for asset upload CGI.
+                external_libs = common_external_libs
+                internal_libs = ['lscript', 'llmath', 'llcommon']
+                create_executable('web/doc/asset-upload/plugins/lsl_compiler/lslc' + file_suffix, 'web/doc/asset-upload/plugins/lsl_compiler/', internal_libs + external_libs);
+
                 # Test
                 Depends('test/test', 'newsim/simulator' + file_suffix)
                 external_libs = common_external_libs + ['mysqlclient']
                 internal_libs = [ 'lldatabase', 'llinventory', 'llmessage', 'llxml',
                                 'llvfs', 'llmath', 'llcommon' ]
-                create_executable('test/test' + file_suffix, 'test', 
+                test_executable = 'test/test' + file_suffix
+                create_executable(test_executable, 'test', 
                                                         internal_libs + external_libs)
 
-                # Run test.  foo_target is never actually built, so this test always happens.
+                # Run tests
                 test_results_file = 'test/test_results' + file_suffix + '.txt'
-                env.Command('foo_target', 'test/test' + file_suffix, "$SOURCE 1>" 
-                                + test_results_file + " 2>&1; "
-                                + "sed -n '/^Total Tests/,$ p' " + test_results_file)
-                Depends('foo_target', 'test/test' + file_suffix)
-                Default('foo_target')
+                env.Command(test_results_file,
+                                        test_executable,
+                                        "$SOURCE 2>&1 | tee $TARGET")
+                Depends(test_results_file, test_executable)
+                Default(test_results_file)
 
 #########
 # DONE  #
diff --git a/linden/indra/indra_complete/indra_complete_vc8.sln b/linden/indra/indra_complete/indra_complete_vc8.sln
new file mode 100644
index 0000000..8d09d72
--- /dev/null
+++ b/linden/indra/indra_complete/indra_complete_vc8.sln
@@ -0,0 +1,587 @@
+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcommon", "..\llcommon\llcommon_vc8.vcproj", "{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmath", "..\llmath\llmath_vc8.vcproj", "{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmessage", "..\llmessage\llmessage_vc8.vcproj", "{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvfs", "..\llvfs\llvfs_vc8.vcproj", "{D37774F4-253D-4760-BF64-372A943224A1}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llxml", "..\llxml\llxml_vc8.vcproj", "{A5470DA6-0C3A-4602-B930-43DB25511A59}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llui", "..\llui\llui_vc8.vcproj", "{DE55D666-6A3D-476C-937F-109269B83681}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimage", "..\llimage\llimage_vc8.vcproj", "{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llprimitive", "..\llprimitive\llprimitive_vc8.vcproj", "{FCC4483C-5B84-4944-B91F-4589A219BC0B}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llcharacter", "..\llcharacter\llcharacter_vc8.vcproj", "{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llaudio", "..\llaudio\llaudio_vc8.vcproj", "{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llrender", "..\llrender\llrender_vc8.vcproj", "{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llinventory", "..\llinventory\llinventory_vc8.vcproj", "{328D1968-924F-4863-AAE8-5F9A95BA68E5}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newview", "..\newview\newview_vc8.vcproj", "{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"

+        ProjectSection(ProjectDependencies) = postProject

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594} = {9D0C7E02-6506-4EE7-BC5C-75671D28D594}

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B} = {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}

+                {076DD042-2E58-42EA-9401-53210B65C1FC} = {076DD042-2E58-42EA-9401-53210B65C1FC}

+                {DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}

+                {44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB} = {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4} = {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llwindow", "..\llwindow\llwindow_vc8.vcproj", "{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"

+        ProjectSection(ProjectDependencies) = postProject

+                {A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_library", "..\lscript\lscript_library\lscript_library_vc8.vcproj", "{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_execute", "..\lscript\lscript_execute\lscript_execute_vc8.vcproj", "{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"

+        ProjectSection(ProjectDependencies) = postProject

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile", "..\lscript\lscript_compile\lscript_compile_vc8.vcproj", "{44CE6D82-7320-4609-8FC3-5965C19F4808}"

+        ProjectSection(ProjectDependencies) = postProject

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

+                {44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE} = {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B} = {B4B838C7-2C72-428E-BBFD-25764E659A8B}

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E} = {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb", "..\lscript\lscript_compile\lscript_compile_fb_vc8.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98} = {A5504A1E-8BA4-45D2-8144-1B6937E37E98}

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_crash_logger", "..\win_crash_logger\win_crash_logger_vc8.vcproj", "{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"

+        ProjectSection(ProjectDependencies) = postProject

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_updater", "..\win_updater\win_updater_vc8.vcproj", "{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3} = {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {DE55D666-6A3D-476C-937F-109269B83681} = {DE55D666-6A3D-476C-937F-109269B83681}

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llmedia", "..\llmedia\llmedia_vc8.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"

+EndProject

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test_vc8.vcproj", "{BBAA6588-CA96-4A87-A988-B02270B8D02B}"

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552} = {F882263E-4F2A-43D9-A45A-FA4C8EC66552}

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5} = {328D1968-924F-4863-AAE8-5F9A95BA68E5}

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228} = {B771CF1B-E253-47BD-8B0A-6B0440CC9228}

+                {44CE6D82-7320-4609-8FC3-5965C19F4808} = {44CE6D82-7320-4609-8FC3-5965C19F4808}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC} = {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}

+                {A5470DA6-0C3A-4602-B930-43DB25511A59} = {A5470DA6-0C3A-4602-B930-43DB25511A59}

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E} = {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC} = {777F38BE-2DFE-4051-9AAD-2832ABC474CC}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90} = {2ADE3C14-94C4-40BF-B033-70F3C954EE90}

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB} = {B5B53617-416F-404A-BF10-22EBCCA0E4FB}

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B} = {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B} = {FCC4483C-5B84-4944-B91F-4589A219BC0B}

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4} = {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34} = {E5D94794-5671-4BD6-A16D-26EC18F3DB34}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+EndProject

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+                {D37774F4-253D-4760-BF64-372A943224A1} = {D37774F4-253D-4760-BF64-372A943224A1}

+        EndProjectSection

+EndProject

+        ProjectSection(ProjectDependencies) = postProject

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5} = {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9} = {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}

+        EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej2coj\llimagej2coj_vc8.vcproj", "{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"

+EndProject

+Global

+        GlobalSection(SolutionConfigurationPlatforms) = preSolution

+                Debug|Win32 = Debug|Win32

+                DebugMesaHeadless|Win32 = DebugMesaHeadless|Win32

+                Release|Win32 = Release|Win32

+                ReleaseForDownload|Win32 = ReleaseForDownload|Win32

+                ReleaseNoOpt|Win32 = ReleaseNoOpt|Win32

+        EndGlobalSection

+        GlobalSection(ProjectConfigurationPlatforms) = postSolution

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug|Win32.ActiveCfg = Debug|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug|Win32.Build.0 = Debug|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release|Win32.ActiveCfg = Release|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release|Win32.Build.0 = Release|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug|Win32.ActiveCfg = Debug|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug|Win32.Build.0 = Debug|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release|Win32.ActiveCfg = Release|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release|Win32.Build.0 = Release|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug|Win32.ActiveCfg = Debug|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug|Win32.Build.0 = Debug|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release|Win32.ActiveCfg = Release|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release|Win32.Build.0 = Release|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.Debug|Win32.ActiveCfg = Debug|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.Debug|Win32.Build.0 = Debug|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.Release|Win32.ActiveCfg = Release|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.Release|Win32.Build.0 = Release|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug|Win32.ActiveCfg = Debug|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug|Win32.Build.0 = Debug|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Release|Win32.ActiveCfg = Release|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Release|Win32.Build.0 = Release|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.Debug|Win32.ActiveCfg = Debug|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.Debug|Win32.Build.0 = Debug|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.Release|Win32.ActiveCfg = Release|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.Release|Win32.Build.0 = Release|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug|Win32.ActiveCfg = Debug|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug|Win32.Build.0 = Debug|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release|Win32.ActiveCfg = Release|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release|Win32.Build.0 = Release|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug|Win32.Build.0 = Debug|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release|Win32.ActiveCfg = Release|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release|Win32.Build.0 = Release|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug|Win32.ActiveCfg = Debug|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug|Win32.Build.0 = Debug|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release|Win32.ActiveCfg = Release|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release|Win32.Build.0 = Release|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug|Win32.ActiveCfg = Debug|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug|Win32.Build.0 = Debug|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release|Win32.ActiveCfg = Release|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release|Win32.Build.0 = Release|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug|Win32.ActiveCfg = Debug|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug|Win32.Build.0 = Debug|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release|Win32.ActiveCfg = Release|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release|Win32.Build.0 = Release|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug|Win32.ActiveCfg = Debug|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug|Win32.Build.0 = Debug|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release|Win32.ActiveCfg = Release|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release|Win32.Build.0 = Release|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug|Win32.ActiveCfg = Debug|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug|Win32.Build.0 = Debug|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release|Win32.ActiveCfg = Release|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release|Win32.Build.0 = Release|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload|Win32.ActiveCfg = ReleaseForDownload|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload|Win32.Build.0 = ReleaseForDownload|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug|Win32.Build.0 = Debug|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release|Win32.ActiveCfg = Release|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release|Win32.Build.0 = Release|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug|Win32.ActiveCfg = Debug|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug|Win32.Build.0 = Debug|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless|Win32.ActiveCfg = DebugMesaHeadless|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless|Win32.Build.0 = DebugMesaHeadless|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release|Win32.ActiveCfg = Release|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release|Win32.Build.0 = Release|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug|Win32.ActiveCfg = Debug|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug|Win32.Build.0 = Debug|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release|Win32.ActiveCfg = Release|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release|Win32.Build.0 = Release|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug|Win32.ActiveCfg = Debug|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug|Win32.Build.0 = Debug|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release|Win32.ActiveCfg = Release|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release|Win32.Build.0 = Release|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug|Win32.ActiveCfg = Debug|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug|Win32.Build.0 = Debug|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Release|Win32.ActiveCfg = Release|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Release|Win32.Build.0 = Release|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug|Win32.ActiveCfg = Debug|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug|Win32.Build.0 = Debug|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release|Win32.ActiveCfg = Release|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release|Win32.Build.0 = Release|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug|Win32.ActiveCfg = Debug|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug|Win32.Build.0 = Debug|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release|Win32.ActiveCfg = Release|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release|Win32.Build.0 = Release|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug|Win32.ActiveCfg = Debug|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug|Win32.Build.0 = Debug|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release|Win32.ActiveCfg = Release|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release|Win32.Build.0 = Release|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug|Win32.ActiveCfg = Debug|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug|Win32.Build.0 = Debug|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release|Win32.ActiveCfg = Release|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release|Win32.Build.0 = Release|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32

+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt|Win32.Build.0 = Release|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug|Win32.ActiveCfg = Debug|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug|Win32.Build.0 = Debug|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release|Win32.ActiveCfg = Release|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release|Win32.Build.0 = Release|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug|Win32.ActiveCfg = Debug|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug|Win32.Build.0 = Debug|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release|Win32.ActiveCfg = Release|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release|Win32.Build.0 = Release|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.Debug|Win32.ActiveCfg = Debug|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.Debug|Win32.Build.0 = Debug|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.Release|Win32.ActiveCfg = Release|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.Release|Win32.Build.0 = Release|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {14B06489-F3DD-4DB0-9B0E-A337F5894EDE}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug|Win32.ActiveCfg = Debug|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug|Win32.Build.0 = Debug|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release|Win32.ActiveCfg = Release|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release|Win32.Build.0 = Release|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug|Win32.Build.0 = Debug|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release|Win32.ActiveCfg = Release|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release|Win32.Build.0 = Release|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {F56CA265-93E9-4068-8A67-8B104C876D70}.Debug|Win32.ActiveCfg = Debug|Win32

+                {F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {F56CA265-93E9-4068-8A67-8B104C876D70}.Release|Win32.ActiveCfg = Release|Win32

+                {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Debug|Win32.ActiveCfg = Debug|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Debug|Win32.Build.0 = Debug|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Release|Win32.ActiveCfg = Release|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.Release|Win32.Build.0 = Release|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {BF69CC7B-5C5B-40C3-93CB-92AD6A5FBC45}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.ActiveCfg = Debug|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug|Win32.Build.0 = Debug|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release|Win32.ActiveCfg = Release|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release|Win32.Build.0 = Release|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug|Win32.ActiveCfg = Debug|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug|Win32.Build.0 = Debug|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release|Win32.ActiveCfg = Release|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release|Win32.Build.0 = Release|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug|Win32.Build.0 = Debug|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release|Win32.ActiveCfg = Release|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release|Win32.Build.0 = Release|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug|Win32.ActiveCfg = Debug|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug|Win32.Build.0 = Debug|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release|Win32.ActiveCfg = Release|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release|Win32.Build.0 = Release|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug|Win32.ActiveCfg = Debug|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug|Win32.Build.0 = Debug|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release|Win32.ActiveCfg = Release|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release|Win32.Build.0 = Release|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.ActiveCfg = Debug|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug|Win32.Build.0 = Debug|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release|Win32.ActiveCfg = Release|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release|Win32.Build.0 = Release|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.Debug|Win32.ActiveCfg = Debug|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.Debug|Win32.Build.0 = Debug|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.Release|Win32.ActiveCfg = Release|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.Release|Win32.Build.0 = Release|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug|Win32.ActiveCfg = Debug|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug|Win32.Build.0 = Debug|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release|Win32.ActiveCfg = Release|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release|Win32.Build.0 = Release|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug|Win32.ActiveCfg = Debug|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug|Win32.Build.0 = Debug|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release|Win32.ActiveCfg = Release|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release|Win32.Build.0 = Release|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload|Win32.Build.0 = Release|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32

+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseNoOpt|Win32.Build.0 = ReleaseNoOpt|Win32

+        EndGlobalSection

+        GlobalSection(SolutionProperties) = preSolution

+                HideSolutionNode = FALSE

+        EndGlobalSection

+EndGlobal

diff --git a/linden/indra/lib/python/indra/llmanifest.py b/linden/indra/lib/python/indra/llmanifest.py
new file mode 100644
index 0000000..6697299
--- /dev/null
+++ b/linden/indra/lib/python/indra/llmanifest.py
@@ -0,0 +1,562 @@
+#!/usr/bin/python
+# @file llmanifest.py
+# @author Ryan Williams
+# @brief Library for specifying operations on a set of files.
+#
+# Copyright (c) 2006-2007, Linden Research, Inc.
+# 
+# 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.
+
+import commands
+import filecmp
+import fnmatch
+import getopt
+import glob
+import os
+import os.path
+import re
+import shutil
+import sys
+import tarfile
+
+def path_ancestors(path):
+    path = os.path.normpath(path)
+    result = []
+    while len(path) > 0:
+        result.append(path)
+        path, sub = os.path.split(path)
+    return result
+
+def proper_windows_path(path, current_platform = sys.platform):
+    """ This function takes an absolute Windows or Cygwin path and
+    returns a path appropriately formatted for the platform it's
+    running on (as determined by sys.platform)"""
+    path = path.strip()
+    drive_letter = None
+    rel = None
+    match = re.match("/cygdrive/([a-z])/(.*)", path)
+    if(not match):
+        match = re.match('([a-zA-Z]):\\\(.*)', path)
+    if(not match):
+        return None         # not an absolute path
+    drive_letter = match.group(1)
+    rel = match.group(2)
+    if(current_platform == "cygwin"):
+        return "/cygdrive/" + drive_letter.lower() + '/' + rel.replace('\\', '/')
+    else:
+        return drive_letter.upper() + ':\\' + rel.replace('/', '\\')
+
+def get_default_platform(dummy):
+    return {'linux2':'linux',
+            'linux1':'linux',
+            'cygwin':'windows',
+            'win32':'windows',
+            'darwin':'darwin'
+            }[sys.platform]
+
+def get_default_version(srctree):
+    # look up llversion.h and parse out the version info
+    paths = [os.path.join(srctree, x, 'llversion.h') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']]
+    for p in paths:
+        if os.path.exists(p):
+            contents = open(p, 'r').read()
+            major = re.search("LL_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1)
+            minor = re.search("LL_VERSION_MINOR\s=\s([0-9]+)", contents).group(1)
+            patch = re.search("LL_VERSION_PATCH\s=\s([0-9]+)", contents).group(1)
+            build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1)
+            return major, minor, patch, build
+
+
+ARGUMENTS=[
+    dict(name='actions',
+         description="""This argument specifies the actions that are to be taken when the
+        script is run.  The meaningful actions are currently:
+          copy     - copies the files specified by the manifest into the
+                     destination directory.
+          package  - bundles up the files in the destination directory into
+                     an installer for the current platform
+          unpacked - bundles up the files in the destination directory into
+                     a simple tarball
+        Example use: %(name)s --actions="copy unpacked" """,
+         default="copy package"),
+    dict(name='arch',
+         description="""This argument is appended to the platform string for
+        determining which manifest class to run.
+        Example use: %(name)s --arch=i686
+        On Linux this would try to use Linux_i686Manifest.""",
+         default=""),
+    dict(name='configuration',
+         description="""The build configuration used. Only used on OS X for
+        now, but it could be used for other platforms as well.""",
+         default="Universal"),
+    dict(name='grid',
+         description="""Which grid the client will try to connect to. Even
+        though it's not strictly a grid, 'firstlook' is also an acceptable
+        value for this parameter.""",
+         default=""),
+    dict(name='installer_name',
+         description=""" The name of the file that the installer should be
+        packaged up into. Only used on Linux at the moment.""",
+         default=None),
+    dict(name='login_url',
+         description="""The url that the login screen displays in the client.""",
+         default=None),
+    dict(name='platform',
+         description="""The current platform, to be used for looking up which
+        manifest class to run.""",
+         default=get_default_platform),
+    dict(name='version',
+         description="""This specifies the version of Second Life that is
+        being packaged up.""",
+         default=get_default_version)
+    ]
+
+def usage(srctree=""):
+    nd = {'name':sys.argv[0]}
+    print """Usage:
+    %(name)s [options] [destdir]
+    Options:
+    """ % nd
+    for arg in ARGUMENTS:
+        default = arg['default']
+        if hasattr(default, '__call__'):
+            default = "(computed value) \"" + str(default(srctree)) + '"'
+        elif default is not None:
+            default = '"' + default + '"'
+        print "\t--%s        Default: %s\n\t%s\n" % (
+            arg['name'],
+            default,
+            arg['description'] % nd)
+
+def main(argv=None, srctree='.', dsttree='./dst'):
+    if(argv == None):
+        argv = sys.argv
+
+    print "Source tree:", srctree
+    print "Destination tree:", dsttree
+
+    option_names = [arg['name'] + '=' for arg in ARGUMENTS]
+    option_names.append('help')
+    options, remainder = getopt.getopt(argv[1:], "", option_names)
+    if len(remainder) >= 1:
+        dsttree = remainder[0]
+
+    # convert options to a hash
+    args = {}
+    for opt in options:
+        args[opt[0].replace("--", "")] = opt[1]
+
+    # early out for help
+    if args.has_key('help'):
+        # *TODO: it is a huge hack to pass around the srctree like this
+        usage(srctree)
+        return
+
+    # defaults
+    for arg in ARGUMENTS:
+        if not args.has_key(arg['name']):
+            default = arg['default']
+            if hasattr(default, '__call__'):
+                default = default(srctree)
+            if default is not None:
+                args[arg['name']] = default
+
+    # fix up version
+    if args.has_key('version') and type(args['version']) == str:
+        args['version'] = args['version'].split('.')
+        
+    # default and agni are default
+    if args['grid'] in ['default', 'agni']:
+        args['grid'] = ''
+
+    if args.has_key('actions'):
+        args['actions'] = args['actions'].split()
+
+    # debugging
+    for opt in args:
+        print "Option:", opt, "=", args[opt]
+
+    wm = LLManifest.for_platform(args['platform'], args.get('arch'))(srctree, dsttree, args)
+    wm.do(*args['actions'])
+    return 0
+
+class LLManifestRegistry(type):
+    def __init__(cls, name, bases, dct):
+        super(LLManifestRegistry, cls).__init__(name, bases, dct)
+        match = re.match("(\w+)Manifest", name)
+        if(match):
+           cls.manifests[match.group(1).lower()] = cls
+
+class LLManifest(object):
+    __metaclass__ = LLManifestRegistry
+    manifests = {}
+    def for_platform(self, platform, arch = None):
+        if arch:
+            platform = platform + '_' + arch
+        return self.manifests[platform.lower()]
+    for_platform = classmethod(for_platform)
+
+    def __init__(self, srctree, dsttree, args):
+        super(LLManifest, self).__init__()
+        self.args = args
+        self.file_list = []
+        self.excludes = []
+        self.actions = []
+        self.src_prefix = [srctree]
+        self.dst_prefix = [dsttree]
+        self.created_paths = []
+
+    def construct(self):
+        """ Meant to be overriden by LLManifest implementors with code that
+        constructs the complete destination hierarchy."""
+        pass # override this method
+
+    def exclude(self, glob):
+        """ Excludes all files that match the glob from being included
+        in the file list by path()."""
+        self.excludes.append(glob)
+
+    def prefix(self, src='', dst=None):
+        """ Pushes a prefix onto the stack.  Until end_prefix is
+        called, all relevant method calls (esp. to path()) will prefix
+        paths with the entire prefix stack.  Source and destination
+        prefixes can be different, though if only one is provided they
+        are both equal.  To specify a no-op, use an empty string, not
+        None."""
+        if(dst == None):
+            dst = src
+        self.src_prefix.append(src)
+        self.dst_prefix.append(dst)
+        return True  # so that you can wrap it in an if to get indentation
+
+    def end_prefix(self, descr=None):
+        """Pops a prefix off the stack.  If given an argument, checks
+        the argument against the top of the stack.  If the argument
+        matches neither the source or destination prefixes at the top
+        of the stack, then misnesting must have occurred and an
+        exception is raised."""
+        # as an error-prevention mechanism, check the prefix and see if it matches the source or destination prefix.  If not, improper nesting may have occurred.
+        src = self.src_prefix.pop()
+        dst = self.dst_prefix.pop()
+        if descr and not(src == descr or dst == descr):
+            raise ValueError, "End prefix '" + descr + "' didn't match '" +src+ "' or '" +dst + "'"
+
+    def get_src_prefix(self):
+        """ Returns the current source prefix."""
+        return os.path.join(*self.src_prefix)
+
+    def get_dst_prefix(self):
+        """ Returns the current destination prefix."""
+        return os.path.join(*self.dst_prefix)
+
+    def src_path_of(self, relpath):
+        """Returns the full path to a file or directory specified
+        relative to the source directory."""
+        return os.path.join(self.get_src_prefix(), relpath)
+
+    def dst_path_of(self, relpath):
+        """Returns the full path to a file or directory specified
+        relative to the destination directory."""
+        return os.path.join(self.get_dst_prefix(), relpath)
+
+    def ensure_src_dir(self, reldir):
+        """Construct the path for a directory relative to the
+        source path, and ensures that it exists.  Returns the
+        full path."""
+        path = os.path.join(self.get_src_prefix(), reldir)
+        self.cmakedirs(path)
+        return path
+
+    def ensure_dst_dir(self, reldir):
+        """Construct the path for a directory relative to the
+        destination path, and ensures that it exists.  Returns the
+        full path."""
+        path = os.path.join(self.get_dst_prefix(), reldir)
+        self.cmakedirs(path)
+        return path
+
+    def run_command(self, command):
+        """ Runs an external command, and returns the output.  Raises
+        an exception if the command reurns a nonzero status code.  For
+        debugging/informational purpoases, prints out the command's
+        output as it is received."""
+        print "Running command:", command
+        fd = os.popen(command, 'r')
+        lines = []
+        while True:
+            lines.append(fd.readline())
+            if(lines[-1] == ''):
+                break
+            else:
+                print lines[-1],
+        output = ''.join(lines)
+        status = fd.close()
+        if(status):
+            raise RuntimeError, "Command " + command + " returned non-zero status (" + str(status) + ")"
+        return output
+
+    def created_path(self, path):
+        """ Declare that you've created a path in order to
+          a) verify that you really have created it
+          b) schedule it for cleanup"""
+        if not os.path.exists(path):
+            raise RuntimeError, "Should be something at path " + path
+        self.created_paths.append(path)
+
+    def put_in_file(self, contents, dst):
+        # write contents as dst
+        f = open(self.dst_path_of(dst), "wbU")
+        f.write(contents)
+        f.close()
+
+    def replace_in(self, src, dst=None, searchdict={}):
+        if(dst == None):
+            dst = src
+        # read src
+        f = open(self.src_path_of(src), "rbU")
+        contents = f.read()
+        f.close()
+        # apply dict replacements
+        for old, new in searchdict.iteritems():
+            contents = contents.replace(old, new)
+        self.put_in_file(contents, dst)
+        self.created_paths.append(dst)
+
+    def copy_action(self, src, dst):
+        if(src and (os.path.exists(src) or os.path.islink(src))):
+            # ensure that destination path exists
+            self.cmakedirs(os.path.dirname(dst))
+            self.created_paths.append(dst)
+            if(not os.path.isdir(src)):
+                self.ccopy(src,dst)
+            else:
+                # src is a dir
+                self.ccopytree(src,dst)
+        else:
+            print "Doesn't exist:", src
+
+    def package_action(self, src, dst):
+        pass
+
+    def copy_finish(self):
+        pass
+
+    def package_finish(self):
+        pass
+
+    def unpacked_finish(self):
+        unpacked_file_name = "unpacked_%(plat)s_%(vers)s.tar" % {
+            'plat':self.args['platform'],
+            'vers':'_'.join(self.args['version'])}
+        print "Creating unpacked file:", unpacked_file_name
+        # could add a gz here but that doubles the time it takes to do this step
+        tf = tarfile.open(self.src_path_of(unpacked_file_name), 'w:')
+        # add the entire installation package, at the very top level
+        tf.add(self.get_dst_prefix(), "")
+        tf.close()
+
+    def cleanup_finish(self):
+        """ Delete paths that were specified to have been created by this script"""
+        for c in self.created_paths:
+            # *TODO is this gonna be useful?
+            print "Cleaning up " + c
+
+    def process_file(self, src, dst):
+        if(self.includes(src, dst)):
+#            print src, "=>", dst
+            for action in self.actions:
+                methodname = action + "_action"
+                method = getattr(self, methodname, None)
+                if method is not None:
+                    method(src, dst)
+            self.file_list.append([src, dst])
+        else:
+            print "Excluding: ", src, dst
+
+
+    def process_directory(self, src, dst):
+        if(not self.includes(src, dst)):
+            print "Excluding: ", src, dst
+            return
+        names = os.listdir(src)
+        self.cmakedirs(dst)
+        errors = []
+        for name in names:
+            srcname = os.path.join(src, name)
+            dstname = os.path.join(dst, name)
+            if os.path.isdir(srcname):
+                self.process_directory(srcname, dstname)
+            else:
+                self.process_file(srcname, dstname)
+
+
+
+    def includes(self, src, dst):
+        if src:
+            for excl in self.excludes:
+                if fnmatch.fnmatch(src, excl):
+                    return False
+        return True
+
+    def remove(self, *paths):
+        for path in paths:
+            if(os.path.exists(path)):
+                print "Removing path", path
+                if(os.path.isdir(path)):
+                    shutil.rmtree(path)
+                else:
+                    os.remove(path)
+
+    def ccopy(self, src, dst):
+        """ Copy a single file or symlink.  Uses filecmp to skip copying for existing files."""
+        if os.path.islink(src):
+            linkto = os.readlink(src)
+            if(os.path.islink(dst) or os.path.exists(dst)):
+                os.remove(dst)  # because symlinking over an existing link fails
+            os.symlink(linkto, dst)
+        else:
+            # Don't recopy file if it's up-to-date.
+            # If we seem to be not not overwriting files that have been
+            # updated, set the last arg to False, but it will take longer.
+            if(os.path.exists(dst) and filecmp.cmp(src, dst, True)):
+                return
+            # only copy if it's not excluded
+            if(self.includes(src, dst)):
+                shutil.copy2(src, dst)
+
+    def ccopytree(self, src, dst):
+        """Direct copy of shutil.copytree with the additional
+        feature that the destination directory can exist.  It
+        is so dumb that Python doesn't come with this. Also it
+        implements the excludes functionality."""
+        if(not self.includes(src, dst)):
+            return
+        names = os.listdir(src)
+        self.cmakedirs(dst)
+        errors = []
+        for name in names:
+            srcname = os.path.join(src, name)
+            dstname = os.path.join(dst, name)
+            try:
+                if os.path.isdir(srcname):
+                    self.ccopytree(srcname, dstname)
+                else:
+                    self.ccopy(srcname, dstname)
+                    # XXX What about devices, sockets etc.?
+            except (IOError, os.error), why:
+                errors.append((srcname, dstname, why))
+        if errors:
+            raise RuntimeError, errors
+
+
+    def cmakedirs(self, path):
+        """Ensures that a directory exists, and doesn't throw an exception
+        if you call it on an existing directory."""
+#        print "making path: ", path
+        path = os.path.normpath(path)
+        self.created_paths.append(path)
+        if not os.path.exists(path):
+            os.makedirs(path)
+
+    def find_existing_file(self, *list):
+        for f in list:
+            if(os.path.exists(f)):
+                return f
+
+    def contents_of_tar(self, src_tar, dst_dir):
+        """ Extracts the contents of the tarfile (specified
+        relative to the source prefix) into the directory
+        specified relative to the destination directory."""
+        self.check_file_exists(src_tar)
+        tf = tarfile.open(self.src_path_of(src_tar), 'r')
+        for member in tf.getmembers():
+            tf.extract(member, self.ensure_dst_dir(dst_dir))
+            # TODO get actions working on these dudes, perhaps we should extract to a temporary directory and then process_directory on it?
+            self.file_list.append([src_tar,
+                           self.dst_path_of(os.path.join(dst_dir,member.name))])
+        tf.close()
+
+
+    def wildcard_regex(self, src_glob, dst_glob):
+ #       print "regex_pair:", src_glob, dst_glob
+        src_re = re.escape(src_glob)
+        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]+)')
+        dst_temp = dst_glob
+        i = 1
+        while(dst_temp.count("*") > 0):
+            dst_temp = dst_temp.replace('*', '\g<' + str(i) + '>', 1)
+            i = i+1
+ #       print "regex_result:", src_re, dst_temp
+        return re.compile(src_re), dst_temp
+
+    def check_file_exists(self, path):
+        if(not os.path.exists(path) and not os.path.islink(path)):
+            raise RuntimeError, "Path " + path + " doesn't exist"
+
+
+    wildcard_pattern = re.compile('\*')
+    def expand_globs(self, src, dst):
+        def fw_slash(str):
+            return str.replace('\\', '/')
+        def os_slash(str):
+            return str.replace('/', os.path.sep)
+        dst = fw_slash(dst)
+        src = fw_slash(src)
+        src_list = glob.glob(src)
+        src_re, d_template = self.wildcard_regex(src, dst)
+        for s in src_list:
+            s = fw_slash(s)
+            d = src_re.sub(d_template, s)
+            #print "s:",s, "d_t", d_template, "dst", dst, "d", d
+            yield os_slash(s), os_slash(d)
+
+    def path(self, src, dst=None):
+        print "Processing", src, "=>", dst
+        if dst == None:
+            dst = src
+        dst = os.path.join(self.get_dst_prefix(), dst)
+        src = os.path.join(self.get_src_prefix(), src)
+
+        # expand globs
+        if(self.wildcard_pattern.search(src)):
+            for s,d in self.expand_globs(src, dst):
+                self.process_file(s, d)
+        else:
+            # if we're specifying a single path (not a glob),
+            # we should error out if it doesn't exist
+            self.check_file_exists(src)
+            # if it's a directory, recurse through it
+            if(os.path.isdir(src)):
+                self.process_directory(src, dst)
+            else:
+                self.process_file(src, dst)
+
+
+    def do(self, *actions):
+        self.actions = actions
+        self.construct()
+        # perform finish actions
+        for action in self.actions:
+            methodname = action + "_finish"
+            method = getattr(self, methodname, None)
+            if method is not None:
+                method()
+        return self.file_list
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index 0e8ea67..2e8f45f 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -491,16 +491,17 @@ BOOL LLAudioChannelFMOD::updateBuffer()
         // If we have a source for the channel, we need to update its gain.
         if (mCurrentSourcep)
         {
+                // SJB: warnings can spam and hurt framerate, disabling
                 if (!FSOUND_SetVolume(mChannelID, llround(mCurrentSourcep->getGain() * 255.0f)))
                 {
-                        llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
+//                      llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
                 }
                 
                 if (!FSOUND_SetLoopMode(mChannelID, mCurrentSourcep->isLoop() ? FSOUND_LOOP_NORMAL : FSOUND_LOOP_OFF))
                 {
-                        llwarns << "Channel " << mChannelID << llendl;
-                        llwarns << "Source ID: " << mCurrentSourcep->getID() << " at " << mCurrentSourcep->getPositionGlobal() << llendl;
-                        llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
+//                      llwarns << "Channel " << mChannelID << "Source ID: " << mCurrentSourcep->getID()
+//                                      << " at " << mCurrentSourcep->getPositionGlobal() << llendl;
+//                      llwarns << "LLAudioChannelFMOD::updateBuffer error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
                 }
         }
 
@@ -686,7 +687,7 @@ BOOL LLAudioBufferFMOD::loadWAV(const char *filename)
         // MikeS. - Loading the sound file manually and then handing it over to FMOD,
         //      since FMOD uses posix IO internally,
         // which doesn't work with unicode file paths.
-        FILE*   sound_file = LLFile::fopen(filename,"rb");
+        FILE* sound_file = LLFile::fopen(filename,"rb");        /* Flawfinder: ignore */
         if (sound_file)
         {
                 fseek(sound_file,0,SEEK_END);
diff --git a/linden/indra/llaudio/llaudio_vc8.vcproj b/linden/indra/llaudio/llaudio_vc8.vcproj
new file mode 100644
index 0000000..d0b4bb4
--- /dev/null
+++ b/linden/indra/llaudio/llaudio_vc8.vcproj
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llaudio"

+        ProjectGUID="{93B2BA29-FBE9-4376-92C1-6108DCFE09D3}"

+        RootNamespace="llaudio"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\;"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llaudio.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llaudio.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llaudio.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\audioengine.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\audioengine_fmod.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\listener.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\listener_fmod.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llaudiodecodemgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\vorbisdecode.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\vorbisencode.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\audioengine.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\audioengine_fmod.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\fmod.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\fmod_errors.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\listener.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\listener_ds3d.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\listener_fmod.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\listener_openal.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llaudiodecodemgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\vorbisdecode.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\vorbisencode.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\wavefile.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llaudio/llaudiodecodemgr.cpp b/linden/indra/llaudio/llaudiodecodemgr.cpp
index d98ff5d..832c314 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.cpp
+++ b/linden/indra/llaudio/llaudiodecodemgr.cpp
@@ -52,9 +52,25 @@ LLAudioDecodeMgr *gAudioDecodeMgrp = NULL;
 
 static const S32 WAV_HEADER_SIZE = 44;
 
-class LLVorbisDecodeState
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+class LLVorbisDecodeState : public LLRefCount
 {
 public:
+        class WriteResponder : public LLLFSThread::Responder
+        {
+        public:
+                WriteResponder(LLVorbisDecodeState* decoder) : mDecoder(decoder) {}
+                ~WriteResponder() {}
+                void completed(S32 bytes)
+                {
+                        mDecoder->ioComplete(bytes);
+                }
+                LLPointer<LLVorbisDecodeState> mDecoder;
+        };
+        
         LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename);
         virtual ~LLVorbisDecodeState();
 
@@ -64,12 +80,14 @@ public:
 
         void flushBadFile();
 
+        void ioComplete(S32 bytes)                      { mBytesRead = bytes; }
         BOOL isValid() const                            { return mValid; }
         BOOL isDone() const                                     { return mDone; }
         const LLUUID &getUUID() const           { return mUUID; }
 protected:
         BOOL mValid;
         BOOL mDone;
+        LLAtomicS32 mBytesRead;
         LLUUID mUUID;
 
         std::vector<U8> mWAVBuffer;
@@ -83,172 +101,6 @@ protected:
         S32 mCurrentSection;
 };
 
-void LLVorbisDecodeState::flushBadFile()
-{
-        if (mInFilep)
-        {
-                llwarns << "Flushing bad vorbis file from VFS for " << mUUID << llendl;
-                mInFilep->remove();
-        }
-}
-
-
-LLAudioDecodeMgr::LLAudioDecodeMgr()
-{
-        mCurrentDecodep = NULL;
-}
-
-LLAudioDecodeMgr::~LLAudioDecodeMgr()
-{
-        delete mCurrentDecodep;
-        mCurrentDecodep = NULL;
-}
-
-
-void LLAudioDecodeMgr::processQueue(const F32 num_secs)
-{
-        LLUUID uuid;
-
-        LLTimer decode_timer;
-
-        BOOL done = FALSE;
-        while (!done)
-        {
-                if (mCurrentDecodep)
-                {
-                        BOOL res;
-
-                        // Decode in a loop until we're done or have run out of time.
-                        while(!(res = mCurrentDecodep->decodeSection()) && (decode_timer.getElapsedTimeF32() < num_secs))
-                        {
-                                // decodeSection does all of the work above
-                        }
-
-                        if (mCurrentDecodep->isDone() && !mCurrentDecodep->isValid())
-                        {
-                                // We had an error when decoding, abort.
-                                llwarns << mCurrentDecodep->getUUID() << " has invalid vorbis data, aborting decode" << llendl;
-                                mCurrentDecodep->flushBadFile();
-                                LLAudioData *adp = gAudiop->getAudioData(mCurrentDecodep->getUUID());
-                                adp->setHasValidData(FALSE);
-                                delete mCurrentDecodep;
-                                mCurrentDecodep = NULL;
-                                done = TRUE;
-                        }
-
-                        if (!res)
-                        {
-                                // We've used up out time slice, bail...
-                                done = TRUE;
-                        }
-                        else if (mCurrentDecodep)
-                        {
-                                if (mCurrentDecodep->finishDecode())
-                                {
-                                        // We finished!
-                                        if (mCurrentDecodep->isValid() && mCurrentDecodep->isDone())
-                                        {
-                                                LLAudioData *adp = gAudiop->getAudioData(mCurrentDecodep->getUUID());
-                                                adp->setHasDecodedData(TRUE);
-                                                adp->setHasValidData(TRUE);
-
-                                                // At this point, we could see if anyone needs this sound immediately, but
-                                                // I'm not sure that there's a reason to - we need to poll all of the playing
-                                                // sounds anyway.
-                                                //llinfos << "Finished the vorbis decode, now what?" << llendl;
-                                        }
-                                        else
-                                        {
-                                                llinfos << "Vorbis decode failed!!!" << llendl;
-                                        }
-                                        delete mCurrentDecodep;
-                                        mCurrentDecodep = NULL;
-                                }
-                                done = TRUE; // done for now
-                        }
-                }
-
-                if (!done)
-                {
-                        if (!mDecodeQueue.getLength())
-                        {
-                                // Nothing else on the queue.
-                                done = TRUE;
-                        }
-                        else
-                        {
-                                LLUUID uuid;
-                                mDecodeQueue.pop(uuid);
-                                if (gAudiop->hasDecodedFile(uuid))
-                                {
-                                        // This file has already been decoded, don't decode it again.
-                                        continue;
-                                }
-
-                                lldebugs << "Decoding " << uuid << " from audio queue!" << llendl;
-
-                                char uuid_str[64];                      /*Flawfinder: ignore*/
-                                char d_path[LL_MAX_PATH];       /*Flawfinder: ignore*/
-
-                                LLTimer timer;
-                                timer.reset();
-
-                                uuid.toString(uuid_str);
-                                snprintf(d_path, LL_MAX_PATH, "%s.dsf", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str()); /*Flawfinder: ignore*/
-
-                                mCurrentDecodep = new LLVorbisDecodeState(uuid, d_path);
-                                if (!mCurrentDecodep->initDecode())
-                                {
-                                        delete mCurrentDecodep;
-                                        mCurrentDecodep = NULL;
-                                }
-                        }
-                }
-        }
-}
-
-
-BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
-{
-        if (gAudiop->hasDecodedFile(uuid))
-        {
-                // Already have a decoded version, don't need to decode it.
-                return TRUE;
-        }
-
-        if (gAssetStorage->hasLocalAsset(uuid, LLAssetType::AT_SOUND))
-        {
-                // Just put it on the decode queue.
-                gAudioDecodeMgrp->mDecodeQueue.push(uuid);
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
-
-S32 LLAudioDecodeMgr::getRequestCount()
-{
-        /*
-        S32 count = 0;
-        if (mCurrentTransfer.notNull())
-        {
-                count++;
-        }
-
-        count += mRequestQueue.getLength();
-        return count;
-        */
-        return 0;
-}
-
-
-
-
-
-
-
-
 size_t vfs_read(void *ptr, size_t size, size_t nmemb, void *datasource)
 {
         LLVFile *file = (LLVFile *)datasource;
@@ -303,26 +155,21 @@ int vfs_seek(void *datasource, ogg_int64_t offset, int whence)
 int vfs_close (void *datasource)
 {
         LLVFile *file = (LLVFile *)datasource;
-
         delete file;
-
         return 0;
 }
 
 long vfs_tell (void *datasource)
 {
         LLVFile *file = (LLVFile *)datasource;
-
         return file->tell();
 }
 
-
-
-
 LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &uuid, const LLString &out_filename)
 {
         mDone = FALSE;
         mValid = FALSE;
+        mBytesRead = -1;
         mUUID = uuid;
         mInFilep = NULL;
         mCurrentSection = 0;
@@ -594,32 +441,27 @@ BOOL LLVorbisDecodeState::finishDecode()
                         return TRUE; // we've finished
                 }
 #if !defined(USE_WAV_VFILE)
-                mFileHandle = LLLFSThread::sLocal->write(mOutFilename, &mWAVBuffer[0], 0, data_length);
+                mBytesRead = -1;
+                mFileHandle = LLLFSThread::sLocal->write(mOutFilename, &mWAVBuffer[0], 0, data_length,
+                                                                                                 new WriteResponder(this));
 #endif
         }
 
         if (mFileHandle != LLLFSThread::nullHandle())
         {
-                LLLFSThread::status_t s = LLLFSThread::sLocal->getRequestStatus(mFileHandle);
-                if (s != LLLFSThread::STATUS_COMPLETE)
-                {
-                        if (s != LLLFSThread::STATUS_QUEUED && s != LLLFSThread::STATUS_INPROGRESS)
-                        {
-                                llerrs << "Bad file status in LLVorbisDecodeState::finishDecode: " << s << llendl;
-                        }
-                        return FALSE; // not finished
-                }
-                else
+                if (mBytesRead >= 0)
                 {
-                        LLLFSThread::Request* req = (LLLFSThread::Request*)LLLFSThread::sLocal->getRequest(mFileHandle);
-                        if (req->getBytesRead() == 0) //!= req->getBytes() // should be safe, but needs testing
+                        if (mBytesRead == 0)
                         {
                                 llwarns << "Unable to write file in LLVorbisDecodeState::finishDecode" << llendl;
                                 mValid = FALSE;
                                 return TRUE; // we've finished
                         }
                 }
-                LLLFSThread::sLocal->completeRequest(mFileHandle);
+                else
+                {
+                        return FALSE; // not done
+                }
         }
         
         mDone = TRUE;
@@ -633,3 +475,165 @@ BOOL LLVorbisDecodeState::finishDecode()
 
         return TRUE;
 }
+
+void LLVorbisDecodeState::flushBadFile()
+{
+        if (mInFilep)
+        {
+                llwarns << "Flushing bad vorbis file from VFS for " << mUUID << llendl;
+                mInFilep->remove();
+        }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+class LLAudioDecodeMgr::Impl
+{
+        friend class LLAudioDecodeMgr;
+public:
+        Impl() {};
+        ~Impl() {};
+
+        void processQueue(const F32 num_secs = 0.005);
+
+protected:
+        LLLinkedQueue<LLUUID> mDecodeQueue;
+        LLPointer<LLVorbisDecodeState> mCurrentDecodep;
+};
+
+
+void LLAudioDecodeMgr::Impl::processQueue(const F32 num_secs)
+{
+        LLUUID uuid;
+
+        LLTimer decode_timer;
+
+        BOOL done = FALSE;
+        while (!done)
+        {
+                if (mCurrentDecodep)
+                {
+                        BOOL res;
+
+                        // Decode in a loop until we're done or have run out of time.
+                        while(!(res = mCurrentDecodep->decodeSection()) && (decode_timer.getElapsedTimeF32() < num_secs))
+                        {
+                                // decodeSection does all of the work above
+                        }
+
+                        if (mCurrentDecodep->isDone() && !mCurrentDecodep->isValid())
+                        {
+                                // We had an error when decoding, abort.
+                                llwarns << mCurrentDecodep->getUUID() << " has invalid vorbis data, aborting decode" << llendl;
+                                mCurrentDecodep->flushBadFile();
+                                LLAudioData *adp = gAudiop->getAudioData(mCurrentDecodep->getUUID());
+                                adp->setHasValidData(FALSE);
+                                mCurrentDecodep = NULL;
+                                done = TRUE;
+                        }
+
+                        if (!res)
+                        {
+                                // We've used up out time slice, bail...
+                                done = TRUE;
+                        }
+                        else if (mCurrentDecodep)
+                        {
+                                if (mCurrentDecodep->finishDecode())
+                                {
+                                        // We finished!
+                                        if (mCurrentDecodep->isValid() && mCurrentDecodep->isDone())
+                                        {
+                                                LLAudioData *adp = gAudiop->getAudioData(mCurrentDecodep->getUUID());
+                                                adp->setHasDecodedData(TRUE);
+                                                adp->setHasValidData(TRUE);
+
+                                                // At this point, we could see if anyone needs this sound immediately, but
+                                                // I'm not sure that there's a reason to - we need to poll all of the playing
+                                                // sounds anyway.
+                                                //llinfos << "Finished the vorbis decode, now what?" << llendl;
+                                        }
+                                        else
+                                        {
+                                                llinfos << "Vorbis decode failed!!!" << llendl;
+                                        }
+                                        mCurrentDecodep = NULL;
+                                }
+                                done = TRUE; // done for now
+                        }
+                }
+
+                if (!done)
+                {
+                        if (!mDecodeQueue.getLength())
+                        {
+                                // Nothing else on the queue.
+                                done = TRUE;
+                        }
+                        else
+                        {
+                                LLUUID uuid;
+                                mDecodeQueue.pop(uuid);
+                                if (gAudiop->hasDecodedFile(uuid))
+                                {
+                                        // This file has already been decoded, don't decode it again.
+                                        continue;
+                                }
+
+                                lldebugs << "Decoding " << uuid << " from audio queue!" << llendl;
+
+                                char uuid_str[64];                      /*Flawfinder: ignore*/
+                                char d_path[LL_MAX_PATH];       /*Flawfinder: ignore*/
+
+                                LLTimer timer;
+                                timer.reset();
+
+                                uuid.toString(uuid_str);
+                                snprintf(d_path, LL_MAX_PATH, "%s.dsf", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str()); /*Flawfinder: ignore*/
+
+                                mCurrentDecodep = new LLVorbisDecodeState(uuid, d_path);
+                                if (!mCurrentDecodep->initDecode())
+                                {
+                                        mCurrentDecodep = NULL;
+                                }
+                        }
+                }
+        }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+LLAudioDecodeMgr::LLAudioDecodeMgr()
+{
+        mImpl = new Impl;
+}
+
+LLAudioDecodeMgr::~LLAudioDecodeMgr()
+{
+        delete mImpl;
+}
+
+void LLAudioDecodeMgr::processQueue(const F32 num_secs)
+{
+        mImpl->processQueue(num_secs);
+}
+
+BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
+{
+        if (gAudiop->hasDecodedFile(uuid))
+        {
+                // Already have a decoded version, don't need to decode it.
+                return TRUE;
+        }
+
+        if (gAssetStorage->hasLocalAsset(uuid, LLAssetType::AT_SOUND))
+        {
+                // Just put it on the decode queue.
+                mImpl->mDecodeQueue.push(uuid);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+
diff --git a/linden/indra/llaudio/llaudiodecodemgr.h b/linden/indra/llaudio/llaudiodecodemgr.h
index 3480004..aab7144 100644
--- a/linden/indra/llaudio/llaudiodecodemgr.h
+++ b/linden/indra/llaudio/llaudiodecodemgr.h
@@ -38,7 +38,6 @@
 class LLVFS;
 class LLVorbisDecodeState;
 
-
 class LLAudioDecodeMgr
 {
 public:
@@ -46,19 +45,12 @@ public:
         ~LLAudioDecodeMgr();
 
         void processQueue(const F32 num_secs = 0.005);
-
-        LLLinkedQueue<LLUUID> mDecodeQueue;
-
-        LLVorbisDecodeState *mCurrentDecodep;
-
         BOOL addDecodeRequest(const LLUUID &uuid);
         void addAudioRequest(const LLUUID &uuid);
-
-        S32 getRequestCount();
         
 protected:
-        LLLinkedQueue<LLUUID> mDownloadQueue;
-        LLFrameTimer mCurrentTransferAge;
+        class Impl;
+        Impl* mImpl;
 };
 
 extern LLAudioDecodeMgr *gAudioDecodeMgrp;
diff --git a/linden/indra/llcharacter/llbvhloader.cpp b/linden/indra/llcharacter/llbvhloader.cpp
index 6aa430f..48b5e7c 100644
--- a/linden/indra/llcharacter/llbvhloader.cpp
+++ b/linden/indra/llcharacter/llbvhloader.cpp
@@ -175,8 +175,8 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
         //--------------------------------------------------------------------
         char path[LL_MAX_PATH];         /* Flawfinder: ignore */
 
-        snprintf( path, sizeof(path), "%s",
-                gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName).c_str()); /* Flawfinder: ignore */
+        snprintf( path, sizeof(path), "%s",/* Flawfinder: ignore */
+                gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName).c_str()); 
 
 
         apr_file_t *fp = ll_apr_file_open(path, LL_APR_R);
@@ -209,7 +209,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 // check the 1st token on the line to determine if it's empty or a comment
                 //----------------------------------------------------------------
                 char token[128]; /* Flawfinder: ignore */
-                if ( sscanf(mLine, " %127s", token) != 1 )
+                if ( sscanf(mLine, " %127s", token) != 1 )      /* Flawfinder: ignore */
                         continue;
 
                 if (token[0] == '#')
@@ -244,7 +244,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 if (loadingGlobals && LLString::compareInsensitive(token, "emote")==0)
                 {
                         char emote_str[1024];   /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %1023s", emote_str) != 1 )
+                        if ( sscanf(mLine, " %*s = %1023s", emote_str) != 1 )   /* Flawfinder: ignore */
                                 return ST_NO_XLT_EMOTE;
 
                         mEmoteName.assign( emote_str );
@@ -282,7 +282,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                         {
                                 mLoop = TRUE;
                         }
-                        else if ( sscanf(mLine, " %*s = %127s", trueFalse) == 1 )       
+                        else if ( sscanf(mLine, " %*s = %127s", trueFalse) == 1 )       /* Flawfinder: ignore */        
                         {
                                 mLoop = (LLString::compareInsensitive(trueFalse, "true")==0);
                         }
@@ -304,7 +304,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 {
                         F32 duration;
                         char type[128]; /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %f %127s", &duration, type) != 2 )
+                        if ( sscanf(mLine, " %*s = %f %127s", &duration, type) != 2 )   /* Flawfinder: ignore */
                                 return ST_NO_XLT_EASEIN;
 
                         mEaseIn = duration;
@@ -317,8 +317,8 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 if (loadingGlobals && LLString::compareInsensitive(token, "easeout")==0)
                 {
                         F32 duration;
-                        char type[128];
-                        if ( sscanf(mLine, " %*s = %f %127s", &duration, type) != 2 )
+                        char type[128];         /* Flawfinder: ignore */
+                        if ( sscanf(mLine, " %*s = %f %127s", &duration, type) != 2 )   /* Flawfinder: ignore */
                                 return ST_NO_XLT_EASEOUT;
 
                         mEaseOut = duration;
@@ -343,7 +343,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                         Constraint constraint;
 
                         // try reading optional target direction
-                        if(sscanf(
+                        if(sscanf( /* Flawfinder: ignore */
                                 mLine,
                                 " %*s = %d %f %f %f %f %15s %f %f %f %15s %f %f %f %f %f %f", 
                                 &constraint.mChainLength,
@@ -363,7 +363,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                                 &constraint.mTargetDir.mV[VY],
                                 &constraint.mTargetDir.mV[VZ]) != 16)
                         {
-                                if(sscanf(
+                                if(sscanf( /* Flawfinder: ignore */
                                         mLine,
                                         " %*s = %d %f %f %f %f %15s %f %f %f %15s %f %f %f", 
                                         &constraint.mChainLength,
@@ -403,7 +403,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                         Constraint constraint;
 
                         // try reading optional target direction
-                        if(sscanf(
+                        if(sscanf( /* Flawfinder: ignore */
                                 mLine,
                                 " %*s = %d %f %f %f %f %15s %f %f %f %15s %f %f %f %f %f %f", 
                                 &constraint.mChainLength,
@@ -423,7 +423,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                                 &constraint.mTargetDir.mV[VY],
                                 &constraint.mTargetDir.mV[VZ]) != 16)
                         {
-                                if(sscanf(
+                                if(sscanf( /* Flawfinder: ignore */
                                         mLine,
                                         " %*s = %d %f %f %f %f %15s %f %f %f %15s %f %f %f", 
                                         &constraint.mChainLength,
@@ -471,7 +471,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 if ( LLString::compareInsensitive(token, "ignore")==0 )
                 {
                         char trueFalse[128];    /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %127s", trueFalse) != 1 )
+                        if ( sscanf(mLine, " %*s = %127s", trueFalse) != 1 )    /* Flawfinder: ignore */
                                 return ST_NO_XLT_IGNORE;
 
                         trans->mIgnore = (LLString::compareInsensitive(trueFalse, "true")==0);
@@ -489,7 +489,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                         {
                                 trans->mRelativePosition.setVec( x, y, z );
                         }
-                        else if ( sscanf(mLine, " %*s = %127s", relpos) == 1 )
+                        else if ( sscanf(mLine, " %*s = %127s", relpos) == 1 )  /* Flawfinder: ignore */
                         {
                                 if ( LLString::compareInsensitive(relpos, "firstkey")==0 )
                                 {
@@ -515,7 +515,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 {
                         //F32 x, y, z;
                         char relpos[128];       /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %127s", relpos) == 1 )
+                        if ( sscanf(mLine, " %*s = %127s", relpos) == 1 )       /* Flawfinder: ignore */
                         {
                                 if ( LLString::compareInsensitive(relpos, "firstkey")==0 )
                                 {
@@ -540,7 +540,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 if ( LLString::compareInsensitive(token, "outname")==0 )
                 {
                         char outName[128];      /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %127s", outName) != 1 )
+                        if ( sscanf(mLine, " %*s = %127s", outName) != 1 )      /* Flawfinder: ignore */
                                 return ST_NO_XLT_OUTNAME;
 
                         trans->mOutName = outName;
@@ -585,7 +585,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 if ( LLString::compareInsensitive(token, "mergeparent")==0 )
                 {
                         char mergeParentName[128];      /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %127s", mergeParentName) != 1 )
+                        if ( sscanf(mLine, " %*s = %127s", mergeParentName) != 1 )      /* Flawfinder: ignore */
                                 return ST_NO_XLT_MERGEPARENT;
 
                         trans->mMergeParentName = mergeParentName;
@@ -598,7 +598,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
                 if ( LLString::compareInsensitive(token, "mergechild")==0 )
                 {
                         char mergeChildName[128];       /* Flawfinder: ignore */
-                        if ( sscanf(mLine, " %*s = %127s", mergeChildName) != 1 )
+                        if ( sscanf(mLine, " %*s = %127s", mergeChildName) != 1 )       /* Flawfinder: ignore */
                                 return ST_NO_XLT_MERGECHILD;
 
                         trans->mMergeChildName = mergeChildName;
@@ -724,7 +724,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
                 // get the joint name
                 //----------------------------------------------------------------
                 char jointName[80];     /* Flawfinder: ignore */
-                if ( sscanf(line.c_str(), "%*s %79s", jointName) != 1 )
+                if ( sscanf(line.c_str(), "%*s %79s", jointName) != 1 ) /* Flawfinder: ignore */
                 {
                         strncpy(error_text, line.c_str(), 127); /* Flawfinder: ignore */
                         return ST_NO_NAME;
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 45f692c..6e9327f 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -38,13 +38,7 @@
 
 LLStringTable LLCharacter::sVisualParamNames(1024);
 
-// helper functions
-BOOL larger_screen_area( LLCharacter* data_new, LLCharacter* data_tested )
-{
-        return data_new->getPixelArea() > data_tested->getPixelArea();
-}
-
-LLLinkedList< LLCharacter > LLCharacter::sInstances( larger_screen_area );
+std::vector< LLCharacter* > LLCharacter::sInstances;
 
 
 //-----------------------------------------------------------------------------
@@ -59,7 +53,7 @@ LLCharacter::LLCharacter()
         mSkeletonSerialNum( 0 )
 {
         mMotionController.setCharacter( this );
-        sInstances.addData(this);
+        sInstances.push_back(this);
         mPauseRequest = new LLPauseRequestHandle();
 }
 
@@ -76,7 +70,11 @@ LLCharacter::~LLCharacter()
         {
                 delete param;
         }
-        sInstances.removeData(this);
+        std::vector<LLCharacter*>::iterator iter = std::find(sInstances.begin(), sInstances.end(), this);
+        if (iter != sInstances.end())
+        {
+                sInstances.erase(iter);
+        }
 }
 
 
@@ -85,7 +83,7 @@ LLCharacter::~LLCharacter()
 //-----------------------------------------------------------------------------
 LLJoint *LLCharacter::getJoint( const std::string &name )
 {
-        LLJoint *joint = NULL;
+        LLJoint* joint = NULL;
 
         LLJoint *root = getRootJoint();
         if (root)
@@ -202,7 +200,7 @@ void LLCharacter::flushAllMotions()
 //-----------------------------------------------------------------------------
 // dumpCharacter()
 //-----------------------------------------------------------------------------
-void LLCharacter::dumpCharacter( LLJoint *joint )
+void LLCharacter::dumpCharacter( LLJoint* joint )
 {
         // handle top level entry into recursion
         if (joint == NULL)
@@ -217,11 +215,11 @@ void LLCharacter::dumpCharacter( LLJoint *joint )
         llinfos << "DEBUG: " << joint->getName() << " (" << (joint->getParent()?joint->getParent()->getName():std::string("ROOT")) << ")" << llendl;
 
         // recurse
-        for (   LLJoint *j = joint->mChildren.getFirstData();
-                        j != NULL;
-                        j = joint->mChildren.getNextData() )
+        for (LLJoint::child_list_t::iterator iter = joint->mChildren.begin();
+                 iter != joint->mChildren.end(); ++iter)
         {
-                dumpCharacter(j);
+                LLJoint* child_joint = *iter;
+                dumpCharacter(child_joint);
         }
 }
 
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index bfe3ffa..6f4fe17 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -40,6 +40,7 @@
 #include "linked_lists.h"
 #include "string_table.h"
 #include "llmemory.h"
+#include "llthread.h"
 
 class LLPolyMesh;
 
@@ -109,7 +110,7 @@ public:
         virtual F32 getTimeDilation() = 0;
 
         // gets current pixel area of this character
-        virtual F32 getPixelArea() = 0;
+        virtual F32 getPixelArea() const = 0;
 
         // gets the head mesh of the character
         virtual LLPolyMesh*     getHeadMesh() = 0;
@@ -242,7 +243,7 @@ public:
         U32                             getSkeletonSerialNum() const            { return mSkeletonSerialNum; }
         void                    setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; }
 
-        static LLLinkedList< LLCharacter > sInstances;
+        static std::vector< LLCharacter* > sInstances;
 
 protected:
         LLMotionController      mMotionController;
diff --git a/linden/indra/llcharacter/llcharacter_vc8.vcproj b/linden/indra/llcharacter/llcharacter_vc8.vcproj
new file mode 100644
index 0000000..415b74f
--- /dev/null
+++ b/linden/indra/llcharacter/llcharacter_vc8.vcproj
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llcharacter"

+        ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llcharacter.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llcharacter.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llcharacter.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llanimationstates.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbvhloader.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcharacter.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleditingmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgesture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhandmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llheadrotmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljoint.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljointsolverrp3.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframefallmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframemotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframemotionparam.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframestandmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframewalkmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmotioncontroller.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmultigesture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpose.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatemachine.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltargetingmotion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvisualparam.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llanimationstates.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbvhloader.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcharacter.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleditingmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgesture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhandmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llheadrotmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljoint.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljointsolverrp3.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljointstate.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframefallmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframemotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframemotionparam.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframestandmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyframewalkmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmotioncontroller.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmultigesture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpose.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatemachine.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltargetingmotion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvisualparam.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llcharacter/lljoint.cpp b/linden/indra/llcharacter/lljoint.cpp
index 4ef9835..4102612 100644
--- a/linden/indra/llcharacter/lljoint.cpp
+++ b/linden/indra/llcharacter/lljoint.cpp
@@ -69,8 +69,9 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent)
 
         setName(name);
         if (parent)
+        {
                 parent->addChild( this );
-
+        }
         touch();
 }
 
@@ -80,6 +81,10 @@ LLJoint::LLJoint(const std::string &name, LLJoint *parent)
 //-----------------------------------------------------------------------------
 LLJoint::~LLJoint()
 {
+        if (mParent)
+        {
+                mParent->removeChild( this );
+        }
         removeAllChildren();
 }
 
@@ -91,7 +96,9 @@ void LLJoint::setup(const std::string &name, LLJoint *parent)
 {
         setName(name);
         if (parent)
+        {
                 parent->addChild( this );
+        }
 }
 
 //-----------------------------------------------------------------------------
@@ -109,11 +116,11 @@ void LLJoint::touch(U32 flags)
                 {
                         child_flags |= POSITION_DIRTY;
                 }
-                
-                for (   LLJoint *joint = mChildren.getFirstData();
-                                joint != NULL;
-                                joint = mChildren.getNextData() )
+
+                for (child_list_t::iterator iter = mChildren.begin();
+                         iter != mChildren.end(); ++iter)
                 {
+                        LLJoint* joint = *iter;
                         joint->touch(child_flags);
                 }
         }
@@ -140,13 +147,15 @@ LLJoint *LLJoint::findJoint( const std::string &name )
         if (name == getName())
                 return this;
 
-        for (   LLJoint *j = mChildren.getFirstData();
-                        j != NULL;
-                        j = mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
-                LLJoint *found = j->findJoint(name);
+                LLJoint* joint = *iter;
+                LLJoint *found = joint->findJoint(name);
                 if (found)
+                {
                         return found;
+                }
         }
 
         return NULL;    
@@ -156,12 +165,12 @@ LLJoint *LLJoint::findJoint( const std::string &name )
 //--------------------------------------------------------------------
 // addChild()
 //--------------------------------------------------------------------
-void LLJoint::addChild(LLJoint *joint)
+void LLJoint::addChild(LLJoint* joint)
 {
         if (joint->mParent)
                 joint->mParent->removeChild(joint);
 
-        mChildren.addDataAtEnd(joint);
+        mChildren.push_back(joint);
         joint->mXform.setParent(&mXform);
         joint->mParent = this;  
         joint->touch();
@@ -171,9 +180,13 @@ void LLJoint::addChild(LLJoint *joint)
 //--------------------------------------------------------------------
 // removeChild()
 //--------------------------------------------------------------------
-void LLJoint::removeChild(LLJoint *joint)
+void LLJoint::removeChild(LLJoint* joint)
 {
-        this->mChildren.removeData(joint);
+        child_list_t::iterator iter = std::find(mChildren.begin(), mChildren.end(), joint);
+        if (iter != mChildren.end())
+        {
+                this->mChildren.erase(iter);
+        }
         joint->mXform.setParent(NULL);
         joint->mParent = NULL;
         joint->touch();
@@ -185,11 +198,15 @@ void LLJoint::removeChild(LLJoint *joint)
 //--------------------------------------------------------------------
 void LLJoint::removeAllChildren()
 {
-        for (   LLJoint *joint = mChildren.getFirstData();
-                        joint != NULL;
-                        joint = mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end();)
         {
-                removeChild(joint);
+                child_list_t::iterator curiter = iter++;
+                LLJoint* joint = *curiter;
+                mChildren.erase(curiter);
+                joint->mXform.setParent(NULL);
+                joint->mParent = NULL;
+                joint->touch();
         }
 }
 
@@ -208,8 +225,11 @@ const LLVector3& LLJoint::getPosition()
 //--------------------------------------------------------------------
 void LLJoint::setPosition( const LLVector3& pos )
 {
-        mXform.setPosition(pos);
-        touch(MATRIX_DIRTY | POSITION_DIRTY);
+//      if (mXform.getPosition() != pos)
+        {
+                mXform.setPosition(pos);
+                touch(MATRIX_DIRTY | POSITION_DIRTY);
+        }
 }
 
 
@@ -276,8 +296,11 @@ void LLJoint::setRotation( const LLQuaternion& rot )
 {
         if (rot.isFinite())
         {
-                mXform.setRotation(rot);
-                touch(MATRIX_DIRTY | ROTATION_DIRTY);
+        //      if (mXform.getRotation() != rot)
+                {
+                        mXform.setRotation(rot);
+                        touch(MATRIX_DIRTY | ROTATION_DIRTY);
+                }
         }
 }
 
@@ -339,8 +362,12 @@ const LLVector3& LLJoint::getScale()
 //--------------------------------------------------------------------
 void LLJoint::setScale( const LLVector3& scale )
 {
-        mXform.setScale(scale);
-        touch();
+//      if (mXform.getScale() != scale)
+        {
+                mXform.setScale(scale);
+                touch();
+        }
+
 }
 
 
@@ -412,14 +439,18 @@ void LLJoint::updateWorldPRSParent()
 // updateWorldMatrixChildren()
 //-----------------------------------------------------------------------------
 void LLJoint::updateWorldMatrixChildren()
-{
+{       
+        if (!this->mUpdateXform) return;
+
         if (mDirtyFlags & MATRIX_DIRTY)
         {
                 updateWorldMatrix();
         }
-        for (LLJoint *child = mChildren.getFirstData(); child; child = mChildren.getNextData())
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
-                child->updateWorldMatrixChildren();
+                LLJoint* joint = *iter;
+                joint->updateWorldMatrixChildren();
         }
 }
 
@@ -494,8 +525,10 @@ void LLJoint::clampRotation(LLQuaternion old_rot, LLQuaternion new_rot)
 {
         LLVector3 main_axis(1.f, 0.f, 0.f);
 
-        for (LLJoint* joint = mChildren.getFirstData(); joint; joint = mChildren.getNextData())
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLJoint* joint = *iter;
                 if (joint->isAnimatable())
                 {
                         main_axis = joint->getPosition();
diff --git a/linden/indra/llcharacter/lljoint.h b/linden/indra/llcharacter/lljoint.h
index 15b82c2..352d222 100644
--- a/linden/indra/llcharacter/lljoint.h
+++ b/linden/indra/llcharacter/lljoint.h
@@ -95,7 +95,8 @@ public:
         LLDynamicArray<LLVector3> mConstraintSilhouette;
 
         // child joints
-        LLLinkedList<LLJoint> mChildren;
+        typedef std::list<LLJoint*> child_list_t;
+        child_list_t mChildren;
 
         // debug statics
         static S32              sNumTouches;
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index e5b0d99..d09de0e 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -1720,9 +1720,9 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
                 {
                         success &= dp.packU8(shared_constraintp->mChainLength, "chain_length");
                         success &= dp.packU8(shared_constraintp->mConstraintType, "constraint_type");
-                        char volume_name[16];
-                        snprintf(volume_name, sizeof(volume_name), "%s",
-                                mCharacter->findCollisionVolume(shared_constraintp->mSourceConstraintVolume)->getName().c_str()); /* Flawfinder: ignore */
+                        char volume_name[16];   /* Flawfinder: ignore */
+                        snprintf(volume_name, sizeof(volume_name), "%s",        /* Flawfinder: ignore */
+                                mCharacter->findCollisionVolume(shared_constraintp->mSourceConstraintVolume)->getName().c_str()); 
                         success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "source_volume");
                         success &= dp.packVector3(shared_constraintp->mSourceConstraintOffset, "source_offset");
                         if (shared_constraintp->mConstraintTargetType == TYPE_GROUND)
@@ -1731,8 +1731,8 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
                         }
                         else
                         {
-                                snprintf(volume_name, sizeof(volume_name),"%s", 
-                                        mCharacter->findCollisionVolume(shared_constraintp->mTargetConstraintVolume)->getName().c_str());       /* Flawfinder: ignore */
+                                snprintf(volume_name, sizeof(volume_name),"%s", /* Flawfinder: ignore */
+                                        mCharacter->findCollisionVolume(shared_constraintp->mTargetConstraintVolume)->getName().c_str());       
                         }
                         success &= dp.packBinaryDataFixed((U8*)volume_name, 16, "target_volume");
                         success &= dp.packVector3(shared_constraintp->mTargetConstraintOffset, "target_offset");
@@ -1911,28 +1911,26 @@ void LLKeyframeMotion::onLoadComplete(LLVFS *vfs,
                                                                            void* user_data, S32 status)
 {
         LLUUID* id = (LLUUID*)user_data;
+                
+        std::vector<LLCharacter* >::iterator char_iter = LLCharacter::sInstances.begin();
 
-        LLCharacter* character = NULL;
+        while(char_iter != LLCharacter::sInstances.end() &&
+                        (*char_iter)->getID() != *id)
+        {
+                ++char_iter;
+        }
         
-        for(character = LLCharacter::sInstances.getFirstData();
-                character;
-                character = LLCharacter::sInstances.getNextData())
-                {
-                        if (character->getID() == *id)
-                        {
-                                break;
-                        }
-                }
-
         delete id;
 
-        if (!character)
+        if (char_iter == LLCharacter::sInstances.end())
         {
                 return;
         }
 
+        LLCharacter* character = *char_iter;
+
         // create an instance of this motion (it may or may not already exist)
-        LLKeyframeMotion* motionp = (LLKeyframeMotion*)character->createMotion(asset_uuid);
+        LLKeyframeMotion* motionp = (LLKeyframeMotion*) character->createMotion(asset_uuid);
 
         if (0 == status && motionp)
         {
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 0bdc723..93df410 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -348,9 +348,9 @@ BOOL LLKeyframeMotionParam::loadMotions()
         // Load data into a buffer to be parsed.
         //-------------------------------------------------------------------------
         char path[LL_MAX_PATH];         /* Flawfinder: ignore */
-        snprintf( path, sizeof(path), "%s_%s.llp",
+        snprintf( path,sizeof(path), "%s_%s.llp",       /* Flawfinder: ignore */
                 gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(),
-                getName().c_str() );    /* Flawfinder: ignore */
+                getName().c_str() );    
 
         //-------------------------------------------------------------------------
         // open the file
@@ -425,7 +425,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
         // get priority
         //-------------------------------------------------------------------------
         BOOL isFirstMotion = TRUE;
-        num = sscanf(p, "%79s %79s %f", strA, strB, &floatA);
+        num = sscanf(p, "%79s %79s %f", strA, strB, &floatA);   /* Flawfinder: ignore */
 
         while(1)
         {
@@ -451,7 +451,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
                 }
                         
                 p++;
-                num = sscanf(p, "%79s %79s %f", strA, strB, &floatA);
+                num = sscanf(p, "%79s %79s %f", strA, strB, &floatA);   /* Flawfinder: ignore */
         }
 
         delete [] text;
diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst
index 2482eec..5fcb8c7 100644
--- a/linden/indra/llcommon/files.lst
+++ b/linden/indra/llcommon/files.lst
@@ -2,18 +2,20 @@ llcommon/bitpack.cpp
 llcommon/llapp.cpp
 llcommon/llapr.cpp
 llcommon/llassettype.cpp
+llcommon/llbase32.cpp
+llcommon/llbase64.cpp
 llcommon/llcommon.cpp
 llcommon/llcriticaldamp.cpp
 llcommon/lldate.cpp
-llcommon/llerrorbuffer.cpp
 llcommon/llerror.cpp
-llcommon/llerrorstream.cpp
 llcommon/llerrorthread.cpp
 llcommon/llevent.cpp
 llcommon/llfasttimer.cpp
 llcommon/llfile.cpp
 llcommon/llfixedbuffer.cpp
+llcommon/llformat.cpp
 llcommon/llframetimer.cpp
+llcommon/llliveappconfig.cpp
 llcommon/lllivefile.cpp
 llcommon/llmemory.cpp
 llcommon/llmemorystream.cpp
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index 150322e..d65b374 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -50,7 +50,7 @@
 const LLUUID IMG_CLEAR                  ("11ee27f5-43c0-414e-afd5-d7f5688c351f");  // VIEWER
 const LLUUID IMG_SMOKE                  ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");  // VIEWER
 
-const LLUUID IMG_DEFAULT                ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");  // VIEWER
+const LLUUID IMG_DEFAULT                ("d2114404-dd59-4a4d-8e6c-49359e91bbf0");  // VIEWER
 
 //const LLUUID IMG_SAND                 ("0ff70ead-4562-45f9-9e8a-52b1a3286868"); // VIEWER 1.5k
 //const LLUUID IMG_GRASS                        ("5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508"); // VIEWER 1.2k
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 31c2559..deb9c9d 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -28,6 +28,7 @@
 #ifndef LL_INDRA_CONSTANTS_H
 #define LL_INDRA_CONSTANTS_H
 
+#include "stdtypes.h"
 #include "lluuid.h"
 
 // Viewer object cache version, change if object update
@@ -105,8 +106,8 @@ const	char* const DEFAULT_LOCAL_ASSET_SERVER	= "http://localhost:12041/asset/tmp
 const   char* const     LOCAL_ASSET_URL_FORMAT          = "http://%s:12041/asset";
 
 const   U32             DEFAULT_LAUNCHER_PORT                   = 12029;
-const   U32             DEFAULT_BIGBOARD_PORT                   = 12030;
-const   U32             DEFAULT_QUERYSIM_PORT                   = 12031;
+//const U32             DEFAULT_BIGBOARD_PORT                   = 12030; // Deprecated
+//const U32             DEFAULT_QUERYSIM_PORT                   = 12031; // Deprecated
 const   U32             DEFAULT_DATA_SERVER_PORT                = 12032;
 const   U32             DEFAULT_SPACE_SERVER_PORT               = 12033;
 const   U32             DEFAULT_VIEWER_PORT                             = 12034;
@@ -115,8 +116,11 @@ const	U32		DEFAULT_USER_SERVER_PORT		= 12036;
 const   U32             DEFAULT_RPC_SERVER_PORT                 = 12037;
 const   U32             DEFAULT_LOG_DATA_SERVER_PORT    = 12039;
 const   U32             DEFAULT_BACKBONE_PORT                   = 12040;
+const   U32             DEFAULT_CGI_SERVICES_PORT               = 12045;
 const   U32             DEFAULT_LOCAL_ASSET_PORT                = 12041;
-const   U32             DEFAULT_BACKBONE_CAP_PORT               = 12042;
+//const   U32           DEFAULT_BACKBONE_CAP_PORT               = 12042; // Deprecated
+const   U32             DEFAULT_CAP_PROXY_PORT                  = 12043;
+const   U32             DEFAULT_INV_DATA_SERVER_PORT    = 12044;
 
 // For automatic port discovery when running multiple viewers on one host
 const   U32             PORT_DISCOVERY_RANGE_MIN                = 13000;
@@ -322,7 +326,7 @@ const U32 MAP_ITEM_TELEHUB = 0x01;
 const U32 MAP_ITEM_PG_EVENT = 0x02;
 const U32 MAP_ITEM_MATURE_EVENT = 0x03;
 const U32 MAP_ITEM_POPULAR = 0x04;
-const U32 MAP_ITEM_AGENT_COUNT = 0x05;
+//const U32 MAP_ITEM_AGENT_COUNT = 0x05;
 const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06;
 const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;
 const U32 MAP_ITEM_CLASSIFIED = 0x08;
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index ff77b3d..b1c5f3b 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -49,6 +49,7 @@
 #include "stdtypes.h"
 #include "lldefs.h"
 #include "llerror.h"
+#include "llformat.h"
 #include "llstring.h"
 #include "lltimer.h"
 #include "llfasttimer.h"
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index 42d9050..f48ff8f 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -30,9 +30,11 @@
 
 #include "llcommon.h"
 #include "llapr.h"
+#include "llerrorcontrol.h"
 #include "llerrorthread.h"
 #include "llframetimer.h"
 #include "llmemory.h"
+#include "lltimer.h"
 
 //
 // Signal handling
@@ -193,10 +195,8 @@ LLSD LLApp::getOptionData(OptionPriority level)
 
 void LLApp::stepFrame()
 {
-        // Update the static frame timer.
         LLFrameTimer::updateFrameTime();
-
-        // Run ready runnables
+        LLEventTimer::updateClass();
         mRunner.run();
 }
 
@@ -563,7 +563,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
                 else
                 {
                         // Don't log anything, even errors - this is because this signal could happen anywhere.
-                        gErrorStream.setLevel(LLErrorStream::NONE);
+                        LLError::setDefaultLevel(LLError::LEVEL_NONE);
                 }
                 
                 // Change the signal that we reraise to SIGABRT, so we generate a core dump.
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 665ee75..550a8d8 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -122,11 +122,13 @@ void ll_apr_assert_status(apr_status_t status)
         llassert(ll_apr_warn_status(status) == false);
 }
 
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep)
+// File I/O
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool)
 {
         apr_file_t* apr_file;
         apr_status_t s;
-        s = apr_file_open(&apr_file, filename.c_str(), flags, APR_OS_DEFAULT, gAPRPoolp);
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_file_open(&apr_file, filename.c_str(), flags, APR_OS_DEFAULT, pool);
         if (s != APR_SUCCESS)
         {
                 if (sizep)
@@ -142,6 +144,7 @@ apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* s
                 apr_off_t offset = 0;
                 if (apr_file_seek(apr_file, APR_END, &offset) == APR_SUCCESS)
                 {
+                        llassert_always(offset <= 0x7fffffff);
                         file_size = (S32)offset;
                         offset = 0;
                         apr_file_seek(apr_file, APR_SET, &offset);
@@ -151,6 +154,18 @@ apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* s
 
         return apr_file;
 }
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep)
+{
+        return ll_apr_file_open(filename, flags, sizep, NULL);
+}
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, apr_pool_t* pool)
+{
+        return ll_apr_file_open(filename, flags, NULL, pool);
+}
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags)
+{
+        return ll_apr_file_open(filename, flags, NULL, NULL);
+}
 
 S32 ll_apr_file_read(apr_file_t* apr_file, void *buf, S32 nbytes)
 {
@@ -162,10 +177,37 @@ S32 ll_apr_file_read(apr_file_t* apr_file, void *buf, S32 nbytes)
         }
         else
         {
+                llassert_always(sz <= 0x7fffffff);
                 return (S32)sz;
         }
 }
 
+S32 ll_apr_file_read_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
+{
+        if (pool == NULL) pool = gAPRPoolp;
+        apr_file_t* filep = ll_apr_file_open(filename, APR_READ|APR_BINARY, pool);
+        if (!filep)
+        {
+                return 0;
+        }
+        S32 off;
+        if (offset < 0)
+                off = ll_apr_file_seek(filep, APR_END, 0);
+        else
+                off = ll_apr_file_seek(filep, APR_SET, offset);
+        S32 bytes_read;
+        if (off < 0)
+        {
+                bytes_read = 0;
+        }
+        else
+        {
+                bytes_read = ll_apr_file_read(filep, buf, nbytes );
+        }
+        apr_file_close(filep);
+
+        return bytes_read;
+}
 
 S32 ll_apr_file_write(apr_file_t* apr_file, const void *buf, S32 nbytes)
 {
@@ -177,28 +219,73 @@ S32 ll_apr_file_write(apr_file_t* apr_file, const void *buf, S32 nbytes)
         }
         else
         {
+                llassert_always(sz <= 0x7fffffff);
                 return (S32)sz;
         }
 }
 
+S32 ll_apr_file_write_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes)
+{
+        if (pool == NULL) pool = gAPRPoolp;
+        apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
+        if (offset < 0)
+        {
+                flags |= APR_APPEND;
+                offset = 0;
+        }
+        apr_file_t* filep = ll_apr_file_open(filename, flags, pool);
+        if (!filep)
+        {
+                return 0;
+        }
+        if (offset > 0)
+        {
+                offset = ll_apr_file_seek(filep, APR_SET, offset);
+        }
+        S32 bytes_written;
+        if (offset < 0)
+        {
+                bytes_written = 0;
+        }
+        else
+        {
+                bytes_written = ll_apr_file_write(filep, buf, nbytes );
+        }
+        apr_file_close(filep);
+
+        return bytes_written;
+}
+
 S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset)
 {
-        apr_off_t apr_offset = offset;
-        apr_status_t s = apr_file_seek(apr_file, where, &apr_offset);
+        apr_status_t s;
+        apr_off_t apr_offset;
+        if (offset >= 0)
+        {
+                apr_offset = (apr_off_t)offset;
+                s = apr_file_seek(apr_file, where, &apr_offset);
+        }
+        else
+        {
+                apr_offset = 0;
+                s = apr_file_seek(apr_file, APR_END, &apr_offset);
+        }
         if (s != APR_SUCCESS)
         {
                 return -1;
         }
         else
         {
+                llassert_always(apr_offset <= 0x7fffffff);
                 return (S32)apr_offset;
         }
 }
 
-bool ll_apr_file_remove(const LLString& filename)
+bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool)
 {
         apr_status_t s;
-        s = apr_file_remove(filename.c_str(), gAPRPoolp);
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_file_remove(filename.c_str(), pool);
         if (s != APR_SUCCESS)
         {
                 llwarns << "ll_apr_file_remove failed on file: " << filename << llendl;
@@ -207,10 +294,11 @@ bool ll_apr_file_remove(const LLString& filename)
         return true;
 }
 
-bool ll_apr_file_rename(const LLString& filename, const LLString& newname)
+bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_pool_t* pool)
 {
         apr_status_t s;
-        s = apr_file_rename(filename.c_str(), newname.c_str(), gAPRPoolp);
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_file_rename(filename.c_str(), newname.c_str(), pool);
         if (s != APR_SUCCESS)
         {
                 llwarns << "ll_apr_file_rename failed on file: " << filename << llendl;
@@ -218,3 +306,73 @@ bool ll_apr_file_rename(const LLString& filename, const LLString& newname)
         }
         return true;
 }
+
+bool ll_apr_file_exists(const LLString& filename, apr_pool_t* pool)
+{
+        apr_file_t* apr_file;
+        apr_status_t s;
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_file_open(&apr_file, filename.c_str(), APR_READ, APR_OS_DEFAULT, pool);
+        if (s != APR_SUCCESS || !apr_file)
+        {
+                return false;
+        }
+        else
+        {
+                apr_file_close(apr_file);
+                return true;
+        }
+}
+
+S32 ll_apr_file_size(const LLString& filename, apr_pool_t* pool)
+{
+        apr_file_t* apr_file;
+        apr_finfo_t info;
+        apr_status_t s;
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_file_open(&apr_file, filename.c_str(), APR_READ, APR_OS_DEFAULT, pool);
+        if (s != APR_SUCCESS || !apr_file)
+        {
+                return 0;
+        }
+        else
+        {
+                apr_status_t s = apr_file_info_get(&info, APR_FINFO_SIZE, apr_file);
+                apr_file_close(apr_file);
+                if (s == APR_SUCCESS)
+                {
+                        return (S32)info.size;
+                }
+                else
+                {
+                        return 0;
+                }
+        }
+}
+
+bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool)
+{
+        apr_status_t s;
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_dir_make(dirname.c_str(), APR_FPROT_OS_DEFAULT, pool);
+        if (s != APR_SUCCESS)
+        {
+                llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl;
+                return false;
+        }
+        return true;
+}
+
+bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool)
+{
+        apr_status_t s;
+        if (pool == NULL) pool = gAPRPoolp;
+        s = apr_file_remove(dirname.c_str(), pool);
+        if (s != APR_SUCCESS)
+        {
+                llwarns << "ll_apr_file_remove failed on file: " << dirname << llendl;
+                return false;
+        }
+        return true;
+}
+
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index a5c217c..be6fc6c 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -125,14 +125,24 @@ typedef LLAtomic32<S32> LLAtomicS32;
 #define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb"
 #define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b"
 #define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b"
-apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep = NULL);
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool);
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep);
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, apr_pool_t* pool);
+apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags);
 // Returns actual offset, -1 if seek fails
 S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset);
-// Returns bytes read/written, 0 if read/write fails
+// Returns bytes read/written, 0 if read/write fails:
 S32 ll_apr_file_read(apr_file_t* apr_file, void* buf, S32 nbytes);
+S32 ll_apr_file_read_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
 S32 ll_apr_file_write(apr_file_t* apr_file, const void* buf, S32 nbytes);
-bool ll_apr_file_remove(const LLString& filename);
-bool ll_apr_file_rename(const LLString& filename, const LLString& newname);
+S32 ll_apr_file_write_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes);
+// returns false if failure:
+bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool = NULL);
+bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_pool_t* pool = NULL);
+bool ll_apr_file_exists(const LLString& filename, apr_pool_t* pool = NULL);
+S32 ll_apr_file_size(const LLString& filename, apr_pool_t* pool = NULL);
+bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool = NULL);
+bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool = NULL);
 
 /**
  * @brief Function which approprately logs error or remains quiet on
diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp
index 051092e..df00af8 100644
--- a/linden/indra/llcommon/llassettype.cpp
+++ b/linden/indra/llcommon/llassettype.cpp
@@ -203,6 +203,20 @@ const char* LLAssetType::lookupHumanReadable(LLAssetType::EType type)
         }
 }
 
+// static
+LLAssetType::EType LLAssetType::lookupHumanReadable( const char* name )
+{
+        for( S32 i = 0; i < AT_COUNT; i++ )
+        {
+                if( 0 == strcmp(name, mAssetTypeHumanNames[i]) )
+                {
+                        // match
+                        return (EType)i;
+                }
+        }
+        return AT_NONE;
+}
+
 EDragAndDropType LLAssetType::lookupDragAndDropType( EType asset )
 {
         switch( asset )
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index 67dc3ef..da4cf0b 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -145,6 +145,7 @@ public:
         static const char* lookup(EType type);
 
         // translation from a type to a human readable form.
+        static EType lookupHumanReadable( const char* name );
         static const char* lookupHumanReadable(EType type);
 
         static EDragAndDropType lookupDragAndDropType( EType );
diff --git a/linden/indra/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h
index 3335949..1eb5b05 100644
--- a/linden/indra/llcommon/llavatarconstants.h
+++ b/linden/indra/llcommon/llavatarconstants.h
@@ -39,16 +39,16 @@ const char* const BLACKLIST_PROFILE_WEB_URL = "http://secondlife.com/app/webdisa
 // Maximum number of avatar picks
 const S32 MAX_AVATAR_PICKS = 10;
 
-// For Flags in AvatarPropertiesReply

-const U32 AVATAR_ALLOW_PUBLISH                  = 0x1 << 0;     // whether profile is externally visible or not

-const U32 AVATAR_MATURE_PUBLISH                 = 0x1 << 1;     // profile is "mature"

-const U32 AVATAR_IDENTIFIED                             = 0x1 << 2;     // whether avatar has provided payment info

+// For Flags in AvatarPropertiesReply
+const U32 AVATAR_ALLOW_PUBLISH                  = 0x1 << 0;     // whether profile is externally visible or not
+const U32 AVATAR_MATURE_PUBLISH                 = 0x1 << 1;     // profile is "mature"
+const U32 AVATAR_IDENTIFIED                             = 0x1 << 2;     // whether avatar has provided payment info
 const U32 AVATAR_TRANSACTED                             = 0x1 << 3;     // whether avatar has actively used payment info
 const U32 AVATAR_ONLINE                                 = 0x1 << 4; // the online status of this avatar, if known.
 
-static const std::string VISIBILITY_DEFAULT("default");

+static const std::string VISIBILITY_DEFAULT("default");
 static const std::string VISIBILITY_HIDDEN("hidden");
-static const std::string VISIBILITY_VISIBLE("visible");

+static const std::string VISIBILITY_VISIBLE("visible");
 static const std::string VISIBILITY_INVISIBLE("invisible");
 
 #endif
diff --git a/linden/indra/llcommon/llbase32.cpp b/linden/indra/llcommon/llbase32.cpp
new file mode 100644
index 0000000..711ba63
--- /dev/null
+++ b/linden/indra/llcommon/llbase32.cpp
@@ -0,0 +1,214 @@
+/** 
+ * @file llbase32.cpp
+ * @brief base32 encoding that returns a std::string
+ * @author James Cook
+ *
+ * Based on code from bitter
+ * http://ghostwhitecrab.com/bitter/
+ *
+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the authors nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "linden_common.h"
+
+#include "llbase32.h"
+
+#include <string>
+
+// bitter - base32.c starts here
+
+/*
+ * See RFC 3548 for details about Base 32 encoding:
+ *  http://www.faqs.org/rfcs/rfc3548.html
+ */
+
+static const char base32_alphabet[32] = {
+  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+  'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+  'Y', 'Z', '2', '3', '4', '5', '6', '7'
+};
+
+size_t
+base32_encode(char *dst, size_t size, const void *data, size_t len)
+{
+  size_t i = 0;
+  const U8 *p = (const U8*)data;
+  const char *end = &dst[size];
+  char *q = dst;
+
+  do {
+    size_t j, k;
+    U8 x[5];
+    char s[8];
+
+    switch (len - i) {
+    case 4: k = 7; break;
+    case 3: k = 5; break;
+    case 2: k = 3; break;
+    case 1: k = 2; break;
+    default:
+      k = 8;
+    }
+
+    for (j = 0; j < 5; j++)
+      x[j] = i < len ? p[i++] : 0;
+
+/*
+  +-------+-----------+--------+
+  | target| source    | source |
+  | byte  | bits      | byte   |
+  +-------+-----------+--------+
+  |     0 | 7 6 5 4 3 | 0      |
+  |     1 | 2 1 0 7 6 | 0-1    |
+  |     2 | 5 4 3 2 1 | 1      |
+  |     3 | 0 7 6 5 4 | 1-2    |
+  |     4 | 3 2 1 0 7 | 2-3    |
+  |     5 | 6 5 4 3 2 | 3      |
+  |     6 | 1 0 7 6 5 | 3-4    |
+  |     7 | 4 3 2 1 0 | 4      |
+  +-------+-----------+--------+
+  
+*/
+    
+    s[0] =  (x[0] >> 3);
+    s[1] = ((x[0] & 0x07) << 2) | (x[1] >> 6);
+    s[2] =  (x[1] >> 1) & 0x1f;
+    s[3] = ((x[1] & 0x01) << 4) | (x[2] >> 4);
+    s[4] = ((x[2] & 0x0f) << 1) | (x[3] >> 7);
+    s[5] =  (x[3] >> 2) & 0x1f;
+    s[6] = ((x[3] & 0x03) << 3) | (x[4] >> 5);
+    s[7] =   x[4] & 0x1f;
+
+    for (j = 0; j < k && q != end; j++)
+      *q++ = base32_alphabet[(U8) s[j]];
+
+  } while (i < len);
+
+  return q - dst;
+}
+
+/* *TODO: Implement base32 encode.
+
+#define ARRAY_LEN(a) (sizeof (a) / sizeof((a)[0]))
+
+static inline int
+ascii_toupper(int c)
+{
+  return c >= 97 && c <= 122 ? c - 32 : c;
+}
+
+static inline int
+ascii_tolower(int c)
+{
+  return c >= 65 && c <= 90 ? c + 32 : c;
+}
+
+
+static char base32_map[(unsigned char) -1];
+
+size_t
+base32_decode(char *dst, size_t size, const void *data, size_t len)
+{
+  const char *end = &dst[size];
+  const unsigned char *p = data;
+  char *q = dst;
+  size_t i;
+  unsigned max_pad = 3;
+
+  if (0 == base32_map[0]) {
+    for (i = 0; i < ARRAY_LEN(base32_map); i++) {
+      const char *x;
+      
+      x = memchr(base32_alphabet, ascii_toupper(i), sizeof base32_alphabet);
+      base32_map[i] = x ? (x - base32_alphabet) : (unsigned char) -1;
+    }
+  }
+  
+  for (i = 0; i < len && max_pad > 0; i++) {
+    unsigned char c;
+    char s[8];
+    size_t j;
+
+    c = p[i];
+    if ('=' == c) {
+      max_pad--;
+      c = 0;
+    } else {
+      c = base32_map[c];
+      if ((unsigned char) -1 == c) {
+        return -1;
+      }
+    }
+
+    j = i % ARRAY_LEN(s);
+    s[j] = c;
+
+    if (7 == j) {
+      char b[5];
+
+      b[0] = ((s[0] << 3) & 0xf8) | ((s[1] >> 2) & 0x07);
+      b[1] = ((s[1] & 0x03) << 6) | ((s[2] & 0x1f) << 1) | ((s[3] >> 4) & 1);
+      b[2] = ((s[3] & 0x0f) << 4) | ((s[4] >> 1) & 0x0f);
+      b[3] = ((s[4] & 1) << 7) | ((s[5] & 0x1f) << 2) | ((s[6] >> 3) & 0x03);
+      b[4] = ((s[6] & 0x07) << 5) | (s[7] & 0x1f);
+
+      for (j = 0; j < ARRAY_LEN(b); j++) {
+        if (q != end)
+          *q = b[j];
+        q++;
+      }
+    }
+  }
+
+  return q - dst;
+}
+*/
+
+
+// static
+std::string LLBase32::encode(const U8* input, size_t input_size)
+{
+        std::string output;
+        if (input)
+        {
+                // Each 5 byte chunk of input is represented by an
+                // 8 byte chunk of output.
+                size_t input_chunks = (input_size + 4) / 5;
+                size_t output_size = input_chunks * 8;
+
+                output.resize(output_size);
+
+                size_t encoded = base32_encode(&output[0], output_size, input, input_size);
+
+                llinfos << "encoded " << encoded << " into buffer of size " << output_size
+                        << llendl;
+        }
+        return output;
+}
diff --git a/linden/indra/llcommon/llbase32.h b/linden/indra/llcommon/llbase32.h
new file mode 100644
index 0000000..eaf3efc
--- /dev/null
+++ b/linden/indra/llcommon/llbase32.h
@@ -0,0 +1,38 @@
+/** 

+ * @file llbase32.h

+ * @brief base32 encoding that returns a std::string

+ * @author James Cook

+ *

+ * Copyright (c) 2007-2007, Linden Research, Inc.

+ * 
+ * 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.

+ */

+

+#ifndef LLBASE32_H

+#define LLBASE32_h

+

+class LLBase32

+{

+public:

+        static std::string encode(const U8* input, size_t input_size);

+};

+

+#endif

diff --git a/linden/indra/llcommon/llbase64.cpp b/linden/indra/llcommon/llbase64.cpp
new file mode 100644
index 0000000..0869d3f
--- /dev/null
+++ b/linden/indra/llcommon/llbase64.cpp
@@ -0,0 +1,62 @@
+/** 
+ * @file llbase64.cpp
+ * @brief Wrapper for apr base64 encoding that returns a std::string
+ * @author James Cook
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+
+#include "llbase64.h"
+
+#include <string>
+
+#include "apr-1/apr_base64.h"
+
+
+// static
+std::string LLBase64::encode(const U8* input, size_t input_size)
+{
+        std::string output;
+        if (input
+                && input_size > 0)
+        {
+                // Yes, it returns int.
+                int b64_buffer_length = apr_base64_encode_len(input_size);
+                char* b64_buffer = new char[b64_buffer_length];
+                
+                // This is faster than apr_base64_encode() if you know
+                // you're not on an EBCDIC machine.  Also, the output is
+                // null terminated, even though the documentation doesn't
+                // specify.  See apr_base64.c for details. JC
+                b64_buffer_length = apr_base64_encode_binary(
+                        b64_buffer,
+                        input,
+                        input_size);
+                output.assign(b64_buffer);
+                delete[] b64_buffer;
+        }
+        return output;
+}
+
diff --git a/linden/indra/llcommon/llbase64.h b/linden/indra/llcommon/llbase64.h
new file mode 100644
index 0000000..d8b4acc
--- /dev/null
+++ b/linden/indra/llcommon/llbase64.h
@@ -0,0 +1,38 @@
+/** 
+ * @file llbase64.h
+ * @brief Wrapper for apr base64 encoding that returns a std::string
+ * @author James Cook
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LLBASE64_H
+#define LLBASE64_h
+
+class LLBase64
+{
+public:
+        static std::string encode(const U8* input, size_t input_size);
+};
+
+#endif
diff --git a/linden/indra/llcommon/llcommon.cpp b/linden/indra/llcommon/llcommon.cpp
index 50b9849..49675e1 100644
--- a/linden/indra/llcommon/llcommon.cpp
+++ b/linden/indra/llcommon/llcommon.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 
 #include "llcommon.h"
+#include "llthread.h"
 
 //static
 BOOL LLCommon::sAprInitialized = FALSE;
diff --git a/linden/indra/llcommon/llcommon.h b/linden/indra/llcommon/llcommon.h
index 5d5264c..8b57579 100644
--- a/linden/indra/llcommon/llcommon.h
+++ b/linden/indra/llcommon/llcommon.h
@@ -31,7 +31,6 @@
 #include "llapr.h"
 // #include "llframecallbackmanager.h"
 #include "lltimer.h"
-#include "llworkerthread.h"
 #include "llfile.h"
 
 class LLCommon
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index 5cfbc64..403b8c5 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -167,22 +167,22 @@
                                 RelativePath=".\llassettype.cpp">
                         </File>
                         <File
-                                RelativePath=".\llcommon.cpp">
+                                RelativePath=".\llbase32.cpp">
                         </File>
                         <File
-                                RelativePath=".\llcriticaldamp.cpp">
+                                RelativePath=".\llbase64.cpp">
                         </File>
                         <File
-                                RelativePath=".\lldate.cpp">
+                                RelativePath=".\llcommon.cpp">
                         </File>
                         <File
-                                RelativePath=".\llerror.cpp">
+                                RelativePath=".\llcriticaldamp.cpp">
                         </File>
                         <File
-                                RelativePath=".\llerrorbuffer.cpp">
+                                RelativePath=".\lldate.cpp">
                         </File>
                         <File
-                                RelativePath=".\llerrorstream.cpp">
+                                RelativePath=".\llerror.cpp">
                         </File>
                         <File
                                 RelativePath=".\llerrorthread.cpp">
@@ -200,9 +200,15 @@
                                 RelativePath=".\llfixedbuffer.cpp">
                         </File>
                         <File
+                                RelativePath=".\llformat.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llframetimer.cpp">
                         </File>
                         <File
+                                RelativePath=".\llliveappconfig.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\lllivefile.cpp">
                         </File>
                         <File
@@ -322,6 +328,12 @@
                                 RelativePath=".\llavatarconstants.h">
                         </File>
                         <File
+                                RelativePath=".\llbase32.h">
+                        </File>
+                        <File
+                                RelativePath=".\llbase64.h">
+                        </File>
+                        <File
                                 RelativePath=".\llboost.h">
                         </File>
                         <File
@@ -364,10 +376,7 @@
                                 RelativePath=".\llerror.h">
                         </File>
                         <File
-                                RelativePath=".\llerrorbuffer.h">
-                        </File>
-                        <File
-                                RelativePath=".\llerrorstream.h">
+                                RelativePath=".\llerrorcontrol.h">
                         </File>
                         <File
                                 RelativePath=".\llerrorthread.h">
@@ -385,6 +394,9 @@
                                 RelativePath=".\llfixedbuffer.h">
                         </File>
                         <File
+                                RelativePath=".\llformat.h">
+                        </File>
+                        <File
                                 RelativePath=".\llframecallbackmanager.h">
                         </File>
                         <File
@@ -400,6 +412,9 @@
                                 RelativePath=".\lllinkedqueue.h">
                         </File>
                         <File
+                                RelativePath=".\llliveappconfig.h">
+                        </File>
+                        <File
                                 RelativePath=".\lllivefile.h">
                         </File>
                         <File
@@ -418,6 +433,9 @@
                                 RelativePath=".\llmemorystream.h">
                         </File>
                         <File
+                                RelativePath=".\llmemtype.h">
+                        </File>
+                        <File
                                 RelativePath=".\llmortician.h">
                         </File>
                         <File
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj
new file mode 100644
index 0000000..4fee443
--- /dev/null
+++ b/linden/indra/llcommon/llcommon_vc8.vcproj
@@ -0,0 +1,759 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llcommon"

+        ProjectGUID="{7BCB4B2C-8378-4186-88EA-5742B5ABE17F}"

+        RootNamespace="llcommon"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XML_STATIC;APR_DECLARE_STATIC"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llcommon.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                InlineFunctionExpansion="2"

+                                EnableIntrinsicFunctions="true"

+                                AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llcommon.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XML_STATIC;APR_DECLARE_STATIC"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llcommon.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\bitpack.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llapp.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llapr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llassettype.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbase64.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcommon.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcriticaldamp.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldate.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llerror.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llerrorthread.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llevent.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfasttimer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfixedbuffer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llformat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframetimer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllivefile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemorystream.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmortician.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprocessor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llqueuedthread.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrun.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsd.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdserialize.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdserialize_xml.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdutil.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsecondlifeurls.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstreamtools.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstring.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstringtable.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsys.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llthread.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltimer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluri.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworkerthread.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\metaclass.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\metaproperty.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\reflective.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\timing.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\u64.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\bitpack.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\doublelinkedlist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\imageids.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\indra_constants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\linden_common.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\linked_lists.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagentconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llapp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llapr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llassettype.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llassoclist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llavatarconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbase64.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llboost.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llchat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclickaction.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcommon.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcriticaldamp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldarray.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldarrayptr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldate.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldefs.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldlinked.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldqueueptr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llendianswizzle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llenum.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llerror.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llerrorcontrol.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llerrorthread.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llevent.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfasttimer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfixedbuffer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llformat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframecallbackmanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframetimer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhash.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llindexedqueue.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllinkedqueue.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllivefile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllocalidhashmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllslconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemorystream.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmortician.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnametable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpagemem.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreprocessor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpriqueuemap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprocessor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llptrskiplist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llptrskipmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llqueuedthread.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrun.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsd.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdserialize.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdserialize_xml.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdutil.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsecondlifeurls.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llskiplist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llskipmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatenums.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstreamtools.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstrider.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstring.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstringtable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsys.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llthread.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltimer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluri.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluuidhashmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llversion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworkerthread.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\new_mem_ops.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\priqueue.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\processor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\roles_constants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\stdenums.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\stdtypes.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\string_table.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\timer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\timing.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\u64.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 29f4500..57e098e 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -1,8 +1,9 @@
 /** 
  * @file llerror.cpp
- * @brief Function to crash.
+ * @date   December 2006
+ * @brief error message system
  *
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -24,36 +25,1048 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  */
+
 #include "linden_common.h"
 
 #include "llerror.h"
+#include "llerrorcontrol.h"
+
+#include "llapp.h"
+#include "llapr.h"
+extern apr_thread_mutex_t *gLogMutexp;
+#include "llfile.h"
+#include "llfixedbuffer.h"
+#include "lllivefile.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+
+#include <algorithm>
+#include <cctype>
+#include <map>
+#include <sstream>
+#if !LL_WINDOWS
+#include <stdio.h>
+#include <syslog.h>
+#endif
+#include <time.h>
+#if LL_WINDOWS
+#include <windows.h>
+#endif
+#include <vector>
+
+
+#ifdef __GNUC__
+#include <cxxabi.h>
+#endif
+
+namespace {
+#if !LL_WINDOWS
+        class RecordToSyslog : public LLError::Recorder
+        {
+        public:
+                RecordToSyslog(const std::string& identity)
+                        : mIdentity(identity)
+                {
+                        openlog(mIdentity.c_str(), LOG_CONS|LOG_PID, LOG_LOCAL0);
+                                // we need to set the string from a local copy of the string
+                                // since apparanetly openlog expects the const char* to remain
+                                // valid even after it returns (presumably until closelog)
+                }
+                
+                ~RecordToSyslog()
+                {
+                        closelog();
+                }
+                
+                virtual void recordMessage(LLError::ELevel level,
+                                                                        const std::string& message)
+                {
+                        int syslogPriority = LOG_CRIT;
+                        switch (level) {
+                                case LLError::LEVEL_DEBUG:      syslogPriority = LOG_DEBUG;     break;
+                                case LLError::LEVEL_INFO:       syslogPriority = LOG_INFO;      break;
+                                case LLError::LEVEL_WARN:       syslogPriority = LOG_WARNING; break;
+                                case LLError::LEVEL_ERROR:      syslogPriority = LOG_CRIT;      break;
+                                default:                                        syslogPriority = LOG_CRIT;
+                        }
+                        
+                        syslog(syslogPriority, "%s", message.c_str());
+                }
+        private:
+                std::string mIdentity;
+        };
+#endif
+
+        class RecordToFile : public LLError::Recorder
+        {
+        public:
+                RecordToFile(const std::string& filename)
+                {
+                        mFile.open(filename.c_str(), llofstream::out | llofstream::app);
+                        if (!mFile)
+                        {
+                                llinfos << "Error setting log file to " << filename << llendl;
+                        }
+                }
+                
+                ~RecordToFile()
+                {
+                        mFile.close();
+                }
+                
+                bool okay() { return mFile; }
+                
+                virtual bool wantsTime() { return true; }
+                
+                virtual void recordMessage(LLError::ELevel level,
+                                                                        const std::string& message)
+                {
+                        mFile << message << std::endl;
+                        // mFile.flush();
+                                // *FIX: should we do this? 
+                }
+        
+        private:
+                llofstream mFile;
+        };
+        
+        
+        class RecordToStderr : public LLError::Recorder
+        {
+        public:
+                RecordToStderr(bool timestamp) : mTimestamp(timestamp) { }
 
-LLErrorBuffer gErrorBuffer;
-LLErrorStream gErrorStream(&gErrorBuffer);
+                virtual bool wantsTime() { return mTimestamp; }
+                
+                virtual void recordMessage(LLError::ELevel level,
+                                                                        const std::string& message)
+                {
+                        fprintf(stderr, "%s\n", message.c_str());
+                }
+        
+        private:
+                bool mTimestamp;
+        };
 
+        class RecordToFixedBuffer : public LLError::Recorder
+        {
+        public:
+                RecordToFixedBuffer(LLFixedBuffer& buffer) : mBuffer(buffer) { }
+                
+                virtual void recordMessage(LLError::ELevel level,
+                                                                        const std::string& message)
+                {
+                        mBuffer.addLine(message.c_str());
+                }
+        
+        private:
+                LLFixedBuffer& mBuffer;
+        };
 
-void _llcrash_and_loop()
+#if LL_WINDOWS
+        class RecordToWinDebug: public LLError::Recorder
+        {
+        public:
+                virtual void recordMessage(LLError::ELevel level,
+                                                                        const std::string& message)
+                {
+                        llutf16string utf16str =
+                                wstring_to_utf16str(utf8str_to_wstring(message));
+                        utf16str += '\n';
+                        OutputDebugString(utf16str.c_str());
+                }
+        };
+#endif
+}
+
+
+namespace
 {
-        // Now, we go kaboom!
-        U32* crash = NULL;
+        std::string className(const std::type_info& type)
+        {
+#ifdef __GNUC__
+                // GCC: type_info::name() returns a mangled class name, must demangle
+
+                static size_t abi_name_len = 100;
+                static char* abi_name_buf = (char*)malloc(abi_name_len);
+                        // warning: above is voodoo inferred from the GCC manual,
+                        // do NOT change
+
+                int status;
+                        // We don't use status, and shouldn't have to pass apointer to it
+                        // but gcc 3.3 libstc++'s implementation of demangling is broken
+                        // and fails without.
+                        
+                char* name = abi::__cxa_demangle(type.name(),
+                                                                                abi_name_buf, &abi_name_len, &status);
+                        // this call can realloc the abi_name_buf pointer (!)
+
+                return name ? name : type.name();
 
-        *crash = 0;
+#elif LL_WINDOWS
+                // DevStudio: type_info::name() includes the text "class " at the start
 
-        while(TRUE)
+                static const std::string class_prefix = "class ";
+
+                std::string name = type.name();
+                std::string::size_type p = name.find(class_prefix);
+                if (p == std::string::npos)
+                {
+                        return name;
+                }
+
+                return name.substr(p + class_prefix.size());
+
+#else           
+                return type.name();
+#endif
+        }
+
+        std::string functionName(const std::string& preprocessor_name)
         {
+#if LL_WINDOWS
+                // DevStudio: the __FUNCTION__ macro string includes
+                // the type and/or namespace prefixes
+
+                std::string::size_type p = preprocessor_name.rfind(':');
+                if (p == std::string::npos)
+                {
+                        return preprocessor_name;
+                }
+                return preprocessor_name.substr(p + 1);
+
+#else
+                return preprocessor_name;
+#endif
+        }
+
+
+        class LogControlFile : public LLLiveFile
+        {
+                LOG_CLASS(LogControlFile);
+        
+        public:
+                static LogControlFile& fromDirectory(const std::string& dir);
+                
+                virtual void loadFile();
+                
+        private:
+                LogControlFile(const std::string &filename)
+                        : LLLiveFile(filename)
+                        { }
+        };
+
+        LogControlFile& LogControlFile::fromDirectory(const std::string& dir)
+        {
+                std::string dirBase = dir + "/";
+                        // NB: We have no abstraction in llcommon  for the "proper"
+                        // delimiter but it turns out that "/" works on all three platforms
+                        
+                std::string file = dirBase + "logcontrol-dev.xml";
+                
+                llstat stat_info;
+                if (LLFile::stat(file.c_str(), &stat_info)) {
+                        // NB: stat returns non-zero if it can't read the file, for example
+                        // if it doesn't exist.  LLFile has no better abstraction for 
+                        // testing for file existence.
+                        
+                        file = dirBase + "logcontrol.xml";
+                }
+                return * new LogControlFile(file);
+                        // NB: This instance is never freed
+        }
+        
+        void LogControlFile::loadFile()
+        {
+                LLSD configuration;
+
+                {
+                        llifstream file(filename().c_str());
+                        if (file.is_open())
+                        {
+                                LLSDSerialize::fromXML(configuration, file);
+                        }
+
+                        if (configuration.isUndefined())
+                        {
+                                llwarns << filename() << " missing, ill-formed,"
+                                                        " or simply undefined; not changing configuration"
+                                                << llendl;
+                                return;
+                        }
+                }
+                
+                LLError::configure(configuration);
+                llinfos << "logging reconfigured from " << filename() << llendl;
+        }
+
+
+        typedef std::map<std::string, LLError::ELevel> LevelMap;
+        typedef std::vector<LLError::Recorder*> Recorders;
+        typedef std::vector<LLError::CallSite*> CallSiteVector;
+
+        class Globals
+        {
+        public:
+                std::ostringstream messageStream;
+                bool messageStreamInUse;
+
+                void addCallSite(LLError::CallSite&);
+                void invalidateCallSites();
+                
+                static Globals& get();
+                        // return the one instance of the globals
+
+        private:
+                CallSiteVector callSites;
+
+                Globals()
+                        :       messageStreamInUse(false)
+                        { }
+                
+        };
+
+        void Globals::addCallSite(LLError::CallSite& site)
+        {
+                callSites.push_back(&site);
+        }
         
-                // Loop forever, in case the crash didn't work?
+        void Globals::invalidateCallSites()
+        {
+                for (CallSiteVector::const_iterator i = callSites.begin();
+                         i != callSites.end();
+                         ++i)
+                {
+                        (*i)->invalidate();
+                }
+                
+                callSites.clear();
+        }
+
+        Globals& Globals::get()
+        {
+                /* This pattern, of returning a reference to a static function
+                   variable, is to ensure that this global is constructed before
+                   it is used, no matter what the global initializeation sequence
+                   is.
+                   See C++ FAQ Lite, sections 10.12 through 10.14
+                */
+                static Globals* globals = new Globals;          
+                return *globals;
         }
 }
 
-LLScopedErrorLevel::LLScopedErrorLevel(LLErrorBuffer::ELevel error_level)
+namespace LLError
 {
-        mOrigErrorLevel = gErrorStream.getErrorLevel();
-        gErrorStream.setErrorLevel(error_level);
+        class Settings
+        {
+        public:
+                bool printLocation;
+
+                LLError::ELevel defaultLevel;
+                
+                LevelMap functionLevelMap;
+                LevelMap classLevelMap;
+                LevelMap fileLevelMap;
+                
+                LLError::FatalFunction crashFunction;
+                LLError::TimeFunction timeFunction;
+                
+                Recorders recorders;
+                Recorder* fileRecorder;
+                Recorder* fixedBufferRecorder;
+                std::string fileRecorderFileName;
+                
+                int shouldLogCallCounter;
+                
+                static Settings& get();
+        
+                static void reset();
+                static Settings* saveAndReset();
+                static void restore(Settings*);
+                
+        private:
+                Settings()
+                        :       printLocation(false),
+                                defaultLevel(LLError::LEVEL_DEBUG),
+                                crashFunction(NULL),
+                                timeFunction(NULL),
+                                fileRecorder(NULL),
+                                fixedBufferRecorder(NULL),
+                                shouldLogCallCounter(0)
+                        { }
+                
+                static Settings*& getPtr();
+        };
+        
+        Settings& Settings::get()
+        {
+                Settings* p = getPtr();
+                if (!p)
+                {
+                        reset();
+                        p = getPtr();
+                }
+                return *p;
+        }
+        
+        void Settings::reset()
+        {
+                Globals::get().invalidateCallSites();
+                
+                Settings*& p = getPtr();
+                delete p;
+                p = new Settings();
+        }
+        
+        Settings* Settings::saveAndReset()
+        {
+                Globals::get().invalidateCallSites();
+                
+                Settings*& p = getPtr();
+                Settings* originalSettings = p;
+                p = new Settings();
+                return originalSettings;
+        }
+        
+        void Settings::restore(Settings* originalSettings)
+        {
+                Globals::get().invalidateCallSites();
+                
+                Settings*& p = getPtr();
+                delete p;
+                p = originalSettings;
+        }
+        
+        Settings*& Settings::getPtr()
+        {
+                static Settings* currentSettings = NULL;
+                return currentSettings;
+        }
 }
 
+namespace LLError
+{
+        CallSite::CallSite(ELevel level,
+                                        const char* file, int line,
+                                        const std::type_info& class_info, const char* function)
+                : mLevel(level), mFile(file), mLine(line),
+                  mClassInfo(class_info), mFunction(function),
+                  mCached(false), mShouldLog(false)
+                { }
+
+
+        void CallSite::invalidate()
+                { mCached = false; }
+}
+
+namespace
+{
+        bool shouldLogToStderr()
+        {
+#if LL_DARWIN
+                // On Mac OS X, stderr from apps launched from the Finder goes to the
+                // console log.  It's generally considered bad form to spam too much
+                // there.
+                
+                // If stdin is a tty, assume the user launched from the command line and
+                // therefore wants to see stderr.  Otherwise, assume we've been launched
+                // from the finder and shouldn't spam stderr.
+                return isatty(0);
+#else
+                return true;
+#endif
+        }
+        
+        bool stderrLogWantsTime()
+        {
+#if LL_WINDOWS
+                return false;
+#else
+                return true;
+#endif
+        }
+        
+        
+        void commonInit(const std::string& dir)
+        {
+                LLError::Settings::reset();
+                
+                LLError::setDefaultLevel(LLError::LEVEL_INFO);
+                LLError::setFatalFunction(LLError::crashAndLoop);
+                LLError::setTimeFunction(LLError::utcTime);
+
+                if (shouldLogToStderr())
+                {
+                        LLError::addRecorder(new RecordToStderr(stderrLogWantsTime()));
+                }
+                
+#if LL_WINDOWS
+                LLError::addRecorder(new RecordToWinDebug);
+#endif
 
-LLScopedErrorLevel::~LLScopedErrorLevel()
+                LogControlFile& e = LogControlFile::fromDirectory(dir);
+                e.addToEventTimer();
+        }
+}
+
+namespace LLError
 {
-        gErrorStream.setErrorLevel(mOrigErrorLevel);
+        void initForServer(const std::string& identity)
+        {
+                std::string dir = LLApp::instance()->getOption("configdir");
+                commonInit(dir);
+#if !LL_WINDOWS
+                addRecorder(new RecordToSyslog(identity));
+#endif
+        }
+
+        void initForApplication(const std::string& dir)
+        {
+                commonInit(dir);
+        }
+
+        void setPrintLocation(bool print)
+        {
+                Settings& s = Settings::get();
+                s.printLocation = print;
+        }
+
+        void setFatalFunction(FatalFunction f)
+        {
+                Settings& s = Settings::get();
+                s.crashFunction = f;
+        }
+
+        void setTimeFunction(TimeFunction f)
+        {
+                Settings& s = Settings::get();
+                s.timeFunction = f;
+        }
+
+        void setDefaultLevel(ELevel level)
+        {
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+                g.invalidateCallSites();
+                s.defaultLevel = level;
+        }
+
+        void setFunctionLevel(const std::string& function_name, ELevel level)
+        {
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+                g.invalidateCallSites();
+                s.functionLevelMap[function_name] = level;
+        }
+
+        void setClassLevel(const std::string& class_name, ELevel level)
+        {
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+                g.invalidateCallSites();
+                s.classLevelMap[class_name] = level;
+        }
+
+        void setFileLevel(const std::string& file_name, ELevel level)
+        {
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+                g.invalidateCallSites();
+                s.fileLevelMap[file_name] = level;
+        }
 }
+
+namespace {
+        LLError::ELevel decodeLevel(std::string name)
+        {
+                static LevelMap level_names;
+                if (level_names.empty())
+                {
+                        level_names["ALL"]              = LLError::LEVEL_ALL;
+                        level_names["DEBUG"]    = LLError::LEVEL_DEBUG;
+                        level_names["INFO"]             = LLError::LEVEL_INFO;
+                        level_names["WARN"]             = LLError::LEVEL_WARN;
+                        level_names["ERROR"]    = LLError::LEVEL_ERROR;
+                        level_names["NONE"]             = LLError::LEVEL_NONE;
+                }
+                
+                std::transform(name.begin(), name.end(), name.begin(), toupper);
+                
+                LevelMap::const_iterator i = level_names.find(name);
+                if (i == level_names.end())
+                {
+                        llwarns << "unrecognized logging level: '" << name << "'" << llendl;
+                        return LLError::LEVEL_INFO;
+                }
+                
+                return i->second;
+        }
+        
+        void setLevels(LevelMap& map, const LLSD& list, LLError::ELevel level)
+        {
+                LLSD::array_const_iterator i, end;
+                for (i = list.beginArray(), end = list.endArray(); i != end; ++i)
+                {
+                        map[*i] = level;
+                }
+        }
+}
+
+namespace LLError
+{
+        void configure(const LLSD& config)
+        {
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+                
+                g.invalidateCallSites();
+                s.functionLevelMap.clear();
+                s.classLevelMap.clear();
+                s.fileLevelMap.clear();
+                
+                setPrintLocation(config["print-location"]);
+                setDefaultLevel(decodeLevel(config["default-level"]));
+                
+                LLSD sets = config["settings"];
+                LLSD::array_const_iterator a, end;
+                for (a = sets.beginArray(), end = sets.endArray(); a != end; ++a)
+                {
+                        const LLSD& entry = *a;
+                        
+                        ELevel level = decodeLevel(entry["level"]);
+                        
+                        setLevels(s.functionLevelMap,   entry["functions"],     level);
+                        setLevels(s.classLevelMap,              entry["classes"],       level);
+                        setLevels(s.fileLevelMap,               entry["files"],         level);
+                }
+        }
+}
+
+
+namespace LLError
+{
+        Recorder::~Recorder()
+                { }
+
+        // virtual
+        bool Recorder::wantsTime()
+                { return false; }
+
+
+
+        void addRecorder(Recorder* recorder)
+        {
+                if (recorder == NULL)
+                {
+                        return;
+                }
+                Settings& s = Settings::get();
+                s.recorders.push_back(recorder);
+        }
+
+        void removeRecorder(Recorder* recorder)
+        {
+                if (recorder == NULL)
+                {
+                        return;
+                }
+                Settings& s = Settings::get();
+                s.recorders.erase(
+                        std::remove(s.recorders.begin(), s.recorders.end(), recorder),
+                        s.recorders.end());
+        }
+}
+
+namespace LLError
+{
+        void logToFile(const std::string& file_name)
+        {
+                LLError::Settings& s = LLError::Settings::get();
+
+                removeRecorder(s.fileRecorder);
+                delete s.fileRecorder;
+                s.fileRecorder = NULL;
+                s.fileRecorderFileName.clear();
+                
+                if (file_name.empty())
+                {
+                        return;
+                }
+                
+                RecordToFile* f = new RecordToFile(file_name);
+                if (!f->okay())
+                {
+                        delete f;
+                        return;
+                }
+
+                s.fileRecorderFileName = file_name;
+                s.fileRecorder = f;
+                addRecorder(f);
+        }
+        
+        void logToFixedBuffer(LLFixedBuffer* fixedBuffer)
+        {
+                LLError::Settings& s = LLError::Settings::get();
+
+                removeRecorder(s.fixedBufferRecorder);
+                delete s.fixedBufferRecorder;
+                s.fixedBufferRecorder = NULL;
+                
+                if (!fixedBuffer)
+                {
+                        return;
+                }
+                
+                s.fixedBufferRecorder = new RecordToFixedBuffer(*fixedBuffer);
+                addRecorder(s.fixedBufferRecorder);
+        }
+
+        std::string logFileName()
+        {
+                LLError::Settings& s = LLError::Settings::get();
+                return s.fileRecorderFileName;
+        }
+}
+
+namespace
+{
+        void writeToRecorders(LLError::ELevel level, const std::string& message)
+        {
+                LLError::Settings& s = LLError::Settings::get();
+        
+                std::string messageWithTime;
+                
+                for (Recorders::const_iterator i = s.recorders.begin();
+                        i != s.recorders.end();
+                        ++i)
+                {
+                        LLError::Recorder* r = *i;
+                        
+                        if (r->wantsTime()  &&  s.timeFunction != NULL)
+                        {
+                                if (messageWithTime.empty())
+                                {
+                                        messageWithTime = s.timeFunction() + " " + message;
+                                }
+                                
+                                r->recordMessage(level, messageWithTime);
+                        }
+                        else
+                        {
+                                r->recordMessage(level, message);
+                        }
+                }
+        }
+}
+
+
+/*
+Recorder formats:
+
+$type = "ERROR" | "WARNING" | "ALERT" | "INFO" | "DEBUG"
+$loc = "$file($line)"
+$msg = "$loc : " if FATAL or printing loc
+                "" otherwise
+$msg += "$type: "
+$msg += contents of stringstream
+
+$time = "%Y-%m-%dT%H:%M:%SZ" if UTC
+         or "%Y-%m-%dT%H:%M:%S %Z" if local
+
+syslog: "$msg"
+file: "$time $msg\n"
+stderr: "$time $msg\n" except on windows, "$msg\n"
+fixedbuf: "$msg"
+winddebug: "$msg\n"
+
+Note: if FATAL, an additional line gets logged first, with $msg set to
+        "$loc : error"
+        
+You get:
+        llfoo.cpp(42) : error
+        llfoo.cpp(42) : ERROR: something
+        
+*/
+
+namespace {
+        bool checkLevelMap(const LevelMap& map, const std::string& key,
+                                                LLError::ELevel& level)
+        {
+                LevelMap::const_iterator i = map.find(key);
+                if (i == map.end())
+                {
+                        return false;
+                }
+                
+                level = i->second;
+                return true;
+        }
+        
+        class LogLock
+        {
+        public:
+                LogLock();
+                ~LogLock();
+                bool ok() const { return mOK; }
+        private:
+                bool mLocked;
+                bool mOK;
+        };
+        
+        LogLock::LogLock()
+                : mLocked(false), mOK(false)
+        {
+                if (!gLogMutexp)
+                {
+                        mOK = true;
+                        return;
+                }
+                
+                const int MAX_RETRIES = 5;
+                for (int attempts = 0; attempts < MAX_RETRIES; ++attempts)
+                {
+                        apr_status_t s = apr_thread_mutex_trylock(gLogMutexp);
+                        if (!APR_STATUS_IS_EBUSY(s))
+                        {
+                                mLocked = true;
+                                mOK = true;
+                                return;
+                        }
+
+                        ms_sleep(1);
+                        //apr_thread_yield();
+                                // Just yielding won't necessarily work, I had problems with
+                                // this on Linux - doug 12/02/04
+                }
+
+                // We're hosed, we can't get the mutex.  Blah.
+                std::cerr << "LogLock::LogLock: failed to get mutex for log"
+                                        << std::endl;
+        }
+        
+        LogLock::~LogLock()
+        {
+                if (mLocked)
+                {
+                        apr_thread_mutex_unlock(gLogMutexp);
+                }
+        }
+}
+
+namespace LLError
+{
+        bool Log::shouldLog(CallSite& site)
+        {
+                LogLock lock;
+                if (!lock.ok())
+                {
+                        return false;
+                }
+                
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+                
+                s.shouldLogCallCounter += 1;
+                
+                std::string class_name = className(site.mClassInfo);
+                std::string function_name = functionName(site.mFunction);
+                if (site.mClassInfo != typeid(NoClassInfo))
+                {
+                        function_name = class_name + "::" + function_name;
+                }
+
+                ELevel compareLevel = s.defaultLevel;
+
+                checkLevelMap(s.functionLevelMap, function_name, compareLevel)
+                || checkLevelMap(s.classLevelMap, class_name, compareLevel)
+                || checkLevelMap(s.fileLevelMap, abbreviateFile(site.mFile), compareLevel);
+
+                site.mCached = true;
+                g.addCallSite(site);
+                return site.mShouldLog = site.mLevel >= compareLevel;
+        }
+
+
+        std::ostringstream* Log::out()
+        {
+                LogLock lock;
+                if (lock.ok())
+                {
+                        Globals& g = Globals::get();
+
+                        if (!g.messageStreamInUse)
+                        {
+                                g.messageStreamInUse = true;
+                                return &g.messageStream;
+                        }
+                }
+                
+                return new std::ostringstream;
+        }
+
+        void Log::flush(std::ostringstream* out, const CallSite& site)
+        {
+                LogLock lock;
+                if (!lock.ok())
+                {
+                        return;
+                }
+                
+                Globals& g = Globals::get();
+                Settings& s = Settings::get();
+
+                std::string message = out->str();
+                if (out == &g.messageStream)
+                {
+                        g.messageStream.clear();
+                        g.messageStream.str("");
+                        g.messageStreamInUse = false;
+                }
+                else
+                {
+                        delete out;
+                }
+
+                if (site.mLevel == LEVEL_ERROR)
+                {
+                        std::ostringstream fatalMessage;
+                        fatalMessage << abbreviateFile(site.mFile)
+                                                << "(" << site.mLine << ") : error";
+                        
+                        writeToRecorders(site.mLevel, fatalMessage.str());
+                }
+                
+                
+                std::ostringstream prefix;
+
+                switch (site.mLevel)
+                {
+                        case LEVEL_DEBUG:               prefix << "DEBUG: ";    break;
+                        case LEVEL_INFO:                prefix << "INFO: ";             break;
+                        case LEVEL_WARN:                prefix << "WARNING: ";  break;
+                        case LEVEL_ERROR:               prefix << "ERROR: ";    break;
+                        default:                                prefix << "XXX: ";              break;
+                };
+                
+                if (s.printLocation)
+                {
+                        prefix << abbreviateFile(site.mFile)
+                                        << "(" << site.mLine << ") : ";
+                }
+                
+                if (message.find(functionName(site.mFunction)) == std::string::npos)
+                {
+        #if LL_WINDOWS
+                        // DevStudio: __FUNCTION__ already includes the full class name
+        #else
+                        if (site.mClassInfo != typeid(NoClassInfo))
+                        {
+                                prefix << className(site.mClassInfo) << "::";
+                        }
+        #endif
+                        prefix << site.mFunction << ": ";
+                }
+                
+                prefix << message;
+                message = prefix.str();
+                
+                writeToRecorders(site.mLevel, message);
+                
+                if (site.mLevel == LEVEL_ERROR  &&  s.crashFunction)
+                {
+                        s.crashFunction(message);
+                }
+        }
+}
+
+
+
+
+namespace LLError
+{
+        Settings* saveAndResetSettings()
+        {
+                return Settings::saveAndReset();
+        }
+        
+        void restoreSettings(Settings* s)
+        {
+                return Settings::restore(s);
+        }
+
+        std::string removePrefix(std::string& s, const std::string& p)
+        {
+                std::string::size_type where = s.find(p);
+                if (where == std::string::npos)
+                {
+                        return s;
+                }
+                
+                return std::string(s, where + p.size());
+        }
+        
+        void replaceChar(std::string& s, char old, char replacement)
+        {
+                std::string::size_type i = 0;
+                std::string::size_type len = s.length();
+                for ( ; i < len; i++ )
+                {
+                        if (s[i] == old)
+                        {
+                                s[i] = replacement;
+                        }
+                }
+        }
+
+        std::string abbreviateFile(const std::string& filePath)
+        {
+                std::string f = filePath;
+#if LL_WINDOWS
+                replaceChar(f, '\\', '/');
+#endif
+                static std::string indra_prefix = "indra/";
+                f = removePrefix(f, indra_prefix);
+
+#if LL_DARWIN
+                static std::string newview_prefix = "newview/../";
+                f = removePrefix(f, newview_prefix);
+#endif
+
+                return f;
+        }
+
+        int shouldLogCallCount()
+        {
+                Settings& s = Settings::get();
+                return s.shouldLogCallCounter;
+        }
+
+        void crashAndLoop(const std::string& message)
+        {
+                // Now, we go kaboom!
+                int* crash = NULL;
+
+                *crash = 0;
+
+                while(true)
+                {
+                        // Loop forever, in case the crash didn't work?
+                }
+        }
+
+        std::string utcTime()
+        {
+                time_t now = time(NULL);
+                const size_t BUF_SIZE = 64;
+                char time_str[BUF_SIZE];        /* Flawfinder: ignore */
+                
+                int chars = strftime(time_str, BUF_SIZE, 
+                                                                  "%Y-%m-%dT%H:%M:%SZ",
+                                                                  gmtime(&now));
+
+                return chars ? time_str : "time error";
+        }
+}
+
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h
index 04e8eee..1285491 100644
--- a/linden/indra/llcommon/llerror.h
+++ b/linden/indra/llcommon/llerror.h
@@ -1,8 +1,9 @@
 /** 
  * @file llerror.h
- * @brief Constants, functions, and macros for logging and runtime errors.
+ * @date   December 2006
+ * @brief error message system
  *
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -29,209 +30,208 @@
 #define LL_LLERROR_H
 
 #include <sstream>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "llerrorstream.h"
-#include "llerrorbuffer.h"
-
-// Specific error codes
-const S32 LL_ERR_NOERR = 0;
-const S32 LL_ERR_ASSET_REQUEST_FAILED = -1;
-//const S32 LL_ERR_ASSET_REQUEST_INVALID = -2;
-const S32 LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE = -3;
-const S32 LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE = -4;
-const S32 LL_ERR_INSUFFICIENT_PERMISSIONS = -5;
-const S32 LL_ERR_EOF = -39;
-const S32 LL_ERR_CANNOT_OPEN_FILE = -42;
-const S32 LL_ERR_FILE_NOT_FOUND = -43;
-const S32 LL_ERR_FILE_EMPTY     = -44;
-const S32 LL_ERR_TCP_TIMEOUT    = -23016;
-const S32 LL_ERR_CIRCUIT_GONE   = -23017;
-
-// Error types
-
-#define LLERR_IMAGE                             (1 << 1) // Image requests
-#define LLERR_MESSAGE                   (1 << 2) // Messaging
-#define LLERR_PERF                              (1 << 3) // Performance
-#define LLERR_SQL                               (1 << 4) // SQL statements
-#define LLERR_DOUG                              (1 << 5) // Doug's debugging
-#define LLERR_USER_INPUT                (1 << 6) // Keyboard and mouse
-#define LLERR_TIMING                    (1 << 7) // Verbose time info
-#define LLERR_TASK                              (1 << 8) // Tracking tasks
-#define LLERR_MSG_HANDLER               (1 << 9) //
-#define LLERR_CIRCUIT_INFO              (1 << 10) // Message system circuit info
-#define LLERR_PHYSICS                   (1 << 11) // physics
-#define LLERR_VFS                               (1 << 12) // VFS
-const U32 LLERR_ALL = 0xffff;
-const U32 LLERR_NONE = 0x0;
-
-// Define one of these for different error levels in release...
-// #define RELEASE_SHOW_DEBUG // Define this if you want your release builds to show lldebug output.
-#define RELEASE_SHOW_INFO // Define this if you want your release builds to show llinfo output
-#define RELEASE_SHOW_WARN // Define this if you want your release builds to show llwarn output.
-
-
-//////////////////////////////////////////
-//
-//  Implementation - ignore
-//
-//
-#ifdef _DEBUG
-#define SHOW_DEBUG
-#define SHOW_WARN
-#define SHOW_INFO
-#define SHOW_ASSERT
-#else // _DEBUG
-
-#ifdef RELEASE_SHOW_DEBUG
-#define SHOW_DEBUG
-#endif
-
-#ifdef RELEASE_SHOW_WARN
-#define SHOW_WARN
-#endif
-
-#ifdef RELEASE_SHOW_INFO
-#define SHOW_INFO
-#endif
-
-#ifdef RELEASE_SHOW_ASSERT
-#define SHOW_ASSERT
-#endif
-
-#endif // _DEBUG
-
-
-extern LLErrorStream gErrorStream;
-
-
-// LL Error macros
-//
-// Usage:
-//
-// llerrs << "An error, oh my!" << variable << endl;
-// llwarns << "Another error, fuck me!" << variable << endl;
-// llwarnst(LLERR_IMAGE) << "Debug, mother fucker" << endl;
-//
-// NOTE: The output format of filename(lineno): is so that MS DevStudio
-// can parse the output and automatically jump to that location
-
-inline std::string llerrno_string(int errnum)
+#include <typeinfo>
+
+#include "llerrorlegacy.h"
+
+
+/* Error Logging Facility
+
+        Information for most users:
+        
+        Code can log messages with constuctions like this:
+        
+                llinfos << "request to fizzbip agent " << agent_id
+                        << " denied due to timeout" << llendl;
+                
+        Messages can be logged to one of four increasing levels of concern,
+        using one of four "streams":
+
+                lldebugs        - debug messages that are normally supressed
+                llinfos         - informational messages that are normall shown
+                llwarns         - warning messages that singal a problem
+                llerrs          - error messages that are major, unrecoverable failures
+                
+        The later (llerrs) automatically crashes the process after the message
+        is logged.
+        
+        Note that these "streams" are actually #define magic.  Rules for use:
+                * they cannot be used as normal streams, only to start a message
+                * messages written to them MUST be terminated with llendl
+                * between the opening and closing, the << operator is indeed
+                  writing onto a std::ostream, so all conversions and stream
+                  formating are available
+        
+        These messages are automatically logged with function name, and (if enabled)
+        file and line of the message.  (Note: Existing messages that already include
+        the function name don't get name printed twice.)
+        
+        If you have a class, adding LOG_CLASS line to the declaration will cause
+        all messages emitted from member functions (normal and static) to be tagged
+        with the proper class name as well as the function name:
+        
+                class LLFoo
+                {
+                        LOG_CLASS(LLFoo);
+                public:
+                        ...
+                };
+        
+                void LLFoo::doSomething(int i)
+                {
+                        if (i > 100)
+                        {
+                                llwanrs << "called with a big value for i: " << i << llendl; 
+                        }
+                        ...
+                }
+        
+        will result in messages like:
+        
+                WARN: LLFoo::doSomething: called with a big value for i: 283
+        
+        Which messages are logged and which are supressed can be controled at run
+        time from the live file logcontrol.xml based on function, class and/or 
+        source file.  See etc/logcontrol-dev.xml for details.
+        
+        Lastly, logging is now very efficient in both compiled code and execution
+        when skipped.  There is no need to wrap messages, even debugging ones, in
+        #ifdef _DEBUG constructs.  lldebugs messages are compiled into all builds,
+        even release.  Which means you can use them to help debug even when deployed
+        to a real grid.
+*/
+
+namespace LLError
 {
-        std::stringstream res;
-        res << "error(" << errnum << "):" << strerror(errnum) << " ";
-        return res.str();
+        enum ELevel
+        {
+                LEVEL_ALL = 0,
+                        // used to indicate that all messagess should be logged
+                        
+                LEVEL_DEBUG = 0,
+                LEVEL_INFO = 1,
+                LEVEL_WARN = 2,
+                LEVEL_ERROR = 3,        // used to be called FATAL
+                
+                LEVEL_NONE = 4
+                        // not really a level
+                        // used to indicate that no messages should be logged
+        };
+        
+        /*      Macro support
+                The classes CallSite and Log are used by the logging macros below.
+                They are not intended for general use.
+        */
+        
+        class CallSite;
+        
+        class Log
+        {
+        public:
+                static bool shouldLog(CallSite&);
+                static std::ostringstream* out();
+                static void flush(std::ostringstream*, const CallSite&);
+        };
+        
+        class CallSite
+        {
+                // Represents a specific place in the code where a message is logged
+                // This is public because it is used by the macros below.  It is not
+                // intended for public use.
+        public:
+                CallSite(ELevel, const char* file, int line,
+                                const std::type_info& class_info, const char* function);
+                                                
+                bool shouldLog()
+                        { return mCached ? mShouldLog : Log::shouldLog(*this); }
+                        // this member function needs to be in-line for efficiency
+                
+                void invalidate();
+                
+        private:
+                // these describe the call site and never change
+                const ELevel                    mLevel;
+                const char* const               mFile;
+                const int                               mLine;
+                const std::type_info&   mClassInfo;
+                const char* const               mFunction;
+                
+                // these implement a cache of the call to shouldLog()
+                bool mCached;
+                bool mShouldLog;
+                
+                friend class Log;
+        };
+        
+        
+        class End { };
+        inline std::ostream& operator<<(std::ostream& s, const End&)
+                { return s; }
+                // used to indicate the end of a message
+                
+        class NoClassInfo { };
+                // used to indicate no class info known for logging
 }
 
-inline std::string llerror_file_line(const char* file, S32 line)
-{
-        std::stringstream res;
-        res << file << "(" <<line << ")";
-        return res.str();
-}
 
-// Used to throw an error which is always causes a system halt.
-#define llerrs if (gErrorStream.isEnabledFor(LLErrorBuffer::FATAL)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::FATAL; \
-                llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : error\n"; \
-                llerror_oss <<  "ERROR: " << llerror_file_line(__FILE__, __LINE__) << " "
-
-// Used to show warnings
-#define llwarns if (gErrorStream.isEnabledFor(LLErrorBuffer::WARN)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::WARN; \
-                if (gErrorStream.getPrintLocation()) llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : WARNING: "; \
-                else llerror_oss << "WARNING: "; \
-                llerror_oss
-
-// Alerts are for serious non-fatal situations that are not supposed to happen and need to alert someone
-#define llalerts if (gErrorStream.isEnabledFor(LLErrorBuffer::WARN)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::WARN; \
-                if (gErrorStream.getPrintLocation()) llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : ALERT: "; \
-                else llerror_oss << "ALERT: ";  \
-                llerror_oss
-
-// Used to show informational messages that don't get disabled
-#define llinfos if (gErrorStream.isEnabledFor(LLErrorBuffer::INFO)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::INFO; \
-                if (gErrorStream.getPrintLocation()) llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : INFO: "; \
-                else llerror_oss << "INFO: ";  \
-                llerror_oss
-
-#define llinfost(type) if (gErrorStream.isEnabledFor(LLErrorBuffer::INFO, type)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::INFO; \
-                if (gErrorStream.getPrintLocation()) llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : INFO: "; \
-                else llerror_oss << "INFO: [" << #type << "] ";  \
-                llerror_oss
- 
-// Used for general debugging output
-#define lldebugs if (gErrorStream.isEnabledFor(LLErrorBuffer::DEBUG)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::DEBUG; \
-                if (gErrorStream.getPrintLocation()) llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : DEBUG: "; \
-                else llerror_oss << "DEBUG: ";  \
-                llerror_oss
-
-#define lldebugst(type) if (gErrorStream.isEnabledFor(LLErrorBuffer::DEBUG, type)) \
-        {       std::ostringstream llerror_oss; LLErrorBuffer::ELevel llerror_level = LLErrorBuffer::DEBUG; \
-                if (gErrorStream.getPrintLocation()) llerror_oss << llerror_file_line(__FILE__, __LINE__) << " : DEBUG: "; \
-                else llerror_oss << "DEBUG: [" << #type << "] ";  \
-                llerror_oss
-
-#define llendl std::endl; gErrorStream.crashOnError(llerror_oss, llerror_level); }
-#define llendflush std::endl << std::flush; gErrorStream.crashOnError(llerror_oss, llerror_level); }
-#define llcont llerror_oss
-
-#define llerror(msg, num)               llerrs << "Error # " << num << ": " << msg << llendl;
-
-#define llwarning(msg, num)             llwarns << "Warning # " << num << ": " << msg << llendl;
-
-#ifdef SHOW_ASSERT
-#define llassert(func)                  if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
-#else
-#define llassert(func)
-#endif
-#define llassert_always(func)   if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
-
-#ifdef SHOW_ASSERT
-#define llverify(func)                  if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
-#else
-#define llverify(func)                  (func); // get rid of warning C4189
-#endif
-
-// handy compile-time assert - enforce those template parameters! 
-#define cassert(expn) typedef char __C_ASSERT__[(expn)?1:-1]
- 
-// Makes the app go down in flames, but on purpose!
-void _llcrash_and_loop();
-
-// Use as follows:
-// llinfos << llformat("Test:%d (%.2f %.2f)", idx, x, y) << llendl;
-//
-// *NOTE: buffer limited to 1024, (but vsnprintf prevents overrun)
-// should perhaps be replaced with boost::format.
-inline std::string llformat(const char *fmt, ...)
-{
-        char tstr[1024];        /* Flawfinder: ignore */
-        va_list va;
-        va_start(va, fmt);
-#if LL_WINDOWS
-        _vsnprintf(tstr, 1024, fmt, va);
-#else
-        vsnprintf(tstr, 1024, fmt, va); /* Flawfinder: ignore */
-#endif
-        va_end(va);
-        return std::string(tstr);
-}
 
-// Helper class to temporarily change error level for the current scope.
-class LLScopedErrorLevel
-{
-public:
-        LLScopedErrorLevel(LLErrorBuffer::ELevel error_level);
-        ~LLScopedErrorLevel();
-
-private:
-        LLErrorBuffer::ELevel mOrigErrorLevel;
-};
- 
+/*
+        Class type information for logging
+ */
+
+#define LOG_CLASS(s)    typedef s _LL_CLASS_TO_LOG
+        // Declares class to tag logged messages with.
+        // See top of file for example of how to use this
+        
+typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
+        // Outside a class declartion, or in class without LOG_CLASS(), this
+        // typedef causes the messages to not be associated with any class.
+
+
+
+
+
+/*
+        Error Logging Macros
+        See top of file for common usage.       
+*/
+
+#define lllog(level) \
+        { \
+                static LLError::CallSite _site( \
+                        level, __FILE__, __LINE__, typeid(_LL_CLASS_TO_LOG), __FUNCTION__);\
+                if (_site.shouldLog()) \
+                { \
+                        std::ostringstream* _out = LLError::Log::out(); \
+                        (*_out)
+        
+#define llendl \
+                        LLError::End(); \
+                        LLError::Log::flush(_out, _site); \
+                } \
+        }
+
+#define llinfos         lllog(LLError::LEVEL_INFO)
+#define lldebugs        lllog(LLError::LEVEL_DEBUG)
+#define llwarns         lllog(LLError::LEVEL_WARN)
+#define llerrs          lllog(LLError::LEVEL_ERROR)
+
+#define llcont          (*_out)
+        /*
+                Use this construct if you need to do computation in the middle of a
+                message:
+                
+                        llinfos << "the agent " << agend_id;
+                        switch (f)
+                        {
+                                case FOP_SHRUGS:        llcont << "shrugs";                             break;
+                                case FOP_TAPS:          llcont << "points at " << who;  break;
+                                case FOP_SAYS:          llcont << "says " << message;   break;
+                        }
+                        llcont << " for " << t << " seconds" << llendl;
+                
+                Such computation is done iff the message will be logged.
+        */
+
+
 #endif // LL_LLERROR_H
diff --git a/linden/indra/llcommon/llerrorbuffer.cpp b/linden/indra/llcommon/llerrorbuffer.cpp
deleted file mode 100644
index 9de4616..0000000
--- a/linden/indra/llcommon/llerrorbuffer.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/** 
- * @file llerrorbuffer.cpp
- *
- * Copyright (c) 2002-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "linden_common.h"
-
-#include "llerrorbuffer.h"
-#include "llfixedbuffer.h"
-
-#include <fstream>
-#include <string.h>
-
-#if LL_WINDOWS
-#       define WIN32_LEAN_AND_MEAN
-#       include <winsock2.h>
-#       include <windows.h>             // for OutputDebugString
-#else
-#       include <syslog.h>
-#       include <stdio.h>
-#endif
-
-#include <time.h>
-
-// In order to compile in Visual C++ 6.0, you must use std:: in the header, and then
-// use the std namespace in the cpp.  Otherwise, you'll break the (very) fragile C++ parser.
-using namespace std;
-
-LLErrorBuffer::LLErrorBuffer()
-:       streambuf(),
-    mFile(NULL),
-        mBuf(),
-        mFixedBuf(NULL),
-    mErrorActive(TRUE),
-        mErrorTimestamp(TRUE),
-    mFileActive(FALSE),
-    mSyslogActive(TRUE),
-        mWinDebugActive(TRUE),
-        mElevatedRemote(FALSE),
-        mIsUTC(TRUE),
-        mLevel(DEBUG),
-        mPriority(DEBUG)
-{
-        mFilename[0] = '\0';
-#if LL_WINDOWS
-        // by default, turn off timestamps in the debug log on windows
-        mErrorTimestamp = FALSE;
-#endif
-}
-
-LLErrorBuffer::~LLErrorBuffer()
-{
-    delete mFile;
-        mFile = NULL;
-}
-
-#if !LL_WINDOWS
-int LLErrorBuffer::ELevelToSyslogPriority(const ELevel l)
-{
-                switch(l)
-                {
-                case DEBUG:
-                                return LOG_DEBUG;
-                case INFO:
-                        switch(mElevatedRemote)
-                        {
-                        case TRUE: return LOG_NOTICE;
-                        default: return LOG_INFO;
-                        }
-                case WARN:
-                                return LOG_WARNING;
-                case FATAL:
-                                return LOG_CRIT;
-                default:
-                                return LOG_CRIT;
-                }
-                return LOG_CRIT;
-}
-#endif // LL_WINDOWS
-
-BOOL LLErrorBuffer::setFile(const char *filename)
-{
-    if (mFile == NULL)
-        {
-                mFile = new llofstream();
-        }
-    if (mFile->is_open())
-        {
-                mFile->close();
-        }
-        if (filename == NULL)
-        {
-                llwarns << "Input filename is NULL!!" << llendl;
-                return FALSE;
-        }
-    mFile->open(filename, llofstream::out | llofstream::app);   /* Flawfinder: ignore */
-    if (mFile->is_open())
-        {
-                mFileActive = TRUE;
-        }
-    else
-        {
-                mFileActive = FALSE;
-                delete mFile;
-                mFile = NULL;
-    }
-        snprintf(mFilename, sizeof(mFilename), filename);       /* Flawfinder: ignore */
-    return mFileActive;
-}
-
-void LLErrorBuffer::closeFile()
-{
-    if (mFile && mFile->is_open())
-        {
-                mFile->close();
-                mFileActive = FALSE;
-                delete mFile;
-                mFile = NULL;
-        }
-}
-
-const char * LLErrorBuffer::getFilename() const
-{
-        return mFilename;
-}
-
-void LLErrorBuffer::setUTCTimestamp(BOOL utc)
-{
-        mIsUTC = utc;
-}
-
-void LLErrorBuffer::enableError(BOOL active)
-{
-    mErrorActive = active;
-}
-
-void LLErrorBuffer::enableErrorTimestamp(BOOL active)
-{
-        mErrorTimestamp = active;
-}
-
-void LLErrorBuffer::enableFile(BOOL active)
-{
-    if (mFile != NULL)
-    {
-        if (mFile->is_open())
-            mFileActive = active;
-    }
-    else
-        mFileActive = FALSE;
-}
-
-#if !LL_WINDOWS
-void LLErrorBuffer::enableSyslog(BOOL active)
-{
-    mSyslogActive = active;
-}
-#endif // LL_WINDOWS
-
-#if LL_WINDOWS
-void LLErrorBuffer::enableWinDebug(BOOL active)
-{
-        mWinDebugActive = active;
-}
-#endif // LL_WINDOWS
-
-int LLErrorBuffer::overflow(int c)
-{
-    if (EOF != c)
-    {
-                        if ('\n' == c)
-                        {
-                                        // If we're not supposed to print anything, don't, but
-                                        // pretend that we did so taht the iostream doesn't think
-                                        // there's been a failure
-                                        if (mPriority < mLevel)
-                                        {
-                                                        // Flush our message buffer
-                                                        mBuf = "";
-                                                        return 0;
-                                        }
-#if !LL_WINDOWS
-                                        if (mSyslogActive)
-                                        {
-                                                        int pri = ELevelToSyslogPriority(mPriority);
-                                                        syslog(pri, "%s", mBuf.c_str());
-                                        }
-#endif // LL_WINDOWS
-                                        const S32 BUF_SIZE = 64;
-                                        char time_str[BUF_SIZE];        /* Flawfinder: ignore */
-                                        if (mFileActive || mErrorActive)
-                                        {
-                                                        time_t now;
-                                                        time(&now);
-                                                        S32 chars;
-                                                        if(mIsUTC)
-                                                        {
-                                                                chars = (S32)strftime(time_str, BUF_SIZE, 
-                                                                                                          "%Y-%m-%dT%H:%M:%SZ",
-                                                                                                          gmtime(&now));
-                                                        }
-                                                        else
-                                                        {
-                                                                chars = (S32)strftime(time_str, BUF_SIZE, 
-                                                                                                          "%Y-%m-%dT%H:%M:%S %Z",
-                                                                                                          localtime(&now));
-                                                        }
-                                                        if (0 == chars)
-                                                        {
-                                                                strcpy(time_str, "time error"); /* Flawfinder: ignore */
-                                                        }
-                                        }
-                                        if (mFileActive)
-                                        {
-                                                *mFile << time_str << " " << mBuf << std::endl;
-                                        }
-                                        if (mErrorActive)
-                                        {
-                                                if (mErrorTimestamp)
-                                                {
-                                                        fprintf(stderr, "%s %s\n", time_str, mBuf.c_str());
-                                                }
-                                                else
-                                                {
-                                                        fprintf(stderr, "%s\n", mBuf.c_str());
-                                                }
-
-                                                // std::cerr goes into the void on the viewer
-                                                //std::cerr << time_str << ' ' << mBuf << std::endl;
-                                        }
-                                        if (mFixedBuf)
-                                        {
-                                                mFixedBuf->addLine(mBuf.c_str());
-                                        }
-#if LL_WINDOWS
-                                        if (mWinDebugActive)
-                                        {
-                                                llutf16string utf16str = wstring_to_utf16str(utf8str_to_wstring(mBuf));
-                                                utf16str += '\n';
-                                                OutputDebugString(utf16str.c_str());
-                                        }
-#endif // LL_WINDOWS
-                                        // Is there a better way to truncate a string?
-                                        mBuf.erase(0, mBuf.length()); // Hack, Linux doesn't implement clear()!
-                        }
-                        else
-                        {
-                                        mBuf += c;
-                        }
-        }
-        return 0;
-}
-
-LLErrorBuffer::ELevel LLErrorBuffer::mergeLevel(const LLErrorBuffer::ELevel l)
-{
-                mLevel = llmin(mLevel, l);
-                return mLevel;
-}
diff --git a/linden/indra/llcommon/llerrorbuffer.h b/linden/indra/llcommon/llerrorbuffer.h
deleted file mode 100644
index b52de3a..0000000
--- a/linden/indra/llcommon/llerrorbuffer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/** 
- * @file llerrorbuffer.h
- * @brief Buffer implementation for logging.
- *
- * Copyright (c) 2002-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLERRORBUFFER_H
-#define LL_LLERRORBUFFER_H
-
-#include <fstream>
-#include <iostream>
-#include <string>
-
-#include "lldefs.h"
-#include "stdtypes.h"
-#include "llfile.h"
-
-// A streambuf that sends it's output into a file, stderr, or syslog.
-//
-// Each output can be enabled/disabled, and a priority can be set.
-
-class LLFixedBuffer;
-
-class LLErrorBuffer : public std::streambuf
-{
- public:
-
-        // Specify error levels
-        enum ELevel
-        {
-                DEBUG = 0,
-                INFO = 1,
-                WARN = 2,
-                FATAL = 3,
-                NONE = 4 // Do NO error logging (for use in signal handlers)
-        };
-
-    LLErrorBuffer();
-    ~LLErrorBuffer();
-    BOOL setFile(const char *filename);
-        void closeFile();
-        const char *getFilename() const;
-        void setFixedBuffer(LLFixedBuffer *b) { mFixedBuf = b; };
-
-        // Sets the priority of the current message
-    void setPriority(const ELevel l) { mPriority = l; }
-
-        // Only display messages >= to this level
-        void setLevel(const ELevel l) { mLevel = l; }
-        ELevel getLevel()                       { return mLevel; }
-        // Display messages >= to level l, if l < current level
-        ELevel mergeLevel(const ELevel l);
-
-        // on linux, this sets syslog info to be a LOG_NOTICE which will
-        // be centrally logged. *NOTE: This is very
-        // linux/syslog/configuration dependent.
-        void setElevatedRemote(BOOL b) { mElevatedRemote = b; }
-
-        // logs are in utc rather than local
-        void setUTCTimestamp(BOOL utc);
-
-        // Turn on or off logging outputs
-    void enableError(BOOL active);
-        void enableErrorTimestamp(BOOL active);
-    void enableFile(BOOL active);
-    void enableSyslog(BOOL active);
-#if LL_WINDOWS
-        void enableWinDebug(BOOL active);
-#endif // LL_WINDOWS
-
- protected:
-    int overflow(int c = EOF);
-
- private:
-        char mFilename[LL_MAX_PATH];    /* Flawfinder: ignore */
-        int ELevelToSyslogPriority(const ELevel l);
-        
-        llofstream *mFile;
-        std::string mBuf;
-        LLFixedBuffer *mFixedBuf;
-        
-    BOOL mErrorActive;
-        BOOL mErrorTimestamp;
-    BOOL mFileActive;
-    BOOL mSyslogActive;
-        BOOL mWinDebugActive;
-        BOOL mElevatedRemote;
-        BOOL mIsUTC;
-
-        // If priority < level, output is thrown away
-        ELevel mLevel;
-        // Current message priority
-        ELevel mPriority;
-};
- 
-#endif // LL_LLERRORBUFFER_H
diff --git a/linden/indra/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h
new file mode 100644
index 0000000..f2c8755
--- /dev/null
+++ b/linden/indra/llcommon/llerrorcontrol.h
@@ -0,0 +1,142 @@
+/** 
+ * @file llerrorcontrol.h
+ * @date   December 2006
+ * @brief error message system control
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LL_LLERRORCONTROL_H
+#define LL_LLERRORCONTROL_H
+
+#include "llerror.h"
+
+#include <string>
+
+class LLFixedBuffer;
+class LLSD;
+
+/*
+        This is the part of the LLError namespace that manages the messages
+        produced by the logging.  The logging support is defined in llerror.h.
+        Most files do not need to include this.
+        
+        These implementations are in llerror.cpp.
+*/
+
+
+namespace LLError
+{
+        void initForServer(const std::string& identity);
+                // resets all logging settings to defaults needed by server processes
+                // logs to stderr, syslog, and windows debug log
+                // the identity string is used for in the syslog
+
+        void initForApplication(const std::string& dir);
+                // resets all logging settings to defaults needed by applicaitons
+                // logs to stderr and windows debug log
+                // sets up log configuration from the file logcontrol.xml in dir
+
+
+        /*
+                Settings that control what is logged.
+                Setting a level means log messages at that level or above.
+        */
+        
+        void setPrintLocation(bool);
+        void setDefaultLevel(LLError::ELevel);
+        void setFunctionLevel(const std::string& function_name, LLError::ELevel);
+        void setClassLevel(const std::string& class_name, LLError::ELevel);
+        void setFileLevel(const std::string& file_name, LLError::ELevel);
+        
+        void configure(const LLSD&);
+                // the LLSD can configure all of the settings
+                // usually read automatically from the live errorlog.xml file
+
+
+        /*
+                Control functions.
+        */
+
+        typedef void (*FatalFunction)(const std::string& message);
+        void crashAndLoop(const std::string& message);
+                // Default fatal funtion: divides by zero and loops forever
+
+        void setFatalFunction(FatalFunction);
+                // The fatal function will be called when an message of LEVEL_ERROR
+                // is logged.  Note: supressing a LEVEL_ERROR message from being logged
+                // (by, for example, setting a class level to LEVEL_NONE), will keep
+                // the that message from causing the fatal funciton to be invoked.
+                
+        typedef std::string (*TimeFunction)();
+        std::string utcTime();
+        
+        void setTimeFunction(TimeFunction);
+                // The function is use to return the current time, formatted for
+                // display by those error recorders that want the time included.
+
+
+
+        class Recorder
+        {
+                // An object that handles the actual output or error messages.
+        public:
+                virtual ~Recorder();
+                
+                virtual void recordMessage(LLError::ELevel, const std::string& message) = 0;
+                        // use the level for better display, not for filtering
+                        
+                virtual bool wantsTime(); // default returns false
+                        // override and return true if the recorder wants the time string
+                        // included in the text of the message
+        };
+        
+        void addRecorder(Recorder*);
+        void removeRecorder(Recorder*);
+                // each error message is passed to each recorder via recordMessage()
+        
+        void logToFile(const std::string& filename);
+        void logToFixedBuffer(LLFixedBuffer*);
+                // Utilities to add recorders for logging to a file or a fixed buffer
+                // A second call to the same function will remove the logger added
+                // with the first.
+                // Passing the empty string or NULL to just removes any prior.
+        std::string logFileName();
+                // returns name of current logging file, empty string if none
+
+
+        /*
+                Utilities for use by the unit tests of LLError itself.
+        */
+
+        class Settings;
+        Settings* saveAndResetSettings();
+        void restoreSettings(Settings *);
+                
+        std::string abbreviateFile(const std::string& filePath);
+        int shouldLogCallCount();
+        
+};
+
+#endif // LL_LLERRORCONTROL_H
+
diff --git a/linden/indra/llcommon/llerrorlegacy.h b/linden/indra/llcommon/llerrorlegacy.h
new file mode 100644
index 0000000..5438a21
--- /dev/null
+++ b/linden/indra/llcommon/llerrorlegacy.h
@@ -0,0 +1,117 @@
+/** 
+ * @file llerrorlegacy.h
+ * @date   January 2007
+ * @brief old things from the older error system
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LL_LLERRORLEGACY_H
+#define LL_LLERRORLEGACY_H
+
+
+
+/*
+        LEGACY -- DO NOT USE THIS STUFF ANYMORE
+*/
+
+// Specific error codes
+const int LL_ERR_NOERR = 0;
+const int LL_ERR_ASSET_REQUEST_FAILED = -1;
+//const int LL_ERR_ASSET_REQUEST_INVALID = -2;
+const int LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE = -3;
+const int LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE = -4;
+const int LL_ERR_INSUFFICIENT_PERMISSIONS = -5;
+const int LL_ERR_EOF = -39;
+const int LL_ERR_CANNOT_OPEN_FILE = -42;
+const int LL_ERR_FILE_NOT_FOUND = -43;
+const int LL_ERR_FILE_EMPTY     = -44;
+const int LL_ERR_TCP_TIMEOUT    = -23016;
+const int LL_ERR_CIRCUIT_GONE   = -23017;
+
+
+
+// Define one of these for different error levels in release...
+// #define RELEASE_SHOW_DEBUG // Define this if you want your release builds to show lldebug output.
+#define RELEASE_SHOW_INFO // Define this if you want your release builds to show llinfo output
+#define RELEASE_SHOW_WARN // Define this if you want your release builds to show llwarn output.
+
+
+//////////////////////////////////////////
+//
+//  Implementation - ignore
+//
+//
+#ifdef _DEBUG
+#define SHOW_DEBUG
+#define SHOW_WARN
+#define SHOW_INFO
+#define SHOW_ASSERT
+#else // _DEBUG
+
+#ifdef RELEASE_SHOW_DEBUG
+#define SHOW_DEBUG
+#endif
+
+#ifdef RELEASE_SHOW_WARN
+#define SHOW_WARN
+#endif
+
+#ifdef RELEASE_SHOW_INFO
+#define SHOW_INFO
+#endif
+
+#ifdef RELEASE_SHOW_ASSERT
+#define SHOW_ASSERT
+#endif
+
+#endif // _DEBUG
+
+
+
+#define lldebugst(type)                 lldebugs
+#define llendflush                              llendl
+
+
+#define llerror(msg, num)               llerrs << "Error # " << num << ": " << msg << llendl;
+
+#define llwarning(msg, num)             llwarns << "Warning # " << num << ": " << msg << llendl;
+
+#ifdef SHOW_ASSERT
+#define llassert(func)                  if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
+#else
+#define llassert(func)
+#endif
+#define llassert_always(func)   if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
+
+#ifdef SHOW_ASSERT
+#define llverify(func)                  if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
+#else
+#define llverify(func)                  (func); // get rid of warning C4189
+#endif
+
+// handy compile-time assert - enforce those template parameters! 
+#define cassert(expn) typedef char __C_ASSERT__[(expn)?1:-1]   /* Flawfinder: ignore */
+        //XXX: used in two places in llcommon/llskipmap.h
+
+#endif // LL_LLERRORLEGACY_H
diff --git a/linden/indra/llcommon/llerrorstream.cpp b/linden/indra/llcommon/llerrorstream.cpp
deleted file mode 100644
index ed54d88..0000000
--- a/linden/indra/llcommon/llerrorstream.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/** 
- * @file llerrorstream.cpp
- * @brief Implementation of c++ log straming.
- *
- * Copyright (c) 2002-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "linden_common.h"
-
-#include "llerrorstream.h"
-#include "llerrorbuffer.h"
-#include "llerror.h"
-
-using namespace std;
-
-// Define this if we're using APR mutexes.
-#include "llapr.h"
-extern apr_thread_mutex_t *gLogMutexp;
-
-// In order to compile in Visual C++ 6.0, you must use std:: in the header, and then
-// use the std namespace in the cpp.  Otherwise, you'll break the (very) fragile C++ parser.
-LLErrorStream::LLErrorStream(LLErrorBuffer *eb):
-                ostream(eb),
-                mErrorBuffer(eb),
-                mKill(FALSE),
-                mErrorCallback(NULL)
-{
-#ifdef SHOW_DEBUG
-        setErrorLevel(LLErrorBuffer::DEBUG);
-#else
-#ifdef SHOW_INFO
-        setErrorLevel(LLErrorBuffer::INFO);
-#else
-#ifdef SHOW_WARN
-        setErrorLevel(LLErrorBuffer::WARN);
-#else
-        setErrorLevel(LLErrorBuffer::FATAL);
-#endif // SHOW_WARN
-#endif // SHOW_INFO
-#endif // SHOW_DEBUG
-
-        setDebugMask(LLERR_NONE);
-        setPrintLocation(FALSE);
-}
-
-LLErrorBuffer::ELevel LLErrorStream::ELevelToBufferELevel(const ELevel l)
-{
-        switch (l)
-        {
-        case DEBUG:
-                return LLErrorBuffer::DEBUG;
-        case INFO:
-                return LLErrorBuffer::INFO;
-        case WARN:
-                return LLErrorBuffer::WARN;
-        case FATAL:
-                return LLErrorBuffer::FATAL;
-        default:
-                return LLErrorBuffer::FATAL;
-        }
-}
-
-LLErrorStream::ELevel LLErrorStream::BufferELevelToELevel(const LLErrorBuffer::ELevel l)
-{
-        switch(l)
-        {
-        case LLErrorBuffer::DEBUG:
-                return DEBUG;
-        case LLErrorBuffer::INFO:
-                return INFO;
-        case LLErrorBuffer::WARN:
-                return WARN;
-        case LLErrorBuffer::FATAL:
-                return FATAL;
-        default:
-                return FATAL;
-        }
-}
-
-
-BOOL LLErrorStream::isEnabledFor(const LLErrorBuffer::ELevel l)
-{
-        if (l == LLErrorBuffer::FATAL)
-        {
-                if (LLErrorBuffer::FATAL < getErrorLevel())
-                {
-                        // Fatal error, but we're at log level NONE (used by signal handlers)
-                        // We want to crash this process now instead of logging
-                        _llcrash_and_loop();
-                }
-        }
-        // Always returns false if not safe (recursive call)
-        return (getErrorLevel() <= l);
-}
-
-
-BOOL LLErrorStream::isEnabledFor(const LLErrorBuffer::ELevel l, const U32 type)
-{
-        // Always returns false if not safe (recursive call)
-        return (getErrorLevel() <= l) && (mDebugMask & type);
-}
-
-
-
-void LLErrorStream::crashOnError(std::ostringstream &oss, LLErrorBuffer::ELevel l)
-{
-        if (gLogMutexp)
-        {
-                const S32 MAX_RETRIES = 5;
-                S32 attempts = 0;
-                while (attempts < MAX_RETRIES)
-                {
-                        apr_status_t s = apr_thread_mutex_trylock(gLogMutexp);
-                        if (!APR_STATUS_IS_EBUSY(s))
-                        {
-                                break;
-                        }
-                        else
-                        {
-                                attempts++;
-                                ms_sleep(1);
-
-                                //
-                                // Just yielding won't necessarily work, I had problems with this on Linux - doug 12/02/04
-                                //apr_thread_yield();
-                        }
-                }
-                if (attempts == MAX_RETRIES)
-                {
-                        // We're hosed, we can't get the mutex.
-                        // I guess we just won't log, then.  Blah.
-                        fprintf(stderr, "LLErrorStream::crashOnError() failed to get mutex for log\n");
-                        return;
-                }
-        }
-
-        mErrorBuffer->setPriority(l);
-        if (LLErrorBuffer::FATAL == l)
-        {
-                setError();
-        }
-
-        *this << oss.str();
-
-        if (mKill)
-        {
-                // We want to flush this stream.
-                flush();
-        }
-
-        BOOL crashme = FALSE;
-        if (mKill)
-        {
-                crashme = TRUE;
-        }
-        mKill = FALSE;
-
-        if (gLogMutexp)
-        {
-                apr_thread_mutex_unlock(gLogMutexp);
-        }
-
-        if (crashme)
-        {
-                mErrorCallback(oss.str());
-                _llcrash_and_loop();
-        }
-}
diff --git a/linden/indra/llcommon/llerrorstream.h b/linden/indra/llcommon/llerrorstream.h
deleted file mode 100644
index 4028583..0000000
--- a/linden/indra/llcommon/llerrorstream.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/** 
- * @file llerrorstream.h
- * @brief Declaration of c++ log straming.
- *
- * Copyright (c) 2002-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLERRORSTREAM_H
-#define LL_LLERRORSTREAM_H
-
-// Usage:
-// LLErrorStream gErrorStream(gErrorBuffer);
-//
-// gErrorStream << debug << "This is a debug message" << endl;
-//
-// gErrorStream << fatal << "This message will cause a crash!" << endl;
-
-#include <iostream>
-#include "llerrorbuffer.h"
-#include "stdtypes.h"
-
-class LLFixedBuffer;
-
-class LLErrorStream : public std::ostream
-{
- public:
-    LLErrorStream(LLErrorBuffer *eb);
-        
-        // Specify error levels-- Use LLErrorBuffer::ELevel instead
-        enum ELevel
-        {
-                DEBUG = 0,
-                INFO = 1,
-                WARN = 2,
-                FATAL = 3,
-                NONE = 4 // Don't log anything
-        };
-
-    LLErrorBuffer *mErrorBuffer;
-
-        // This is used to specify if we need to merge the DebugMask
-        // or replace it
-        enum EControl
-        {
-                        REPLACE = 0,
-                        MERGE = 1       
-        };
-
-        void setDebugMask(U32 mask)                     { mDebugMask = mask; }
-        void mergeDebugMask(U32 mask)           { mDebugMask |= mask; }
-        U32 getDebugMask()                                      { return mDebugMask; }
-        void setDebugFlag(U32 flag)                     { mDebugMask |= flag; }
-        void clearDebugFlag(U32 flag)           { mDebugMask &= ~flag; }
-        BOOL setFile(const char *path) { return mErrorBuffer->setFile(path); }
-        void closeFile()                                        { mErrorBuffer->closeFile(); }
-        const char *getFilename() const                 { return mErrorBuffer->getFilename(); }
-        void setFixedBuffer(LLFixedBuffer *b) { mErrorBuffer->setFixedBuffer(b); }
-        void setErrorLevel(const LLErrorBuffer::ELevel l) { mErrorBuffer->setLevel(l); }
-        LLErrorBuffer::ELevel getErrorLevel() { return mErrorBuffer->getLevel(); }
-        void mergeErrorLevel(const LLErrorBuffer::ELevel l) { mErrorBuffer->mergeLevel(l); }
-        void setError() { mKill = TRUE; };
-        void crashOnError(std::ostringstream &ss, LLErrorBuffer::ELevel l);
-
-        BOOL isEnabledFor(const LLErrorBuffer::ELevel l);
-        BOOL isEnabledFor(const LLErrorBuffer::ELevel l, const U32 type);
-
-
-        void mergeLevel(const LLErrorBuffer::ELevel l) { mErrorBuffer->mergeLevel(l); }
-
-        void setPrintLocation(BOOL b) { mPrintLocation = b; }
-        BOOL getPrintLocation() { return mPrintLocation; }
-
-        void setElevatedRemote(BOOL b) { mErrorBuffer->setElevatedRemote(b); }
-        void setUTCTimestamp(BOOL utc) { mErrorBuffer->setUTCTimestamp(utc); }
-                        
-        // Deprecated
-        void setLevel(const ELevel l) { setErrorLevel(ELevelToBufferELevel(l)); }
-        ELevel getLevel() { return BufferELevelToELevel(getErrorLevel()); }
-        void mergeLevel(const ELevel l) { mergeErrorLevel(ELevelToBufferELevel(l)); }
-
-
-        // Backwards compatilibity cruft.  Should be removed
-        void mergeTime(BOOL b) { } // NOP
-        void mergeLocation(BOOL b) { } // NOP
-        void setTime(BOOL b) { } // NOP
-        char *getTime() { return ""; } // NOP
-        
-        typedef void(*LLErrorCallback)(const std::string &error_string);
-        void setErrorCallback(LLErrorCallback callback) {mErrorCallback = callback;}
-
-private:
-        // This maintains the existing ELevel interface, but new code should use
-        // LLErrorBuffer::ELevel instead.
-        LLErrorBuffer::ELevel ELevelToBufferELevel(const ELevel l);
-        ELevel BufferELevelToELevel(const LLErrorBuffer::ELevel l);
-        U32 mDebugMask; // Mask for debugst() output
-
-        BOOL mPrintLocation;
-
-        S32  mSafeDepth; // Counter so we can safely do recursive calls, 0 means we're OK
-        BOOL mKill;
-        LLErrorCallback mErrorCallback;
-};
-
-
-#endif // LL_LLERRORSTREAM_H
diff --git a/linden/indra/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp
index e9b6a51..bbb37c5 100644
--- a/linden/indra/llcommon/llevent.cpp
+++ b/linden/indra/llcommon/llevent.cpp
@@ -186,16 +186,14 @@ void LLSimpleDispatcher::addListener(LLEventListener* listener, LLSD filter, con
 
 void LLSimpleDispatcher::removeListener(LLEventListener* listener)
 {
-        std::vector<LLListenerEntry>::iterator itor;
-        for (itor=mListeners.begin(); itor!=mListeners.end();)
+        std::vector<LLListenerEntry>::iterator itor = mListeners.begin();
+        std::vector<LLListenerEntry>::iterator end = mListeners.end();
+        for (; itor != end; ++itor)
         {
                 if ((*itor).listener == listener)
                 {
                         mListeners.erase(itor);
-                }
-                else
-                {
-                        ++itor;
+                        break;
                 }
         }
         listener->handleDetach(mParent);
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index c48817e..bcb6ee9 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -31,6 +31,7 @@
 
 #include "llsd.h"
 #include "llmemory.h"
+#include "llthread.h"
 
 class LLEventListener;
 class LLEvent;
@@ -128,6 +129,7 @@ public:
 
         // Adds a listener to this dispatcher, with a given user data
         // that will be passed to the listener when an event is fired.
+        // Duplicate pointers are removed on addtion.
         void addListener(LLEventListener *listener, LLSD filter, const LLSD& userdata);
 
         // Removes a listener from this dispatcher
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index b5e0734..47634ac 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -44,6 +44,7 @@ public:
                 FTM_UPDATE,
                 FTM_RENDER,
                 FTM_SWAP,
+                FTM_CLIENT_COPY,
                 FTM_IDLE,
                 FTM_SLEEP,
 
@@ -56,13 +57,23 @@ public:
                 FTM_UPDATE_TERRAIN,
                 FTM_UPDATE_PRIMITIVES,
                 FTM_UPDATE_PARTICLES,
+                FTM_SIMULATE_PARTICLES,
                 FTM_UPDATE_SKY,
                 FTM_UPDATE_TEXTURES,
+                FTM_UPDATE_WATER,
+                FTM_UPDATE_CLOUDS,
+                FTM_UPDATE_GRASS,
+                FTM_UPDATE_TREE,
+                FTM_UPDATE_AVATAR,
                 
                 // common render components
                 FTM_RENDER_GEOMETRY,
                  FTM_RENDER_TERRAIN,
                  FTM_RENDER_SIMPLE,
+                 FTM_RENDER_FULLBRIGHT,
+                 FTM_RENDER_GLOW,
+                 FTM_RENDER_GRASS,
+                 FTM_RENDER_INVISIBLE,
                  FTM_RENDER_SHINY,
                  FTM_RENDER_BUMP,
                  FTM_RENDER_TREES,
@@ -81,6 +92,20 @@ public:
                 FTM_MESSAGES,
                 FTM_REBUILD,
                 FTM_STATESORT,
+                FTM_STATESORT_DRAWABLE,
+                FTM_STATESORT_POSTSORT,
+                FTM_REBUILD_VBO,
+                FTM_REBUILD_VOLUME_VB,
+                FTM_REBUILD_BRIDGE_VB,
+                FTM_REBUILD_HUD_VB,
+                FTM_REBUILD_TERRAIN_VB,
+                FTM_REBUILD_WATER_VB,
+                FTM_REBUILD_TREE_VB,
+                FTM_REBUILD_PARTICLE_VB,
+                FTM_REBUILD_CLOUD_VB,
+                FTM_REBUILD_GRASS_VB,
+                FTM_REBUILD_NONE_VB,
+                FTM_REBUILD_OCCLUSION_VB,
                 FTM_POOLS,
                 FTM_POOLRENDER,
                 FTM_IDLE_CB,
@@ -90,6 +115,7 @@ public:
                 FTM_UPDATE_LIGHTS,
                 FTM_CULL,
                 FTM_CULL_REBOUND,
+                FTM_FRUSTUM_CULL,
                 FTM_GEO_UPDATE,
                 FTM_GEO_RESERVE,
                 FTM_GEO_LIGHT,
@@ -116,6 +142,7 @@ public:
                 FTM_IMAGE_UPDATE,
                 FTM_IMAGE_CREATE,
                 FTM_IMAGE_DECODE,
+                FTM_IMAGE_MARK_DIRTY,
                 FTM_PIPELINE,
                 FTM_VFILE_WAIT,
                 FTM_FLEXIBLE_UPDATE,
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index d9fd360..feac28f 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -48,6 +48,19 @@ int	LLFile::mkdir(const	char* dirname, int perms)
 }
 
 // static
+int     LLFile::rmdir(const     char* dirname)
+{
+#if LL_WINDOWS  
+        // permissions are ignored on Windows
+        std::string utf8dirname = dirname;
+        llutf16string utf16dirname = utf8str_to_utf16str(utf8dirname);
+        return _wrmdir(utf16dirname.c_str());
+#else
+        return ::rmdir(dirname);
+#endif
+}
+
+// static
 LLFILE* LLFile::fopen(const     char* filename, const char* mode)       /* Flawfinder: ignore */
 {
 #if     LL_WINDOWS
@@ -184,9 +197,9 @@ void llifstream::close()
         }
 }
 
-void llifstream::open(const char *_Filename,
+void llifstream::open(const char* _Filename,    /* Flawfinder: ignore */
         ios_base::openmode _Mode,
-        int _Prot)      /* Flawfinder: ignore */
+        int _Prot)
 {       // open a C stream with specified mode
         
         FILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::in, _Prot);
@@ -197,6 +210,7 @@ void llifstream::open(const char *_Filename,
         }
         llassert(_Filebuffer == NULL);
         _Filebuffer = new _Myfb(filep);
+        _ShouldClose = true;
         _Myios::init(_Filebuffer);
 }
 
@@ -208,13 +222,17 @@ bool llifstream::is_open() const
 }
 llifstream::~llifstream()
 {       
+        if (_ShouldClose)
+        {
+                close();
+        }
         delete _Filebuffer;
 }
 
 llifstream::llifstream(const char *_Filename,
         ios_base::openmode _Mode,
         int _Prot)
-        : std::basic_istream< char , std::char_traits< char > >(NULL,true),_Filebuffer(NULL)
+        : std::basic_istream< char , std::char_traits< char > >(NULL,true),_Filebuffer(NULL),_ShouldClose(false)
 
 {       // construct with named file and specified mode
         open(_Filename, _Mode | ios_base::in, _Prot);   /* Flawfinder: ignore */
@@ -230,9 +248,9 @@ bool llofstream::is_open() const
         return false;
 }
 
-void llofstream::open(const char *_Filename,
+void llofstream::open(const char* _Filename,    /* Flawfinder: ignore */
         ios_base::openmode _Mode,
-        int _Prot)      /* Flawfinder: ignore */
+        int _Prot)      
 {       // open a C stream with specified mode
 
         FILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::out, _Prot);
diff --git a/linden/indra/llcommon/llfile.h b/linden/indra/llcommon/llfile.h
index 554308f..5034cf7 100644
--- a/linden/indra/llcommon/llfile.h
+++ b/linden/indra/llcommon/llfile.h
@@ -69,6 +69,7 @@ public:
         // be overridden by the user's umask.  It is ignored on Windows.
         static  int             mkdir(const char* filename, int perms = 0700);
 
+        static  int             rmdir(const char* filename);
         static  int             remove(const char* filename);
         static  int             rename(const char* filename,const char* newname);
         static  int             stat(const char*        filename,llstat*        file_status);
@@ -87,7 +88,7 @@ public:
         typedef std::basic_ios<char,std::char_traits< char > > _Myios;
 
         llifstream()
-                : std::basic_istream<char,std::char_traits< char > >(NULL,true),_Filebuffer(NULL)
+                : std::basic_istream<char,std::char_traits< char > >(NULL,true),_Filebuffer(NULL),_ShouldClose(false)
         {       // construct unopened
         }
 
@@ -97,7 +98,8 @@ public:
 
         explicit llifstream(_Filet *_File)
                 : std::basic_istream<char,std::char_traits< char > >(NULL,true),
-                        _Filebuffer(new _Myfb(_File))
+                        _Filebuffer(new _Myfb(_File)),
+                        _ShouldClose(false)
         {       // construct with specified C stream
         }
         virtual ~llifstream();
@@ -107,13 +109,14 @@ public:
                 return _Filebuffer;
         }
         bool is_open() const;
-        void open(const char *_Filename,
+        void open(const char* _Filename,        /* Flawfinder: ignore */
                 ios_base::openmode _Mode = ios_base::in,
-                int _Prot = (int)ios_base::_Openprot);  /* Flawfinder: ignore */
+                int _Prot = (int)ios_base::_Openprot);  
         void close();
 
 private:
         _Myfb* _Filebuffer;     // the file buffer
+        bool _ShouldClose;
 };
 
 
diff --git a/linden/indra/llcommon/llformat.cpp b/linden/indra/llcommon/llformat.cpp
new file mode 100644
index 0000000..f088bc6
--- /dev/null
+++ b/linden/indra/llcommon/llformat.cpp
@@ -0,0 +1,47 @@
+/** 
+ * @file llformat.cpp
+ * @date   January 2007
+ * @brief string formatting utility
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+
+#include "llformat.h"
+
+#include <stdarg.h>
+
+std::string llformat(const char *fmt, ...)
+{
+        char tstr[1024];        /* Flawfinder: ignore */
+        va_list va;
+        va_start(va, fmt);
+#if LL_WINDOWS
+        _vsnprintf(tstr, 1024, fmt, va);
+#else
+        vsnprintf(tstr, 1024, fmt, va); /* Flawfinder: ignore */
+#endif
+        va_end(va);
+        return std::string(tstr);
+}
diff --git a/linden/indra/llcommon/llformat.h b/linden/indra/llcommon/llformat.h
new file mode 100644
index 0000000..135f9d2
--- /dev/null
+++ b/linden/indra/llcommon/llformat.h
@@ -0,0 +1,42 @@
+/** 
+ * @file llformat.h
+ * @date   January 2007
+ * @brief string formatting utility
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LL_LLFORMAT_H
+#define LL_LLFORMAT_H
+
+#include <string>
+
+// Use as follows:
+// llinfos << llformat("Test:%d (%.2f %.2f)", idx, x, y) << llendl;
+//
+// *NOTE: buffer limited to 1024, (but vsnprintf prevents overrun)
+// should perhaps be replaced with boost::format.
+
+std::string llformat(const char *fmt, ...);
+
+#endif // LL_LLFORMAT_H
diff --git a/linden/indra/llcommon/llliveappconfig.cpp b/linden/indra/llcommon/llliveappconfig.cpp
new file mode 100644
index 0000000..bcffa7c
--- /dev/null
+++ b/linden/indra/llcommon/llliveappconfig.cpp
@@ -0,0 +1,65 @@
+/** 
+ * @file llliveappconfig.cpp
+ * @brief Configuration information for an LLApp that overrides indra.xml
+ *
+ * Copyright (c) 2003-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+
+#include "llliveappconfig.h"
+
+#include "llapp.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+
+LLLiveAppConfig::LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period)
+:       LLLiveFile(filename, refresh_period),
+        mApp(app)
+{ }
+
+
+LLLiveAppConfig::~LLLiveAppConfig()
+{ }
+
+// virtual 
+void LLLiveAppConfig::loadFile()
+{
+        llinfos << "LLLiveAppConfig::loadFile(): reading from "
+                << filename() << llendl;
+    llifstream file(filename().c_str());
+        LLSD config;
+    if (file.is_open())
+    {
+        LLSDSerialize::fromXML(config, file);
+                if(!config.isMap())
+                {
+                        llinfos << "LLDataserverConfig::loadFile(): not an map!"
+                                << " Ignoring the data." << llendl;
+                        return;
+                }
+                file.close();
+    }
+        mApp->setOptionData(
+                LLApp::PRIORITY_SPECIFIC_CONFIGURATION, config);
+}
diff --git a/linden/indra/newview/lldrawpooltreenew.h b/linden/indra/llcommon/llliveappconfig.h
index 9150331..822410f 100644
--- a/linden/indra/newview/lldrawpooltreenew.h
+++ b/linden/indra/llcommon/llliveappconfig.h
@@ -1,6 +1,6 @@
 /** 
- * @file lldrawpooltreenew.h
- * @brief LLDrawPoolTreeNew class definition
+ * @file llliveappconfig.h
+ * @brief Configuration information for an LLApp that overrides indra.xml
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
@@ -25,31 +25,28 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
-#ifndef LL_LLDRAWPOOLTREENEW_H
-#define LL_LLDRAWPOOLTREENEW_H
+#ifndef LLLIVEAPPCONFIG_H
+#define LLLIVEAPPCONFIG_H
 
-#include "lldrawpool.h"
+#include "lllivefile.h"
 
-class LLDrawPoolTreeNew : public LLDrawPool
+class LLApp;
+
+class LLLiveAppConfig : public LLLiveFile
 {
-        LLPointer<LLViewerImage> mTexturep;
 public:
-        LLDrawPoolTreeNew(LLViewerImage *texturep);
+        // To use this, instantiate a LLLiveAppConfig object inside your main loop.
+        // The traditional name for it is live_config.
+        // Be sure to call live_config.checkAndReload() periodically.
 
-        /*virtual*/ LLDrawPool *instancePool();
+        LLLiveAppConfig(LLApp* app, const std::string& filename, F32 refresh_period);
+        ~LLLiveAppConfig();
 
-        /*virtual*/ void prerender();
-        /*virtual*/ void render( S32 pass );
-        /*virtual*/ void renderForSelect();
-        /*virtual*/ S32 rebuild();
-        /*virtual*/ BOOL verify() const;
-        /*virtual*/ LLViewerImage *getTexture();
-        /*virtual*/ LLViewerImage *getDebugTexture();
-        /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
-        virtual S32     getMaterialAttribIndex() { return 0; }
+protected:
+        /*virtual*/ void loadFile();
 
 private:
-        void renderTree(BOOL selecting = FALSE);
+        LLApp* mApp;
 };
 
-#endif // LL_LLDRAWPOOLTREE_H
+#endif
diff --git a/linden/indra/llcommon/lllivefile.cpp b/linden/indra/llcommon/lllivefile.cpp
index 33e2014..d289671 100644
--- a/linden/indra/llcommon/lllivefile.cpp
+++ b/linden/indra/llcommon/lllivefile.cpp
@@ -27,24 +27,56 @@
 #include "linden_common.h"
 
 #include "lllivefile.h"
+#include "llframetimer.h"
+#include "lltimer.h"
 
+class LLLiveFile::Impl
+{
+public:
+        Impl(const std::string &filename, const F32 refresh_period);
+        ~Impl();
+        
+        bool check();
+        
+        
+        bool mForceCheck;
+        F32 mRefreshPeriod;
+        LLFrameTimer mRefreshTimer;
 
-LLLiveFile::LLLiveFile(const std::string &filename, const F32 refresh_period) :
-mForceCheck(true),
-mRefreshPeriod(refresh_period),
-mFilename(filename),
-mLastModTime(0),
-mLastExists(false)
+        std::string mFilename;
+        time_t mLastModTime;
+        bool mLastExists;
+        
+        LLEventTimer* mEventTimer;
+};
+
+LLLiveFile::Impl::Impl(const std::string &filename, const F32 refresh_period)
+        : mForceCheck(true),
+        mRefreshPeriod(refresh_period),
+        mFilename(filename),
+        mLastModTime(0),
+        mLastExists(false),
+        mEventTimer(NULL)
 {
 }
 
+LLLiveFile::Impl::~Impl()
+{
+        delete mEventTimer;
+}
+
+LLLiveFile::LLLiveFile(const std::string &filename, const F32 refresh_period)
+        : impl(* new Impl(filename, refresh_period))
+{
+}
 
 LLLiveFile::~LLLiveFile()
 {
+        delete &impl;
 }
 
 
-bool LLLiveFile::checkAndReload()
+bool LLLiveFile::Impl::check()
 {
         if (!mForceCheck && mRefreshTimer.getElapsedTimeF32() < mRefreshPeriod)
         {
@@ -65,9 +97,8 @@ bool LLLiveFile::checkAndReload()
                 // broken somehow.  Clear flags and return.
                 if (mLastExists)
                 {
-                        loadFile(); // Load the file, even though it's missing to allow it to clear state.
                         mLastExists = false;
-                        return true;
+                        return true;    // no longer existing is a change!
                 }
                 return false;
         }
@@ -87,7 +118,44 @@ bool LLLiveFile::checkAndReload()
         mLastExists = true;
         mLastModTime = stat_data.st_mtime;
         
-        loadFile();
         return true;
 }
 
+bool LLLiveFile::checkAndReload()
+{
+        bool changed = impl.check();
+        if (changed)
+        {
+                loadFile();
+        }
+        return changed;
+}
+
+std::string LLLiveFile::filename() const
+{
+        return impl.mFilename;
+}
+
+namespace
+{
+        class LiveFileEventTimer : public LLEventTimer
+        {
+        public:
+                LiveFileEventTimer(LLLiveFile& f, F32 refresh)
+                        : LLEventTimer(refresh), mLiveFile(f)
+                        { }
+                        
+                void tick()
+                        { mLiveFile.checkAndReload(); }
+        
+        private:
+                LLLiveFile& mLiveFile;
+        };
+        
+}
+
+void LLLiveFile::addToEventTimer()
+{
+        impl.mEventTimer = new LiveFileEventTimer(*this, impl.mRefreshPeriod);
+}
+
diff --git a/linden/indra/llcommon/lllivefile.h b/linden/indra/llcommon/lllivefile.h
index b305531..fbf2bdf 100644
--- a/linden/indra/llcommon/lllivefile.h
+++ b/linden/indra/llcommon/lllivefile.h
@@ -28,7 +28,6 @@
 #ifndef LL_LLLIVEFILE_H
 #define LL_LLLIVEFILE_H
 
-#include "llframetimer.h"
 
 class LLLiveFile
 {
@@ -36,18 +35,22 @@ public:
         LLLiveFile(const std::string &filename, const F32 refresh_period = 5.f);
         virtual ~LLLiveFile();
 
-        bool checkAndReload(); // Returns true if the file changed in any way
+        bool checkAndReload();
+                // Returns true if the file changed in any way
+                // Call this before using anything that was read & cached from the file
+
+        std::string filename() const;
+
+        void addToEventTimer();
+                // Normally, just calling checkAndReload() is enough.  In some cases
+                // though, you may need to let the live file periodically check itself.
 
 protected:
         virtual void loadFile() = 0; // Implement this to load your file if it changed
 
-        bool mForceCheck;
-        F32 mRefreshPeriod;
-        LLFrameTimer mRefreshTimer;
-
-        std::string mFilename;
-        time_t mLastModTime;
-        bool mLastExists;
+private:
+        class Impl;
+        Impl& impl;
 };
 
 #endif //LL_LLLIVEFILE_H
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index 52d2858..08c63e3 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -155,4 +155,8 @@ const S32 LIST_STAT_SUM_SQUARES = 7;
 const S32 LIST_STAT_NUM_COUNT = 8;
 const S32 LIST_STAT_GEO_MEAN = 9;
 
+const S32 STRING_TRIM_HEAD = 0x01;
+const S32 STRING_TRIM_TAIL = 0x02;
+const S32 STRING_TRIM = STRING_TRIM_HEAD | STRING_TRIM_TAIL;
+
 #endif
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 9bfbf88..8528433 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -28,6 +28,12 @@
 #include "linden_common.h"
 
 #include "llmemory.h"
+#include "llmemtype.h"
+
+// not defining nullfunc will currently crash when trying to use a LLHandle
+template< typename _Ty >
+  const typename LLHandle< _Ty >::NullFunc
+    LLHandle< _Ty >::sNullFunc = LLHandle< _Ty >::defaultNullFunc;
 
 //----------------------------------------------------------------------------
 
@@ -258,43 +264,6 @@ void operator delete[] (void *p)
 
 //----------------------------------------------------------------------------
 
-//static
-LLMutex* LLThreadSafeRefCount::sMutex = 0;
-
-//static
-void LLThreadSafeRefCount::initClass()
-{
-        if (!sMutex)
-        {
-                sMutex = new LLMutex(0);
-        }
-}
-
-//static
-void LLThreadSafeRefCount::cleanupClass()
-{
-        delete sMutex;
-        sMutex = NULL;
-}
-        
-
-//----------------------------------------------------------------------------
-
-LLThreadSafeRefCount::LLThreadSafeRefCount() :
-        mRef(0)
-{
-}
-
-LLThreadSafeRefCount::~LLThreadSafeRefCount()
-{ 
-        if (mRef != 0)
-        {
-                llerrs << "deleting non-zero reference" << llendl;
-        }
-}
-
-//----------------------------------------------------------------------------
-
 LLRefCount::LLRefCount() :
         mRef(0)
 {
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h
index b40ab79..7a7996b 100644
--- a/linden/indra/llcommon/llmemory.h
+++ b/linden/indra/llcommon/llmemory.h
@@ -31,8 +31,6 @@
 #include <cstdlib>
 
 #include "llerror.h"
-#include "llthread.h"
-#include "llmemtype.h"
 
 extern S32 gTotalDAlloc;
 extern S32 gTotalDAUse;
@@ -61,53 +59,7 @@ private:
 //   LLPointer<LLFoo> x = new LLFoo; // constructor does not do anything interesting
 //   x->instantiate(); // does stuff like place x into an update queue
 
-class LLThreadSafeRefCount
-{
-public:
-        static void initClass(); // creates sMutex
-        static void cleanupClass(); // destroys sMutex
-        
-private:
-        static LLMutex* sMutex;
-
-private:
-        LLThreadSafeRefCount(const LLThreadSafeRefCount&); // not implemented
-        LLThreadSafeRefCount&operator=(const LLThreadSafeRefCount&); // not implemented
-
-protected:
-        virtual ~LLThreadSafeRefCount(); // use unref()
-        
-public:
-        LLThreadSafeRefCount();
-        
-        void ref()
-        {
-                if (sMutex) sMutex->lock();
-                mRef++; 
-                if (sMutex) sMutex->unlock();
-        } 
-
-        S32 unref()
-        {
-                llassert(mRef >= 1);
-                if (sMutex) sMutex->lock();
-                S32 res = --mRef;
-                if (sMutex) sMutex->unlock();
-                if (0 == res) 
-                {
-                        delete this; 
-                        res = 0;
-                }
-                return res;
-        }       
-        S32 getNumRefs() const
-        {
-                return mRef;
-        }
-
-private: 
-        S32     mRef; 
-};
+// see llthread.h for LLThreadSafeRefCount
 
 //----------------------------------------------------------------------------
 
@@ -139,6 +91,7 @@ public:
                 }
                 return mRef;
         }       
+
         S32 getNumRefs() const
         {
                 return mRef;
@@ -150,6 +103,7 @@ private:
 
 //----------------------------------------------------------------------------
 
+// Note: relies on Type having ref() and unref() methods
 template <class Type> class LLPointer
 {
 public:
@@ -268,6 +222,154 @@ protected:
         Type*   mPointer;
 };
 
+//template <class Type> 
+//class LLPointerTraits
+//{
+//      static Type* null();
+//};
+//
+// Expands LLPointer to return a pointer to a special instance of class Type instead of NULL.
+// This is useful in instances where operations on NULL pointers are semantically safe and/or
+// when error checking occurs at a different granularity or in a different part of the code
+// than when referencing an object via a LLHandle.
+// 
+
+template <class Type> 
+class LLHandle
+{
+public:
+        LLHandle() :
+                mPointer(sNullFunc())
+        {
+                ref();
+        }
+
+        LLHandle(Type* ptr) : 
+                mPointer(nonNull(ptr))
+        {
+                ref();
+        }
+
+        LLHandle(const LLHandle<Type>& ptr) : 
+                mPointer(ptr.mPointer)
+        {
+                ref();
+        }
+
+        // support conversion up the type hierarchy.  See Item 45 in Effective C++, 3rd Ed.
+        template<typename Subclass>
+        LLHandle(const LLHandle<Subclass>& ptr) : 
+                mPointer(ptr.get())
+        {
+                ref();
+        }
+
+        ~LLHandle()                                                             
+        {
+                unref();
+        }
+
+        Type*   get() const                                                     { return mPointer; }
+        const Type*     operator->() const                              { return mPointer; }
+        Type*   operator->()                                            { return mPointer; }
+        const Type&     operator*() const                               { return *mPointer; }
+        Type&   operator*()                                                     { return *mPointer; }
+
+        operator BOOL()  const                                          { return (mPointer != sNullFunc()); }
+        operator bool()  const                                          { return (mPointer != sNullFunc()); }
+        bool operator!() const                                          { return (mPointer == sNullFunc()); }
+        bool isNull() const                                                     { return (mPointer == sNullFunc()); }
+        bool notNull() const                                            { return (mPointer != sNullFunc()); }
+
+
+        operator Type*()       const                            { return mPointer; }
+        operator const Type*() const                            { return mPointer; }
+        bool operator !=(Type* ptr) const           { return (mPointer != nonNull(ptr));        }
+        bool operator ==(Type* ptr) const           { return (mPointer == nonNull(ptr));        }
+        bool operator ==(const LLHandle<Type>& ptr) const           { return (mPointer == ptr.mPointer);        }
+        bool operator < (const LLHandle<Type>& ptr) const           { return (mPointer < ptr.mPointer);         }
+        bool operator > (const LLHandle<Type>& ptr) const           { return (mPointer > ptr.mPointer);         }
+
+        LLHandle<Type>& operator =(Type* ptr)                   
+        { 
+                if( mPointer != ptr )
+                {
+                        unref(); 
+                        mPointer = nonNull(ptr); 
+                        ref();
+                }
+
+                return *this; 
+        }
+
+        LLHandle<Type>& operator =(const LLHandle<Type>& ptr)  
+        { 
+                if( mPointer != ptr.mPointer )
+                {
+                        unref(); 
+                        mPointer = ptr.mPointer;
+                        ref();
+                }
+                return *this; 
+        }
+
+        // support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
+        template<typename Subclass>
+        LLHandle<Type>& operator =(const LLHandle<Subclass>& ptr)  
+        { 
+                if( mPointer != ptr.get() )
+                {
+                        unref(); 
+                        mPointer = ptr.get();
+                        ref();
+                }
+                return *this; 
+        }
+
+public:
+        typedef Type* (*NullFunc)();
+        static const NullFunc sNullFunc;
+
+protected:
+        void ref()                             
+        { 
+                if (mPointer)
+                {
+                        mPointer->ref();
+                }
+        }
+
+        void unref()
+        {
+                if (mPointer)
+                {
+                        Type *tempp = mPointer;
+                        mPointer = sNullFunc();
+                        tempp->unref();
+                        if (mPointer != sNullFunc())
+                        {
+                                llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl;
+                                unref();
+                        }
+                }
+        }
+
+        static Type* nonNull(Type* ptr)
+        {
+                return ptr == NULL ? sNullFunc() : ptr;
+        }
+
+        static Type* defaultNullFunc()
+        {
+                llerrs << "No null value provided for LLHandle" << llendl;
+                return NULL;
+        }
+
+protected:
+
+        Type*   mPointer;
+};
+
 // LLInitializedPointer is just a pointer with a default constructor that initializes it to NULL
 // NOT a smart pointer like LLPointer<>
 // Useful for example in std::map<int,LLInitializedPointer<LLFoo> >
diff --git a/linden/indra/llcommon/llmemtype.h b/linden/indra/llcommon/llmemtype.h
index 15ef924..0af1ed3 100644
--- a/linden/indra/llcommon/llmemtype.h
+++ b/linden/indra/llcommon/llmemtype.h
@@ -71,6 +71,7 @@ public:
                 
                 MTYPE_DRAWABLE,
                 MTYPE_OBJECT,
+                MTYPE_VERTEX_DATA,
                 MTYPE_SPACE_PARTITION,
                 MTYPE_PIPELINE,
                 MTYPE_AVATAR,
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index f03fe89..9db0108 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -51,7 +51,9 @@
         #define LL_LIBXUL_ENABLED               1
 #elif LL_LINUX
         #define LL_QUICKTIME_ENABLED    0
-        #define LL_LIBXUL_ENABLED               0
+        #ifndef LL_LIBXUL_ENABLED
+                #define LL_LIBXUL_ENABLED               1
+        #endif // def LL_LIBXUL_ENABLED
 #endif
 
 #if LL_LIBXUL_ENABLED && !defined(MOZILLA_INTERNAL_API)
@@ -80,7 +82,7 @@
 
 // Deal with the differeneces on Windows
 #if defined(LL_WINDOWS)
-#define snprintf _snprintf
+#define snprintf _snprintf      /*Flawfinder: ignore*/
 #endif  //      LL_WINDOWS
 
 // Static linking with apr on windows needs to be declared.
@@ -110,6 +112,7 @@
 #pragma warning( disable : 4284 )       // silly MS warning deep inside their <map> include file
 #pragma warning( disable : 4503 )       // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
 #pragma warning( disable : 4800 )       // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
+#pragma warning( disable : 4996 )       // warning: deprecated
 #endif  //      LL_WINDOWS
 
 #endif  //      not LL_LINDEN_PREPROCESSOR_H
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index b811678..3408cb1 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -604,7 +604,7 @@ bool CProcessor::AnalyzeIntelProcessor()
                         mov sig3, edx
                 }
                 // Then we convert the data to a readable string
-                snprintf(
+                snprintf(       /* Flawfinder: ignore */
                         CPUInfo.strProcessorSerial,
                         sizeof(CPUInfo.strProcessorSerial),
                         "%04lX-%04lX-%04lX-%04lX-%04lX-%04lX",
@@ -612,15 +612,15 @@ bool CProcessor::AnalyzeIntelProcessor()
                         sig1 & 0xFFFF,
                         sig3 >> 16,
                         sig3 & 0xFFFF,
-                        sig2 >> 16, sig2 & 0xFFFF);     /* Flawfinder: ignore */
+                        sig2 >> 16, sig2 & 0xFFFF);
         }
         else
         {
                 // If there's no serial number support we just put "No serial number"
-                snprintf(
+                snprintf( /* Flawfinder: ignore */
                         CPUInfo.strProcessorSerial,
                         sizeof(CPUInfo.strProcessorSerial),
-                        "No Processor Serial Number");  /* Flawfinder: ignore */
+                        "No Processor Serial Number");  
         }
 
         // Now we get the standard processor extensions
@@ -854,7 +854,7 @@ bool CProcessor::AnalyzeAMDProcessor()
                                         break;
                                 case 0xD:               // Model = 0xD:  K6-2+ / K6-III+
                                         strcpy(CPUInfo.strModel, "AMD K6-2+ or K6-III+ (0.18 micron)");         /* Flawfinder: ignore */
-                                        strncat(strCPUName, "AMD K6-2+ or K6-III+ (0.18 micron)", sizeof(strCPUName) - strlen(strCPUName) -1);
+                                        strncat(strCPUName, "AMD K6-2+ or K6-III+ (0.18 micron)", sizeof(strCPUName) - strlen(strCPUName) -1);  /* Flawfinder: ignore */
                                         break;
                                 default:                // ...
                                         strcpy(CPUInfo.strModel, "Unknown AMD K5 or K6 model");         /* Flawfinder: ignore */
diff --git a/linden/indra/llcommon/llqueuedthread.cpp b/linden/indra/llcommon/llqueuedthread.cpp
index 565836b..2e4324b 100644
--- a/linden/indra/llcommon/llqueuedthread.cpp
+++ b/linden/indra/llcommon/llqueuedthread.cpp
@@ -31,10 +31,9 @@
 //============================================================================
 
 // MAIN THREAD
-LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded, bool runalways) :
+LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded) :
         LLThread(name),
         mThreaded(threaded),
-        mRunAlways(runalways),
         mIdleThread(TRUE),
         mNextHandle(0)
 {
@@ -47,6 +46,12 @@ LLQueuedThread::LLQueuedThread(const std::string& name, bool threaded, bool runa
 // MAIN THREAD
 LLQueuedThread::~LLQueuedThread()
 {
+        shutdown();
+        // ~LLThread() will be called here
+}
+
+void LLQueuedThread::shutdown()
+{
         setQuitting();
 
         unpause(); // MAIN THREAD
@@ -73,61 +78,69 @@ LLQueuedThread::~LLQueuedThread()
         }
 
         QueuedRequest* req;
+        S32 active_count = 0;
         while ( (req = (QueuedRequest*)mRequestHash.pop_element()) )
         {
+                if (req->getStatus() == STATUS_QUEUED || req->getStatus() == STATUS_INPROGRESS)
+                {
+                        ++active_count;
+                }
                 req->deleteRequest();
         }
-        
-        // ~LLThread() will be called here
+        if (active_count)
+        {
+                llwarns << "~LLQueuedThread() called with active requests: " << active_count << llendl;
+        }
 }
 
 //----------------------------------------------------------------------------
 
 // MAIN THREAD
-void LLQueuedThread::update(U32 ms_elapsed)
+// virtual
+S32 LLQueuedThread::update(U32 max_time_ms)
 {
-        updateQueue(0);
+        return updateQueue(max_time_ms);
 }
 
-void LLQueuedThread::updateQueue(S32 inc)
+S32 LLQueuedThread::updateQueue(U32 max_time_ms)
 {
-        // If mRunAlways == TRUE, unpause the thread whenever we put something into the queue.
-        // If mRunAlways == FALSE, we only unpause the thread when updateQueue() is called from the main loop (i.e. between rendered frames)
-        
-        if (inc == 0) // Frame Update
+        F64 max_time = (F64)max_time_ms * .001;
+        LLTimer timer;
+        S32 pending = 1;
+
+        // Frame Update
+        if (mThreaded)
         {
-                if (mThreaded)
-                {
-                        unpause();
-                        wake(); // Wake the thread up if necessary.
-                }
-                else
+                pending = getPending();
+                unpause();
+        }
+        else
+        {
+                while (pending > 0)
                 {
-                        while (processNextRequest() > 0)
-                                ;
+                        pending = processNextRequest();
+                        if (max_time && timer.getElapsedTimeF64() > max_time)
+                                break;
                 }
         }
-        else
+        return pending;
+}
+
+void LLQueuedThread::incQueue()
+{
+        // Something has been added to the queue
+        if (!isPaused())
         {
-                // Something has been added to the queue
-                if (mRunAlways)
+                if (mThreaded)
                 {
-                        if (mThreaded)
-                        {
-                                wake(); // Wake the thread up if necessary.
-                        }
-                        else
-                        {
-                                while(processNextRequest() > 0)
-                                        ;
-                        }
+                        wake(); // Wake the thread up if necessary.
                 }
         }
 }
 
 //virtual
 // May be called from any thread
-S32 LLQueuedThread::getPending(bool child_thread)
+S32 LLQueuedThread::getPending()
 {
         S32 res;
         lockData();
@@ -141,7 +154,7 @@ void LLQueuedThread::waitOnPending()
 {
         while(1)
         {
-                updateQueue(0);
+                update(0);
 
                 if (mIdleThread)
                 {
@@ -200,7 +213,7 @@ bool LLQueuedThread::addRequest(QueuedRequest* req)
 #endif
         unlockData();
 
-        updateQueue(1);
+        incQueue();
 
         return true;
 }
@@ -214,7 +227,7 @@ bool LLQueuedThread::waitForResult(LLQueuedThread::handle_t handle, bool auto_co
         bool done = false;
         while(!done)
         {
-                updateQueue(0); // unpauses
+                update(0); // unpauses
                 lockData();
                 QueuedRequest* req = (QueuedRequest*)mRequestHash.find(handle);
                 if (!req)
@@ -272,51 +285,47 @@ LLQueuedThread::status_t LLQueuedThread::getRequestStatus(handle_t handle)
         return res;
 }
 
-LLQueuedThread::status_t LLQueuedThread::abortRequest(handle_t handle, U32 flags)
+void LLQueuedThread::abortRequest(handle_t handle, bool autocomplete)
 {
-        status_t res = STATUS_EXPIRED;
         lockData();
         QueuedRequest* req = (QueuedRequest*)mRequestHash.find(handle);
         if (req)
         {
-                res = req->abortRequest(flags);
-                if ((flags & AUTO_COMPLETE) && (res == STATUS_COMPLETE))
-                {
-                        mRequestHash.erase(handle);
-                        req->deleteRequest();
-//                      check();
-                }
-#if _DEBUG
-//              llinfos << llformat("LLQueuedThread::Aborted req [%08d]",handle) << llendl;
-#endif
+                req->setFlags(FLAG_ABORT | (autocomplete ? FLAG_AUTO_COMPLETE : 0));
         }
         unlockData();
-        return res;
 }
 
 // MAIN thread
-LLQueuedThread::status_t LLQueuedThread::setFlags(handle_t handle, U32 flags)
+void LLQueuedThread::setFlags(handle_t handle, U32 flags)
 {
-        status_t res = STATUS_EXPIRED;
         lockData();
         QueuedRequest* req = (QueuedRequest*)mRequestHash.find(handle);
         if (req)
         {
-                res = req->setFlags(flags);
+                req->setFlags(flags);
         }
         unlockData();
-        return res;
 }
 
 void LLQueuedThread::setPriority(handle_t handle, U32 priority)
 {
         lockData();
         QueuedRequest* req = (QueuedRequest*)mRequestHash.find(handle);
-        if (req && (req->getStatus() == STATUS_QUEUED))
+        if (req)
         {
-                llverify(mRequestQueue.erase(req) == 1);
-                req->setPriority(priority);
-                mRequestQueue.insert(req);
+                if(req->getStatus() == STATUS_INPROGRESS)
+                {
+                        // not in list
+                        req->setPriority(priority);
+                }
+                else if(req->getStatus() == STATUS_QUEUED)
+                {
+                        // remove from list then re-insert
+                        llverify(mRequestQueue.erase(req) == 1);
+                        req->setPriority(priority);
+                        mRequestQueue.insert(req);
+                }
         }
         unlockData();
 }
@@ -328,9 +337,10 @@ bool LLQueuedThread::completeRequest(handle_t handle)
         QueuedRequest* req = (QueuedRequest*)mRequestHash.find(handle);
         if (req)
         {
-                llassert(req->getStatus() != STATUS_QUEUED && req->getStatus() != STATUS_ABORT);
+                llassert_always(req->getStatus() != STATUS_QUEUED);
+                llassert_always(req->getStatus() != STATUS_INPROGRESS);
 #if _DEBUG
-//              llinfos << llformat("LLQueuedThread::Completed req [%08d]",handle) << llendl;
+//              llinfos << llformat("LLQueuedThread::Completed req [%08d]",handle) << llendl;
 #endif
                 mRequestHash.erase(handle);
                 req->deleteRequest();
@@ -364,28 +374,34 @@ bool LLQueuedThread::check()
 //============================================================================
 // Runs on its OWN thread
 
-int LLQueuedThread::processNextRequest()
+S32 LLQueuedThread::processNextRequest()
 {
-        QueuedRequest *req = 0;
+        QueuedRequest *req;
         // Get next request from pool
         lockData();
         while(1)
         {
-                if (!mRequestQueue.empty())
+                req = NULL;
+                if (mRequestQueue.empty())
                 {
-                        req = *mRequestQueue.begin();
-                        mRequestQueue.erase(mRequestQueue.begin());
+                        break;
                 }
-                if (req && req->getStatus() == STATUS_ABORT)
+                req = *mRequestQueue.begin();
+                mRequestQueue.erase(mRequestQueue.begin());
+                if ((req->getFlags() & FLAG_ABORT) || (mStatus == QUITTING))
                 {
                         req->setStatus(STATUS_ABORTED);
-                        req = 0;
-                }
-                else
-                {
-                        llassert (!req || req->getStatus() == STATUS_QUEUED)
-                        break;
+                        req->finishRequest(false);
+                        if (req->getFlags() & FLAG_AUTO_COMPLETE)
+                        {
+                                mRequestHash.erase(req);
+                                req->deleteRequest();
+//                              check();
+                        }
+                        continue;
                 }
+                llassert_always(req->getStatus() == STATUS_QUEUED);
+                break;
         }
         if (req)
         {
@@ -393,22 +409,22 @@ int LLQueuedThread::processNextRequest()
         }
         unlockData();
 
-        // This is the only place we will cal req->setStatus() after
+        // This is the only place we will call req->setStatus() after
         // it has initially been seet to STATUS_QUEUED, so it is
         // safe to access req.
         if (req)
         {
                 // process request
-                bool complete = processRequest(req);
+                bool complete = req->processRequest();
 
                 if (complete)
                 {
                         lockData();
                         req->setStatus(STATUS_COMPLETE);
-                        req->finishRequest();
-                        if (req->getFlags() & AUTO_COMPLETE)
+                        req->finishRequest(true);
+                        if (req->getFlags() & FLAG_AUTO_COMPLETE)
                         {
-                                llverify(mRequestHash.erase(req))
+                                mRequestHash.erase(req);
                                 req->deleteRequest();
 //                              check();
                         }
@@ -419,12 +435,18 @@ int LLQueuedThread::processNextRequest()
                         lockData();
                         req->setStatus(STATUS_QUEUED);
                         mRequestQueue.insert(req);
+                        U32 priority = req->getPriority();
                         unlockData();
+                        if (priority < PRIORITY_NORMAL)
+                        {
+                                ms_sleep(1); // sleep the thread a little
+                        }
                 }
         }
 
-        int res;
-        if (getPending(true) == 0)
+        S32 res;
+        S32 pending = getPending();
+        if (pending == 0)
         {
                 if (isQuitting())
                 {
@@ -437,7 +459,7 @@ int LLQueuedThread::processNextRequest()
         }
         else
         {
-                res = 1;
+                res = pending;
         }
         return res;
 }
@@ -445,13 +467,14 @@ int LLQueuedThread::processNextRequest()
 bool LLQueuedThread::runCondition()
 {
         // mRunCondition must be locked here
-        return (mRequestQueue.empty() && mIdleThread) ? FALSE : TRUE;
+        if (mRequestQueue.empty() && mIdleThread)
+                return false;
+        else
+                return true;
 }
 
 void LLQueuedThread::run()
 {
-        llinfos << "QUEUED THREAD STARTING" << llendl;
-
         while (1)
         {
                 // this will block on the condition until runCondition() returns true, the thread is unpaused, or the thread leaves the RUNNING state.
@@ -474,6 +497,8 @@ void LLQueuedThread::run()
                 {
                         break;
                 }
+
+                //LLThread::yield(); // thread should yield after each request          
         }
 
         llinfos << "QUEUED THREAD " << mName << " EXITING." << llendl;
@@ -491,20 +516,18 @@ LLQueuedThread::QueuedRequest::QueuedRequest(LLQueuedThread::handle_t handle, U3
 
 LLQueuedThread::QueuedRequest::~QueuedRequest()
 {
-        if (mStatus != STATUS_DELETE)
-        {
-                llerrs << "Attemt to directly delete a  LLQueuedThread::QueuedRequest; use deleteRequest()" << llendl;
-        }
+        llassert_always(mStatus == STATUS_DELETE);
 }
 
 //virtual
-void LLQueuedThread::QueuedRequest::finishRequest()
+void LLQueuedThread::QueuedRequest::finishRequest(bool completed)
 {
 }
 
 //virtual
 void LLQueuedThread::QueuedRequest::deleteRequest()
 {
+        llassert_always(mStatus != STATUS_INPROGRESS);
         setStatus(STATUS_DELETE);
         delete this;
 }
diff --git a/linden/indra/llcommon/llqueuedthread.h b/linden/indra/llcommon/llqueuedthread.h
index cc21b3b..7231285 100644
--- a/linden/indra/llcommon/llqueuedthread.h
+++ b/linden/indra/llcommon/llqueuedthread.h
@@ -52,7 +52,8 @@ public:
                 PRIORITY_HIGH =      0x30000000,
                 PRIORITY_NORMAL =    0x20000000,
                 PRIORITY_LOW =       0x10000000,
-                PRIORITY_LOWBITS =   0x0FFFFFFF
+                PRIORITY_LOWBITS =   0x0FFFFFFF,
+                PRIORITY_HIGHBITS =  0x70000000
         };
         enum status_t {
                 STATUS_EXPIRED = -1,
@@ -60,13 +61,13 @@ public:
                 STATUS_QUEUED = 1,
                 STATUS_INPROGRESS = 2,
                 STATUS_COMPLETE = 3,
-                STATUS_ABORT = 4,
-                STATUS_ABORTED = 5,
-                STATUS_DELETE = 6
+                STATUS_ABORTED = 4,
+                STATUS_DELETE = 5
         };
         enum flags_t {
-                AUTO_COMPLETE = 1,
-                AUTO_DELETE = 2 // child-class dependent
+                FLAG_AUTO_COMPLETE = 1,
+                FLAG_AUTO_DELETE = 2, // child-class dependent
+                FLAG_ABORT = 4
         };
 
         typedef U32 handle_t;
@@ -79,7 +80,7 @@ public:
                 friend class LLQueuedThread;
                 
         protected:
-                ~QueuedRequest(); // use deleteRequest()
+                virtual ~QueuedRequest(); // use deleteRequest()
                 
         public:
                 QueuedRequest(handle_t handle, U32 priority, U32 flags = 0);
@@ -111,26 +112,14 @@ public:
                         mStatus = newstatus;
                         return oldstatus;
                 }
-                status_t abortRequest(U32 flags)
+                void setFlags(U32 flags)
                 {
                         // NOTE: flags are |'d
-                        if (mStatus == STATUS_QUEUED)
-                        {
-                                setStatus(STATUS_ABORT);
-                        }
                         mFlags |= flags;
-                        status_t status = mStatus;
-                        return status;
-                }
-                status_t setFlags(U32 flags)
-                {
-                        // NOTE: flags are |'d
-                        mFlags |= flags;
-                        status_t status = mStatus;
-                        return status;
                 }
                 
-                virtual void finishRequest(); // Always called when after has been processed
+                virtual bool processRequest() = 0; // Return true when request has completed
+                virtual void finishRequest(bool completed); // Always called from thread after request has completed or aborted
                 virtual void deleteRequest(); // Only method to delete a request
 
                 void setPriority(U32 pri)
@@ -160,9 +149,10 @@ public:
         static handle_t nullHandle() { return handle_t(0); }
         
 public:
-        LLQueuedThread(const std::string& name, bool threaded = TRUE, bool runalways = TRUE);
+        LLQueuedThread(const std::string& name, bool threaded = true);
         virtual ~LLQueuedThread();      
-
+        virtual void shutdown();
+        
 private:
         // No copy constructor or copy assignment
         LLQueuedThread(const LLQueuedThread&);
@@ -174,26 +164,25 @@ private:
 protected:
         handle_t generateHandle();
         bool addRequest(QueuedRequest* req);
-        int  processNextRequest(void);
+        S32  processNextRequest(void);
+        void incQueue();
 
-        virtual bool processRequest(QueuedRequest* req) = 0;
-        
 public:
         bool waitForResult(handle_t handle, bool auto_complete = true);
 
-        void update(U32 ms_elapsed);
-        void updateQueue(S32 inc);
+        virtual S32 update(U32 max_time_ms);
+        S32 updateQueue(U32 max_time_ms);
+        
         void waitOnPending();
         void printQueueStats();
 
-        S32 getPending(bool child_thread = false);
+        S32 getPending();
         bool getThreaded() { return mThreaded ? true : false; }
-        bool getRunAlways() { return mRunAlways ? true : false; }
 
         // Request accessors
         status_t getRequestStatus(handle_t handle);
-        status_t abortRequest(handle_t handle, U32 flags = 0);
-        status_t setFlags(handle_t handle, U32 flags);
+        void abortRequest(handle_t handle, bool autocomplete);
+        void setFlags(handle_t handle, U32 flags);
         void setPriority(handle_t handle, U32 priority);
         bool completeRequest(handle_t handle);
         // This is public for support classes like LLWorkerThread,
@@ -205,7 +194,6 @@ public:
         
 protected:
         BOOL mThreaded;  // if false, run on main thread and do updates during update()
-        BOOL mRunAlways; // if false, only wake the threads when updateClass() is called
         LLAtomic32<BOOL> mIdleThread; // request queue is empty (or we are quitting) and the thread is idle
         
         typedef std::set<QueuedRequest*, queued_request_less> request_queue_t;
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index 7a0ff9d..342e356 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -27,8 +27,12 @@
 
 #include "llsd.h"
 
+#include <sstream>
 #include <math.h>
+
+#include "llerror.h"
 #include "../llmath/llmath.h"
+#include "llformat.h"
 
 namespace {
         class ImplMap;
@@ -251,7 +255,7 @@ namespace {
         public:
                 ImplUUID(const LLSD::UUID& v) : Base(v) { }
                                 
-                virtual LLSD::String    asString() const{ return mValue.getString(); }
+                virtual LLSD::String    asString() const{ return mValue.asString(); }
                 virtual LLSD::UUID              asUUID() const  { return mValue; }
         };
 
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index 4c00c98..653fc66 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -804,7 +804,7 @@ S32 LLSDBinaryParser::parse(std::istream& istr, LLSD& data) const
                 // the size, and read it.
                 // *FIX: Should we set a maximum size?
                 U32 size_nbo = 0;
-                istr.read((char*)&size_nbo, sizeof(U32));
+                istr.read((char*)&size_nbo, sizeof(U32));       /*Flawfinder: ignore*/
                 S32 size = (S32)ntohl(size_nbo);
                 std::vector<U8> value;
                 if(size)
@@ -944,7 +944,7 @@ void LLSDFormatter::realFormat(const std::string& format)
 void LLSDFormatter::formatReal(LLSD::Real real, std::ostream& ostr) const
 {
         char buffer[MAX_STRING];                /* Flawfinder: ignore */
-        snprintf(buffer, MAX_STRING, mRealFormat.c_str(), real);
+        snprintf(buffer, MAX_STRING, mRealFormat.c_str(), real);        /* Flawfinder: ignore */
         ostr << buffer;
 }
 
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 892f454..bb36fa7 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -190,6 +190,7 @@ S32 LLSDXMLFormatter::format_impl(const LLSD& data, std::ostream& ostr, U32 opti
                 else
                 {
                         // *FIX: memory inefficient.
+                        // *TODO: convert to use LLBase64
                         ostr << pre << "<binary encoding=\"base64\">";
                         int b64_buffer_length = apr_base64_encode_len(buffer.size());
                         char* b64_buffer = new char[b64_buffer_length];
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index 6050d7f..4372373 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -76,7 +76,5 @@ const char LSL_DOC_URL[] =
 const char SL_KB_URL[] =
         "http://secondlife.com/knowledgebase/";
 
-const char ACCOUNT_TRANSACTIONS_URL[] =
-        "https://secondlife.com/account/transactions.php";
-
 const char RELEASE_NOTES[] = "releasenotes.txt";
+
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h
index f338bc3..1f7d359 100644
--- a/linden/indra/llcommon/llsecondlifeurls.h
+++ b/linden/indra/llcommon/llsecondlifeurls.h
@@ -50,18 +50,9 @@ extern const char UPGRADE_TO_PREMIUM_URL[];
 // How to get DirectX 9
 extern const char DIRECTX_9_URL[];
 
-// On AMD with bad AGP controller
-extern const char AMD_AGP_URL[];
-
 // Out of date VIA chipset
 extern const char VIA_URL[];
 
-// Out of date intel chipset driver
-extern const char INTEL_CHIPSET_URL[];
-
-// Out of date SiS chipset driver
-extern const char SIS_CHIPSET_URL[];
-
 // Linden Blogs page
 extern const char BLOGS_URL[];
 
@@ -74,9 +65,6 @@ extern const char LSL_DOC_URL[];
 // SL KnowledgeBase page
 extern const char SL_KB_URL[];
 
-// Account transactions
-extern const char ACCOUNT_TRANSACTIONS_URL[];
-
 // Local Url Release Notes
 extern const char RELEASE_NOTES[];
 
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp
index b68edd3..2c78e05 100644
--- a/linden/indra/llcommon/llstreamtools.cpp
+++ b/linden/indra/llcommon/llstreamtools.cpp
@@ -553,7 +553,7 @@ std::istream& fullread(std::istream& str, char *buf, std::streamsize requested)
 
 std::istream& operator>>(std::istream& str, const char *tocheck)
 {
-        char c;
+        char c = '\0';
         const char *p;
         p = tocheck;
         while (*p && !str.bad())
diff --git a/linden/indra/llcommon/llstrider.h b/linden/indra/llcommon/llstrider.h
index 07b8c48..efc2ae4 100644
--- a/linden/indra/llcommon/llstrider.h
+++ b/linden/indra/llcommon/llstrider.h
@@ -51,6 +51,7 @@ public:
         Object* operator->()           { return mObjectp; }
         Object& operator *()           { return *mObjectp; }
         Object* operator ++(int)       { Object* old = mObjectp; mBytep += mSkip; return old; }
+        Object* operator +=(int i)     { mBytep += mSkip*i; return mObjectp; }
         Object& operator[](U32 index)  { return *(Object*)(mBytep + (mSkip * index)); }
 };
 
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 5cb42cc..c9f684f 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -195,6 +195,7 @@ llutf16string utf8str_to_utf16str ( const LLString& utf8str )
 LLWString utf16str_to_wstring(const llutf16string &utf16str, S32 len)
 {
         LLWString wout;
+        if((len <= 0) || utf16str.empty()) return wout;
 
         S32 i = 0;
         // craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index a83b7cf..0485a1e 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -30,6 +30,7 @@
 
 #include "stdtypes.h"
 #include "llerror.h"
+#include "llfile.h"
 #include <algorithm>
 #include <map>
 #include <stdio.h>
@@ -101,7 +102,7 @@ struct char_traits<U16>
         
         static char_type* 
                 copy(char_type* __s1, const char_type* __s2, size_t __n)
-        {  return static_cast<char_type*>(memcpy(__s1, __s2, __n * sizeof(char_type))); }
+        {  return static_cast<char_type*>(memcpy(__s1, __s2, __n * sizeof(char_type))); }       /* Flawfinder: ignore */
         
         static char_type* 
                 assign(char_type* __s, size_t __n, char_type __a)
@@ -922,7 +923,7 @@ void LLStringBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T r
 
 //static
 template<class T> 
-void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& string, size_type spaces_per_tab )
+void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
 {
         llassert( spaces_per_tab >= 0 );
 
@@ -931,19 +932,19 @@ void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& string, size_
 
         LLStringBase<T> out_str;
         // Replace tabs with spaces
-        for (size_type i = 0; i < string.length(); i++)
+        for (size_type i = 0; i < str.length(); i++)
         {
-                if (string[i] == TAB)
+                if (str[i] == TAB)
                 {
                         for (size_type j = 0; j < spaces_per_tab; j++)
                                 out_str += SPACE;
                 }
                 else
                 {
-                        out_str += string[i];
+                        out_str += str[i];
                 }
         }
-        string = out_str;
+        str = out_str;
 }
 
 //static
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h
index d53c0e1..ddfef88 100644
--- a/linden/indra/llcommon/llstringtable.h
+++ b/linden/indra/llcommon/llstringtable.h
@@ -29,14 +29,15 @@
 #ifndef LL_STRING_TABLE_H
 #define LL_STRING_TABLE_H
 
+#include "lldefs.h"
+#include "llformat.h"
 #include "llstl.h"
 #include <list>
 #include <set>
 
 #if LL_WINDOWS
-# if (_MSC_VER >= 1300)
+# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
 #  define STRING_TABLE_HASH_MAP 1
-#  pragma warning(disable : 4996)
 # endif
 #else
 //# define STRING_TABLE_HASH_MAP 1
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index 148e4de..906bc65 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -132,23 +132,23 @@ LLOSInfo::LLOSInfo() :
                         char tmp[MAX_STRING];           /* Flawfinder: ignore */
                         if(osvi.dwMajorVersion <= 4)
                         {
-                                snprintf(
+                                snprintf(       /* Flawfinder: ignore */
                                         tmp,
                                         sizeof(tmp),
                                         "version %d.%d %s (Build %d)",
                                         osvi.dwMajorVersion,
                                         osvi.dwMinorVersion,
                                         csdversion.c_str(),
-                                        (osvi.dwBuildNumber & 0xffff)); /* Flawfinder: ignore */
+                                        (osvi.dwBuildNumber & 0xffff));
                         }
                         else
                         {
-                                snprintf(
+                                snprintf( /* Flawfinder: ignore */
                                         tmp,
                                         sizeof(tmp),
                                         "%s (Build %d)",
                                         csdversion.c_str(),
-                                        (osvi.dwBuildNumber & 0xffff));  /*Flawfinder: ignore*/
+                                        (osvi.dwBuildNumber & 0xffff));  
                         }
                         mOSString += tmp;
                 }
@@ -250,7 +250,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB()
 #if LL_WINDOWS
 #endif
 #if LL_LINUX
-        FILE *status_filep = LLFile::fopen("/proc/self/status", "r");
+        FILE* status_filep = LLFile::fopen("/proc/self/status", "r");   /* Flawfinder: ignore */
         S32 numRead = 0;                
         char buff[STATUS_SIZE];         /* Flawfinder: ignore */
         bzero(buff, STATUS_SIZE);
@@ -276,7 +276,7 @@ U32 LLOSInfo::getProcessResidentSizeKB()
 #if LL_WINDOWS
 #endif
 #if LL_LINUX
-        FILE *status_filep = LLFile::fopen("/proc/self/status", "r");
+        FILE* status_filep = LLFile::fopen("/proc/self/status", "r");   /* Flawfinder: ignore */
         if (status_filep != NULL)
         {
                 S32 numRead = 0;
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index 290879d..d6b52f7 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -100,6 +100,11 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) :
 
 LLThread::~LLThread()
 {
+        shutdown();
+}
+
+void LLThread::shutdown()
+{
         // Warning!  If you somehow call the thread destructor from itself,
         // the thread will die in an unclean fashion!
         if (mAPRThreadp)
@@ -205,18 +210,6 @@ void LLThread::checkPause()
 
 //============================================================================
 
-bool LLThread::isQuitting() const
-{
-        return (QUITTING == mStatus);
-}
-
-
-bool LLThread::isStopped() const
-{
-        return (STOPPED == mStatus);
-}
-
-
 void LLThread::setQuitting()
 {
         mRunCondition->lock();
@@ -347,3 +340,49 @@ void LLCondition::broadcast()
         apr_thread_cond_broadcast(mAPRCondp);
 }
 
+//============================================================================
+
+//----------------------------------------------------------------------------
+
+//static
+LLMutex* LLThreadSafeRefCount::sMutex = 0;
+
+//static
+void LLThreadSafeRefCount::initClass()
+{
+        if (!sMutex)
+        {
+                sMutex = new LLMutex(0);
+        }
+}
+
+//static
+void LLThreadSafeRefCount::cleanupClass()
+{
+        delete sMutex;
+        sMutex = NULL;
+}
+        
+
+//----------------------------------------------------------------------------
+
+LLThreadSafeRefCount::LLThreadSafeRefCount() :
+        mRef(0)
+{
+}
+
+LLThreadSafeRefCount::~LLThreadSafeRefCount()
+{ 
+        if (mRef != 0)
+        {
+                llerrs << "deleting non-zero reference" << llendl;
+        }
+}
+
+//============================================================================
+
+LLResponder::~LLResponder()
+{
+}
+
+//============================================================================
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index 2a13d72..cdf1d33 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -30,6 +30,7 @@
 
 #include "llapr.h"
 #include "llapp.h"
+#include "llmemory.h"
 
 #include "apr-1/apr_thread_cond.h"
 
@@ -49,19 +50,20 @@ public:
 
         LLThread(const std::string& name, apr_pool_t *poolp = NULL);
         virtual ~LLThread(); // Warning!  You almost NEVER want to destroy a thread unless it's in the STOPPED state.
-                
+        virtual void shutdown(); // stops the thread
+        
         static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure.
 
 
-        bool isQuitting() const;
-        bool isStopped() const;
+        bool isQuitting() const { return (QUITTING == mStatus); }
+        bool isStopped() const { return (STOPPED == mStatus); }
         
         // PAUSE / RESUME functionality. See source code for important usage notes.
 public:
         // Called from MAIN THREAD.
         void pause();
         void unpause();
-        bool isPaused() { return mPaused ? true : false; }
+        bool isPaused() { return isStopped() || mPaused == TRUE; }
         
         // Cause the thread to wake up and check its condition
         void wake();
@@ -79,7 +81,7 @@ public:
         
 private:
         BOOL                            mPaused;
-
+        
         // static function passed to APR thread creation routine
         static void *APR_THREAD_FUNC staticRun(apr_thread_t *apr_threadp, void *datap);
 
@@ -180,4 +182,67 @@ void LLThread::unlockData()
 
 //============================================================================
 
+// see llmemory.h for LLPointer<> definition
+
+class LLThreadSafeRefCount
+{
+public:
+        static void initClass(); // creates sMutex
+        static void cleanupClass(); // destroys sMutex
+        
+private:
+        static LLMutex* sMutex;
+
+private:
+        LLThreadSafeRefCount(const LLThreadSafeRefCount&); // not implemented
+        LLThreadSafeRefCount&operator=(const LLThreadSafeRefCount&); // not implemented
+
+protected:
+        virtual ~LLThreadSafeRefCount(); // use unref()
+        
+public:
+        LLThreadSafeRefCount();
+        
+        void ref()
+        {
+                if (sMutex) sMutex->lock();
+                mRef++; 
+                if (sMutex) sMutex->unlock();
+        } 
+
+        S32 unref()
+        {
+                llassert(mRef >= 1);
+                if (sMutex) sMutex->lock();
+                S32 res = --mRef;
+                if (sMutex) sMutex->unlock();
+                if (0 == res) 
+                {
+                        delete this; 
+                        res = 0;
+                }
+                return res;
+        }       
+        S32 getNumRefs() const
+        {
+                return mRef;
+        }
+
+private: 
+        S32     mRef; 
+};
+
+//============================================================================
+
+// Simple responder for self destructing callbacks
+// Pure virtual class
+class LLResponder : public LLThreadSafeRefCount
+{
+public:
+        virtual ~LLResponder();
+        virtual void completed(bool success) = 0;
+};
+
+//============================================================================
+
 #endif // LL_LLTHREAD_H
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index e697ec1..bc3540e 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -32,273 +32,86 @@
 #include "llapp.h"
 #include "lluri.h"
 #include "llsd.h"
-
+#include <iomanip>
+  
 #include "../llmath/lluuid.h"
 
-// uric = reserved | unreserved | escaped
-// reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
-// unreserved = alphanum | mark
-// mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
-// escaped = "%" hex hex
-static const char* ESCAPED_CHARACTERS[256] =
+
+// static
+std::string LLURI::escape(const std::string& str, const std::string & allowed)
 {
-        "%00",          // 0
-        "%01",          // 1
-        "%02",          // 2
-        "%03",          // 3
-        "%04",          // 4
-        "%05",          // 5
-        "%06",          // 6
-        "%07",          // 7
-        "%08",          // 8
-        "%09",          // 9
-        "%0a",          // 10
-        "%0b",          // 11
-        "%0c",          // 12
-        "%0d",          // 13
-        "%0e",          // 14
-        "%0f",          // 15
-        "%10",          // 16
-        "%11",          // 17
-        "%12",          // 18
-        "%13",          // 19
-        "%14",          // 20
-        "%15",          // 21
-        "%16",          // 22
-        "%17",          // 23
-        "%18",          // 24
-        "%19",          // 25
-        "%1a",          // 26
-        "%1b",          // 27
-        "%1c",          // 28
-        "%1d",          // 29
-        "%1e",          // 30
-        "%1f",          // 31
-        "%20",          // 32
-        "!",            // 33
-        "%22",          // 34
-        "%23",          // 35
-        "$",            // 36
-        "%25",          // 37
-        "&",            // 38
-        "'",            // 39
-        "(",            // 40
-        ")",            // 41
-        "*",            // 42
-        "+",            // 43
-        ",",            // 44
-        "-",            // 45
-        ".",            // 46
-        "/",            // 47
-        "0",            // 48
-        "1",            // 49
-        "2",            // 50
-        "3",            // 51
-        "4",            // 52
-        "5",            // 53
-        "6",            // 54
-        "7",            // 55
-        "8",            // 56
-        "9",            // 57
-        ":",            // 58
-        ";",            // 59
-        "%3c",          // 60
-        "=",            // 61
-        "%3e",          // 62
-        "?",            // 63
-        "@",            // 64
-        "A",            // 65
-        "B",            // 66
-        "C",            // 67
-        "D",            // 68
-        "E",            // 69
-        "F",            // 70
-        "G",            // 71
-        "H",            // 72
-        "I",            // 73
-        "J",            // 74
-        "K",            // 75
-        "L",            // 76
-        "M",            // 77
-        "N",            // 78
-        "O",            // 79
-        "P",            // 80
-        "Q",            // 81
-        "R",            // 82
-        "S",            // 83
-        "T",            // 84
-        "U",            // 85
-        "V",            // 86
-        "W",            // 87
-        "X",            // 88
-        "Y",            // 89
-        "Z",            // 90
-        "%5b",          // 91
-        "%5c",          // 92
-        "%5d",          // 93
-        "%5e",          // 94
-        "_",            // 95
-        "%60",          // 96
-        "a",            // 97
-        "b",            // 98
-        "c",            // 99
-        "d",            // 100
-        "e",            // 101
-        "f",            // 102
-        "g",            // 103
-        "h",            // 104
-        "i",            // 105
-        "j",            // 106
-        "k",            // 107
-        "l",            // 108
-        "m",            // 109
-        "n",            // 110
-        "o",            // 111
-        "p",            // 112
-        "q",            // 113
-        "r",            // 114
-        "s",            // 115
-        "t",            // 116
-        "u",            // 117
-        "v",            // 118
-        "w",            // 119
-        "x",            // 120
-        "y",            // 121
-        "z",            // 122
-        "%7b",          // 123
-        "%7c",          // 124
-        "%7d",          // 125
-        "~",            // 126
-        "%7f",          // 127
-        "%80",          // 128
-        "%81",          // 129
-        "%82",          // 130
-        "%83",          // 131
-        "%84",          // 132
-        "%85",          // 133
-        "%86",          // 134
-        "%87",          // 135
-        "%88",          // 136
-        "%89",          // 137
-        "%8a",          // 138
-        "%8b",          // 139
-        "%8c",          // 140
-        "%8d",          // 141
-        "%8e",          // 142
-        "%8f",          // 143
-        "%90",          // 144
-        "%91",          // 145
-        "%92",          // 146
-        "%93",          // 147
-        "%94",          // 148
-        "%95",          // 149
-        "%96",          // 150
-        "%97",          // 151
-        "%98",          // 152
-        "%99",          // 153
-        "%9a",          // 154
-        "%9b",          // 155
-        "%9c",          // 156
-        "%9d",          // 157
-        "%9e",          // 158
-        "%9f",          // 159
-        "%a0",          // 160
-        "%a1",          // 161
-        "%a2",          // 162
-        "%a3",          // 163
-        "%a4",          // 164
-        "%a5",          // 165
-        "%a6",          // 166
-        "%a7",          // 167
-        "%a8",          // 168
-        "%a9",          // 169
-        "%aa",          // 170
-        "%ab",          // 171
-        "%ac",          // 172
-        "%ad",          // 173
-        "%ae",          // 174
-        "%af",          // 175
-        "%b0",          // 176
-        "%b1",          // 177
-        "%b2",          // 178
-        "%b3",          // 179
-        "%b4",          // 180
-        "%b5",          // 181
-        "%b6",          // 182
-        "%b7",          // 183
-        "%b8",          // 184
-        "%b9",          // 185
-        "%ba",          // 186
-        "%bb",          // 187
-        "%bc",          // 188
-        "%bd",          // 189
-        "%be",          // 190
-        "%bf",          // 191
-        "%c0",          // 192
-        "%c1",          // 193
-        "%c2",          // 194
-        "%c3",          // 195
-        "%c4",          // 196
-        "%c5",          // 197
-        "%c6",          // 198
-        "%c7",          // 199
-        "%c8",          // 200
-        "%c9",          // 201
-        "%ca",          // 202
-        "%cb",          // 203
-        "%cc",          // 204
-        "%cd",          // 205
-        "%ce",          // 206
-        "%cf",          // 207
-        "%d0",          // 208
-        "%d1",          // 209
-        "%d2",          // 210
-        "%d3",          // 211
-        "%d4",          // 212
-        "%d5",          // 213
-        "%d6",          // 214
-        "%d7",          // 215
-        "%d8",          // 216
-        "%d9",          // 217
-        "%da",          // 218
-        "%db",          // 219
-        "%dc",          // 220
-        "%dd",          // 221
-        "%de",          // 222
-        "%df",          // 223
-        "%e0",          // 224
-        "%e1",          // 225
-        "%e2",          // 226
-        "%e3",          // 227
-        "%e4",          // 228
-        "%e5",          // 229
-        "%e6",          // 230
-        "%e7",          // 231
-        "%e8",          // 232
-        "%e9",          // 233
-        "%ea",          // 234
-        "%eb",          // 235
-        "%ec",          // 236
-        "%ed",          // 237
-        "%ee",          // 238
-        "%ef",          // 239
-        "%f0",          // 240
-        "%f1",          // 241
-        "%f2",          // 242
-        "%f3",          // 243
-        "%f4",          // 244
-        "%f5",          // 245
-        "%f6",          // 246
-        "%f7",          // 247
-        "%f8",          // 248
-        "%f9",          // 249
-        "%fa",          // 250
-        "%fb",          // 251
-        "%fc",          // 252
-        "%fd",          // 253
-        "%fe",          // 254
-        "%ff"           // 255
-};
+        std::ostringstream ostr;
+
+        std::string::const_iterator it = str.begin();
+        std::string::const_iterator end = str.end();
+        for(; it != end; ++it)
+        {
+                std::string::value_type c = *it;
+                if(allowed.find(c) == std::string::npos)
+                  {
+                    ostr << "%"
+                         << std::uppercase << std::hex << std::setw(2) << std::setfill('0')
+                         << static_cast<U32>(c);
+                  }
+                else
+                  {
+                    ostr << c;
+                  }
+        }
+        return ostr.str();
+}
+
+// static
+std::string LLURI::unescape(const std::string& str)
+{
+        std::ostringstream ostr;
+        std::string::const_iterator it = str.begin();
+        std::string::const_iterator end = str.end();
+        for(; it != end; ++it)
+        {
+                if((*it) == '%')
+                {
+                        ++it;
+                        if(it == end) break;
+                        U8 c = hex_as_nybble(*it++);
+                        c = c << 4;
+                        if (it == end) break;
+                        c |= hex_as_nybble(*it);
+                        ostr.put((char)c);
+                }
+                else
+                {
+                        ostr.put(*it);
+                }
+        }
+        return ostr.str();
+}
+
+namespace
+{
+        const std::string unreserved()
+        {
+                static const std::string s =   
+                        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+                        "0123456789"
+                        "-._~";
+                return s;
+        }
+        const std::string sub_delims()
+        {
+                static const std::string s = "!$&'()*+,;=";
+                return s;
+        }
+
+        std::string escapeHostAndPort(const std::string& s)
+                { return LLURI::escape(s, unreserved() + sub_delims() +":"); }
+        std::string escapePathComponent(const std::string& s)
+                { return LLURI::escape(s, unreserved() + sub_delims() + ":@"); }
+        std::string escapeQueryVariable(const std::string& s)
+                { return LLURI::escape(s, unreserved() + ":@!$'()*+,"); }        // sub_delims - "&;=" + ":@"
+        std::string escapeQueryValue(const std::string& s)
+                { return LLURI::escape(s, unreserved() + ":@!$'()*+,="); }      // sub_delims - "&;" + ":@"
+}
 
 LLURI::LLURI()
 {
@@ -371,24 +184,23 @@ LLURI::~LLURI()
 {
 }
 
-
-LLURI LLURI::buildHTTP(const std::string& host_port,
+// static
+LLURI LLURI::buildHTTP(const std::string& prefix,
                                            const LLSD& path)
 {
         LLURI result;
         
         // TODO: deal with '/' '?' '#' in host_port
-        S32 index = host_port.find("://");
-        if (index != host_port.npos)
+        if (prefix.find("://") != prefix.npos)
         {
-                // The scheme is part of the host_port
-                result.mScheme = "";
-                result.mEscapedAuthority = escape(host_port);
+                // it is a prefix
+                result = LLURI(prefix);
         }
         else
         {
-                result.mScheme = "HTTP";
-                result.mEscapedAuthority = "//" + escape(host_port);
+                // it is just a host and optional port
+                result.mScheme = "http";
+                result.mEscapedAuthority = escapeHostAndPort(prefix);
         }
 
         if (path.isArray())
@@ -399,20 +211,20 @@ LLURI LLURI::buildHTTP(const std::string& host_port,
                          ++it)
                 {
                         lldebugs << "PATH: inserting " << it->asString() << llendl;
-                        result.mEscapedPath += "/" + escape(it->asString());
+                        result.mEscapedPath += "/" + escapePathComponent(it->asString());
                 }
         }
-        result.mEscapedOpaque = result.mEscapedAuthority +
+        result.mEscapedOpaque = "//" + result.mEscapedAuthority +
                 result.mEscapedPath;
         return result;
 }
 
 // static
-LLURI LLURI::buildHTTP(const std::string& host_port,
+LLURI LLURI::buildHTTP(const std::string& prefix,
                                            const LLSD& path,
                                            const LLSD& query)
 {
-        LLURI result = buildHTTP(host_port, path);
+        LLURI result = buildHTTP(prefix, path);
         // break out and escape each query component
         if (query.isMap())
         {
@@ -420,8 +232,8 @@ LLURI LLURI::buildHTTP(const std::string& host_port,
                          it != query.endMap();
                          it++)
                 {
-                        result.mEscapedQuery += escape(it->first) +
-                                (it->second.isUndefined() ? "" : "=" + it->second.asString()) +
+                        result.mEscapedQuery += escapeQueryVariable(it->first) +
+                                (it->second.isUndefined() ? "" : "=" + escapeQueryValue(it->second.asString())) +
                                 "&";
                 }
                 if (query.size() > 0)
@@ -433,8 +245,61 @@ LLURI LLURI::buildHTTP(const std::string& host_port,
 }
 
 // static
+LLURI LLURI::buildHTTP(const std::string& host,
+                                           const U32& port,
+                                           const LLSD& path)
+{
+        return LLURI::buildHTTP(llformat("%s:%u", host.c_str(), port), path);
+}
+
+// static
+LLURI LLURI::buildHTTP(const std::string& host,
+                                           const U32& port,
+                                           const LLSD& path,
+                                           const LLSD& query)
+{
+        return LLURI::buildHTTP(llformat("%s:%u", host.c_str(), port), path, query);
+}
+
+
+namespace {
+        LLURI buildBackboneURL(LLApp* app,
+                                const std::string& p1 = "",
+                                const std::string& p2 = "",
+                                const std::string& p3 = "")
+        {
+                std::string host = "localhost:12040";
+
+                if (app)
+                {
+                        host = app->getOption("backbone-host-port").asString();
+                }
+
+                LLSD path = LLSD::emptyArray();
+                if (!p1.empty())        path.append(p1);
+                if (!p2.empty())        path.append(p2);
+                if (!p3.empty())        path.append(p3);
+
+                return LLURI::buildHTTP(host, path);
+        }
+}
+
+
+// static
 LLURI LLURI::buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app)
 {
+        return buildBackboneURL(app, "agent", agent_id.asString(), "presence");
+}
+
+// static
+LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app)
+{
+        return buildBackboneURL(app, "agent", "presence");
+}
+
+// static
+LLURI LLURI::buildBulkAgentNamesURI(LLApp* app)
+{
         std::string host = "localhost:12040";
 
         if (app)
@@ -444,14 +309,19 @@ LLURI LLURI::buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app)
 
         LLSD path = LLSD::emptyArray();
         path.append("agent");
-        path.append(agent_id);
-        path.append("presence");
+        path.append("names");
 
         return buildHTTP(host, path);
 }
 
 // static
-LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app)
+LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
+{
+        return buildBackboneURL(app, "agent", agent_id.asString(), "session");
+}
+
+// static
+LLURI LLURI::buildInventoryHostURI(const LLUUID& agent_id, LLApp* app)
 {
         std::string host = "localhost:12040";
 
@@ -462,13 +332,15 @@ LLURI LLURI::buildBulkAgentPresenceURI(LLApp* app)
 
         LLSD path = LLSD::emptyArray();
         path.append("agent");
-        path.append("presence");
+        path.append(agent_id);
+        path.append("inventory");
+        path.append("host");
 
         return buildHTTP(host, path);
 }
 
 // static
-LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
+LLURI LLURI::buildAgentNameURI(const LLUUID& agent_id, LLApp* app)
 {
         std::string host = "localhost:12040";
 
@@ -480,7 +352,7 @@ LLURI LLURI::buildAgentSessionURI(const LLUUID& agent_id, LLApp* app)
         LLSD path = LLSD::emptyArray();
         path.append("agent");
         path.append(agent_id);
-        path.append("session");
+        path.append("name");
 
         return buildHTTP(host, path);
 }
@@ -636,43 +508,3 @@ LLSD LLURI::queryMap(std::string escaped_query_string)
         return result;
 }
 
-// static
-std::string LLURI::escape(const std::string& str)
-{
-        std::ostringstream ostr;
-        std::string::const_iterator it = str.begin();
-        std::string::const_iterator end = str.end();
-        S32 c;
-        for(; it != end; ++it)
-        {
-                c = (S32)(*it);
-                ostr << ESCAPED_CHARACTERS[c];
-        }
-        return ostr.str();
-}
-
-// static
-std::string LLURI::unescape(const std::string& str)
-{
-        std::ostringstream ostr;
-        std::string::const_iterator it = str.begin();
-        std::string::const_iterator end = str.end();
-        for(; it != end; ++it)
-        {
-                if((*it) == '%')
-                {
-                        ++it;
-                        if(it == end) break;
-                        U8 c = hex_as_nybble(*it++);
-                        c = c << 4;
-                        if (it == end) break;
-                        c |= hex_as_nybble(*it);
-                        ostr.put((char)c);
-                }
-                else
-                {
-                        ostr.put(*it);
-                }
-        }
-        return ostr.str();
-}
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h
index f69472f..60b3d48 100644
--- a/linden/indra/llcommon/lluri.h
+++ b/linden/indra/llcommon/lluri.h
@@ -45,54 +45,70 @@ class LLApp;
 class LLURI
 {
 public:
-        LLURI();
-        LLURI(const std::string& escaped_str);
-                // construct from escaped string, as would be transmitted on the net
+  LLURI();
+  LLURI(const std::string& escaped_str);
+  // construct from escaped string, as would be transmitted on the net
 
-        ~LLURI();
+  ~LLURI();
 
-        static LLURI buildHTTP(const std::string& host_port,
-                                                   const LLSD& path);
-        static LLURI buildHTTP(const std::string& host_port,
-                                                   const LLSD& path,
-                                                   const LLSD& query);
-        
-        std::string asString() const;
-                // the whole URI, escaped as needed
+  static LLURI buildHTTP(const std::string& prefix,
+                         const LLSD& path);
+  static LLURI buildHTTP(const std::string& prefix,
+                         const LLSD& path,
+                         const LLSD& query);
+        // prefix is either a full URL prefix of the form "http://example.com:8080",
+        // or it can be simply a host and optional port like "example.com" or 
+        // "example.com:8080", in these cases, the "http://" will be added
 
-        // Parts of a URI
-        // These functions return parts of the decoded URI.  The returned
-        // strings are un-escaped as needed
-        
-        // for all schemes
-        std::string scheme() const;             // ex.: "http", note lack of colon
-        std::string opaque() const;             // everything after the colon
+  static LLURI buildHTTP(const std::string& host,
+                         const U32& port,
+                         const LLSD& path);
+  static LLURI buildHTTP(const std::string& host,
+                         const U32& port,
+                         const LLSD& path,
+                         const LLSD& query);
+                         
+          
+  std::string asString() const;
+  // the whole URI, escaped as needed
+  
+  // Parts of a URI
+  // These functions return parts of the decoded URI.  The returned
+  // strings are un-escaped as needed
+  
+  // for all schemes
+  std::string scheme() const;           // ex.: "http", note lack of colon
+  std::string opaque() const;           // everything after the colon
+  
+  // for schemes that follow path like syntax (http, https, ftp)
+  std::string authority() const;        // ex.: "host.com:80"
+  std::string hostName() const; // ex.: "host.com"
+  U16 hostPort() const;                 // ex.: 80, will include implicit port
+  std::string path() const;             // ex.: "/abc/def", includes leading slash
+  //    LLSD pathArray() const;                 // above decoded into an array of strings
+  std::string query() const;            // ex.: "x=34", section after "?"
+  LLSD queryMap() const;                        // above decoded into a map
+  static LLSD queryMap(std::string escaped_query_string);
 
-        // for schemes that follow path like syntax (http, https, ftp)
-        std::string authority() const;  // ex.: "bob@host.com:80"
-        std::string hostName() const;   // ex.: "host.com"
-        U16 hostPort() const;                   // ex.: 80, will include implicit port
-        std::string path() const;               // ex.: "/abc/def", includes leading slash
-//    LLSD pathArray() const;                   // above decoded into an array of strings
-        std::string query() const;              // ex.: "x=34", section after "?"
-    LLSD queryMap() const;                      // above decoded into a map
-    static LLSD queryMap(std::string escaped_query_string);
-
-        // Escaping Utilities
-        static std::string escape(const std::string& str);
-        static std::string unescape(const std::string& str);
+  // Escaping Utilities
+  // Escape a string by urlencoding all the characters that aren't in the allowed string.
+  static std::string escape(const std::string& str, const std::string & allowed); 
+  static std::string unescape(const std::string& str);
 
         // Functions for building specific URIs for web services
         static LLURI buildAgentPresenceURI(const LLUUID& agent_id, LLApp* app);
         static LLURI buildBulkAgentPresenceURI(LLApp* app);
+        static LLURI buildBulkAgentNamesURI(LLApp* app);
         static LLURI buildAgentSessionURI(const LLUUID& agent_id, LLApp* app);
         static LLURI buildAgentLoginInfoURI(const LLUUID& agent_id, const std::string& dataserver);
+        static LLURI buildInventoryHostURI(const LLUUID& agent_id, LLApp* app);
+        static LLURI buildAgentNameURI(const LLUUID& agent_id, LLApp* app);
 private:
-        std::string mScheme;
-        std::string mEscapedOpaque;
-        std::string mEscapedAuthority;
-        std::string mEscapedPath;
-        std::string mEscapedQuery;
+  std::string mScheme;
+  std::string mEscapedOpaque;
+  std::string mEscapedAuthority;
+  std::string mEscapedPath;
+  std::string mEscapedQuery;
 };
 
 #endif // LL_LLURI_H
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index af21f72..a3e5152 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -32,9 +32,9 @@
 
 // MUST ALSO change version number in secondlife setup.nsi
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 13;
-const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_MINOR = 14;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 0;
 
 
 
diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index 3190046..4f99393 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/indra/llcommon/llworkerthread.cpp
@@ -33,98 +33,86 @@
 #endif
 
 //============================================================================
-
-/*static*/ LLWorkerThread* LLWorkerThread::sLocal = NULL;
-/*static*/ std::set<LLWorkerThread*> LLWorkerThread::sThreadList;
-
-//============================================================================
 // Run on MAIN thread
 
-//static
-void LLWorkerThread::initClass(bool local_is_threaded, bool local_run_always)
+LLWorkerThread::LLWorkerThread(const std::string& name, bool threaded) :
+        LLQueuedThread(name, threaded),
+        mWorkerAPRPoolp(NULL)
 {
-        if (!sLocal)
-        {
-                sLocal = new LLWorkerThread(local_is_threaded, local_run_always);
-        }
+        apr_pool_create(&mWorkerAPRPoolp, NULL);
+        mDeleteMutex = new LLMutex(getAPRPool());
 }
 
-//static
-void LLWorkerThread::cleanupClass()
+LLWorkerThread::~LLWorkerThread()
 {
-        if (sLocal)
+        // Delete any workers in the delete queue (should be safe - had better be!)
+        if (!mDeleteList.empty())
         {
-                while (sLocal->getPending())
-                {
-                        sLocal->update(0);
-                }
-                delete sLocal;
-                sLocal = NULL;
-                llassert(sThreadList.size() == 0);
+                llwarns << "Worker Thread: " << mName << " destroyed with " << mDeleteList.size()
+                                << " entries in delete list." << llendl;
         }
-}
 
-//static
-S32 LLWorkerThread::updateClass(U32 ms_elapsed)
-{
-        for (std::set<LLWorkerThread*>::iterator iter = sThreadList.begin(); iter != sThreadList.end(); iter++)
-        {
-                (*iter)->update(ms_elapsed);
-        }
-        return getAllPending();
+        delete mDeleteMutex;
+        
+        // ~LLQueuedThread() will be called here
 }
 
-//static
-S32 LLWorkerThread::getAllPending()
+// virtual
+S32 LLWorkerThread::update(U32 max_time_ms)
 {
-        S32 res = 0;
-        for (std::set<LLWorkerThread*>::iterator iter = sThreadList.begin(); iter != sThreadList.end(); iter++)
+        S32 res = LLQueuedThread::update(max_time_ms);
+        // Delete scheduled workers
+        std::vector<LLWorkerClass*> delete_list;
+        std::vector<LLWorkerClass*> abort_list;
+        mDeleteMutex->lock();
+        for (delete_list_t::iterator iter = mDeleteList.begin();
+                 iter != mDeleteList.end(); )
         {
-                res += (*iter)->getPending();
+                delete_list_t::iterator curiter = iter++;
+                LLWorkerClass* worker = *curiter;
+                if (worker->deleteOK())
+                {
+                        if (worker->getFlags(LLWorkerClass::WCF_WORK_FINISHED))
+                        {
+                                delete_list.push_back(worker);
+                                mDeleteList.erase(curiter);
+                        }
+                        else if (!worker->getFlags(LLWorkerClass::WCF_ABORT_REQUESTED))
+                        {
+                                abort_list.push_back(worker);
+                        }
+                }
         }
-        return res;
-}
-
-//static
-void LLWorkerThread::pauseAll()
-{
-        for (std::set<LLWorkerThread*>::iterator iter = sThreadList.begin(); iter != sThreadList.end(); iter++)
+        mDeleteMutex->unlock(); 
+        // abort and delete after releasing mutex
+        for (std::vector<LLWorkerClass*>::iterator iter = abort_list.begin();
+                 iter != abort_list.end(); ++iter)
         {
-                (*iter)->pause();
+                (*iter)->abortWork(false);
         }
-}
-
-//static
-void LLWorkerThread::waitOnAllPending()
-{
-        for (std::set<LLWorkerThread*>::iterator iter = sThreadList.begin(); iter != sThreadList.end(); iter++)
+        for (std::vector<LLWorkerClass*>::iterator iter = delete_list.begin();
+                 iter != delete_list.end(); ++iter)
         {
-                (*iter)->waitOnPending();
+                LLWorkerClass* worker = *iter;
+                if (worker->mRequestHandle)
+                {
+                        // Finished but not completed
+                        completeRequest(worker->mRequestHandle);
+                        worker->mRequestHandle = LLWorkerThread::nullHandle();
+                        worker->clearFlags(LLWorkerClass::WCF_HAVE_WORK);
+                }
+                delete *iter;
         }
+        return res;
 }
 
 //----------------------------------------------------------------------------
 
-LLWorkerThread::LLWorkerThread(bool threaded, bool runalways) :
-        LLQueuedThread("Worker", threaded, runalways)
-{
-        sThreadList.insert(this);
-}
-
-LLWorkerThread::~LLWorkerThread()
-{
-        llverify(sThreadList.erase(this) == 1);
-        // ~LLQueuedThread() will be called here
-}
-
-//----------------------------------------------------------------------------
-
-
-LLWorkerThread::handle_t LLWorkerThread::add(LLWorkerClass* workerclass, S32 param, U32 priority)
+LLWorkerThread::handle_t LLWorkerThread::addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority)
 {
         handle_t handle = generateHandle();
         
-        Request* req = new Request(handle, priority, workerclass, param);
+        WorkRequest* req = new WorkRequest(handle, priority, workerclass, param);
 
         bool res = addRequest(req);
         if (!res)
@@ -137,63 +125,80 @@ LLWorkerThread::handle_t LLWorkerThread::add(LLWorkerClass* workerclass, S32 par
         return handle;
 }
 
-//============================================================================
-// Runs on its OWN thread
-
-bool LLWorkerThread::processRequest(QueuedRequest* qreq)
+void LLWorkerThread::deleteWorker(LLWorkerClass* workerclass)
 {
-        Request *req = (Request*)qreq;
-
-        req->getWorkerClass()->setWorking(true);
-
-        bool complete = req->getWorkerClass()->doWork(req->getParam());
-
-        req->getWorkerClass()->setWorking(false);
-
-        LLThread::yield(); // worker thread should yield after each request
-        
-        return complete;
+        mDeleteMutex->lock();
+        mDeleteList.push_back(workerclass);
+        mDeleteMutex->unlock();
 }
 
 //============================================================================
+// Runs on its OWN thread
 
-LLWorkerThread::Request::Request(handle_t handle, U32 priority, LLWorkerClass* workerclass, S32 param) :
+LLWorkerThread::WorkRequest::WorkRequest(handle_t handle, U32 priority, LLWorkerClass* workerclass, S32 param) :
         LLQueuedThread::QueuedRequest(handle, priority),
         mWorkerClass(workerclass),
         mParam(param)
 {
 }
 
-void LLWorkerThread::Request::deleteRequest()
+LLWorkerThread::WorkRequest::~WorkRequest()
+{
+}
+
+// virtual (required for access by LLWorkerThread)
+void LLWorkerThread::WorkRequest::deleteRequest()
 {
         LLQueuedThread::QueuedRequest::deleteRequest();
 }       
 
+// virtual
+bool LLWorkerThread::WorkRequest::processRequest()
+{
+        LLWorkerClass* workerclass = getWorkerClass();
+        workerclass->setWorking(true);
+        bool complete = workerclass->doWork(getParam());
+        workerclass->setWorking(false);
+        return complete;
+}
+
+// virtual
+void LLWorkerThread::WorkRequest::finishRequest(bool completed)
+{
+        LLWorkerClass* workerclass = getWorkerClass();
+        workerclass->finishWork(getParam(), completed);
+        U32 flags = LLWorkerClass::WCF_WORK_FINISHED | (completed ? 0 : LLWorkerClass::WCF_WORK_ABORTED);
+        workerclass->setFlags(flags);
+}
+
 //============================================================================
 // LLWorkerClass:: operates in main thread
 
 LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& name)
         : mWorkerThread(workerthread),
           mWorkerClassName(name),
-          mWorkHandle(LLWorkerThread::nullHandle()),
+          mRequestHandle(LLWorkerThread::nullHandle()),
+          mMutex(workerthread->getWorkerAPRPool()),
           mWorkFlags(0)
 {
         if (!mWorkerThread)
         {
-                mWorkerThread = LLWorkerThread::sLocal;
+                llerrs << "LLWorkerClass() called with NULL workerthread: " << name << llendl;
         }
 }
+
 LLWorkerClass::~LLWorkerClass()
 {
-        if (mWorkHandle != LLWorkerThread::nullHandle())
+        llassert_always(!(mWorkFlags & WCF_WORKING));
+        llassert_always(mWorkFlags & WCF_DELETE_REQUESTED);
+        if (mRequestHandle != LLWorkerThread::nullHandle())
         {
-                LLWorkerThread::Request* workreq = (LLWorkerThread::Request*)mWorkerThread->getRequest(mWorkHandle);
+                LLWorkerThread::WorkRequest* workreq = (LLWorkerThread::WorkRequest*)mWorkerThread->getRequest(mRequestHandle);
                 if (!workreq)
                 {
                         llerrs << "LLWorkerClass destroyed with stale work handle" << llendl;
                 }
-                if (workreq->getStatus() != LLWorkerThread::STATUS_ABORT &&
-                        workreq->getStatus() != LLWorkerThread::STATUS_ABORTED &&
+                if (workreq->getStatus() != LLWorkerThread::STATUS_ABORTED &&
                         workreq->getStatus() != LLWorkerThread::STATUS_COMPLETE)
                 {
                         llerrs << "LLWorkerClass destroyed with active worker! Worker Status: " << workreq->getStatus() << llendl;
@@ -203,21 +208,58 @@ LLWorkerClass::~LLWorkerClass()
 
 void LLWorkerClass::setWorkerThread(LLWorkerThread* workerthread)
 {
-        if (mWorkHandle != LLWorkerThread::nullHandle())
+        mMutex.lock();
+        if (mRequestHandle != LLWorkerThread::nullHandle())
         {
                 llerrs << "LLWorkerClass attempt to change WorkerThread with active worker!" << llendl;
         }
         mWorkerThread = workerthread;
+        mMutex.unlock();
+}
+
+//----------------------------------------------------------------------------
+
+//virtual
+void LLWorkerClass::finishWork(S32 param, bool success)
+{
+}
+
+//virtual
+bool LLWorkerClass::deleteOK()
+{
+        return true; // default always OK
+}
+
+//----------------------------------------------------------------------------
+
+// Called from worker thread
+void LLWorkerClass::setWorking(bool working)
+{
+        mMutex.lock();
+        if (working)
+        {
+                llassert_always(!(mWorkFlags & WCF_WORKING));
+                setFlags(WCF_WORKING);
+        }
+        else
+        {
+                llassert_always((mWorkFlags & WCF_WORKING));
+                clearFlags(WCF_WORKING);
+        }
+        mMutex.unlock();
 }
 
 //----------------------------------------------------------------------------
 
 bool LLWorkerClass::yield()
 {
-        llassert(mWorkFlags & WCF_WORKING);
         LLThread::yield();
         mWorkerThread->checkPause();
-        return (getFlags() & WCF_ABORT_REQUESTED) ? true : false;
+        bool res;
+        mMutex.lock();
+        res = (getFlags() & WCF_ABORT_REQUESTED) ? true : false;
+        mMutex.unlock();
+        return res;
 }
 
 //----------------------------------------------------------------------------
@@ -225,7 +267,9 @@ bool LLWorkerClass::yield()
 // calls startWork, adds doWork() to queue
 void LLWorkerClass::addWork(S32 param, U32 priority)
 {
-        if (mWorkHandle != LLWorkerThread::nullHandle())
+        mMutex.lock();
+        llassert_always(!(mWorkFlags & (WCF_WORKING|WCF_HAVE_WORK)));
+        if (mRequestHandle != LLWorkerThread::nullHandle())
         {
                 llerrs << "LLWorkerClass attempt to add work with active worker!" << llendl;
         }
@@ -233,70 +277,93 @@ void LLWorkerClass::addWork(S32 param, U32 priority)
 //      llinfos << "addWork: " << mWorkerClassName << " Param: " << param << llendl;
 #endif
         startWork(param);
-        mWorkHandle = mWorkerThread->add(this, param, priority);
+        clearFlags(WCF_WORK_FINISHED|WCF_WORK_ABORTED);
+        setFlags(WCF_HAVE_WORK);
+        mRequestHandle = mWorkerThread->addWorkRequest(this, param, priority);
+        mMutex.unlock();
 }
 
-void LLWorkerClass::abortWork()
+void LLWorkerClass::abortWork(bool autocomplete)
 {
+        mMutex.lock();
 #if _DEBUG
-//      LLWorkerThread::Request* workreq = mWorkerThread->getRequest(mWorkHandle);
+//      LLWorkerThread::WorkRequest* workreq = mWorkerThread->getRequest(mRequestHandle);
 //      if (workreq)
 //              llinfos << "abortWork: " << mWorkerClassName << " Param: " << workreq->getParam() << llendl;
 #endif
-        mWorkerThread->abortRequest(mWorkHandle);
-        setFlags(WCF_ABORT_REQUESTED);
+        if (mRequestHandle != LLWorkerThread::nullHandle())
+        {
+                mWorkerThread->abortRequest(mRequestHandle, autocomplete);
+                mWorkerThread->setPriority(mRequestHandle, LLQueuedThread::PRIORITY_IMMEDIATE);
+                setFlags(WCF_ABORT_REQUESTED);
+        }
+        mMutex.unlock();
 }
 
 // if doWork is complete or aborted, call endWork() and return true
-bool LLWorkerClass::checkWork()
+bool LLWorkerClass::checkWork(bool aborting)
 {
+        LLMutexLock lock(&mMutex);
         bool complete = false, abort = false;
-        LLWorkerThread::Request* workreq = (LLWorkerThread::Request*)mWorkerThread->getRequest(mWorkHandle);
-        llassert(workreq);
-        if (getFlags(WCF_ABORT_REQUESTED) || workreq->getStatus() == LLWorkerThread::STATUS_ABORTED)
+        if (mRequestHandle != LLWorkerThread::nullHandle())
         {
-                complete = true;
-                abort = true;
+                LLWorkerThread::WorkRequest* workreq = (LLWorkerThread::WorkRequest*)mWorkerThread->getRequest(mRequestHandle);
+                llassert_always(workreq);
+                LLQueuedThread::status_t status = workreq->getStatus();
+                if (status == LLWorkerThread::STATUS_ABORTED)
+                {
+                        complete = true;
+                        abort = true;
+                }
+                else if (status == LLWorkerThread::STATUS_COMPLETE)
+                {
+                        complete = true;
+                }
+                else
+                {
+                        llassert_always(!aborting || (workreq->getFlags() & LLQueuedThread::FLAG_ABORT));
+                }
+                if (complete)
+                {
+                        llassert_always(!(getFlags(WCF_WORKING)));
+                        endWork(workreq->getParam(), abort);
+                        mWorkerThread->completeRequest(mRequestHandle);
+                        mRequestHandle = LLWorkerThread::nullHandle();
+                        clearFlags(WCF_HAVE_WORK);
+                }
         }
-        else if (workreq->getStatus() == LLWorkerThread::STATUS_COMPLETE)
+        else
         {
                 complete = true;
         }
-        if (complete)
-        {
-#if _DEBUG
-//              llinfos << "endWork: " << mWorkerClassName << " Param: " << workreq->getParam() << llendl;
-#endif
-                endWork(workreq->getParam(), abort);
-                mWorkerThread->completeRequest(mWorkHandle);
-                mWorkHandle = LLWorkerThread::nullHandle();
-        }
         return complete;
 }
 
-void LLWorkerClass::killWork()
+void LLWorkerClass::scheduleDelete()
 {
-        if (haveWork())
+        bool do_delete = false;
+        mMutex.lock();
+        if (!(getFlags(WCF_DELETE_REQUESTED)))
         {
-                abortWork();
-                bool paused = mWorkerThread->isPaused();
-                while (!checkWork())
-                {
-                        mWorkerThread->updateQueue(0);
-                }
-                if (paused)
-                {
-                        mWorkerThread->pause();
-                }
+                setFlags(WCF_DELETE_REQUESTED);
+                do_delete = true;
+        }
+        mMutex.unlock();
+        if (do_delete)
+        {
+                mWorkerThread->deleteWorker(this);
         }
 }
 
 void LLWorkerClass::setPriority(U32 priority)
 {
-        if (haveWork())
+        mMutex.lock();
+        if (mRequestHandle != LLWorkerThread::nullHandle())
         {
-                mWorkerThread->setPriority(mWorkHandle, priority);
+                mRequestPriority = priority;
+                mWorkerThread->setPriority(mRequestHandle, priority);
         }
+        mMutex.unlock();
 }
 
 //============================================================================
diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h
index f01e67b..17b7e7b 100644
--- a/linden/indra/llcommon/llworkerthread.h
+++ b/linden/indra/llcommon/llworkerthread.h
@@ -47,13 +47,13 @@ class LLWorkerClass;
 class LLWorkerThread : public LLQueuedThread
 {
 public:
-        class Request : public LLQueuedThread::QueuedRequest
+        class WorkRequest : public LLQueuedThread::QueuedRequest
         {
         protected:
-                ~Request() {}; // use deleteRequest()
+                virtual ~WorkRequest(); // use deleteRequest()
                 
         public:
-                Request(handle_t handle, U32 priority, LLWorkerClass* workerclass, S32 param);
+                WorkRequest(handle_t handle, U32 priority, LLWorkerClass* workerclass, S32 param);
 
                 S32 getParam()
                 {
@@ -64,6 +64,8 @@ public:
                         return mWorkerClass;
                 }
 
+                /*virtual*/ bool processRequest();
+                /*virtual*/ void finishRequest(bool completed);
                 /*virtual*/ void deleteRequest();
                 
         private:
@@ -71,26 +73,24 @@ public:
                 S32 mParam;
         };
 
-public:
-        LLWorkerThread(bool threaded = true, bool runalways = true);
-        ~LLWorkerThread();      
-
-protected:
-        /*virtual*/ bool processRequest(QueuedRequest* req);
+private:
+        typedef std::list<LLWorkerClass*> delete_list_t;
+        delete_list_t mDeleteList;
+        LLMutex* mDeleteMutex;
+        apr_pool_t* mWorkerAPRPoolp;
         
 public:
-        handle_t add(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL);
-
-        static void initClass(bool local_is_threaded = true, bool local_run_always = true); // Setup sLocal
-        static S32 updateClass(U32 ms_elapsed);
-        static S32 getAllPending();
-        static void pauseAll();
-        static void waitOnAllPending();
-        static void cleanupClass();             // Delete sLocal
+        LLWorkerThread(const std::string& name, bool threaded = true);
+        ~LLWorkerThread();
 
-public:
-        static LLWorkerThread* sLocal;          // Default worker thread
-        static std::set<LLWorkerThread*> sThreadList; // array of threads (includes sLocal)
+        apr_pool_t* getWorkerAPRPool() { return mWorkerAPRPoolp; }
+        
+        /*virtual*/ S32 update(U32 max_time_ms);
+        
+        handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param, U32 priority = PRIORITY_NORMAL);
+        
+        void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion
+        S32 getNumDeletes() { return mDeleteList.size(); } // debug
 };
 
 //============================================================================
@@ -112,11 +112,17 @@ public:
 
 class LLWorkerClass
 {
+        friend class LLWorkerThread;
+        friend class LLWorkerThread::WorkRequest;
 public:
         typedef LLWorkerThread::handle_t handle_t;
         enum FLAGS
         {
-                WCF_WORKING = 0x01,
+                WCF_HAVE_WORK = 0x01,
+                WCF_WORKING = 0x02,
+                WCF_WORK_FINISHED = 0x10,
+                WCF_WORK_ABORTED = 0x20,
+                WCF_DELETE_REQUESTED = 0x40,
                 WCF_ABORT_REQUESTED = 0x80
         };
         
@@ -125,17 +131,29 @@ public:
         virtual ~LLWorkerClass();
 
         // pure virtual, called from WORKER THREAD, returns TRUE if done
-        virtual bool doWork(S32 param)=0; // Called from LLWorkerThread::processRequest()
-
-        // called from WORKER THREAD
-        void setWorking(bool working) { working ? setFlags(WCF_WORKING) : clearFlags(WCF_WORKING); }
+        virtual bool doWork(S32 param)=0; // Called from WorkRequest::processRequest()
+        // virtual, called from finishRequest() after completed or aborted
+        virtual void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
+        // virtual, returns true if safe to delete the worker
+        virtual bool deleteOK(); // called from update() (WORK THREAD)
         
+        // schedlueDelete(): schedules deletion once aborted or completed
+        void scheduleDelete();
+        
+        bool haveWork() { return getFlags(WCF_HAVE_WORK); } // may still be true if aborted
         bool isWorking() { return getFlags(WCF_WORKING); }
         bool wasAborted() { return getFlags(WCF_ABORT_REQUESTED); }
+
+        // setPriority(): changes the priority of a request
+        void setPriority(U32 priority);
+        U32  getPriority() { return mRequestPriority; }
                 
         const std::string& getName() const { return mWorkerClassName; }
 
 protected:
+        // called from WORKER THREAD
+        void setWorking(bool working);
+        
         // Call from doWork only to avoid eating up cpu time.
         // Returns true if work has been aborted
         // yields the current thread and calls mWorkerThread->checkPause()
@@ -147,20 +165,11 @@ protected:
         void addWork(S32 param, U32 priority = LLWorkerThread::PRIORITY_NORMAL);
 
         // abortWork(): requests that work be aborted
-        void abortWork();
+        void abortWork(bool autocomplete);
         
         // checkWork(): if doWork is complete or aborted, call endWork() and return true
-        bool checkWork();
+        bool checkWork(bool aborting = false);
 
-        // haveWork(): return true if mWorkHandle != null
-        bool haveWork() { return mWorkHandle != LLWorkerThread::nullHandle(); }
-
-        // killWork(): aborts work and waits for the abort to process
-        void killWork();
-
-        // setPriority(): changes the priority of a request
-        void setPriority(U32 priority);
-        
 private:
         void setFlags(U32 flags) { mWorkFlags = mWorkFlags | flags; }
         void clearFlags(U32 flags) { mWorkFlags = mWorkFlags & ~flags; }
@@ -175,9 +184,11 @@ private:
 protected:
         LLWorkerThread* mWorkerThread;
         std::string mWorkerClassName;
-        handle_t mWorkHandle;
+        handle_t mRequestHandle;
+        U32 mRequestPriority; // last priority set
 
 private:
+        LLMutex mMutex;
         LLAtomicU32 mWorkFlags;
 };
 
diff --git a/linden/indra/llcommon/metaproperty.cpp b/linden/indra/llcommon/metaproperty.cpp
index e4983cc..312dd9d 100644
--- a/linden/indra/llcommon/metaproperty.cpp
+++ b/linden/indra/llcommon/metaproperty.cpp
@@ -44,7 +44,7 @@ const LLMetaClass& LLMetaProperty::getObjectMetaClass() const
 {
         return mObjectClass;
 }
-

+
 void LLMetaProperty::checkObjectClass(const LLReflective* object) const
 {
         if(! mObjectClass.isInstance(object))
diff --git a/linden/indra/llcommon/u64.cpp b/linden/indra/llcommon/u64.cpp
index 45baa13..744e0ab 100644
--- a/linden/indra/llcommon/u64.cpp
+++ b/linden/indra/llcommon/u64.cpp
@@ -33,7 +33,7 @@
 U64 str_to_U64(const char *str)
 {
         U64 result = 0;
-        char *aptr = strpbrk(str,"0123456789");
+        const char *aptr = strpbrk(str,"0123456789");
 
         if (!aptr)
         {
@@ -66,27 +66,27 @@ char* U64_to_str(U64 value, char* result, S32 result_size)
         
         if (part1)
         {
-                snprintf(
+                snprintf(       /* Flawfinder: ignore */
                         result,
                         result_size,
                         "%u%07u%07u",
-                        part1,part2,part3);             /* Flawfinder: ignore */
+                        part1,part2,part3);
         }
         else if (part2)
         {
-                snprintf(
+                snprintf(       /* Flawfinder: ignore */
                         result,
                         result_size,
                         "%u%07u",
-                        part2,part3);           /* Flawfinder: ignore */
+                        part2,part3);
         }
         else
         {
-                snprintf(
+                snprintf(       /* Flawfinder: ignore */
                         result,
                         result_size,
                         "%u",
-                        part3);         /* Flawfinder: ignore */
+                        part3);         
         }
         return (result);
 } 
diff --git a/linden/indra/llimage/files.lst b/linden/indra/llimage/files.lst
index 83f53bc..9e14118 100644
--- a/linden/indra/llimage/files.lst
+++ b/linden/indra/llimage/files.lst
@@ -3,4 +3,5 @@ llimage/llimage.cpp
 llimage/llimagedxt.cpp
 llimage/llimagej2c.cpp
 llimage/llimagejpeg.cpp
-llimage/llimagetga.cpp
\ No newline at end of file
+llimage/llimagetga.cpp
+llimage/llimageworker.cpp
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index acd6aef..eb4ff46 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -36,7 +36,7 @@
 #include "llmath.h"
 #include "stdtypes.h"
 #include "v4coloru.h"
-#include "llmemory.h"
+#include "llmemtype.h"
 
 #include "llimage.h"
 #include "llimagebmp.h"
@@ -133,7 +133,7 @@ U8* LLImageBase::allocateData(S32 size)
                         llerrs << llformat("LLImageBase::allocateData called with bad dimentions: %dx%dx%d",mWidth,mHeight,mComponents) << llendl;
                 }
         }
-        else if ((size <= 0 || size > 4096*4096*16) && sSizeOverride == FALSE)
+        else if (size <= 0 || (size > 4096*4096*16 && sSizeOverride == FALSE))
         {
                 llerrs << "LLImageBase::allocateData: bad size: " << size << llendl;
         }
@@ -167,7 +167,7 @@ U8* LLImageBase::reallocateData(S32 size)
         if (mData)
         {
                 S32 bytes = llmin(mDataSize, size);
-                memcpy(new_datap, mData, bytes);
+                memcpy(new_datap, mData, bytes);        /* Flawfinder: ignore */
                 delete[] mData;
         }
         mData = new_datap;
@@ -216,7 +216,8 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
         : LLImageBase()
 {
         mMemType = LLMemType::MTYPE_IMAGERAW;
-        copyData(data, width, height, components);
+        allocateDataSize(width, height, components);
+        memcpy(getData(), data, width*height*components);
         ++sRawImageCount;
 }
 
@@ -258,16 +259,6 @@ void LLImageRaw::deleteData()
         LLImageBase::deleteData();
 }
 
-BOOL LLImageRaw::copyData(U8 *data, U16 width, U16 height, S8 components)
-{
-        if (!resize(width, height, components))
-        {
-                return FALSE;
-        }
-        memcpy(getData(), data, width*height*components);
-        return TRUE;
-}
-
 BOOL LLImageRaw::resize(U16 width, U16 height, S8 components)
 {
         if ((getWidth() == width) && (getHeight() == height) && (getComponents() == components))
@@ -288,11 +279,16 @@ U8 * LLImageRaw::getSubImage(U32 x_pos, U32 y_pos, U32 width, U32 height) const
         U8 *data = new U8[width*height*getComponents()];
 
         // Should do some simple bounds checking
+        if (!data)
+        {
+                llerrs << "Out of memory in LLImageRaw::getSubImage" << llendl;
+                return NULL;
+        }
 
         U32 i;
         for (i = y_pos; i < y_pos+height; i++)
         {
-                memcpy(data + i*width*getComponents(),
+                memcpy(data + i*width*getComponents(),          /* Flawfinder: ignore */
                                 getData() + ((y_pos + i)*getWidth() + x_pos)*getComponents(), getComponents()*width);
         }
         return data;
@@ -328,7 +324,7 @@ BOOL LLImageRaw::setSubImage(U32 x_pos, U32 y_pos, U32 width, U32 height,
                         {
                                 from_offset = i*width*getComponents();
                         }
-                        memcpy(getData() + to_offset*getComponents(),
+                        memcpy(getData() + to_offset*getComponents(),           /* Flawfinder: ignore */
                                         data + from_offset, getComponents()*width);
                 }
         }
@@ -345,7 +341,7 @@ BOOL LLImageRaw::setSubImage(U32 x_pos, U32 y_pos, U32 width, U32 height,
                         {
                                 from_offset = (height - 1 - i)*width*getComponents();
                         }
-                        memcpy(getData() + to_offset*getComponents(),
+                        memcpy(getData() + to_offset*getComponents(),           /* Flawfinder: ignore */
                                         data + from_offset, getComponents()*width);
                 }
         }
@@ -392,14 +388,19 @@ void LLImageRaw::verticalFlip()
         LLMemType mt1((LLMemType::EMemType)mMemType);
         S32 row_bytes = getWidth() * getComponents();
         U8* line_buffer = new U8[row_bytes];
+        if (!line_buffer )
+        {
+                llerrs << "Out of memory in LLImageRaw::verticalFlip()" << llendl;
+                return;
+        }
         S32 mid_row = getHeight() / 2;
         for( S32 row = 0; row < mid_row; row++ )
         {
                 U8* row_a_data = getData() + row * row_bytes;
                 U8* row_b_data = getData() + (getHeight() - 1 - row) * row_bytes;
-                memcpy( line_buffer, row_a_data,  row_bytes );
-                memcpy( row_a_data,  row_b_data,  row_bytes );
-                memcpy( row_b_data,  line_buffer, row_bytes );
+                memcpy( line_buffer, row_a_data,  row_bytes );  /* Flawfinder: ignore */
+                memcpy( row_a_data,  row_b_data,  row_bytes );  /* Flawfinder: ignore */
+                memcpy( row_b_data,  line_buffer, row_bytes );  /* Flawfinder: ignore */
         }
         delete[] line_buffer;
 }
@@ -691,7 +692,7 @@ void LLImageRaw::copyUnscaled(LLImageRaw* src)
         llassert( src->getComponents() == dst->getComponents() );
         llassert( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) );
 
-        memcpy( dst->getData(), src->getData(), getWidth() * getHeight() * getComponents() );
+        memcpy( dst->getData(), src->getData(), getWidth() * getHeight() * getComponents() );   /* Flawfinder: ignore */
 }
 
 
@@ -775,7 +776,7 @@ void LLImageRaw::copyScaled( LLImageRaw* src )
 
         if( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) )
         {
-                memcpy( dst->getData(), src->getData(), getWidth() * getHeight() * getComponents() );
+                memcpy( dst->getData(), src->getData(), getWidth() * getHeight() * getComponents() );   /* Flawfinder: ignore */
                 return;
         }
 
@@ -841,7 +842,12 @@ void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
                 // copy out     existing image data
                 S32     temp_data_size = old_width * old_height * getComponents();
                 U8*     temp_buffer     = new U8[ temp_data_size ];
-                memcpy(temp_buffer,     getData(), temp_data_size);
+                if (!temp_buffer)
+                {
+                        llerrs << "Out of memory in LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )" << llendl;
+                        return;
+                }
+                memcpy(temp_buffer,     getData(), temp_data_size);     /* Flawfinder: ignore */
 
                 // allocate     new     image data,     will delete     old     data
                 U8*     new_buffer = allocateDataSize(new_width, new_height, getComponents());
@@ -850,7 +856,7 @@ void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
                 {
                         if (row < old_height)
                         {
-                                memcpy(new_buffer +     (new_width * row * getComponents()), temp_buffer + (old_width * row     * getComponents()),     getComponents() * llmin(old_width, new_width));
+                                memcpy(new_buffer +     (new_width * row * getComponents()), temp_buffer + (old_width * row     * getComponents()),     getComponents() * llmin(old_width, new_width)); /* Flawfinder: ignore */
                                 if (old_width < new_width)
                                 {
                                         // pad out rest of row with     black
@@ -1204,7 +1210,7 @@ bool LLImageRaw::createFromFile(const LLString &filename, bool j2c_lowest_mip_on
         llassert(image.notNull());
 
         U8 *buffer = image->allocateData(length);
-        ifs.read ((char*)buffer, length);
+        ifs.read ((char*)buffer, length);       /* Flawfinder: ignore */
         ifs.close();
         
         image->updateData();
@@ -1243,25 +1249,8 @@ bool LLImageRaw::createFromFile(const LLString &filename, bool j2c_lowest_mip_on
 //static
 S32 LLImageFormatted::sGlobalFormattedMemory = 0;
 
-//static
-LLWorkerThread* LLImageFormatted::sWorkerThread = NULL;
-
-//static
-void LLImageFormatted::initClass(bool threaded, bool run_always)
-{
-        sWorkerThread = new LLWorkerThread(threaded, run_always);
-}
-
-//static
-void LLImageFormatted::cleanupClass()
-{
-        delete sWorkerThread;
-        sWorkerThread = NULL;
-}
-
-
 LLImageFormatted::LLImageFormatted(S8 codec)
-        : LLImageBase(), LLWorkerClass(sWorkerThread, "ImageFormatted"),
+        : LLImageBase(),
           mCodec(codec),
           mDecoding(0),
           mDecoded(0),
@@ -1276,64 +1265,14 @@ LLImageFormatted::~LLImageFormatted()
         // NOTE: ~LLimageBase() call to deleteData() calls LLImageBase::deleteData()
         //        NOT LLImageFormatted::deleteData()
         deleteData();
-        releaseDecodedData();
-}
-
-//----------------------------------------------------------------------------
-
-//virtual
-void LLImageFormatted::startWork(S32 param)
-{
-        if (mDecoding) llerrs << "WTF?" << llendl;
-}
-
-bool LLImageFormatted::doWork(S32 param)
-{
-        if (!(isWorking())) llerrs << "WTF?" << llendl;
-        llassert(mDecodedImage.notNull());
-        if (param == 0)
-        {
-                // Decode primary channels
-                mDecoded = decode(mDecodedImage, .001f); // 1ms
-        }
-        else
-        {
-                // Decode aux channel
-                mDecoded = decode(mDecodedImage, .001f, param, param); // 1ms
-        }
-        if (mDecoded)
-        {
-                return true;
-        }
-        else
-        {
-                return false;
-        }
-}
-
-void LLImageFormatted::endWork(S32 param, bool aborted)
-{
-        if (mDecoding) llerrs << "WTF?" << llendl;
-        if (!mDecoded) llerrs << "WTF?" << llendl;
 }
 
 //----------------------------------------------------------------------------
 
 // static
-LLImageFormatted* LLImageFormatted::createFromExtension(const LLString& instring)
+LLImageFormatted* LLImageFormatted::createFromType(S8 codec)
 {
-        LLString exten;
-        size_t dotidx = instring.rfind('.');
-        if (dotidx != LLString::npos)
-        {
-                exten = instring.substr(dotidx+1);
-        }
-        else
-        {
-                exten = instring;
-        }
-        S8 codec = get_codec(exten);
-        LLPointer<LLImageFormatted> image;
+        LLImageFormatted* image;
         switch(codec)
         {
           case IMG_CODEC_BMP:
@@ -1354,10 +1293,28 @@ LLImageFormatted* LLImageFormatted::createFromExtension(const LLString& instring
                 image = new LLImageDXT();
                 break;
           default:
+                image = NULL;
                 break;
         }
         return image;
 }
+
+// static
+LLImageFormatted* LLImageFormatted::createFromExtension(const LLString& instring)
+{
+        LLString exten;
+        size_t dotidx = instring.rfind('.');
+        if (dotidx != LLString::npos)
+        {
+                exten = instring.substr(dotidx+1);
+        }
+        else
+        {
+                exten = instring;
+        }
+        S8 codec = get_codec(exten);
+        return createFromType(codec);
+}
 //----------------------------------------------------------------------------
 
 // virtual
@@ -1374,15 +1331,6 @@ void LLImageFormatted::dump()
 
 //----------------------------------------------------------------------------
 
-void LLImageFormatted::readHeader(U8* data, S32 size)
-{
-        if (size <= 0)
-        {
-                size = calcHeaderSize();
-        }
-        copyData(data, size); // calls updateData()
-}
-
 S32 LLImageFormatted::calcDataSize(S32 discard_level)
 {
         if (discard_level < 0)
@@ -1426,82 +1374,6 @@ BOOL LLImageFormatted::decode(LLImageRaw* raw_image,F32  decode_time, S32 first_
         return decode( raw_image, decode_time );  // Loads first 4 channels by default.
 } 
 
-// virtual
-BOOL LLImageFormatted::requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard, F32 decode_time)
-{
-        llassert(getData() && getDataSize());
-        // For most codecs, only mDiscardLevel data is available. (see LLImageDXT for exception)
-        if (discard >= 0 && discard != mDiscardLevel)
-        {
-                llerrs << "Request for invalid discard level" << llendl;
-        }
-        if (haveWork())
-        {
-                checkWork();
-        }
-        if (!mDecoded)
-        {
-                if (!haveWork())
-                {
-                        llassert(!mDecoding);
-                        mDecodedImage = new LLImageRaw(getWidth(), getHeight(), getComponents());
-                        addWork(0);
-                }
-                return FALSE;
-        }
-        else
-        {
-                llassert(mDecodedImage.notNull());
-                llassert(!mDecoding);
-                raw = mDecodedImage;
-                return TRUE;
-        }
-}
-
-BOOL LLImageFormatted::requestDecodedAuxData(LLPointer<LLImageRaw>& raw, S32 channel, 
-                                                                                         S32 discard, F32 decode_time)
-{
-        llassert(getData() && getDataSize());
-        // For most codecs, only mDiscardLevel data is available. (see LLImageDXT for exception)
-        if (discard >= 0 && discard != mDiscardLevel)
-        {
-                llerrs << "Request for invalid discard level" << llendl;
-        }
-        if (haveWork())
-        {
-                checkWork();
-        }
-        if (!mDecoded)
-        {
-                if (!haveWork())
-                {
-                        llassert(!mDecoding);
-                        mDecodedImage = new LLImageRaw(getWidth(), getHeight(), 1);
-                        addWork(channel);
-                }
-                return FALSE;
-        }
-        else
-        {
-                llassert(mDecodedImage.notNull());
-                llassert(!mDecoding);
-                raw = mDecodedImage;
-                return TRUE;
-        }
-}
-
-
-// virtual
-void LLImageFormatted::releaseDecodedData()
-{
-        if (mDecoded || mDecoding)
-        {
-                mDecodedImage = NULL; // deletes image
-                mDecoded = FALSE;
-                mDecoding = FALSE;
-        }
-}
-
 //----------------------------------------------------------------------------
 
 // virtual
@@ -1549,47 +1421,42 @@ void LLImageFormatted::sanityCheck()
 
 BOOL LLImageFormatted::copyData(U8 *data, S32 size)
 {
-        if (data && data != getData())
+        if ( (data && data != getData()) || (size != getDataSize()) )
         {
                 deleteData();
                 allocateData(size);
-                memcpy(getData(), data, size);
+                memcpy(getData(), data, size);  /* Flawfinder: ignore */
         }
-        updateData(); // virtual
-        
         return TRUE;
 }
 
-BOOL LLImageFormatted::appendData(U8 *data, S32 size)
+// LLImageFormatted becomes the owner of data
+void LLImageFormatted::setData(U8 *data, S32 size)
 {
-        LLMemType mt1((LLMemType::EMemType)mMemType);
-        S32 old_size = getDataSize();
-        U8* old_data = getData();
-        S32 new_size = old_size + size;
-        U8* new_data = new U8[new_size];
-        // resize the image
-        setDataAndSize(new_data, new_size);
-        // copy the old data and delete it
-        memcpy(new_data, old_data, old_size);
-        delete old_data;
-        // if we have new data, copy it and call updateData()
-        if (data)
+        if (data && data != getData())
         {
-                memcpy(new_data + old_size, data, size);
-                updateData(); // virtual
+                deleteData();
+                setDataAndSize(data, size); // Access private LLImageBase members
+                sGlobalFormattedMemory += getDataSize();
         }
-        return TRUE;
 }
 
-BOOL LLImageFormatted::setData(U8 *data, S32 size)
+void LLImageFormatted::appendData(U8 *data, S32 size)
 {
-        if (data && data != getData())
+        if (data)
         {
-                deleteData();
-                setDataAndSize(data, size); // Access private LLImageBase members
-                sGlobalFormattedMemory += getDataSize();
+                if (!getData())
+                {
+                        setData(data, size);
+                }
+                else 
+                {
+                        S32 cursize = getDataSize();
+                        S32 newsize = cursize + size;
+                        reallocateData(newsize);
+                        memcpy(getData() + cursize, data, size);
+                }
         }
-        return updateData(); // virtual
 }
 
 //----------------------------------------------------------------------------
@@ -1662,8 +1529,6 @@ S8 LLImageFormatted::getCodec() const
 
 //============================================================================
 
-//----------------------------------------------------------------------------
-
 static void avg4_colors4(const U8* a, const U8* b, const U8* c, const U8* d, U8* dst)
 {
         dst[0] = (U8)(((U32)(a[0]) + b[0] + c[0] + d[0])>>2);
@@ -1789,3 +1654,5 @@ F32 LLImageBase::calc_download_priority(F32 virtual_size, F32 visible_pixels, S3
 
         return w_priority;
 }
+
+//============================================================================
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index eb1805a..ef5496e 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -32,7 +32,7 @@
 #include "lluuid.h"
 #include "llstring.h"
 #include "llmemory.h"
-#include "llworkerthread.h"
+#include "llthread.h"
 
 const S32 MIN_IMAGE_MIP =  2; // 4x4, only used for expand/contract power of 2
 const S32 MAX_IMAGE_MIP = 11; // 2048x2048
@@ -154,8 +154,6 @@ public:
         /*virtual*/ U8* allocateData(S32 size = -1);
         /*virtual*/ U8* reallocateData(S32 size);
         
-        BOOL copyData(U8 *data, U16 width, U16 height, S8 components);
-
         BOOL resize(U16 width, U16 height, S8 components);
 
         U8 * getSubImage(U32 x_pos, U32 y_pos, U32 width, U32 height) const;
@@ -225,11 +223,10 @@ public:
 
 // Compressed representation of image.
 // Subclass from this class for the different representations (J2C, bmp)
-class LLImageFormatted : public LLImageBase, public LLWorkerClass
+class LLImageFormatted : public LLImageBase
 {
 public:
-        static void initClass(bool threaded = true, bool run_always = true);
-        static void cleanupClass();
+        static LLImageFormatted* createFromType(S8 codec);
         static LLImageFormatted* createFromExtension(const LLString& instring); 
 
 protected:
@@ -247,22 +244,11 @@ public:
         /*virtual*/ void dump();
         /*virtual*/ void sanityCheck();
 
-        // LLWorkerThread
-public:
-        // called from WORKER THREAD, returns TRUE if done
-        /*virtual*/ bool doWork(S32 param);
-private:
-        // called from MAIN THREAD
-        /*virtual*/ void startWork(S32 param); // called from addWork()
-        /*virtual*/ void endWork(S32 param, bool aborted); // called from doWork()
-
         // New methods
 public:
         // calcHeaderSize() returns the maximum size of header;
         //   0 indicates we don't know have a header and have to lead the entire file
         virtual S32 calcHeaderSize() { return 0; };
-        // readHeader() reads size bytes into mData, and sets width/height/ncomponents
-        virtual void readHeader(U8* data, S32 size);
         // calcDataSize() returns how many bytes to read to load discard_level (including header)
         virtual S32 calcDataSize(S32 discard_level);
         // calcDiscardLevelBytes() returns the smallest valid discard level based on the number of input bytes
@@ -272,27 +258,16 @@ public:
         
         BOOL load(const LLString& filename);
         BOOL save(const LLString& filename);
-//      BOOL save(LLVFS *vfs, const LLUUID &uuid, const LLAssetType::EType type);
-//    Depricated to remove VFS dependency (see .cpp for replacement):
 
         virtual BOOL updateData() = 0; // pure virtual
-        BOOL copyData(U8 *data, S32 size); // calls updateData()
-        BOOL setData(U8 *data, S32 size); // calls updateData()
-        BOOL appendData(U8 *data, S32 size); // use if some data (e.g header) is already loaded, calls updateData()
+        void setData(U8 *data, S32 size);
+        void appendData(U8 *data, S32 size);
 
         // Loads first 4 channels.
         virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time=0.0) = 0;  
         // Subclasses that can handle more than 4 channels should override this function.
         virtual BOOL decode(LLImageRaw* raw_image, F32 decode_time, S32 first_channel, S32 max_channel);
 
-        // Decode methods to return a pointer to raw data for purposes of passing to
-        // opengl or such. This class tracks the decoded data and keeps it alive until
-        // destroyed or releaseDecodedData() is called.
-        virtual BOOL requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard = -1, F32 decode_time=0.0);
-        virtual BOOL requestDecodedAuxData(LLPointer<LLImageRaw>& raw, S32 channel, 
-                                                                           S32 discard = -1, F32 decode_time=0.0);
-        virtual void releaseDecodedData();
-
         virtual BOOL encode(const LLImageRaw* raw_image, F32 encode_time=0.0) = 0;
 
         S8 getCodec() const;
@@ -302,16 +277,16 @@ public:
         S8 getDiscardLevel() const { return mDiscardLevel; }
 
 protected:
+        BOOL copyData(U8 *data, S32 size); // calls updateData()
+        
+protected:
         S8 mCodec;
         S8 mDecoding;
         S8 mDecoded;
         S8 mDiscardLevel;
 
-        LLPointer<LLImageRaw> mDecodedImage;
-        
 public:
         static S32 sGlobalFormattedMemory;
-        static LLWorkerThread* sWorkerThread;
 };
 
 #endif
diff --git a/linden/indra/llimage/llimage.vcproj b/linden/indra/llimage/llimage.vcproj
index cd4c735..1f8a6ad 100644
--- a/linden/indra/llimage/llimage.vcproj
+++ b/linden/indra/llimage/llimage.vcproj
@@ -171,6 +171,9 @@
                         <File
                                 RelativePath=".\llimagetga.cpp">
                         </File>
+                        <File
+                                RelativePath=".\llimageworker.cpp">
+                        </File>
                 </Filter>
                 <Filter
                         Name="Header Files"
@@ -197,6 +200,9 @@
                         <File
                                 RelativePath=".\llimagetga.h">
                         </File>
+                        <File
+                                RelativePath=".\llimageworker.h">
+                        </File>
                 </Filter>
                 <Filter
                         Name="Resource Files"
diff --git a/linden/indra/llimage/llimage_vc8.vcproj b/linden/indra/llimage/llimage_vc8.vcproj
new file mode 100644
index 0000000..052a28f
--- /dev/null
+++ b/linden/indra/llimage/llimage_vc8.vcproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llimage"

+        ProjectGUID="{681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llimage.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                InlineFunctionExpansion="2"

+                                EnableIntrinsicFunctions="true"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="false"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llimage.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath; ..\llvfs; ..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llimage.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llimage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagebmp.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagedxt.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagej2c.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagejpeg.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagetga.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimageworker.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llimage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagebmp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimageconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagedxt.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagej2c.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagejpeg.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagetga.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimageworker.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llimage/llimagebmp.cpp b/linden/indra/llimage/llimagebmp.cpp
index fc9532e..e8cada5 100644
--- a/linden/indra/llimage/llimagebmp.cpp
+++ b/linden/indra/llimage/llimagebmp.cpp
@@ -142,7 +142,10 @@ BOOL LLImageBMP::updateData()
         LLBMPHeader header;
         llassert( sizeof( header ) == BITMAP_HEADER_SIZE );
 
-        memcpy((void *)&header, mdata + FILE_HEADER_SIZE, BITMAP_HEADER_SIZE);
+        memcpy( /* Flawfinder: ignore */
+                (void*)&header,
+                mdata + FILE_HEADER_SIZE,
+                BITMAP_HEADER_SIZE);
 
         // convert BMP header from little endian (no-op on little endian builds)
         llendianswizzleone(header.mSize);
@@ -276,7 +279,7 @@ BOOL LLImageBMP::updateData()
 
                 
                 extension_size = 4 * 3;
-                memcpy( mBitfieldMask, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE, extension_size);
+                memcpy( mBitfieldMask, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE, extension_size);  /* Flawfinder: ignore */
         }
         else
         if( windows_95_version )
@@ -285,11 +288,11 @@ BOOL LLImageBMP::updateData()
                 extension_size = sizeof( win_95_extension );
 
                 llassert( sizeof( win_95_extension ) + BITMAP_HEADER_SIZE == 108 );
-                memcpy( &win_95_extension, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE, sizeof( win_95_extension ) );
+                memcpy( &win_95_extension, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE, sizeof( win_95_extension ) ); /* Flawfinder: ignore */
 
                 if( 3 == header.mCompression )
                 {
-                        memcpy( mBitfieldMask, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE, 4 * 4);
+                        memcpy( mBitfieldMask, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE, 4 * 4);   /* Flawfinder: ignore */
                 }
 
                 // Color correction ignored for now
@@ -317,7 +320,12 @@ BOOL LLImageBMP::updateData()
         if( 0 != mColorPaletteColors )
         {
                 mColorPalette = new U8[color_palette_size];
-                memcpy( mColorPalette, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE + extension_size, color_palette_size );
+                if (!mColorPalette)
+                {
+                        llerrs << "Out of memory in LLImageBMP::updateData()" << llendl;
+                        return FALSE;
+                }
+                memcpy( mColorPalette, mdata + FILE_HEADER_SIZE + BITMAP_HEADER_SIZE + extension_size, color_palette_size );    /* Flawfinder: ignore */
         }
 
         return TRUE;
@@ -587,7 +595,7 @@ BOOL LLImageBMP::encode(const LLImageRaw* raw_image, F32 encode_time)
         U32 cur_pos = 0;
         memcpy(mdata, magic, 14);
         cur_pos += 14;
-        memcpy(mdata+cur_pos, &header, 40);
+        memcpy(mdata+cur_pos, &header, 40);     /* Flawfinder: ignore */
         cur_pos += 40;
         if (getComponents() == 1)
         {
diff --git a/linden/indra/llimage/llimagedxt.cpp b/linden/indra/llimage/llimagedxt.cpp
index 8b16f97..6676366 100644
--- a/linden/indra/llimage/llimagedxt.cpp
+++ b/linden/indra/llimage/llimagedxt.cpp
@@ -279,13 +279,12 @@ BOOL LLImageDXT::decode(LLImageRaw* raw_image, F32 time)
         }
 
         raw_image->resize(width, height, ncomponents);
-        memcpy(raw_image->getData(), data, image_size);
+        memcpy(raw_image->getData(), data, image_size); /* Flawfinder: ignore */
 
         return TRUE;
 }
 
-// virtual
-BOOL LLImageDXT::requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard, F32 decode_time)
+BOOL LLImageDXT::getMipData(LLPointer<LLImageRaw>& raw, S32 discard)
 {
         if (discard < 0)
         {
@@ -302,11 +301,6 @@ BOOL LLImageDXT::requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard, F32
         return TRUE;
 }
 
-void LLImageDXT::releaseDecodedData()
-{
-        // nothing to do
-}
-
 BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time, bool explicit_mips)
 {
         llassert_always(raw_image);
@@ -373,7 +367,7 @@ BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time, bool explicit_mip
                 S32 bytes = formatBytes(format, w, h);
                 if (mip==0)
                 {
-                        memcpy(mipdata, raw_image->getData(), bytes);
+                        memcpy(mipdata, raw_image->getData(), bytes);   /* Flawfinder: ignore */
                 }
                 else if (explicit_mips)
                 {
@@ -425,21 +419,27 @@ bool LLImageDXT::convertToDXR()
         S32 total_bytes = getDataSize();
         U8* olddata = getData();
         U8* newdata = new U8[total_bytes];
+        if (!newdata)
+        {
+                llerrs << "Out of memory in LLImageDXT::convertToDXR()" << llendl;
+                return false;
+        }
         llassert(total_bytes > 0);
         memset(newdata, 0, total_bytes);
-        memcpy(newdata, olddata, mHeaderSize);
+        memcpy(newdata, olddata, mHeaderSize);  /* Flawfinder: ignore */
         for (S32 mip=0; mip<nmips; mip++)
         {
                 S32 bytes = formatBytes(mFileFormat, width, height);
                 S32 newoffset = getMipOffset(mip);
                 S32 oldoffset = mHeaderSize + (total_bytes - newoffset - bytes);
-                memcpy(newdata + newoffset, olddata + oldoffset, bytes);
+                memcpy(newdata + newoffset, olddata + oldoffset, bytes);        /* Flawfinder: ignore */
                 width >>= 1;
                 height >>= 1;
         }
         dxtfile_header_t* header = (dxtfile_header_t*)newdata;
         header->pixel_fmt.fourcc = getFourCC(newformat);
         setData(newdata, total_bytes);
+        updateData();
         return true;
 }
 
@@ -487,7 +487,7 @@ void LLImageDXT::extractMip(const U8 *indata, U8* mipdata, int width, int height
         for (int h=0;h<mip_height;++h)
         {
                 int start_offset = initial_offset + line_width * h + line_offset;
-                memcpy(mipdata + mip_line_width*h, indata + start_offset, mip_line_width);
+                memcpy(mipdata + mip_line_width*h, indata + start_offset, mip_line_width);      /* Flawfinder: ignore */
         }
 }
 
diff --git a/linden/indra/llimage/llimagedxt.h b/linden/indra/llimage/llimagedxt.h
index c3c01c1..936258a 100644
--- a/linden/indra/llimage/llimagedxt.h
+++ b/linden/indra/llimage/llimagedxt.h
@@ -101,12 +101,11 @@ public:
                                 BOOL encode(const LLImageRaw* raw_image, F32 time, bool explicit_mips);
         /*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 time=0.0);
 
-        /*virtual*/ BOOL requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard=-1, F32 decode_time=0.0);
-        /*virtual*/ void releaseDecodedData();
-        
         /*virtual*/ S32 calcHeaderSize();
         /*virtual*/ S32 calcDataSize(S32 discard_level = 0);
 
+        BOOL getMipData(LLPointer<LLImageRaw>& raw, S32 discard=-1);
+        
         void setFormat();
         S32 getMipOffset(S32 discard);
         
diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 87852e7..51d9522 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -30,7 +30,7 @@
 
 #include "lldir.h"
 #include "llimagej2c.h"
-#include "llmemory.h"
+#include "llmemtype.h"
 
 typedef LLImageJ2CImpl* (*CreateLLImageJ2CFunction)();
 typedef void (*DestroyLLImageJ2CFunction)(LLImageJ2CImpl*);
@@ -243,7 +243,22 @@ BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time, S32 first_chann
         // Update the raw discard level
         updateRawDiscardLevel();
 
-        return mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count);
+        mDecoding = TRUE;
+        BOOL res = mImpl->decodeImpl(*this, *raw_imagep, decode_time, first_channel, max_channel_count);
+        if (res)
+        {
+                if (!mDecoding)
+                {
+                        // Failed
+                        raw_imagep->deleteData();
+                }
+                else
+                {
+                        mDecoding = FALSE;
+                }
+                return TRUE; // done
+        }
+        return FALSE;
 }
 
 
@@ -353,7 +368,7 @@ BOOL LLImageJ2C::loadAndValidate(const LLString &filename)
         U8 *data = new U8[file_size];
         apr_size_t bytes_read = file_size;
         apr_status_t s = apr_file_read(apr_file, data, &bytes_read); // modifies bytes_read     
-        if (s != APR_SUCCESS || bytes_read != file_size)
+        if (s != APR_SUCCESS || (S32)bytes_read != file_size)
         {
                 delete[] data;
                 setLastError("Unable to read entire file");
@@ -368,9 +383,9 @@ BOOL LLImageJ2C::loadAndValidate(const LLString &filename)
 BOOL LLImageJ2C::validate(U8 *data, U32 file_size)
 {
         LLMemType mt1((LLMemType::EMemType)mMemType);
-        // Taken from setData()
 
-        BOOL res = LLImageFormatted::setData(data, file_size);
+        setData(data, file_size);
+        BOOL res = updateData();
         if ( !res )
         {
                 return FALSE;
@@ -386,10 +401,9 @@ BOOL LLImageJ2C::validate(U8 *data, U32 file_size)
         return mImpl->getMetadata(*this);
 }
 
-void LLImageJ2C::setDecodingDone(BOOL complete)
+void LLImageJ2C::decodeFailed()
 {
         mDecoding = FALSE;
-        mDecoded = complete;
 }
 
 void LLImageJ2C::updateRawDiscardLevel()
diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h
index a6894ab..24a1429 100644
--- a/linden/indra/llimage/llimagej2c.h
+++ b/linden/indra/llimage/llimagej2c.h
@@ -72,7 +72,7 @@ protected:
         friend class LLImageJ2CImpl;
         friend class LLImageJ2COJ;
         friend class LLImageJ2CKDU;
-        void setDecodingDone(BOOL complete = TRUE);
+        void decodeFailed();
         void updateRawDiscardLevel();
 
         S32 mMaxBytes; // Maximum number of bytes of data to use...
@@ -87,7 +87,17 @@ class LLImageJ2CImpl
 public:
         virtual ~LLImageJ2CImpl();
 protected:
+        // Find out the image size and number of channels.
+        // Return value:
+        // true: image size and number of channels was determined
+        // false: error on decode
         virtual BOOL getMetadata(LLImageJ2C &base) = 0;
+        // Decode the raw image optionally aborting (to continue later) after
+        // decode_time seconds.  Decode at most max_channel_count and start
+        // decoding channel first_channel.
+        // Return value:
+        // true: decoding complete (even if it failed)
+        // false: time expired while decoding
         virtual BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count) = 0;
         virtual BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0) = 0;
 
diff --git a/linden/indra/llimage/llimagejpeg.cpp b/linden/indra/llimage/llimagejpeg.cpp
index 5c83f20..fdfcc16 100644
--- a/linden/indra/llimage/llimagejpeg.cpp
+++ b/linden/indra/llimage/llimagejpeg.cpp
@@ -354,7 +354,12 @@ boolean LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )
   // Double the buffer size;
   S32 new_buffer_size = self->mOutputBufferSize * 2;
   U8* new_buffer = new U8[ new_buffer_size ];
-  memcpy( new_buffer, self->mOutputBuffer, self->mOutputBufferSize );
+  if (!new_buffer)
+  {
+        llerrs << "Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )" << llendl;
+        return FALSE;
+  }
+  memcpy( new_buffer, self->mOutputBuffer, self->mOutputBufferSize );   /* Flawfinder: ignore */
   delete[] self->mOutputBuffer;
   self->mOutputBuffer = new_buffer;
 
@@ -378,7 +383,7 @@ void LLImageJPEG::encodeTermDestination( j_compress_ptr cinfo )
         S32 file_bytes = (S32)(self->mOutputBufferSize - cinfo->dest->free_in_buffer);
         self->allocateData(file_bytes);
 
-        memcpy( self->getData(), self->mOutputBuffer, file_bytes );
+        memcpy( self->getData(), self->mOutputBuffer, file_bytes );     /* Flawfinder: ignore */
 }
 
 // static 
@@ -435,7 +440,7 @@ void LLImageJPEG::errorEmitMessage( j_common_ptr cinfo, int msg_level )
 void LLImageJPEG::errorOutputMessage( j_common_ptr cinfo )
 {
         // Create the message
-        char buffer[JMSG_LENGTH_MAX];
+        char buffer[JMSG_LENGTH_MAX];   /* Flawfinder: ignore */
         (*cinfo->err->format_message) (cinfo, buffer);
 
         ((LLImageJPEG*) cinfo->client_data)->setLastError( buffer );
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index 722bd1e..d5d60de 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -202,7 +202,7 @@ BOOL LLImageTGA::updateData()
         // discard the ID field, if any
         if (mIDLength)
         {
-                memcpy(junk, getData()+mDataOffset, mIDLength);
+                memcpy(junk, getData()+mDataOffset, mIDLength); /* Flawfinder: ignore */
                 mDataOffset += mIDLength;
         }
         
@@ -239,7 +239,12 @@ BOOL LLImageTGA::updateData()
                 if ( (1 == mImageType) || (9 == mImageType)  )
                 {
                         mColorMap = new U8[ color_map_bytes ];  
-                        memcpy( mColorMap, getData() + mDataOffset, color_map_bytes );
+                        if (!mColorMap)
+                        {
+                                llerrs << "Out of Memory in BOOL LLImageTGA::updateData()" << llendl;
+                                return FALSE;
+                        }
+                        memcpy( mColorMap, getData() + mDataOffset, color_map_bytes );  /* Flawfinder: ignore */
                 }
 
                 mDataOffset += color_map_bytes;
@@ -451,7 +456,7 @@ BOOL LLImageTGA::decodeTruecolorNonRle( LLImageRaw* raw_image, BOOL &alpha_opaqu
         }
         else if (getComponents() == 1)
         {
-                memcpy(dst, src, pixels);
+                memcpy(dst, src, pixels);       /* Flawfinder: ignore */
         }
 
         return TRUE;
@@ -692,7 +697,7 @@ BOOL LLImageTGA::encode(const LLImageRaw* raw_image, F32 encode_time)
         switch( getComponents() )
         {
         case 1:
-                memcpy( dst, src, bytes_per_pixel * pixels );
+                memcpy( dst, src, bytes_per_pixel * pixels );   /* Flawfinder: ignore */
                 break;
 
         case 2:
@@ -1072,7 +1077,7 @@ bool LLImageTGA::loadFile( const LLString& path )
                 return false;
         }
         
-        FILE *file = LLFile::fopen(path.c_str(), "rb");
+        FILE* file = LLFile::fopen(path.c_str(), "rb"); /* Flawfinder: ignore */
         if( !file )
         {
                 llwarns << "Couldn't open file " << path << llendl;
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
new file mode 100644
index 0000000..4550848
--- /dev/null
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -0,0 +1,184 @@
+/** 
+ * @file llimage.cpp
+ * @brief Base class for images.
+ *
+ * Copyright (c) 2001-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+
+#include "llimageworker.h"
+#include "llimagedxt.h"
+
+//----------------------------------------------------------------------------
+
+//static
+LLWorkerThread* LLImageWorker::sWorkerThread = NULL;
+S32 LLImageWorker::sCount = 0;
+
+//static
+void LLImageWorker::initClass(LLWorkerThread* workerthread)
+{
+        sWorkerThread = workerthread;
+}
+
+//static
+void LLImageWorker::cleanupClass()
+{
+}
+
+//----------------------------------------------------------------------------
+
+LLImageWorker::LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder)
+        : LLWorkerClass(sWorkerThread, "Image"),
+          mFormattedImage(image),
+          mDecodedType(-1),
+          mDiscardLevel(discard),
+          mPriority(priority),
+          mResponder(responder)
+{
+        ++sCount;
+}
+
+LLImageWorker::~LLImageWorker()
+{
+        mDecodedImage = NULL;
+        mFormattedImage = NULL;
+        --sCount;
+}
+
+//----------------------------------------------------------------------------
+
+//virtual, main thread
+void LLImageWorker::startWork(S32 param)
+{
+        llassert_always(mDecodedImage.isNull());
+        mDecodedType = -1;
+}
+
+bool LLImageWorker::doWork(S32 param)
+{
+        bool decoded = false;
+        if(mDecodedImage.isNull())
+        {
+                if (!mFormattedImage->updateData())
+                {
+                        mDecodedType = -2; // failed
+                        return true;
+                }
+                if (mDiscardLevel >= 0)
+                {
+                        mFormattedImage->setDiscardLevel(mDiscardLevel);
+                }
+                if (!(mFormattedImage->getWidth() * mFormattedImage->getHeight() * mFormattedImage->getComponents()))
+                {
+                        decoded = true; // failed
+                }
+                else
+                {
+                        S32 nc = param ? 1 : mFormattedImage->getComponents();
+                        mDecodedImage = new LLImageRaw(mFormattedImage->getWidth(),
+                                                                                   mFormattedImage->getHeight(),
+                                                                                   nc);
+                }
+        }
+        if (!decoded)
+        {
+                if (param == 0)
+                {
+                        // Decode primary channels
+                        decoded = mFormattedImage->decode(mDecodedImage, .1f); // 1ms
+                }
+                else
+                {
+                        // Decode aux channel
+                        decoded = mFormattedImage->decode(mDecodedImage, .1f, param, param); // 1ms
+                }
+        }
+        if (decoded)
+        {
+                // Call the callback immediately; endWork doesn't get called until ckeckWork
+                if (mResponder.notNull())
+                {
+                        bool success = (!wasAborted() && mDecodedImage.notNull() && mDecodedImage->getDataSize() != 0);
+                        mResponder->completed(success);
+                }
+        }
+        return decoded;
+}
+
+void LLImageWorker::endWork(S32 param, bool aborted)
+{
+        if (mDecodedType != -2)
+        {
+                mDecodedType = aborted ? -2 : param;
+        }
+}
+
+//----------------------------------------------------------------------------
+
+
+BOOL LLImageWorker::requestDecodedAuxData(LLPointer<LLImageRaw>& raw, S32 channel, S32 discard)
+{
+        // For most codecs, only mDiscardLevel data is available.
+        //  (see LLImageDXT for exception)
+        if (discard >= 0 && discard != mFormattedImage->getDiscardLevel())
+        {
+                llerrs << "Request for invalid discard level" << llendl;
+        }
+        checkWork();
+        if (mDecodedType == -2)
+        {
+                return TRUE; // aborted, done
+        }
+        if (mDecodedType != channel)
+        {
+                if (!haveWork())
+                {
+                        addWork(channel, mPriority);
+                }
+                return FALSE;
+        }
+        else
+        {
+                llassert_always(!haveWork());
+                llassert_always(mDecodedType == channel);
+                raw = mDecodedImage; // smart pointer acquires ownership of data
+                mDecodedImage = NULL;
+                return TRUE;
+        }
+}
+
+BOOL LLImageWorker::requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard)
+{
+        if (mFormattedImage->getCodec() == IMG_CODEC_DXT)
+        {
+                // special case
+                LLImageDXT* imagedxt = (LLImageDXT*)((LLImageFormatted*)mFormattedImage);
+                return imagedxt->getMipData(raw, discard);
+        }
+        else
+        {
+                return requestDecodedAuxData(raw, 0, discard);
+        }
+}
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h
new file mode 100644
index 0000000..a39d21a
--- /dev/null
+++ b/linden/indra/llimage/llimageworker.h
@@ -0,0 +1,76 @@
+/** 
+ * @file llimageworker.h
+ * @brief Object for managing images and their textures.
+ *
+ * Copyright (c) 2000-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LL_LLIMAGEWORKER_H
+#define LL_LLIMAGEWORKER_H
+
+#include "llimage.h"
+#include "llworkerthread.h"
+
+class LLImageWorker : public LLWorkerClass
+{
+public:
+        static void initClass(LLWorkerThread* workerthread);
+        static void cleanupClass();
+        static LLWorkerThread* getWorkerThread() { return sWorkerThread; }
+
+        // LLWorkerThread
+public:
+        LLImageWorker(LLImageFormatted* image, U32 priority, S32 discard, LLResponder* responder = NULL);
+        ~LLImageWorker();
+
+        // called from WORKER THREAD, returns TRUE if done
+        /*virtual*/ bool doWork(S32 param);
+        
+        BOOL requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard = -1);
+        BOOL requestDecodedAuxData(LLPointer<LLImageRaw>& raw, S32 channel, S32 discard = -1);
+        void releaseDecodedData();
+        void cancelDecode();
+
+private:
+        // called from MAIN THREAD
+        /*virtual*/ void startWork(S32 param); // called from addWork()
+        /*virtual*/ void endWork(S32 param, bool aborted); // called from doWork()
+
+protected:
+        LLPointer<LLImageFormatted> mFormattedImage;
+        LLPointer<LLImageRaw> mDecodedImage;
+        S32 mDecodedType;
+        S32 mDiscardLevel;
+
+private:
+        U32 mPriority;
+        LLPointer<LLResponder> mResponder;
+        
+protected:
+        static LLWorkerThread* sWorkerThread;
+
+public:
+        static S32 sCount;
+};
+
+#endif
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index f292da9..307f952 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -28,6 +28,8 @@
 #include "linden_common.h"
 #include "llimagej2coj.h"
 
+// this is defined so that we get static linking.
+#define OPJ_STATIC
 #include "openjpeg/openjpeg.h"
 
 #include "lltimer.h"
@@ -122,46 +124,61 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
 
         /* decode the stream and fill the image structure */
         image = opj_decode(dinfo, cio);
-        if(!image)
-        {
-                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-                opj_destroy_decompress(dinfo);
-                opj_cio_close(cio);
-                return 1;
-        }
 
         /* close the byte stream */
         opj_cio_close(cio);
 
-
         /* free remaining structures */
-        if(dinfo) {
+        if(dinfo)
+        {
                 opj_destroy_decompress(dinfo);
         }
 
+        // The image decode failed if the return was NULL or the component
+        // count was zero.  The latter is just a sanity check before we
+        // dereference the array.
+        if(!image || !image->numcomps)
+        {
+                fprintf(stderr, "ERROR -> decodeImpl: failed to decode image!\n");
+                if (image)
+                        opj_image_destroy(image);
+
+                return TRUE; // done
+        }
+
         // Copy image data into our raw image format (instead of the separate channel format
-        S32 width = 0;
-        S32 height = 0;
 
         S32 img_components = image->numcomps;
         S32 channels = img_components - first_channel;
         if( channels > max_channel_count )
-        {
                 channels = max_channel_count;
-        }
-        width = image->x1 - image->x0;
-        height = image->y1 - image->y0;
+
+        // Component buffers are allocated in an image width by height buffer.
+        // The image placed in that buffer is ceil(width/2^factor) by
+        // ceil(height/2^factor) and if the factor isn't zero it will be at the
+        // top left of the buffer with black filled in the rest of the pixels.
+        // It is integer math so the formula is written in ceildivpo2.
+        // (Assuming all the components have the same width, height and
+        // factor.)
+        S32 comp_width = image->comps[0].w;
+        S32 f=image->comps[0].factor;
+        S32 width = ceildivpow2(image->x1 - image->x0, f);
+        S32 height = ceildivpow2(image->y1 - image->y0, f);
         raw_image.resize(width, height, channels);
         U8 *rawp = raw_image.getData();
 
-        for (S32 comp = first_channel; comp < first_channel + channels; comp++)
+        // first_channel is what channel to start copying from
+        // dest is what channel to copy to.  first_channel comes from the
+        // argument, dest always starts writing at channel zero.
+        for (S32 comp = first_channel, dest=0; comp < first_channel + channels;
+                comp++, dest++)
         {
-                S32 offset = comp;
+                S32 offset = dest;
                 for (S32 y = (height - 1); y >= 0; y--)
                 {
                         for (S32 x = 0; x < width; x++)
                         {
-                                rawp[offset] = image->comps[comp].data[y*width + x];
+                                rawp[offset] = image->comps[comp].data[y*comp_width + x];
                                 offset += channels;
                         }
                 }
@@ -170,8 +187,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
         /* free image data structure */
         opj_image_destroy(image);
 
-        base.setDecodingDone();
-        return TRUE;
+        return TRUE; // done
 }
 
 
@@ -281,6 +297,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
         codestream_length = cio_tell(cio);
 
         base.copyData(cio->buffer, codestream_length);
+        base.updateData(); // set width, height
 
         /* close and free the byte stream */
         opj_cio_close(cio);
@@ -323,6 +340,9 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
         /* set decoding parameters to default values */
         opj_set_default_decoder_parameters(&parameters);
 
+        // Only decode what's required to get the size data.
+        parameters.cp_limit_decoding=LIMIT_TO_MAIN_HEADER;
+
         //parameters.cp_reduce = mRawDiscardLevel;
 
         /* decode the code-stream */
@@ -344,23 +364,22 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
 
         /* decode the stream and fill the image structure */
         image = opj_decode(dinfo, cio);
-        if(!image)
-        {
-                fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-                opj_destroy_decompress(dinfo);
-                opj_cio_close(cio);
-                return 1;
-        }
 
         /* close the byte stream */
         opj_cio_close(cio);
 
-
         /* free remaining structures */
-        if(dinfo) {
+        if(dinfo)
+        {
                 opj_destroy_decompress(dinfo);
         }
 
+        if(!image)
+        {
+                fprintf(stderr, "ERROR -> getMetadata: failed to decode image!\n");
+                return FALSE;
+        }
+
         // Copy image data into our raw image format (instead of the separate channel format
         S32 width = 0;
         S32 height = 0;
@@ -371,5 +390,6 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
         base.setSize(width, height, img_components);
 
         /* free image data structure */
-        opj_image_destroy(image);       return TRUE;
+        opj_image_destroy(image);
+        return TRUE;
 }
diff --git a/linden/indra/llimagej2coj/llimagej2coj.h b/linden/indra/llimagej2coj/llimagej2coj.h
index 3fbf495..c3e3d52 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.h
+++ b/linden/indra/llimagej2coj/llimagej2coj.h
@@ -40,6 +40,11 @@ protected:
         /*virtual*/ BOOL getMetadata(LLImageJ2C &base);
         /*virtual*/ BOOL decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count);
         /*virtual*/ BOOL encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time=0.0);
+        int ceildivpow2(int a, int b)
+        {
+                // Divide a by b to the power of 2 and round upwards.
+                return (a + (1 << b) - 1) >> b;
+        }
 
         // Temporary variables for in-progress decodes...
         LLImageRaw *mRawImagep;
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 3235748..c5be7f7 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -32,7 +32,7 @@
 #include "llinventory.h"
 
 #include "lldbstrings.h"
-#include "llcrypto.h"
+#include "llxorcipher.h"
 #include "llsd.h"
 #include "message.h"
 #include <boost/tokenizer.hpp>
@@ -42,6 +42,24 @@
 #include "llsdutil.h"
 
 ///----------------------------------------------------------------------------
+/// exported functions
+///----------------------------------------------------------------------------
+
+static const std::string INV_ITEM_ID_LABEL("item_id");
+static const std::string INV_FOLDER_ID_LABEL("folder_id");
+static const std::string INV_PARENT_ID_LABEL("parent_id");
+static const std::string INV_ASSET_TYPE_LABEL("type");
+static const std::string INV_PREFERRED_TYPE_LABEL("preferred_type");
+static const std::string INV_INVENTORY_TYPE_LABEL("inv_type");
+static const std::string INV_NAME_LABEL("name");
+static const std::string INV_DESC_LABEL("desc");
+static const std::string INV_PERMISSIONS_LABEL("permissions");
+static const std::string INV_ASSET_ID_LABEL("asset_id");
+static const std::string INV_SALE_INFO_LABEL("sale_info");
+static const std::string INV_FLAGS_LABEL("flags");
+static const std::string INV_CREATION_DATE_LABEL("created_at");
+
+///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
 
@@ -322,16 +340,16 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 {
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
 
         keyword[0] = '\0';
         valuestr[0] = '\0';
         while(input_stream.good())
         {
                 input_stream.getline(buffer, MAX_STRING);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf(buffer, " %254s %254s", keyword, valuestr);      /* Flawfinder: ignore */
                 if(!keyword)
                 {
                         continue;
@@ -360,7 +378,10 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s %254[^|]",
+                                keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
@@ -380,7 +401,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 // not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented...
 BOOL LLInventoryObject::exportFile(FILE* fp, BOOL) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
         fprintf(fp, "\tinv_object\t0\n\t{\n");
         mUUID.toString(uuid_str);
         fprintf(fp, "\t\tobj_id\t%s\n", uuid_str);
@@ -394,7 +415,7 @@ BOOL LLInventoryObject::exportFile(FILE* fp, BOOL) const
 
 BOOL LLInventoryObject::exportLegacyStream(std::ostream& output_stream, BOOL) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
         output_stream <<  "\tinv_object\t0\n\t{\n";
         mUUID.toString(uuid_str);
         output_stream << "\t\tobj_id\t" << uuid_str << "\n";
@@ -647,12 +668,12 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 
         mSaleInfo.unpackMultiMessage(msg, block, block_num);
 
-        char name[DB_INV_ITEM_NAME_BUF_SIZE];
+        char name[DB_INV_ITEM_NAME_BUF_SIZE];   /* Flawfinder: ignore */
         msg->getStringFast(block, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name, block_num);
         mName.assign(name);
         LLString::replaceNonstandardASCII(mName, ' ');
 
-        char desc[DB_INV_ITEM_DESC_BUF_SIZE];
+        char desc[DB_INV_ITEM_DESC_BUF_SIZE];   /* Flawfinder: ignore */
         msg->getStringFast(block, _PREHASH_Description, DB_INV_ITEM_DESC_BUF_SIZE, desc, block_num);
         mDescription.assign(desc);
         LLString::replaceNonstandardASCII(mDescription, ' ');
@@ -685,10 +706,10 @@ BOOL LLInventoryItem::importFile(FILE* fp)
 {
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
-        char junk[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */        
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
+        char junk[MAX_STRING];  /* Flawfinder: ignore */
         BOOL success = TRUE;
 
         keyword[0] = '\0';
@@ -699,7 +720,7 @@ BOOL LLInventoryItem::importFile(FILE* fp)
         while(success && (!feof(fp)))
         {
                 fgets(buffer, MAX_STRING, fp);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf(buffer, " %254s %254s", keyword, valuestr);      /* Flawfinder: ignore */
                 if(!keyword)
                 {
                         continue;
@@ -773,7 +794,10 @@ BOOL LLInventoryItem::importFile(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s%254[\t]%254[^|]",
+                                keyword, junk, valuestr);
 
                         // IW: sscanf chokes and puts | in valuestr if there's no name
                         if (valuestr[0] == '|')
@@ -789,7 +813,10 @@ BOOL LLInventoryItem::importFile(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s%254[\t]%254[^|]",
+                                keyword, junk, valuestr);
 
                         if (valuestr[0] == '|')
                         {
@@ -831,7 +858,7 @@ BOOL LLInventoryItem::importFile(FILE* fp)
 
 BOOL LLInventoryItem::exportFile(FILE* fp, BOOL include_asset_key) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
         fprintf(fp, "\tinv_item\t0\n\t{\n");
         mUUID.toString(uuid_str);
         fprintf(fp, "\t\titem_id\t%s\n", uuid_str);
@@ -881,10 +908,10 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 {
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
-        char junk[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
+        char junk[MAX_STRING];  /* Flawfinder: ignore */
         BOOL success = TRUE;
 
         keyword[0] = '\0';
@@ -895,7 +922,10 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
         while(success && input_stream.good())
         {
                 input_stream.getline(buffer, MAX_STRING);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %254s %254s",
+                        keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -969,7 +999,10 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s%254[\t]%254[^|]",
+                                keyword, junk, valuestr);
 
                         // IW: sscanf chokes and puts | in valuestr if there's no name
                         if (valuestr[0] == '|')
@@ -985,7 +1018,10 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s%254[\t]%254[^|]",
+                                keyword, junk, valuestr);
 
                         if (valuestr[0] == '|')
                         {
@@ -1027,7 +1063,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 
 BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
         output_stream << "\tinv_item\t0\n\t{\n";
         mUUID.toString(uuid_str);
         output_stream << "\t\titem_id\t" << uuid_str << "\n";
@@ -1064,8 +1100,8 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
         const char* inv_type_str = LLInventoryType::lookup(mInventoryType);
         if(inv_type_str) 
                 output_stream << "\t\tinv_type\t" << inv_type_str << "\n";
-        char buffer[32];
-        sprintf(buffer, "\t\tflags\t%08x\n", mFlags);
+        char buffer[32];        /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tflags\t%08x\n", mFlags);  /* Flawfinder: ignore */
         output_stream << buffer;
         mSaleInfo.exportLegacyStream(output_stream);
         output_stream << "\t\tname\t" << mName.c_str() << "|\n";
@@ -1114,24 +1150,24 @@ bool LLInventoryItem::fromLLSD(LLSD& sd)
 {
         mInventoryType = LLInventoryType::IT_NONE;
         mAssetUUID.setNull();
-        const char *w;
+        std::string w;
 
-        w = "item_id";
+        w = INV_ITEM_ID_LABEL;
         if (sd.has(w))
         {
                 mUUID = sd[w];
         }
-        w = "parent_id";
+        w = INV_PARENT_ID_LABEL;
         if (sd.has(w))
         {
                 mParentUUID = sd[w];
         }
-        w = "permissions";
+        w = INV_PERMISSIONS_LABEL;
         if (sd.has(w))
         {
                 mPermissions = ll_permissions_from_sd(sd[w]);
         }
-        w = "sale_info";
+        w = INV_SALE_INFO_LABEL;
         if (sd.has(w))
         {
                 // Sale info used to contain next owner perm. It is now in
@@ -1165,40 +1201,40 @@ bool LLInventoryItem::fromLLSD(LLSD& sd)
                 LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
                 cipher.decrypt(mAssetUUID.mData, UUID_BYTES);
         }
-        w = "asset_id";
+        w = INV_ASSET_ID_LABEL;
         if (sd.has(w))
         {
                 mAssetUUID = sd[w];
         }
-        w = "type";
+        w = INV_ASSET_TYPE_LABEL;
         if (sd.has(w))
         {
                 mType = LLAssetType::lookup(sd[w].asString().c_str());
         }
-        w = "inv_type";
+        w = INV_INVENTORY_TYPE_LABEL;
         if (sd.has(w))
         {
                 mInventoryType = LLInventoryType::lookup(sd[w].asString().c_str());
         }
-        w = "flags";
+        w = INV_FLAGS_LABEL;
         if (sd.has(w))
         {
                 mFlags = ll_U32_from_sd(sd[w]);
         }
-        w = "name";
+        w = INV_NAME_LABEL;
         if (sd.has(w))
         {
                 mName = sd[w].asString();
                 LLString::replaceNonstandardASCII(mName, ' ');
                 LLString::replaceChar(mName, '|', ' ');
         }
-        w = "desc";
+        w = INV_DESC_LABEL;
         if (sd.has(w))
         {
                 mDescription = sd[w].asString();
                 LLString::replaceNonstandardASCII(mDescription, ' ');
         }
-        w = "creation_date";
+        w = INV_CREATION_DATE_LABEL;
         if (sd.has(w))
         {
                 mCreationDate = sd[w];
@@ -1335,18 +1371,18 @@ S32 LLInventoryItem::packBinaryBucket(U8* bin_bucket, LLPermissions* perm_overri
 
         // describe the inventory item
         char* buffer = (char*) bin_bucket;
-        char creator_id_str[UUID_STR_LENGTH];
+        char creator_id_str[UUID_STR_LENGTH];   /* Flawfinder: ignore */
 
         perm.getCreator().toString(creator_id_str);
-        char owner_id_str[UUID_STR_LENGTH];
+        char owner_id_str[UUID_STR_LENGTH];     /* Flawfinder: ignore */
         perm.getOwner().toString(owner_id_str);
-        char last_owner_id_str[UUID_STR_LENGTH];
+        char last_owner_id_str[UUID_STR_LENGTH];        /* Flawfinder: ignore */
         perm.getLastOwner().toString(last_owner_id_str);
-        char group_id_str[UUID_STR_LENGTH];
+        char group_id_str[UUID_STR_LENGTH];     /* Flawfinder: ignore */
         perm.getGroup().toString(group_id_str);
-        char asset_id_str[UUID_STR_LENGTH];
+        char asset_id_str[UUID_STR_LENGTH];     /* Flawfinder: ignore */
         getAssetUUID().toString(asset_id_str);
-        S32 size = sprintf(buffer,
+        S32 size = sprintf(buffer,      /* Flawfinder: ignore */
                                            "%d|%d|%s|%s|%s|%s|%s|%x|%x|%x|%x|%x|%s|%s|%d|%d|%x",
                                            getType(),
                                            getInventoryType(),
@@ -1376,7 +1412,15 @@ void LLInventoryItem::unpackBinaryBucket(U8* bin_bucket, S32 bin_bucket_size)
 
         // Convert the bin_bucket into a string.
         char* item_buffer = new char[bin_bucket_size+1];
-        memcpy(item_buffer, bin_bucket, bin_bucket_size);
+        if ((item_buffer != NULL) && (bin_bucket != NULL))
+        {
+                memcpy(item_buffer, bin_bucket, bin_bucket_size);       /* Flawfinder: ignore */
+        }
+        else
+        {
+                llerrs << "unpackBinaryBucket failed. item_buffer or bin_bucket is Null." << llendl;            
+                return;
+        }
         item_buffer[bin_bucket_size] = '\0';
         std::string str(item_buffer);
 
@@ -1519,7 +1563,7 @@ void LLInventoryCategory::unpackMessage(LLMessageSystem* msg,
         S8 type;
         msg->getS8Fast(block, _PREHASH_Type, type, block_num);
         mPreferredType = static_cast<LLAssetType::EType>(type);
-        char name[DB_INV_ITEM_NAME_BUF_SIZE];
+        char name[DB_INV_ITEM_NAME_BUF_SIZE];   /* Flawfinder: ignore */
         msg->getStringFast(block, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name, block_num);
         mName.assign(name);
         LLString::replaceNonstandardASCII(mName, ' ');
@@ -1530,16 +1574,19 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
 {
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
 
         keyword[0] = '\0';
         valuestr[0] = '\0';
         while(!feof(fp))
         {
                 fgets(buffer, MAX_STRING, fp);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %254s %254s",
+                        keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -1572,7 +1619,10 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s %254[^|]",
+                                keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
@@ -1588,7 +1638,7 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
 
 BOOL LLInventoryCategory::exportFile(FILE* fp, BOOL) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
         fprintf(fp, "\tinv_category\t0\n\t{\n");
         mUUID.toString(uuid_str);
         fprintf(fp, "\t\tcat_id\t%s\n", uuid_str);
@@ -1607,16 +1657,19 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 {
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
 
         keyword[0] = '\0';
         valuestr[0] = '\0';
         while(input_stream.good())
         {
                 input_stream.getline(buffer, MAX_STRING);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %254s %254s",
+                        keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -1649,7 +1702,10 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer,
+                                " %254s %254[^|]",
+                                keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
@@ -1665,7 +1721,7 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 
 BOOL LLInventoryCategory::exportLegacyStream(std::ostream& output_stream, BOOL) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
         output_stream << "\tinv_category\t0\n\t{\n";
         mUUID.toString(uuid_str);
         output_stream << "\t\tcat_id\t" << uuid_str << "\n";
@@ -1701,24 +1757,6 @@ bool inventory_and_asset_types_match(
         return rv;
 }
 
-///----------------------------------------------------------------------------
-/// exported functions
-///----------------------------------------------------------------------------
-
-static const std::string INV_ITEM_ID_LABEL("item_id");
-static const std::string INV_FOLDER_ID_LABEL("folder_id");
-static const std::string INV_PARENT_ID_LABEL("parent_id");
-static const std::string INV_ASSET_TYPE_LABEL("asset_type");
-static const std::string INV_PREFERRED_TYPE_LABEL("preferred_type");
-static const std::string INV_INVENTORY_TYPE_LABEL("inv_type");
-static const std::string INV_NAME_LABEL("name");
-static const std::string INV_DESC_LABEL("description");
-static const std::string INV_PERMISSIONS_LABEL("permissions");
-static const std::string INV_ASSET_ID_LABEL("asset_id");
-static const std::string INV_SALE_INFO_LABEL("sale_info");
-static const std::string INV_FLAGS_LABEL("flags");
-static const std::string INV_CREATION_DATE_LABEL("created_at");
-
 LLSD ll_create_sd_from_inventory_item(LLPointer<LLInventoryItem> item)
 {
         LLSD rv;
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 1ebcabf..fc135de 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -32,6 +32,7 @@
 
 #include "llassetstorage.h"
 #include "lldarray.h"
+#include "llmemtype.h"
 #include "llpermissions.h"
 #include "llsaleinfo.h"
 #include "llsd.h"
@@ -382,6 +383,12 @@ struct SetItemOwnerAndGroup
                 LLPermissions perm = item->getPermissions();
                 bool is_atomic = (LLAssetType::AT_OBJECT == item->getType()) ? false : true;
                 perm.setOwnerAndGroup(mAuthorityID, mOwnerID, mGroupID, is_atomic);
+                // If no owner id is set, this is equivalent to a deed action.
+                // Clear 'share with group'.
+                if (mOwnerID.isNull())
+                {
+                        perm.setMaskGroup(PERM_NONE);
+                }
                 item->setPermissions(perm);
         }
 };
diff --git a/linden/indra/llinventory/llinventory_vc8.vcproj b/linden/indra/llinventory/llinventory_vc8.vcproj
new file mode 100644
index 0000000..d66f352
--- /dev/null
+++ b/linden/indra/llinventory/llinventory_vc8.vcproj
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llinventory"

+        ProjectGUID="{328D1968-924F-4863-AAE8-5F9A95BA68E5}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llinventory.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llinventory.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llinventory.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llcategory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleconomy.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllandmark.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnotecard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llparcel.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpermissions.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsaleinfo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransactionflags.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluserrelations.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llcategory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleconomy.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllandmark.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnotecard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llparcel.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llparcelflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpermissions.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpermissionsflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsaleinfo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransactionflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransactiontypes.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluserrelations.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llinventory/lllandmark.cpp b/linden/indra/llinventory/lllandmark.cpp
index d7dca20..c153d68 100644
--- a/linden/indra/llinventory/lllandmark.cpp
+++ b/linden/indra/llinventory/lllandmark.cpp
@@ -140,10 +140,13 @@ LLLandmark* LLLandmark::constructFromString(const char *buffer)
         {
                 // *NOTE: Changing the buffer size will require changing the
                 // scanf call below.
-                char region_id_str[MAX_STRING];
+                char region_id_str[MAX_STRING]; /* Flawfinder: ignore */
                 LLVector3 pos;
                 cur += chars_read;
-                count = sscanf(cur, "region_id %254s\n%n", region_id_str, &chars_read);
+                count = sscanf( /* Flawfinder: ignore */
+                        cur,
+                        "region_id %254s\n%n",
+                        region_id_str, &chars_read);
                 if(count != 1) goto error;
                 cur += chars_read;
                 count = sscanf(cur, "local_pos %f %f %f\n%n", pos.mV+VX, pos.mV+VY, pos.mV+VZ, &chars_read);
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 5f48f0e..d40cabb 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -26,11 +26,10 @@
  */
 
 #include "linden_common.h"
-#include "llinventory.h"
 #include "llnotecard.h"
 #include "llstreamtools.h"
 
-LLNotecard::LLNotecard(U32 max_text)
+LLNotecard::LLNotecard(S32 max_text)
 : mMaxText(max_text)
 {
 }
@@ -189,7 +188,7 @@ bool LLNotecard::importStream(std::istream& str)
                 return FALSE;
         }
 
-        char line_buf[STD_STRING_BUF_SIZE];
+        char line_buf[STD_STRING_BUF_SIZE];     /* Flawfinder: ignore */
         str.getline(line_buf, STD_STRING_BUF_SIZE);
         if(str.fail())
         {
@@ -198,7 +197,7 @@ bool LLNotecard::importStream(std::istream& str)
         }
         line_buf[STD_STRING_STR_LEN] = '\0';
         
-        U32 text_len = 0;
+        S32 text_len = 0;
         if( 1 != sscanf(line_buf, "Text length %d", &text_len) )
         {
                 llwarns << "Invalid Linden text length field" << llendl;
diff --git a/linden/indra/llinventory/llnotecard.h b/linden/indra/llinventory/llnotecard.h
index 2475fd1..511d779 100644
--- a/linden/indra/llinventory/llnotecard.h
+++ b/linden/indra/llinventory/llnotecard.h
@@ -28,12 +28,21 @@
 #ifndef LL_NOTECARD_H
 #define LL_NOTECARD_H
 
-const S32 MAX_NOTECARD_SIZE = 65536;
+#include "llmemory.h"
+#include "llinventory.h"
 
 class LLNotecard
 {
 public:
-        LLNotecard(U32 max_text);
+        /**
+         * @brief anonymous enumeration to set max size.
+         */
+        enum
+        {
+                MAX_SIZE = 65536
+        };
+        
+        LLNotecard(S32 max_text = LLNotecard::MAX_SIZE);
         virtual ~LLNotecard();
 
         bool importStream(std::istream& str);
@@ -52,7 +61,7 @@ private:
         bool exportEmbeddedItemsStream(std::ostream& str);
         std::vector<LLPointer<LLInventoryItem> > mItems;
         LLString mText;
-        U32 mMaxText;
+        S32 mMaxText;
         S32 mVersion;
         S32 mEmbeddedVersion;
 };
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 9839e43..b4faf7c 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -1017,7 +1017,7 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
 BOOL LLParcel::exportStream(std::ostream& output_stream)
 {
         S32 setting;
-        char id_string[MAX_STRING];
+        char id_string[MAX_STRING];     /* Flawfinder: ignore */
 
         std::ios::fmtflags old_flags = output_stream.flags();
         output_stream.setf(std::ios::showpoint);
@@ -1248,7 +1248,7 @@ void LLParcel::packMessage(LLMessageSystem* msg)
 
 void LLParcel::unpackMessage(LLMessageSystem* msg)
 {
-        char buffer[256];
+        char buffer[256];       /* Flawfinder: ignore */
 
         msg->getU32Fast(        _PREHASH_ParcelData,_PREHASH_ParcelFlags, mParcelFlags );
         msg->getS32Fast(        _PREHASH_ParcelData,_PREHASH_SalePrice, mSalePrice );
diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp
index 35dbc3e..0788ec6 100644
--- a/linden/indra/llinventory/llpermissions.cpp
+++ b/linden/indra/llinventory/llpermissions.cpp
@@ -283,6 +283,7 @@ BOOL LLPermissions::deedToGroup(const LLUUID& agent, const LLUUID& group)
                         mOwner.setNull();
                 }
                 mMaskBase = mMaskNextOwner;
+                mMaskGroup = PERM_NONE;
                 mGroup = group;
                 mIsGroupOwned = true;
                 fixFairUse();
@@ -506,18 +507,18 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b
 // File support
 //
 
-BOOL LLPermissions::importFile(FILE *fp)
+BOOL LLPermissions::importFile(FILE* fp)
 {
         init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
         const S32 BUFSIZE = 16384;
 
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char    buffer[BUFSIZE];
-        char    keyword[256];
-        char    valuestr[256];
-        char    uuid_str[256];
-        U32             mask;
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
+        char keyword[256];      /* Flawfinder: ignore */
+        char valuestr[256];     /* Flawfinder: ignore */
+        char uuid_str[256];     /* Flawfinder: ignore */
+        U32 mask;
 
         keyword[0]  = '\0';
         valuestr[0] = '\0';
@@ -525,7 +526,10 @@ BOOL LLPermissions::importFile(FILE *fp)
         while (!feof(fp))
         {
                 fgets(buffer, BUFSIZE, fp);
-                sscanf(buffer, " %255s %255s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %255s %255s",
+                        keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -573,22 +577,22 @@ BOOL LLPermissions::importFile(FILE *fp)
                 }
                 else if (!strcmp("creator_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str); /* Flawfinder: ignore */
                         mCreator.set(uuid_str);
                 }
                 else if (!strcmp("owner_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str); /* Flawfinder: ignore */
                         mOwner.set(uuid_str);
                 }
                 else if (!strcmp("last_owner_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str); /* Flawfinder: ignore */
                         mLastOwner.set(uuid_str);
                 }
                 else if (!strcmp("group_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str); /* Flawfinder: ignore */
                         mGroup.set(uuid_str);
                 }
                 else if (!strcmp("group_owned", keyword))
@@ -607,9 +611,9 @@ BOOL LLPermissions::importFile(FILE *fp)
 }
 
 
-BOOL LLPermissions::exportFile(FILE *fp) const
+BOOL LLPermissions::exportFile(FILE* fp) const
 {
-        char uuid_str[256];
+        char uuid_str[256];     /* Flawfinder: ignore */
 
         fprintf(fp, "\tpermissions 0\n");
         fprintf(fp, "\t{\n");
@@ -648,11 +652,11 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
 
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char    buffer[BUFSIZE];
-        char    keyword[256];
-        char    valuestr[256];
-        char    uuid_str[256];
-        U32             mask;
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
+        char keyword[256];      /* Flawfinder: ignore */
+        char valuestr[256];     /* Flawfinder: ignore */
+        char uuid_str[256];     /* Flawfinder: ignore */
+        U32 mask;
 
         keyword[0]  = '\0';
         valuestr[0] = '\0';
@@ -660,7 +664,10 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
         while (input_stream.good())
         {
                 input_stream.getline(buffer, BUFSIZE);
-                sscanf(buffer, " %255s %255s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %255s %255s",
+                        keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -708,22 +715,22 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
                 }
                 else if (!strcmp("creator_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);    /* Flawfinder: ignore */
                         mCreator.set(uuid_str);
                 }
                 else if (!strcmp("owner_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);    /* Flawfinder: ignore */
                         mOwner.set(uuid_str);
                 }
                 else if (!strcmp("last_owner_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);    /* Flawfinder: ignore */
                         mLastOwner.set(uuid_str);
                 }
                 else if (!strcmp("group_id", keyword))
                 {
-                        sscanf(valuestr, "%255s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);    /* Flawfinder: ignore */
                         mGroup.set(uuid_str);
                 }
                 else if (!strcmp("group_owned", keyword))
@@ -744,21 +751,21 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
 
 BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const
 {
-        char uuid_str[256];
+        char uuid_str[256];     /* Flawfinder: ignore */
 
         output_stream <<  "\tpermissions 0\n";
         output_stream <<  "\t{\n";
 
-        char buffer[256];
-        sprintf(buffer, "\t\tbase_mask\t%08x\n",                mMaskBase);
+        char buffer[256];       /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tbase_mask\t%08x\n",               mMaskBase);     /* Flawfinder: ignore */
         output_stream << buffer;
-        sprintf(buffer, "\t\towner_mask\t%08x\n",               mMaskOwner);
+        snprintf(buffer, sizeof(buffer), "\t\towner_mask\t%08x\n",              mMaskOwner);    /* Flawfinder: ignore */
         output_stream << buffer;
-        sprintf(buffer, "\t\tgroup_mask\t%08x\n",               mMaskGroup);
+        snprintf(buffer, sizeof(buffer), "\t\tgroup_mask\t%08x\n",              mMaskGroup);    /* Flawfinder: ignore */
         output_stream << buffer;
-        sprintf(buffer, "\t\teveryone_mask\t%08x\n",    mMaskEveryone);
+        snprintf(buffer, sizeof(buffer), "\t\teveryone_mask\t%08x\n",   mMaskEveryone); /* Flawfinder: ignore */
         output_stream << buffer;
-        sprintf(buffer, "\t\tnext_owner_mask\t%08x\n",  mMaskNextOwner);
+        snprintf(buffer, sizeof(buffer), "\t\tnext_owner_mask\t%08x\n", mMaskNextOwner);        /* Flawfinder: ignore */
         output_stream << buffer;
 
         mCreator.toString(uuid_str);
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 98043d1..28801e5 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -160,9 +160,9 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
 
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
         BOOL success = TRUE;
 
         keyword[0] = '\0';
@@ -170,7 +170,10 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
         while(success && (!feof(fp)))
         {
                 fgets(buffer, MAX_STRING, fp);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %254s %254s",
+                        keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -213,9 +216,9 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m
 
         // *NOTE: Changing the buffer size will require changing the scanf
         // calls below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore */
+        char keyword[MAX_STRING];       /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];      /* Flawfinder: ignore */
         BOOL success = TRUE;
 
         keyword[0] = '\0';
@@ -223,7 +226,10 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m
         while(success && input_stream.good())
         {
                 input_stream.getline(buffer, MAX_STRING);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %254s %254s",
+                        keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp
index 13666ba..bc13c90 100644
--- a/linden/indra/llmath/llcamera.cpp
+++ b/linden/indra/llmath/llcamera.cpp
@@ -121,25 +121,25 @@ void LLCamera::setFar(F32 far_plane)
 
 size_t LLCamera::writeFrustumToBuffer(char *buffer) const
 {
-        memcpy(buffer, &mView, sizeof(F32));
+        memcpy(buffer, &mView, sizeof(F32));            /* Flawfinder: ignore */                
         buffer += sizeof(F32);
-        memcpy(buffer, &mAspect, sizeof(F32));
+        memcpy(buffer, &mAspect, sizeof(F32));          /* Flawfinder: ignore */
         buffer += sizeof(F32);
-        memcpy(buffer, &mNearPlane, sizeof(F32));
+        memcpy(buffer, &mNearPlane, sizeof(F32));       /* Flawfinder: ignore */
         buffer += sizeof(F32);
-        memcpy(buffer, &mFarPlane, sizeof(F32));
+        memcpy(buffer, &mFarPlane, sizeof(F32));                /* Flawfinder: ignore */
         return 4*sizeof(F32);
 }
 
 size_t LLCamera::readFrustumFromBuffer(const char *buffer)
 {
-        memcpy(&mView, buffer, sizeof(F32));
+        memcpy(&mView, buffer, sizeof(F32));            /* Flawfinder: ignore */
         buffer += sizeof(F32);
-        memcpy(&mAspect, buffer, sizeof(F32));
+        memcpy(&mAspect, buffer, sizeof(F32));          /* Flawfinder: ignore */
         buffer += sizeof(F32);
-        memcpy(&mNearPlane, buffer, sizeof(F32));
+        memcpy(&mNearPlane, buffer, sizeof(F32));       /* Flawfinder: ignore */
         buffer += sizeof(F32);
-        memcpy(&mFarPlane, buffer, sizeof(F32));
+        memcpy(&mFarPlane, buffer, sizeof(F32));                /* Flawfinder: ignore */
         return 4*sizeof(F32);
 }
 
diff --git a/linden/indra/llmath/llcoordframe.cpp b/linden/indra/llmath/llcoordframe.cpp
index 552854d..c7d18bb 100644
--- a/linden/indra/llmath/llcoordframe.cpp
+++ b/linden/indra/llmath/llcoordframe.cpp
@@ -460,26 +460,26 @@ void LLCoordFrame::getRotMatrixToParent(LLMatrix4& mat) const
 
 size_t LLCoordFrame::writeOrientation(char *buffer) const
 {
-        memcpy(buffer, mOrigin.mV, 3*sizeof(F32)); 
+        memcpy(buffer, mOrigin.mV, 3*sizeof(F32)); /*Flawfinder: ignore */
         buffer += 3*sizeof(F32);
-        memcpy(buffer, mXAxis.mV, 3*sizeof(F32)); 
+        memcpy(buffer, mXAxis.mV, 3*sizeof(F32)); /*Flawfinder: ignore */
         buffer += 3*sizeof(F32);
-        memcpy(buffer, mYAxis.mV, 3*sizeof(F32));
+        memcpy(buffer, mYAxis.mV, 3*sizeof(F32));/*Flawfinder: ignore */
         buffer += 3*sizeof(F32);
-        memcpy(buffer, mZAxis.mV, 3*sizeof(F32));
+        memcpy(buffer, mZAxis.mV, 3*sizeof(F32));       /*Flawfinder: ignore */
         return 12*sizeof(F32);
 }
 
 
 size_t LLCoordFrame::readOrientation(const char *buffer)
 {
-        memcpy(mOrigin.mV, buffer, 3*sizeof(F32));
+        memcpy(mOrigin.mV, buffer, 3*sizeof(F32));      /*Flawfinder: ignore */
         buffer += 3*sizeof(F32);
-        memcpy(mXAxis.mV, buffer, 3*sizeof(F32));
+        memcpy(mXAxis.mV, buffer, 3*sizeof(F32));       /*Flawfinder: ignore */
         buffer += 3*sizeof(F32);
-        memcpy(mYAxis.mV, buffer, 3*sizeof(F32));
+        memcpy(mYAxis.mV, buffer, 3*sizeof(F32));       /*Flawfinder: ignore */
         buffer += 3*sizeof(F32);
-        memcpy(mZAxis.mV, buffer, 3*sizeof(F32));
+        memcpy(mZAxis.mV, buffer, 3*sizeof(F32));       /*Flawfinder: ignore */
 
         if( !isFinite() )
         {
diff --git a/linden/indra/llmath/llcrc.cpp b/linden/indra/llmath/llcrc.cpp
index 4194432..1c0aa5d 100644
--- a/linden/indra/llmath/llcrc.cpp
+++ b/linden/indra/llmath/llcrc.cpp
@@ -161,9 +161,15 @@ void LLCRC::update(const U8* buffer, U32 buffer_size)
         }
 }
 
-void LLCRC::update(const char *filename)
+void LLCRC::update(const char* filename)
 {
-        FILE *fp = LLFile::fopen(filename, "rb");
+        if (!filename)
+        {
+                llerrs << "No filename specified" << llendl;
+                return;
+        }
+
+        FILE* fp = LLFile::fopen(filename, "rb");               /* Flawfinder: ignore */
 
         if (fp)
         {
@@ -172,12 +178,15 @@ void LLCRC::update(const char *filename)
 
                 fseek(fp, 0, SEEK_SET);
 
-                U8 *data = new U8[size];
-                fread(data, size, 1, fp);
-                fclose(fp);
+                if (size > 0)
+                {
+                        U8* data = new U8[size];
+                        fread(data, size, 1, fp);
+                        fclose(fp);
 
-                update(data, size);
-                delete[] data;
+                        update(data, size);
+                        delete[] data;
+                }
         }
 }
 
@@ -186,7 +195,7 @@ void LLCRC::update(const char *filename)
 BOOL LLCRC::testHarness()
 {
         const S32 TEST_BUFFER_SIZE = 16;
-        const char TEST_BUFFER[TEST_BUFFER_SIZE] = "hello &#$)$&Nd0";
+        const char TEST_BUFFER[TEST_BUFFER_SIZE] = "hello &#$)$&Nd0";   /* Flawfinder: ignore */
         LLCRC c1, c2;
         c1.update((U8*)TEST_BUFFER, TEST_BUFFER_SIZE - 1);
         char* rh = (char*)TEST_BUFFER;
diff --git a/linden/indra/llmath/llmath.vcproj b/linden/indra/llmath/llmath.vcproj
index 9b6047d..82feb25 100644
--- a/linden/indra/llmath/llmath.vcproj
+++ b/linden/indra/llmath/llmath.vcproj
@@ -224,6 +224,9 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
+                                RelativePath=".\linden_math.h">
+                        </File>
+                        <File
                                 RelativePath=".\llbboxlocal.h">
                         </File>
                         <File
@@ -242,9 +245,6 @@
                                 RelativePath=".\llinterp.h">
                         </File>
                         <File
-                                RelativePath=".\llmath.h">
-                        </File>
-                        <File
                                 RelativePath=".\llmd5.h">
                         </File>
                         <File
@@ -308,6 +308,9 @@
                                 RelativePath=".\v4math.h">
                         </File>
                         <File
+                                RelativePath=".\vmath.h">
+                        </File>
+                        <File
                                 RelativePath=".\xform.h">
                         </File>
                 </Filter>
diff --git a/linden/indra/llmath/llmath_vc8.vcproj b/linden/indra/llmath/llmath_vc8.vcproj
new file mode 100644
index 0000000..ea23702
--- /dev/null
+++ b/linden/indra/llmath/llmath_vc8.vcproj
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llmath"

+        ProjectGUID="{E87FD9BE-BE42-4EA3-BF4D-D992223046D9}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmath.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmath.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                BrowseInformation="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmath.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llbboxlocal.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcamera.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcoordframe.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcrc.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmd5.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llperlin.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llquaternion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrand.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrect.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluuid.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolume.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumemgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\m3math.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\m4math.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\raytrace.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v2math.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v3color.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v3dmath.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v3math.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v4color.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v4coloru.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v4math.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\xform.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llbboxlocal.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcamera.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcoord.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcoordframe.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcrc.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinterp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmath.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmd5.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lloctree.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llperlin.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llquantize.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llquaternion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrand.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrect.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltreenode.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluuid.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolume.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumemgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\m3math.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\m4math.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\raytrace.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v2math.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v3color.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v3dmath.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v3math.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v4color.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v4coloru.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\v4math.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\xform.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llmath/llmd5.cpp b/linden/indra/llmath/llmd5.cpp
index 19174af..267381c 100644
--- a/linden/indra/llmath/llmd5.cpp
+++ b/linden/indra/llmath/llmd5.cpp
@@ -122,10 +122,18 @@ void LLMD5::update (const uint1 *input, const uint4 input_length) {
   // Transform as many times as possible.
   if (input_length >= buffer_space) { // ie. we have enough to fill the buffer
     // fill the rest of the buffer and transform
-    memcpy (buffer + buffer_index, input, buffer_space);
+    memcpy(     /* Flawfinder: ignore */
+                buffer + buffer_index,
+                input,
+                buffer_space);
     transform (buffer);
 
     // now, transform each 64-byte piece of the input, bypassing the buffer
+  if (input == NULL || input_length == 0){
+        std::cerr << "LLMD5::update:  Invalid input!" << std::endl;
+        return;
+  }
+
     for (input_index = buffer_space; input_index + 63 < input_length; 
          input_index += 64)
       transform (input+input_index);
@@ -137,7 +145,7 @@ void LLMD5::update (const uint1 *input, const uint4 input_length) {
 
 
   // and here we do the buffering:
-  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);
+  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);             /* Flawfinder: ignore */
 }
 
 
@@ -145,9 +153,9 @@ void LLMD5::update (const uint1 *input, const uint4 input_length) {
 // MD5 update for files.
 // Like above, except that it works on files (and uses above as a primitive.)
 
-void LLMD5::update(FILE *file){
+void LLMD5::update(FILE* file){
 
-  unsigned char buffer[1024];
+  unsigned char buffer[1024];           /* Flawfinder: ignore */
   int len;
 
   while ( (len=(int)fread(buffer, 1, 1024, file)) )
@@ -167,11 +175,11 @@ void LLMD5::update(FILE *file){
 
 void LLMD5::update(std::istream& stream){
 
-  unsigned char buffer[1024];
+  unsigned char buffer[1024];           /* Flawfinder: ignore */
   int len;
 
   while (stream.good()){
-    stream.read( (char*)buffer, 1024); // note that return value of read is unusable.
+    stream.read( (char*)buffer, 1024);  /* Flawfinder: ignore */                // note that return value of read is unusable.
     len=stream.gcount();
     update(buffer, len);
   }
@@ -182,35 +190,13 @@ void LLMD5::update(std::istream& stream){
 
 
 
-
-// MD5 update for ifstreams.
-// Like update for files; see above.
-
-void LLMD5::update(llifstream& stream){
-
-  unsigned char buffer[1024];
-  int len;
-
-  while (stream.good()){
-    stream.read( (char*)buffer, 1024); // note that return value of read is unusable.
-    len=stream.gcount();
-    update(buffer, len);
-  }
-
-}
-
-
-
-
-
-
 // MD5 finalization. Ends an MD5 message-digest operation, writing the
 // the message digest and zeroizing the context.
 
 
 void LLMD5::finalize (){
 
-  unsigned char bits[8];
+  unsigned char bits[8];                /* Flawfinder: ignore */
   unsigned int index, padLen;
   static uint1 PADDING[64]={
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -264,25 +250,16 @@ LLMD5::LLMD5(std::istream& stream){
   finalize();
 }
 
-
-
-LLMD5::LLMD5(llifstream& stream)
-{
-        init();  // must called by all constructors
-        update (stream);
-        finalize();
-}
-
 // Digest a string of the format ("%s:%i" % (s, number))
 LLMD5::LLMD5(const unsigned char *string, const unsigned int number)
 {
         const char *colon = ":";
-        char tbuf[16];
+        char tbuf[16];          /* Flawfinder: ignore */
         init();
-        update(string, (U32)strlen((const char *) string));
-        update((const unsigned char *) colon, (U32)strlen(colon));
-        sprintf(tbuf, "%i", number);
-        update((const unsigned char *) tbuf, (U32)strlen(tbuf));
+        update(string, (U32)strlen((const char *) string));             /* Flawfinder: ignore */
+        update((const unsigned char *) colon, (U32)strlen(colon));              /* Flawfinder: ignore */
+        snprintf(tbuf, sizeof(tbuf), "%i", number);             /* Flawfinder: ignore */
+        update((const unsigned char *) tbuf, (U32)strlen(tbuf));        /* Flawfinder: ignore */
         finalize();
 }
 
@@ -290,7 +267,7 @@ LLMD5::LLMD5(const unsigned char *string, const unsigned int number)
 LLMD5::LLMD5(const unsigned char *s)
 {
         init();
-        update(s, (U32)strlen((const char *) s));
+        update(s, (U32)strlen((const char *) s));               /* Flawfinder: ignore */
         finalize();
 }
 
@@ -304,7 +281,7 @@ void LLMD5::raw_digest(unsigned char *s)
                 return;
         }
 
-        memcpy(s, digest, 16);
+        memcpy(s, digest, 16);          /* Flawfinder: ignore */
         return;
 }
 
@@ -324,7 +301,7 @@ void LLMD5::hex_digest(char *s)
 
         for (i=0; i<16; i++)
         {
-                sprintf(s+i*2, "%02x", digest[i]);
+                sprintf(s+i*2, "%02x", digest[i]);              /* Flawfinder: ignore */
         }
 
         s[32]='\0';
@@ -338,7 +315,7 @@ void LLMD5::hex_digest(char *s)
 
 std::ostream& operator<<(std::ostream &stream, LLMD5 context)
 {
-        char s[33];
+        char s[33];             /* Flawfinder: ignore */
         context.hex_digest(s);
         stream << s;
         return stream;
diff --git a/linden/indra/llmath/llmd5.h b/linden/indra/llmath/llmd5.h
index 1874b45..7b185b6 100644
--- a/linden/indra/llmath/llmd5.h
+++ b/linden/indra/llmath/llmd5.h
@@ -90,7 +90,6 @@ public:
   void  update     (const uint1 *input, const uint4 input_length);
   void  update     (std::istream& stream);
   void  update     (FILE *file);
-  void  update     (llifstream& stream);
   void  finalize   ();
 
 // constructors for special circumstances.  All these constructors finalize
@@ -98,7 +97,6 @@ public:
   LLMD5              (const unsigned char *string); // digest string, finalize
   LLMD5              (std::istream& stream);       // digest stream, finalize
   LLMD5              (FILE *file);            // digest file, close, finalize
-  LLMD5              (llifstream& stream);      // digest stream, close, finalize
   LLMD5              (const unsigned char *string, const unsigned int number);
   
 // methods to acquire finalized result
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index 6e068cd..22f298c 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -40,6 +40,11 @@
 #endif
 
 #define LL_OCTREE_PARANOIA_CHECK 0
+#if LL_DARWIN
+#define LL_OCTREE_MAX_CAPACITY 32
+#else
+#define LL_OCTREE_MAX_CAPACITY 256
+#endif
 
 template <class T> class LLOctreeState;
 template <class T> class LLOctreeNode;
@@ -107,7 +112,8 @@ public:
         virtual void removeByAddress(T* data)                           { getOctState()->removeByAddress(data); }
         virtual bool hasLeafState()     const                                   { return getOctState()->isLeaf(); }
         virtual void destroy()                                                          { getOctState()->destroy(); }
-        virtual oct_node* getNodeAt(T* data)                            { return getOctState()->getNodeAt(data); }
+        virtual oct_node* getNodeAt(T* data)                            { return getNodeAt(data->getPositionGroup(), data->getBinRadius()); }
+        virtual oct_node* getNodeAt(const LLVector3d& pos, const F64& rad) { return getOctState()->getNodeAt(pos, rad); }
         virtual U8 getOctant() const                                            { return mOctant; }
         virtual void setOctant(U8 octant)                                       { mOctant = octant; }
         virtual const oct_state* getOctState() const            { return (const oct_state*) BaseType::mState; }
@@ -136,9 +142,14 @@ public:
                 return ret;
         }
         
+        virtual bool isInside(const LLVector3d& pos, const F64& rad) const
+        {
+                return rad <= mSize.mdV[0]*2.0 && isInside(pos); 
+        }
+
         virtual bool isInside(T* data) const                    
         { 
-                return data->getBinRadius() <= mSize.mdV[0]*2.0 && isInside(data->getPositionGroup()); 
+                return isInside(data->getPositionGroup(), data->getBinRadius());
         }
 
         virtual bool isInside(const LLVector3d& pos) const
@@ -174,6 +185,11 @@ public:
 
         bool contains(T* xform)
         {
+                return contains(xform->getBinRadius());
+        }
+
+        bool contains(F64 radius)
+        {
                 if (mParent == NULL)
                 {       //root node contains nothing
                         return false;
@@ -181,7 +197,6 @@ public:
 
                 F64 size = mSize.mdV[0];
                 F64 p_size = size * 2.0;
-                F64 radius = xform->getBinRadius();
 
                 return (radius <= 0.001 && size <= 0.001) ||
                                 (radius <= p_size && radius > size);
@@ -189,17 +204,10 @@ public:
 
         static void pushCenter(LLVector3d &center, LLVector3d &size, T* data)
         {
-                LLVector3 pos(data->getPositionGroup());
-                F64 p[] =
-                {
-                        (F64) pos.mV[0],
-                        (F64) pos.mV[1],
-                        (F64) pos.mV[2]
-                };
-                        
+                LLVector3d pos(data->getPositionGroup());
                 for (U32 i = 0; i < 3; i++)
                 {
-                        if (p[i] > center.mdV[i])
+                        if (pos.mdV[i] > center.mdV[i])
                         {
                                 center.mdV[i] += size.mdV[i];
                         }
@@ -273,11 +281,15 @@ public:
         oct_node* getOctNode()                                                                  { return (oct_node*) BaseType::getNode(); }
 
         virtual oct_node* getNodeAt(T* data)
+        {
+                return getNodeAt(data->getPositionGroup(), data->getBinRadius());
+        }
+
+        virtual oct_node* getNodeAt(const LLVector3d& pos, const F64& rad)
         { 
-                const LLVector3d& pos = data->getPositionGroup();
                 LLOctreeNode<T>* node = getOctNode();
 
-                if (node->isInside(data))
+                if (node->isInside(pos, rad))
                 {               
                         //do a quick search by octant
                         U8 octant = node->getOctant(pos.mdV);
@@ -287,7 +299,7 @@ public:
                         //at the appropriate octant or is smaller than the object.  
                         //by definition, that node is the smallest node that contains 
                         // the data
-                        while (keep_going && node->getSize().mdV[0] >= data->getBinRadius())
+                        while (keep_going && node->getSize().mdV[0] >= rad)
                         {       
                                 keep_going = FALSE;
                                 for (U32 i = 0; i < node->getChildCount() && !keep_going; i++)
@@ -301,9 +313,9 @@ public:
                                 }
                         }
                 }
-                else if (!node->contains(data) && node->getParent())
+                else if (!node->contains(rad) && node->getParent())
                 { //if we got here, data does not exist in this node
-                        return ((LLOctreeNode<T>*) node->getParent())->getNodeAt(data);
+                        return ((LLOctreeNode<T>*) node->getParent())->getNodeAt(pos, rad);
                 }
 
                 return node;
@@ -317,22 +329,15 @@ public:
                         return false;
                 }
                 LLOctreeNode<T>* node = getOctNode();
+                LLOctreeNode<T>* parent = node->getOctParent();
 
-                if (data->getBinRadius() <= node->getSize().mdV[0])
-                {
-                        oct_node* dest = getNodeAt(data);
-
-                        if (dest != node)
-                        {
-                                dest->insert(data);
-                                return false;
-                        }
-                }
-
-                //no kid found, is it even here?
-                if (node->isInside(data))
+                //is it here?
+                if (node->isInside(data->getPositionGroup()))
                 {
-                        if (node->contains(data))
+                        if (getElementCount() < LL_OCTREE_MAX_CAPACITY &&
+                                (node->contains(data->getBinRadius()) ||
+                                (data->getBinRadius() > node->getSize().mdV[0] &&
+                                parent && parent->getElementCount() >= LL_OCTREE_MAX_CAPACITY))) 
                         { //it belongs here
                                 if (data == NULL)
                                 {
@@ -353,7 +358,19 @@ public:
                                 return true;
                         }
                         else
-                        {               
+                        {       
+                                //find a child to give it to
+                                oct_node* child = NULL;
+                                for (U32 i = 0; i < getChildCount(); i++)
+                                {
+                                        child = getChild(i);
+                                        if (child->isInside(data->getPositionGroup()))
+                                        {
+                                                child->insert(data);
+                                                return false;
+                                        }
+                                }
+                                
                                 //it's here, but no kids are in the right place, make a new kid
                                 LLVector3d center(node->getCenter());
                                 LLVector3d size(node->getSize()*0.5);
@@ -385,7 +402,7 @@ public:
 
                                 //make the new kid
                                 LLOctreeState<T>* newstate = new LLOctreeState<T>();
-                                oct_node* child = new LLOctreeNode<T>(center, size, newstate, node);
+                                child = new LLOctreeNode<T>(center, size, newstate, node);
                                 addChild(child);
 
                                 child->insert(data);
@@ -393,8 +410,15 @@ public:
                 }
                 else 
                 {
-                        //it's not in here, give it to the parent
-                        node->getOctParent()->insert(data);
+                        //it's not in here, give it to the root
+                        LLOctreeNode<T>* parent = node->getOctParent();
+                        while (parent)
+                        {
+                                node = parent;
+                                parent = node->getOctParent();
+                        }
+
+                        node->insert(data);
                 }
 
                 return false;
diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp
index c0f03d2..ae52010 100644
--- a/linden/indra/llmath/llrand.cpp
+++ b/linden/indra/llmath/llrand.cpp
@@ -140,7 +140,14 @@ F32 ll_frand(F32 val)
 {
         // The clamping rules are described above.
         F32 rv = ll_internal_random_float() * val;
-        if(rv >= val) return 0.0f;
+        if(val > 0)
+        {
+                if(rv >= val) return 0.0f;
+        }
+        else
+        {
+                if(rv <= val) return 0.0f;
+        }
         return rv;
 }
 
@@ -153,6 +160,13 @@ F64 ll_drand(F64 val)
 {
         // The clamping rules are described above.
         F64 rv = ll_internal_random_double() * val;
-        if(rv >= val) return 0.0;
+        if(val > 0)
+        {
+                if(rv >= val) return 0.0;
+        }
+        else
+        {
+                if(rv <= val) return 0.0;
+        }
         return rv;
 }
diff --git a/linden/indra/llmath/llrand.h b/linden/indra/llmath/llrand.h
index 47b5651..1bf055e 100644
--- a/linden/indra/llmath/llrand.h
+++ b/linden/indra/llmath/llrand.h
@@ -63,7 +63,7 @@
 S32 ll_rand();
 
 /**
- *@brief Generate a float from [0, val).
+ *@brief Generate a float from [0, val) or (val, 0].
  */
 S32 ll_rand(S32 val);
 
@@ -73,7 +73,7 @@ S32 ll_rand(S32 val);
 F32 ll_frand();
 
 /**
- *@brief Generate a float from [0, val).
+ *@brief Generate a float from [0, val) or (val, 0].
  */
 F32 ll_frand(F32 val);
 
@@ -83,7 +83,7 @@ F32 ll_frand(F32 val);
 F64 ll_drand();
 
 /**
- *@brief Generate a double from [0, val).
+ *@brief Generate a double from [0, val) or (val, 0].
  */
 F64 ll_drand(F64 val);
 
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h
index 78ff759..ba3c867 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -41,7 +41,6 @@ class LLTreeState
 public:
         LLTreeState(LLTreeNode<T>* node)                                { setNode(node); }
         virtual ~LLTreeState() { };
-        
         virtual bool insert(T* data) = 0;
         virtual bool remove(T* data) = 0;
         virtual void setNode(LLTreeNode<T>* node);
@@ -54,7 +53,7 @@ private:
 };
 
 template <class T>
-class LLTreeListener
+class LLTreeListener: public LLRefCount
 {
 public:
         virtual ~LLTreeListener() { };
@@ -94,7 +93,7 @@ protected:
         
         LLTreeState<T>* mState;
 public:
-        std::vector<LLTreeListener<T>*> mListeners;
+        std::vector<LLPointer<LLTreeListener<T> > > mListeners;
 };
 
 template <class T>
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp
index 3fb31a6..b943fd9 100644
--- a/linden/indra/llmath/lluuid.cpp
+++ b/linden/indra/llmath/lluuid.cpp
@@ -170,15 +170,15 @@ void LLUUID::toString(char *out) const
 
 void LLUUID::toCompressedString(char *out) const
 {
-        memcpy(out, mData, UUID_BYTES);
+        memcpy(out, mData, UUID_BYTES);         /* Flawfinder: ignore */
         out[UUID_BYTES] = '\0';
 }
 
-LLString LLUUID::getString() const
+std::string LLUUID::asString() const
 {
-        char str[UUID_STR_SIZE];
+        char str[UUID_STR_SIZE];                /* Flawfinder: ignore */
         toString(str);
-        return LLString(str);
+        return std::string(str);
 }
 
 BOOL LLUUID::set(const std::string& in_string, BOOL emit)
@@ -203,11 +203,11 @@ BOOL LLUUID::set(const char *in_string, BOOL emit)
                 return TRUE;
         }
 
-        if (strlen(in_string) != (UUID_STR_LENGTH - 1))
+        if (strlen(in_string) != (UUID_STR_LENGTH - 1))         /* Flawfinder: ignore */
         {
                 // I'm a moron.  First implementation didn't have the right UUID format.
                 // Shouldn't see any of these any more
-                if (strlen(in_string) == (UUID_STR_LENGTH - 2))
+                if (strlen(in_string) == (UUID_STR_LENGTH - 2)) /* Flawfinder: ignore */
                 {
                         if(emit)
                         {
@@ -307,10 +307,10 @@ BOOL LLUUID::validate(const char *in_string)
         {
                 return FALSE;
         }
-        if (strlen(in_string) != (UUID_STR_LENGTH - 1))
+        if (strlen(in_string) != (UUID_STR_LENGTH - 1))         /* Flawfinder: ignore */
         {
                 // I'm a moron.  First implementation didn't have the right UUID format.
-                if (strlen(in_string) == (UUID_STR_LENGTH - 2))
+                if (strlen(in_string) == (UUID_STR_LENGTH - 2))         /* Flawfinder: ignore */
                 {
                         broken_format = TRUE;
                 }
@@ -414,7 +414,7 @@ std::ostream& operator<<(std::ostream& s, const LLUUID &uuid)
 std::istream& operator>>(std::istream &s, LLUUID &uuid)
 {
         U32 i;
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH];         /* Flawfinder: ignore */
         for (i = 0; i < UUID_STR_LENGTH-1; i++)
         {
                 s >> uuid_str[i];
@@ -480,7 +480,7 @@ S32 LLUUID::getNodeID(unsigned char * node_id)
           Ncb.ncb_command = NCBASTAT;
           Ncb.ncb_lana_num = lenum.lana[i];
 
-          strcpy( (char *)Ncb.ncb_callname,  "*               " );
+          strcpy( (char *)Ncb.ncb_callname,  "*               " );              /* Flawfinder: ignore */
           Ncb.ncb_buffer = (unsigned char *)&Adapter;
           Ncb.ncb_length = sizeof(Adapter);
 
@@ -497,7 +497,7 @@ S32 LLUUID::getNodeID(unsigned char * node_id)
 //                  Adapter.adapt.adapter_address[3],
 //                  Adapter.adapt.adapter_address[4],
 //                  Adapter.adapt.adapter_address[5] );
-                        memcpy(node_id,Adapter.adapt.adapter_address,6);
+                        memcpy(node_id,Adapter.adapt.adapter_address,6);                /* Flawfinder: ignore */
                         retval = 1;
 
           }
@@ -652,7 +652,7 @@ S32 LLUUID::getNodeID(unsigned char *node_id)
         n = ifc.ifc_len;
         for (i = 0; i < n; i+= ifreq_size(*ifr) ) {
                 ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
-                strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+                strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);                /* Flawfinder: ignore */
 #ifdef SIOCGIFHWADDR
                 if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
                         continue;
@@ -674,7 +674,7 @@ S32 LLUUID::getNodeID(unsigned char *node_id)
                 if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
                         continue;
                 if (node_id) {
-                        memcpy(node_id, a, 6);
+                        memcpy(node_id, a, 6);          /* Flawfinder: ignore */
                         close(sd);
                         return 1;
                 }
@@ -783,7 +783,7 @@ void LLUUID::generate()
         // Create a UUID.
         uuid_time_t timestamp;
 
-        static unsigned char node_id[6];
+        static unsigned char node_id[6];        /* Flawfinder: ignore */
         static int has_init = 0;
    
         // Create a UUID.
@@ -827,7 +827,7 @@ void LLUUID::generate()
                 if (clock_seq == 0) clock_seq++;
         }
 
-        memcpy(mData+10, node_id, 6);
+        memcpy(mData+10, node_id, 6);           /* Flawfinder: ignore */
         U32 tmp;
         tmp = timestamp.low;
         mData[3] = (unsigned char) tmp;
@@ -865,7 +865,7 @@ void LLUUID::generate()
 
 U32 LLUUID::getRandomSeed()
 {
-   static unsigned char seed[16];
+   static unsigned char seed[16];               /* Flawfinder: ignore */
    
    getNodeID(&seed[0]);
    seed[6]='\0';
diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llmath/lluuid.h
index b8288eb..aeda734 100644
--- a/linden/indra/llmath/lluuid.h
+++ b/linden/indra/llmath/lluuid.h
@@ -29,8 +29,7 @@
 
 #include <iostream>
 #include <set>
-
-#include "llstring.h"
+#include "stdtypes.h"
 
 const S32 UUID_BYTES = 16;
 const S32 UUID_WORDS = 4;
@@ -103,7 +102,9 @@ public:
 
         void toString(char *out) const;         // Does not allocate memory, needs 36 characters (including \0)
         void toCompressedString(char *out) const;       // Does not allocate memory, needs 17 characters (including \0)
-        LLString getString() const;
+
+        std::string asString() const;
+
         U16 getCRC16() const;
         U32 getCRC32() const;
 
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index c527e85..e42413a 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -724,11 +724,11 @@ BOOL LLProfile::generate(BOOL path_open,F32 detail, S32 split)
 BOOL LLProfileParams::importFile(FILE *fp)
 {
         const S32 BUFSIZE = 16384;
-        char buffer[BUFSIZE];
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
         // *NOTE: changing the size or type of these buffers will require
         // changing the sscanf below.
-        char keyword[256];
-        char valuestr[256];
+        char keyword[256];      /* Flawfinder: ignore */
+        char valuestr[256];     /* Flawfinder: ignore */
         keyword[0] = 0;
         valuestr[0] = 0;
         F32 tempF32;
@@ -737,7 +737,10 @@ BOOL LLProfileParams::importFile(FILE *fp)
         while (!feof(fp))
         {
                 fgets(buffer, BUFSIZE, fp);
-                sscanf(buffer, " %255s %255s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %255s %255s",
+                        keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -796,11 +799,11 @@ BOOL LLProfileParams::exportFile(FILE *fp) const
 BOOL LLProfileParams::importLegacyStream(std::istream& input_stream)
 {
         const S32 BUFSIZE = 16384;
-        char buffer[BUFSIZE];
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
         // *NOTE: changing the size or type of these buffers will require
         // changing the sscanf below.
-        char keyword[256];
-        char valuestr[256];
+        char keyword[256];      /* Flawfinder: ignore */
+        char valuestr[256];     /* Flawfinder: ignore */
         keyword[0] = 0;
         valuestr[0] = 0;
         F32 tempF32;
@@ -809,7 +812,11 @@ BOOL LLProfileParams::importLegacyStream(std::istream& input_stream)
         while (input_stream.good())
         {
                 input_stream.getline(buffer, BUFSIZE);
-                sscanf(buffer, " %255s %255s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %255s %255s",
+                        keyword,
+                        valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -1218,11 +1225,11 @@ BOOL LLDynamicPath::generate(F32 detail, S32 split)
 BOOL LLPathParams::importFile(FILE *fp)
 {
         const S32 BUFSIZE = 16384;
-        char buffer[BUFSIZE];
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
         // *NOTE: changing the size or type of these buffers will require
         // changing the sscanf below.
-        char keyword[256];
-        char valuestr[256];
+        char keyword[256];      /* Flawfinder: ignore */
+        char valuestr[256];     /* Flawfinder: ignore */
         keyword[0] = 0;
         valuestr[0] = 0;
 
@@ -1233,7 +1240,10 @@ BOOL LLPathParams::importFile(FILE *fp)
         while (!feof(fp))
         {
                 fgets(buffer, BUFSIZE, fp);
-                sscanf(buffer, " %255s %255s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %255s %255s",
+                        keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -1359,11 +1369,11 @@ BOOL LLPathParams::exportFile(FILE *fp) const
 BOOL LLPathParams::importLegacyStream(std::istream& input_stream)
 {
         const S32 BUFSIZE = 16384;
-        char buffer[BUFSIZE];
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
         // *NOTE: changing the size or type of these buffers will require
         // changing the sscanf below.
-        char keyword[256];
-        char valuestr[256];
+        char keyword[256];      /* Flawfinder: ignore */
+        char valuestr[256];     /* Flawfinder: ignore */
         keyword[0] = 0;
         valuestr[0] = 0;
 
@@ -1374,7 +1384,10 @@ BOOL LLPathParams::importLegacyStream(std::istream& input_stream)
         while (input_stream.good())
         {
                 input_stream.getline(buffer, BUFSIZE);
-                sscanf(buffer, " %255s %255s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer,
+                        " %255s %255s",
+                        keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -1771,9 +1784,6 @@ void LLVolume::createVolumeFaces()
                         mVolumeFaces[i].create();
                 }
         }
-
-        mBounds[1] = LLVector3(0,0,0);
-        mBounds[0] = LLVector3(512,512,512);
 }
 
 
@@ -1818,21 +1828,28 @@ void LLVolumeParams::copyParams(const LLVolumeParams &params)
         mPathParams.copyParams(params.mPathParams);
 }
 
+// Less restricitve approx 0 for volumes
+const F32 APPROXIMATELY_ZERO = 0.001f;
+bool approx_zero( F32 f, F32 tolerance = APPROXIMATELY_ZERO)
+{
+        return (f >= -tolerance) && (f <= tolerance);
+}
+
 // return true if in range (or nearly so)
-static bool limit_range(F32& v, F32 min, F32 max)
+static bool limit_range(F32& v, F32 min, F32 max, F32 tolerance = APPROXIMATELY_ZERO)
 {
         F32 min_delta = v - min;
         if (min_delta < 0.f)
         {
                 v = min;
-                if (!is_approx_zero(min_delta))
+                if (!approx_zero(min_delta, tolerance))
                         return false;
         }
         F32 max_delta = max - v;
         if (max_delta < 0.f)
         {
                 v = max;
-                if (!is_approx_zero(max_delta))
+                if (!approx_zero(max_delta, tolerance))
                         return false;
         }
         return true;
@@ -1847,9 +1864,10 @@ bool LLVolumeParams::setBeginAndEndS(const F32 b, const F32 e)
         valid &= limit_range(begin, 0.f, 1.f - MIN_CUT_DELTA);
 
         F32 end = e;
+        if (end >= .0149f && end < MIN_CUT_DELTA) end = MIN_CUT_DELTA; // eliminate warning for common rounding error
         valid &= limit_range(end, MIN_CUT_DELTA, 1.f);
 
-        valid &= limit_range(begin, 0.f, end - MIN_CUT_DELTA);
+        valid &= limit_range(begin, 0.f, end - MIN_CUT_DELTA, .01f);
 
         // Now set them.
         mProfileParams.setBegin(begin);
@@ -1869,7 +1887,7 @@ bool LLVolumeParams::setBeginAndEndT(const F32 b, const F32 e)
         F32 end = e;
         valid &= limit_range(end, MIN_CUT_DELTA, 1.f);
 
-        valid &= limit_range(begin, 0.f, end - MIN_CUT_DELTA);
+        valid &= limit_range(begin, 0.f, end - MIN_CUT_DELTA, .01f);
 
         // Now set them.
         mPathParams.setBegin(begin);
@@ -2026,7 +2044,7 @@ bool LLVolumeParams::setRadiusOffset(const F32 offset)
                 {
                         radius_offset = max_radius_mag;
                 }
-                valid = is_approx_zero(delta);
+                valid = approx_zero(delta, .1f);
         }
 
         mPathParams.setRadiusOffset(radius_offset);
@@ -2060,7 +2078,7 @@ bool LLVolumeParams::setSkew(const F32 skew_value)
                 {
                         skew = min_skew_mag;
                 }
-                valid = is_approx_zero(delta);
+                valid = approx_zero(delta, .01f);
         }
 
         mPathParams.setSkew(skew);
@@ -2185,7 +2203,7 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
         size_s_out = getProfile().getTotalOut();
         size_t = getPath().mPath.size();
 
-        if (open)
+        if (open)               /* Flawfinder: ignore */
         {
                 if (hollow)
                 {
@@ -2807,7 +2825,7 @@ noindices:
                 return NULL;
         }
         num_indices = count;
-        memcpy(indices, index, count * sizeof(S32));
+        memcpy(indices, index, count * sizeof(S32));            /* Flawfinder: ignore */
         return indices;
 }
 
@@ -2986,10 +3004,15 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
                                                 S32 v2 = face.mIndices[j*3+((k+1)%3)];
                                                 
                                                 vertices.push_back(face.mVertices[v1].mPosition*mat);
-                                                normals.push_back(face.mVertices[v1].mNormal*norm_mat);
+                                                LLVector3 norm1 = face.mVertices[v1].mNormal * norm_mat;
+                                                norm1.normVec();
+                                                normals.push_back(norm1);
 
                                                 vertices.push_back(face.mVertices[v2].mPosition*mat);
-                                                normals.push_back(face.mVertices[v2].mNormal*norm_mat);
+                                                LLVector3 norm2 = face.mVertices[v2].mNormal * norm_mat;
+                                                norm2.normVec();
+                                                normals.push_back(norm2);
+
                                                 segments.push_back(vertices.size());
                                         }
                                 }               
@@ -3310,7 +3333,7 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices,
 
         *output_triangles = new S32[cur_tri*3];
         num_output_triangles = cur_tri;
-        memcpy(*output_triangles, sorted_tris, 3*cur_tri*sizeof(S32));
+        memcpy(*output_triangles, sorted_tris, 3*cur_tri*sizeof(S32));          /* Flawfinder: ignore */
 
         /*
         llinfos << "Out vertices: " << num_output_vertices << llendl;
@@ -3347,16 +3370,16 @@ BOOL LLVolumeParams::importFile(FILE *fp)
 {
         //llinfos << "importing volume" << llendl;
         const S32 BUFSIZE = 16384;
-        char buffer[BUFSIZE];
+        char buffer[BUFSIZE];   /* Flawfinder: ignore */
         // *NOTE: changing the size or type of this buffer will require
         // changing the sscanf below.
-        char keyword[256];
+        char keyword[256];      /* Flawfinder: ignore */
         keyword[0] = 0;
 
         while (!feof(fp))
         {
                 fgets(buffer, BUFSIZE, fp);
-                sscanf(buffer, " %255s", keyword);
+                sscanf(buffer, " %255s", keyword);      /* Flawfinder: ignore */
                 if (!keyword)
                 {
                         continue;
@@ -3403,8 +3426,8 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream)
         const S32 BUFSIZE = 16384;
         // *NOTE: changing the size or type of this buffer will require
         // changing the sscanf below.
-        char buffer[BUFSIZE];
-        char keyword[256];
+        char buffer[BUFSIZE];           /* Flawfinder: ignore */
+        char keyword[256];              /* Flawfinder: ignore */
         keyword[0] = 0;
 
         while (input_stream.good())
@@ -3753,6 +3776,9 @@ BOOL LLVolumeFace::createUnCutCubeCap()
         num_vertices = (grid_size+1)*(grid_size+1);
         num_indices = quad_count * 4;
 
+        LLVector3& min = mExtents[0];
+        LLVector3& max = mExtents[1];
+
         S32 offset = 0;
         if (mTypeMask & TOP_MASK)
                 offset = (max_t-1) * max_s;
@@ -3792,32 +3818,6 @@ BOOL LLVolumeFace::createUnCutCubeCap()
         }
 
         S32     vtop = mVertices.size();
-//      S32     itop = mIndices.size();
-///     vector_append(mVertices,4);
-//      vector_append(mIndices,4);
-//      LLVector3 new_pt = lerp(pt1, pt2, t_fraction);
-#if 0
-        for(int t=0;t<4;t++){
-                VertexData vd;
-                vd.mPosition = corners[t].mPosition;
-                vd.mNormal = 
-                        ((corners[(t+1)%4].mPosition-corners[t].mPosition)%
-                         (corners[(t+2)%4].mPosition-corners[(t+1)%4].mPosition));
-                vd.mNormal.normVec();
-                
-                if (mTypeMask & TOP_MASK)
-                        vd.mNormal *= -1.0f;
-                vd.mBinormal = vd.mNormal;
-                vd.mTexCoord = corners[t].mTexCoord;
-                mVertices.push_back(vd);
-        }
-        int idxs[] = {0,1,2,2,3,0};
-        if (mTypeMask & TOP_MASK){
-                for(int i=0;i<6;i++)mIndices.push_back(vtop+idxs[i]);
-        }else{
-                for(int i=5;i>=0;i--)mIndices.push_back(vtop+idxs[i]);
-        }
-#else
         for(int gx = 0;gx<grid_size+1;gx++){
                 for(int gy = 0;gy<grid_size+1;gy++){
                         VertexData newVert;
@@ -3829,8 +3829,20 @@ BOOL LLVolumeFace::createUnCutCubeCap()
                                 (F32)gx/(F32)grid_size,
                                 (F32)gy/(F32)grid_size);
                         mVertices.push_back(newVert);
+
+                        if (gx == 0 && gy == 0)
+                        {
+                                min = max = newVert.mPosition;
+                        }
+                        else
+                        {
+                                update_min_max(min,max,newVert.mPosition);
+                        }
                 }
         }
+        
+        mCenter = (min + max) * 0.5f;
+
         int idxs[] = {0,1,(grid_size+1)+1,(grid_size+1)+1,(grid_size+1),0};
         for(int gx = 0;gx<grid_size;gx++){
                 for(int gy = 0;gy<grid_size;gy++){
@@ -3841,7 +3853,7 @@ BOOL LLVolumeFace::createUnCutCubeCap()
                         }
                 }
         }
-#endif
+        
         return TRUE;
 }
 
@@ -3888,12 +3900,15 @@ BOOL LLVolumeFace::createCap()
         // Figure out the normal, assume all caps are flat faces.
         // Cross product to get normals.
         
-        LLVector2 cuv = LLVector2(0,0);
-        
+        LLVector2 cuv;
+        LLVector2 min_uv, max_uv;
+
+        LLVector3& min = mExtents[0];
+        LLVector3& max = mExtents[1];
+
         // Copy the vertices into the array
         for (i = 0; i < num_vertices; i++)
         {
-
                 if (mTypeMask & TOP_MASK)
                 {
                         mVertices[i].mTexCoord.mV[0] = profile[i].mV[0]+0.5f;
@@ -3906,17 +3921,22 @@ BOOL LLVolumeFace::createCap()
                         mVertices[i].mTexCoord.mV[1] = 0.5f - profile[i].mV[1];
                 }
 
-                if(i){
-                        //Dont include the first point of the profile in the average
-                        cuv += mVertices[i].mTexCoord;
-                        mCenter += mVertices[i].mPosition = mesh[i + offset].mPos;
+                mVertices[i].mPosition = mesh[i + offset].mPos;
+                
+                if (i == 0)
+                {
+                        min = max = mVertices[i].mPosition;
+                        min_uv = max_uv = mVertices[i].mTexCoord;
+                }
+                else
+                {
+                        update_min_max(min,max, mVertices[i].mPosition);
+                        update_min_max(min_uv, max_uv, mVertices[i].mTexCoord);
                 }
-                else mVertices[i].mPosition = mesh[i + offset].mPos;
-                //mVertices[i].mNormal = normal;
         }
 
-        mCenter /= (F32)(num_vertices-1);
-        cuv /= (F32)(num_vertices-1);
+        mCenter = (min+max)*0.5f;
+        cuv = (min_uv + max_uv)*0.5f;
 
         LLVector3 binormal = calc_binormal_from_triangle( 
                 mCenter, cuv,
@@ -4221,13 +4241,11 @@ BOOL LLVolumeFace::createCap()
         return TRUE;
 }
 
-
 BOOL LLVolumeFace::createSide()
 {
         BOOL flat = mTypeMask & FLAT_MASK;
         S32 num_vertices, num_indices;
 
-
         const std::vector<LLVolume::Point>& mesh = mVolumep->getMesh();
         const std::vector<LLVector3>& profile = mVolumep->getProfile().mProfile;
         const std::vector<LLPath::PathPt>& path_data = mVolumep->getPath().mPath;
@@ -4243,6 +4261,9 @@ BOOL LLVolumeFace::createSide()
         vector_append(mIndices,num_indices);
         vector_append(mEdge, num_indices);
 
+        LLVector3& face_min = mExtents[0];
+        LLVector3& face_max = mExtents[1];
+
         mCenter.clearVec();
 
         S32 begin_stex = llfloor( profile[mBeginS].mV[2] );
@@ -4290,17 +4311,26 @@ BOOL LLVolumeFace::createSide()
                                 i = mBeginS + s + max_s*t;
                         }
 
-                        mCenter += mVertices[cur_vertex].mPosition = mesh[i].mPos;
+                        mVertices[cur_vertex].mPosition = mesh[i].mPos;
                         mVertices[cur_vertex].mTexCoord = LLVector2(ss,tt);
                 
                         mVertices[cur_vertex].mNormal = LLVector3(0,0,0);
                         mVertices[cur_vertex].mBinormal = LLVector3(0,0,0);
                         
+                        if (cur_vertex == 0)
+                        {
+                                face_min = face_max = mesh[i].mPos;
+                        }
+                        else
+                        {
+                                update_min_max(face_min, face_max, mesh[i].mPos);
+                        }
+
                         cur_vertex++;
 
                         if ((mTypeMask & INNER_MASK) && (mTypeMask & FLAT_MASK) && mNumS > 2 && s > 0)
                         {
-                                mCenter += mVertices[cur_vertex].mPosition = mesh[i].mPos;
+                                mVertices[cur_vertex].mPosition = mesh[i].mPos;
                                 mVertices[cur_vertex].mTexCoord = LLVector2(ss,tt);
                         
                                 mVertices[cur_vertex].mNormal = LLVector3(0,0,0);
@@ -4322,15 +4352,19 @@ BOOL LLVolumeFace::createSide()
 
                         i = mBeginS + s + max_s*t;
                         ss = profile[mBeginS + s].mV[2] - begin_stex;
-                        mCenter += mVertices[cur_vertex].mPosition = mesh[i].mPos;
+                        mVertices[cur_vertex].mPosition = mesh[i].mPos;
                         mVertices[cur_vertex].mTexCoord = LLVector2(ss,tt);
                 
                         mVertices[cur_vertex].mNormal = LLVector3(0,0,0);
                         mVertices[cur_vertex].mBinormal = LLVector3(0,0,0);
+
+                        update_min_max(face_min,face_max,mesh[i].mPos);
+
                         cur_vertex++;
                 }
         }
-        mCenter /= (F32)num_vertices;
+        
+        mCenter = (face_min + face_max) * 0.5f;
 
         S32 cur_index = 0;
         S32 cur_edge = 0;
@@ -4454,32 +4488,14 @@ BOOL LLVolumeFace::createSide()
                 }
         }
 
-        //this loop would LOVE OpenMP
-        LLVector3 min = mVolumep->mBounds[0] - mVolumep->mBounds[1];
-        LLVector3 max = mVolumep->mBounds[0] + mVolumep->mBounds[1];
-
-        if (min == max && min == LLVector3(512,512,512))
+        //normalize normals and binormals here so the meshes that reference
+        //this volume data don't have to
+        for (U32 i = 0; i < mVertices.size(); i++) 
         {
-                min = max = mVertices[0].mPosition;
-        }
-
-        for (U32 i = 0; i < mVertices.size(); i++) {
                 mVertices[i].mNormal.normVec();
                 mVertices[i].mBinormal.normVec();
-
-                for (U32 j = 0; j < 3; j++) {
-                        if (mVertices[i].mPosition.mV[j] > max.mV[j]) {
-                                max.mV[j] = mVertices[i].mPosition.mV[j];
-                        }
-                        if (mVertices[i].mPosition.mV[j] < min.mV[j]) {
-                                min.mV[j] = mVertices[i].mPosition.mV[j];
-                        }
-                }
         }
 
-        mVolumep->mBounds[0] = (min + max) * 0.5f; //center
-        mVolumep->mBounds[1] = (max - min) * 0.5f; //half-height
-
         return TRUE;
 }
 
@@ -4578,7 +4594,7 @@ LLVector3 calc_binormal_from_triangle(
                                 -r0.mV[VZ] / r0.mV[VX],
                                 -r1.mV[VZ] / r1.mV[VX],
                                 -r2.mV[VZ] / r2.mV[VX]);
-                //binormal.normVec();
+                // binormal.normVec();
                 return binormal;
         }
         else
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index 63981da..91f7c9b 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -775,6 +775,8 @@ public:
         S32 mNumS;
         S32 mNumT;
 
+        LLVector3 mExtents[2]; //minimum and maximum point of face
+
         std::vector<VertexData> mVertices;
         std::vector<S32>        mIndices;
         std::vector<S32>        mEdge;
@@ -868,7 +870,6 @@ public:
         const LLVolumeFace &getVolumeFace(const S32 f) const {return mVolumeFaces[f];} // DO NOT DELETE VOLUME WHILE USING THIS REFERENCE, OR HOLD A POINTER TO THIS VOLUMEFACE
 
         U32                                     mFaceMask;                      // bit array of which faces exist in this volume
-        LLVector3                       mBounds[2];                     // bounding box (center, half-height)
         LLVector3                       mLODScaleBias;          // vector for biasing LOD based on scale
 
 protected:
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index 6b6182a..2aa480c 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -286,7 +286,7 @@ F32 LLVolumeLODGroup::getVolumeScaleFromDetail(const S32 detail)
 
 F32 LLVolumeLODGroup::dump()
 {
-        char dump_str[255];
+        char dump_str[255];             /* Flawfinder: ignore */
         F32 usage = 0.f;
         for (S32 i = 0; i < NUM_LODS; i++)
         {
@@ -297,7 +297,7 @@ F32 LLVolumeLODGroup::dump()
         }
         usage = usage / (F32)NUM_LODS;
 
-        sprintf(dump_str, "%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);
+        snprintf(dump_str, sizeof(dump_str), "%.3f %d %d %d %d", usage, mAccessCount[0], mAccessCount[1], mAccessCount[2], mAccessCount[3]);            /* Flawfinder: ignore */
 
         llinfos << dump_str << llendl;
         return usage;
diff --git a/linden/indra/llmath/m3math.cpp b/linden/indra/llmath/m3math.cpp
index c5d2c2d..4d93af6 100644
--- a/linden/indra/llmath/m3math.cpp
+++ b/linden/indra/llmath/m3math.cpp
@@ -52,14 +52,14 @@
 
 LLMatrix3::LLMatrix3(const LLQuaternion &q)
 {
-        *this = q.getMatrix3();
+        setRot(q);
 }
 
 
 LLMatrix3::LLMatrix3(const F32 angle, const LLVector3 &vec)
 {
         LLQuaternion    quat(angle, vec);
-        *this = setRot(quat);
+        setRot(quat);
 }
 
 LLMatrix3::LLMatrix3(const F32 angle, const LLVector3d &vec)
@@ -67,60 +67,25 @@ LLMatrix3::LLMatrix3(const F32 angle, const LLVector3d &vec)
         LLVector3 vec_f;
         vec_f.setVec(vec);
         LLQuaternion    quat(angle, vec_f);
-        *this = setRot(quat);
+        setRot(quat);
 }
 
 LLMatrix3::LLMatrix3(const F32 angle, const LLVector4 &vec)
 {
         LLQuaternion    quat(angle, vec);
-        *this = setRot(quat);
+        setRot(quat);
 }
 
 LLMatrix3::LLMatrix3(const F32 angle, const F32 x, const F32 y, const F32 z)
 {
         LLVector3 vec(x, y, z);
         LLQuaternion    quat(angle, vec);
-        *this = setRot(quat);
+        setRot(quat);
 }
 
 LLMatrix3::LLMatrix3(const F32 roll, const F32 pitch, const F32 yaw)
 {
-        // Rotates RH about x-axis by 'roll'  then
-        // rotates RH about the old y-axis by 'pitch' then
-        // rotates RH about the original z-axis by 'yaw'.
-        //                .
-        //               /|\ yaw axis
-        //                |     __.
-        //   ._        ___|      /| pitch axis
-        //  _||\       \\ |-.   /
-        //  \|| \_______\_|__\_/_______
-        //   | _ _   o o o_o_o_o o   /_\_  ________\ roll axis
-        //   //  /_______/    /__________>         /   
-        //  /_,-'       //   /
-        //             /__,-'
-
-        F32             cx, sx, cy, sy, cz, sz;
-        F32             cxsy, sxsy;
-
-    cx = (F32)cos(roll); //A
-    sx = (F32)sin(roll); //B
-    cy = (F32)cos(pitch); //C
-    sy = (F32)sin(pitch); //D
-    cz = (F32)cos(yaw); //E
-    sz = (F32)sin(yaw); //F
-
-    cxsy = cx * sy; //AD
-    sxsy = sx * sy; //BD 
-
-    mMatrix[0][0] =  cy * cz;
-    mMatrix[1][0] = -cy * sz;
-    mMatrix[2][0] = sy;
-    mMatrix[0][1] = sxsy * cz + cx * sz;
-    mMatrix[1][1] = -sxsy * sz + cx * cz;
-    mMatrix[2][1] = -sx * cy;
-    mMatrix[0][2] =  -cxsy * cz + sx * sz;
-    mMatrix[1][2] =  cxsy * sz + sx * cz;
-    mMatrix[2][2] =  cx * cy;
+        setRot(roll,pitch,yaw);
 }
 
 // From Matrix and Quaternion FAQ
@@ -307,34 +272,64 @@ LLQuaternion	LLMatrix3::quaternion() const
 // These functions take Rotation arguments
 const LLMatrix3&        LLMatrix3::setRot(const F32 angle, const F32 x, const F32 y, const F32 z)
 {
-        LLMatrix3       mat(angle, x, y, z);
-        *this = mat;
+        setRot(LLQuaternion(angle,x,y,z));
         return *this;
 }
 
 const LLMatrix3&        LLMatrix3::setRot(const F32 angle, const LLVector3 &vec)
 {
-        LLMatrix3       mat(angle, vec);
-        *this = mat;
+        setRot(LLQuaternion(angle, vec));
         return *this;
 }
 
 const LLMatrix3&        LLMatrix3::setRot(const F32 roll, const F32 pitch, const F32 yaw)
 {
-        LLMatrix3       mat(roll, pitch, yaw); 
-        *this = mat;
+        // Rotates RH about x-axis by 'roll'  then
+        // rotates RH about the old y-axis by 'pitch' then
+        // rotates RH about the original z-axis by 'yaw'.
+        //                .
+        //               /|\ yaw axis
+        //                |     __.
+        //   ._        ___|      /| pitch axis
+        //  _||\       \\ |-.   /
+        //  \|| \_______\_|__\_/_______
+        //   | _ _   o o o_o_o_o o   /_\_  ________\ roll axis
+        //   //  /_______/    /__________>         /   
+        //  /_,-'       //   /
+        //             /__,-'
+
+        F32             cx, sx, cy, sy, cz, sz;
+        F32             cxsy, sxsy;
+
+    cx = (F32)cos(roll); //A
+    sx = (F32)sin(roll); //B
+    cy = (F32)cos(pitch); //C
+    sy = (F32)sin(pitch); //D
+    cz = (F32)cos(yaw); //E
+    sz = (F32)sin(yaw); //F
+
+    cxsy = cx * sy; //AD
+    sxsy = sx * sy; //BD 
+
+    mMatrix[0][0] =  cy * cz;
+    mMatrix[1][0] = -cy * sz;
+    mMatrix[2][0] = sy;
+    mMatrix[0][1] = sxsy * cz + cx * sz;
+    mMatrix[1][1] = -sxsy * sz + cx * cz;
+    mMatrix[2][1] = -sx * cy;
+    mMatrix[0][2] =  -cxsy * cz + sx * sz;
+    mMatrix[1][2] =  cxsy * sz + sx * cz;
+    mMatrix[2][2] =  cx * cy;
         return *this;
 }
 
 
 const LLMatrix3&        LLMatrix3::setRot(const LLQuaternion &q)
 {
-        LLMatrix3       mat(q);
-        *this = mat;
+        *this = q.getMatrix3();
         return *this;
 }
 
-
 const LLMatrix3&        LLMatrix3::setRows(const LLVector3 &fwd, const LLVector3 &left, const LLVector3 &up)
 {
         mMatrix[0][0] = fwd.mV[0];
diff --git a/linden/indra/llmath/m3math.h b/linden/indra/llmath/m3math.h
index 74c5203..494856a 100644
--- a/linden/indra/llmath/m3math.h
+++ b/linden/indra/llmath/m3math.h
@@ -51,9 +51,6 @@ class LLQuaternion;
 
 
 static const U32 NUM_VALUES_IN_MAT3     = 3;
-#if LL_WINDOWS
-__declspec( align(16) )
-#endif
 class LLMatrix3
 {
         public:
@@ -138,11 +135,7 @@ class LLMatrix3
                 friend const LLMatrix3& operator*=(LLMatrix3 &a, const LLMatrix3 &b);                           // Return a * b
 
                 friend std::ostream&     operator<<(std::ostream& s, const LLMatrix3 &a);       // Stream a
-}
-#if LL_DARWIN
-__attribute__ ((aligned (16)))
-#endif
-;
+};
 
 inline LLMatrix3::LLMatrix3(void)
 {
diff --git a/linden/indra/llmath/m4math.h b/linden/indra/llmath/m4math.h
index fe9b26a..7de29ed 100644
--- a/linden/indra/llmath/m4math.h
+++ b/linden/indra/llmath/m4math.h
@@ -92,9 +92,6 @@ class LLQuaternion;
 
 static const U32 NUM_VALUES_IN_MAT4 = 4;
 
-#if LL_WINDOWS
-__declspec(align(16))
-#endif
 class LLMatrix4
 {
 public:
@@ -237,11 +234,7 @@ public:
         friend const LLMatrix4& operator*=(LLMatrix4 &a, const F32 &b);                 // Return a * b
 
         friend std::ostream&     operator<<(std::ostream& s, const LLMatrix4 &a);       // Stream a
-}
-#if LL_DARWIN
-__attribute__ ((aligned (16)))
-#endif
-;
+};
 
 
 inline LLMatrix4::LLMatrix4()
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h
index 1832403..c978fc0 100644
--- a/linden/indra/llmath/v2math.h
+++ b/linden/indra/llmath/v2math.h
@@ -317,6 +317,21 @@ inline LLVector2 operator-(const LLVector2 &a)
         return LLVector2( -a.mV[0], -a.mV[1] );
 }
 
+inline void update_min_max(LLVector2& min, LLVector2& max, const LLVector2& pos)
+{
+        for (U32 i = 0; i < 2; i++)
+        {
+                if (min.mV[i] > pos.mV[i])
+                {
+                        min.mV[i] = pos.mV[i];
+                }
+                if (max.mV[i] < pos.mV[i])
+                {
+                        max.mV[i] = pos.mV[i];
+                }
+        }
+}
+
 inline std::ostream& operator<<(std::ostream& s, const LLVector2 &a) 
 {
         s << "{ " << a.mV[VX] << ", " << a.mV[VY] << " }";
diff --git a/linden/indra/llmath/v3color.h b/linden/indra/llmath/v3color.h
index 606a810..06a94db 100644
--- a/linden/indra/llmath/v3color.h
+++ b/linden/indra/llmath/v3color.h
@@ -166,7 +166,7 @@ inline LLColor3::LLColor3(const F32 *vec)
 
 inline LLColor3::LLColor3(char* color_string) // takes a string of format "RRGGBB" where RR is hex 00..FF 
 {
-        if (strlen(color_string) <  6)
+        if (strlen(color_string) <  6)          /* Flawfinder: ignore */
         {
                 mV[0] = 0.f;
                 mV[1] = 0.f;
@@ -174,8 +174,8 @@ inline LLColor3::LLColor3(char* color_string) // takes a string of format "RRGGB
                 return;
         }
 
-        static char tempstr[7];
-        strncpy(tempstr,color_string,6);
+        static char tempstr[7];         /* Flawfinder: ignore */
+        strncpy(tempstr,color_string,6);                /* Flawfinder: ignore */
         tempstr[6] = '\0';
         mV[VZ] = (F32)strtol(&tempstr[4],NULL,16)/255.f;
         tempstr[4] = '\0';
diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp
index 39d3b70..a97b6d8 100644
--- a/linden/indra/llmath/v3math.cpp
+++ b/linden/indra/llmath/v3math.cpp
@@ -137,7 +137,7 @@ const LLVector3&	LLVector3::rotVec(F32 angle, const LLVector3 &vec)
 {
         if ( !vec.isExactlyZero() && angle )
         {
-                *this = *this * LLMatrix3(angle, vec);
+                *this = *this * LLQuaternion(angle, vec);
         }
         return *this;
 }
@@ -147,7 +147,7 @@ const LLVector3&	LLVector3::rotVec(F32 angle, F32 x, F32 y, F32 z)
         LLVector3 vec(x, y, z);
         if ( !vec.isExactlyZero() && angle )
         {
-                *this = *this * LLMatrix3(angle, vec);
+                *this = *this * LLQuaternion(angle, vec);
         }
         return *this;
 }
@@ -198,6 +198,33 @@ LLVector3::LLVector3(const LLVector4 &vec)
         mV[VZ] = (F32)vec.mV[VZ];
 }
 
+LLVector3::LLVector3(const LLSD& sd)
+{
+        setValue(sd);
+}
+
+LLSD LLVector3::getValue() const
+{
+        LLSD ret;
+        ret[0] = mV[0];
+        ret[1] = mV[1];
+        ret[2] = mV[2];
+        return ret;
+}
+
+void LLVector3::setValue(const LLSD& sd)
+{
+        mV[0] = (F32) sd[0].asReal();
+        mV[1] = (F32) sd[1].asReal();
+        mV[2] = (F32) sd[2].asReal();
+}
+
+const LLVector3& LLVector3::operator=(const LLSD& sd)
+{
+        setValue(sd);
+        return *this;
+}
+
 const LLVector3& operator*=(LLVector3 &a, const LLQuaternion &rot)
 {
     const F32 rw = - rot.mQ[VX] * a.mV[VX] - rot.mQ[VY] * a.mV[VY] - rot.mQ[VZ] * a.mV[VZ];
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index 68e60de..e7134eb 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -37,7 +37,7 @@ class LLMatrix3;
 class LLVector3d;
 class LLQuaternion;
 
-//  Llvector3 = |x y z w|
+//  LLvector3 = |x y z w|
 
 static const U32 LENGTHOFVECTOR3 = 3;
 
@@ -60,32 +60,13 @@ class LLVector3
                 inline explicit LLVector3(const F32 *vec);                              // Initializes LLVector3 to (vec[0]. vec[1], vec[2])
                 explicit LLVector3(const LLVector3d &vec);                              // Initializes LLVector3 to (vec[0]. vec[1], vec[2])
                 explicit LLVector3(const LLVector4 &vec);                               // Initializes LLVector4 to (vec[0]. vec[1], vec[2])
-                LLVector3(const LLSD& sd)
-                {
-                        setValue(sd);
-                }
+                LLVector3(const LLSD& sd);
 
-                LLSD getValue() const
-                {
-                        LLSD ret;
-                        ret[0] = mV[0];
-                        ret[1] = mV[1];
-                        ret[2] = mV[2];
-                        return ret;
-                }
+                LLSD getValue() const;
 
-                void setValue(const LLSD& sd)
-                {
-                        mV[0] = (F32) sd[0].asReal();
-                        mV[1] = (F32) sd[1].asReal();
-                        mV[2] = (F32) sd[2].asReal();
-                }
+                void setValue(const LLSD& sd);
 
-                const LLVector3& operator=(const LLSD& sd)
-                {
-                        setValue(sd);
-                        return *this;
-                }
+                const LLVector3& operator=(const LLSD& sd);
 
                 inline BOOL isFinite() const;                                                                   // checks to see if all values of LLVector3 are finite
                 BOOL            clamp(F32 min, F32 max);                // Clamps all values to (min,max), returns TRUE if data changed
@@ -434,6 +415,20 @@ inline BOOL	LLVector3::isNull() const
         return FALSE;
 }
 
+inline void update_min_max(LLVector3& min, LLVector3& max, const LLVector3& pos)
+{
+        for (U32 i = 0; i < 3; i++)
+        {
+                if (min.mV[i] > pos.mV[i])
+                {
+                        min.mV[i] = pos.mV[i];
+                }
+                if (max.mV[i] < pos.mV[i])
+                {
+                        max.mV[i] = pos.mV[i];
+                }
+        }
+}
 
 inline F32 angle_between(const LLVector3& a, const LLVector3& b)
 {
diff --git a/linden/indra/llmath/v4math.h b/linden/indra/llmath/v4math.h
index 06ac777..f768ba7 100644
--- a/linden/indra/llmath/v4math.h
+++ b/linden/indra/llmath/v4math.h
@@ -40,10 +40,6 @@ class LLQuaternion;
 
 static const U32 LENGTHOFVECTOR4 = 4;
 
-#if LL_WINDOWS
-__declspec( align(16) )
-#endif
-
 class LLVector4
 {
         public:
@@ -114,12 +110,7 @@ class LLVector4
                 friend const LLVector4& operator/=(LLVector4 &a, F32 k);                                // Return a divided by scaler k
 
                 friend LLVector4 operator-(const LLVector4 &a);                                 // Return vector -a
-}
-#if LL_DARWIN
-__attribute__ ((aligned (16)))
-#endif
-;
-
+};
 
 // Non-member functions 
 F32 angle_between(const LLVector4 &a, const LLVector4 &b);              // Returns angle (radians) between a and b
diff --git a/linden/indra/llmedia/llmedia_vc8.vcproj b/linden/indra/llmedia/llmedia_vc8.vcproj
new file mode 100644
index 0000000..12fa817
--- /dev/null
+++ b/linden/indra/llmedia/llmedia_vc8.vcproj
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llmedia"

+        ProjectGUID="{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"

+        RootNamespace="llmedia"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XP_WIN;XP_WIN32"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                                DisableSpecificWarnings="4702"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmedia.lib"

+                                AdditionalLibraryDirectories=""

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                InlineFunctionExpansion="0"

+                                EnableIntrinsicFunctions="false"

+                                AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="false"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                                DisableSpecificWarnings="4702"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmedia.lib"

+                                AdditionalLibraryDirectories=""

+                                IgnoreAllDefaultLibraries="false"

+                                IgnoreDefaultLibraryNames=""

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                InlineFunctionExpansion="0"

+                                EnableIntrinsicFunctions="false"

+                                AdditionalIncludeDirectories="..\llcommon;..\llrender;..\llwindow;..\llimage;..\llmath;..\llvfs;..\llmessage;..\llui;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                                DisableSpecificWarnings="4702"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmedia.lib"

+                                AdditionalLibraryDirectories=""

+                                IgnoreAllDefaultLibraries="false"

+                                IgnoreDefaultLibraryNames=""

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{44DBC47A-0AF0-4726-A094-2D6FBB65FFFA}"

+                        >

+                        <File

+                                RelativePath=".\llmediabase.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaengine.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaimplquicktime.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediamoviebase.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediamoviebase.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{D188664C-B9B7-4982-8C4B-8D9A44B4D9EF}"

+                        >

+                        <File

+                                RelativePath=".\llmediabase.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaemitter.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaemitterevents.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaengine.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaimplquicktime.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaobservers.h"

+                                >

+                        </File>

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llmedia/llmediaengine.cpp b/linden/indra/llmedia/llmediaengine.cpp
index c3930a4..c8a21ba 100644
--- a/linden/indra/llmedia/llmediaengine.cpp
+++ b/linden/indra/llmedia/llmediaengine.cpp
@@ -567,7 +567,7 @@ void LLMediaEngine::process_parcel_media( LLMessageSystem *msg, void ** )
 void LLMediaEngine::process_parcel_media_update( LLMessageSystem *msg, void ** )
 {
         LLUUID media_uuid;
-        char media_url[255];
+        char media_url[255];    /* Flawfinder: ignore */
         U8 auto_align;
         msg->getUUID( "DataBlock", "MediaID", media_uuid );
         msg->getString( "DataBlock", "MediaURL", 255, media_url );
diff --git a/linden/indra/llmedia/llmediaengine.h b/linden/indra/llmedia/llmediaengine.h
index 1efebec..0d0db58 100644
--- a/linden/indra/llmedia/llmediaengine.h
+++ b/linden/indra/llmedia/llmediaengine.h
@@ -62,7 +62,7 @@ public:
         BOOL update ();
         
         // Pass web_url true if it's a web page, false if it's a movie.
-        // path is to mozilla directory for mozila
+        // path is to mozilla directory for mozilla
         BOOL load( const LLString& urlIn, bool web_url, const LLString& path, S32 width_pixels, S32 height_pixels);
         
         BOOL isLoaded ();
diff --git a/linden/indra/llmedia/llmediaimplquicktime.cpp b/linden/indra/llmedia/llmediaimplquicktime.cpp
index 74b6cd9..6489f66 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.cpp
+++ b/linden/indra/llmedia/llmediaimplquicktime.cpp
@@ -383,7 +383,7 @@ myFrameDrawnCallback ( Movie callbackMovie, long refCon )
 
         LockPixels ( myQtRenderer->pixmapHandle );
 
-        memcpy ( ( U8* ) myQtRenderer->mediaData, pixels, myQtRenderer->getMediaBufferSize () );
+        memcpy ( ( U8* ) myQtRenderer->mediaData, pixels, myQtRenderer->getMediaBufferSize () );        /* Flawfinder: ignore */
 
         UnlockPixels ( myQtRenderer->pixmapHandle );
 #endif
diff --git a/linden/indra/llmessage/files.lst b/linden/indra/llmessage/files.lst
index b2f7d41..2ff3771 100644
--- a/linden/indra/llmessage/files.lst
+++ b/linden/indra/llmessage/files.lst
@@ -1,10 +1,12 @@
 llmessage/llassetstorage.cpp
+llmessage/llblowfishcipher.cpp
 llmessage/llbuffer.cpp
 llmessage/llbufferstream.cpp
 llmessage/llcachename.cpp
 llmessage/llchainio.cpp
 llmessage/llcircuit.cpp
 llmessage/llclassifiedflags.cpp
+llmessage/llcurl.cpp
 llmessage/lldatapacker.cpp
 llmessage/lldispatcher.cpp
 llmessage/llfiltersd2xmlrpc.cpp
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index eb26157..a8cd0e5 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -174,10 +174,40 @@ LLAssetRequest::LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType type
         mTime = LLMessageSystem::getMessageTimeSeconds(TRUE);
 }
 
+// virtual
 LLAssetRequest::~LLAssetRequest()
 {
 }
 
+// virtual
+LLSD LLAssetRequest::getTerseDetails() const
+{
+        LLSD sd;
+        sd["asset_id"] = getUUID();
+        sd["type_long"] = LLAssetType::lookupHumanReadable(getType());
+        sd["type"] = LLAssetType::lookup(getType());
+        sd["time"] = mTime;
+        time_t timestamp = (time_t) mTime;
+        std::ostringstream time_string;
+        time_string << ctime(&timestamp);
+        sd["time_string"] = time_string.str();
+        return sd;
+}
+
+// virtual
+LLSD LLAssetRequest::getFullDetails() const
+{
+        LLSD sd = getTerseDetails();
+        sd["host"] = mHost.getIPandPort();
+        sd["requesting_agent"] = mRequestingAgentID;
+        sd["is_temp"] = mIsTemp;
+        sd["is_local"] = mIsLocal;
+        sd["is_priority"] = mIsPriority;
+        sd["data_send_in_first_packet"] = mDataSentInFirstPacket;
+        sd["data_is_in_vfs"] = mDataIsInVFS;
+
+        return sd;
+}
 
 ///----------------------------------------------------------------------------
 /// LLInvItemRequest
@@ -298,47 +328,41 @@ void LLAssetStorage::checkForTimeouts()
 
 void LLAssetStorage::_cleanupRequests(BOOL all, S32 error)
 {
-        const S32 NUM_QUEUES = 3;
         F64 mt_secs = LLMessageSystem::getMessageTimeSeconds();
 
-        std::list<LLAssetRequest*>* requests[NUM_QUEUES];
-        requests[0] = &mPendingDownloads;
-        requests[1] = &mPendingUploads;
-        requests[2] = &mPendingLocalUploads;
-        static const char* REQUEST_TYPE[NUM_QUEUES] = { "download", "upload", "localuploads"};
-        
-        std::list<LLAssetRequest*> timed_out;
-        
-        for (S32 ii = 0; ii < NUM_QUEUES; ++ii)
+        request_list_t timed_out;
+        S32 rt;
+        for (rt = 0; rt < RT_COUNT; rt++)
         {
-                for (std::list<LLAssetRequest*>::iterator iter = requests[ii]->begin();
-                         iter != requests[ii]->end(); )
+                request_list_t* requests = getRequestList((ERequestType)rt);
+                for (request_list_t::iterator iter = requests->begin();
+                         iter != requests->end(); )
                 {
-                        std::list<LLAssetRequest*>::iterator curiter = iter++;
+                        request_list_t::iterator curiter = iter++;
                         LLAssetRequest* tmp = *curiter;
                         // if all is true, we want to clean up everything
                         // otherwise just check for timed out requests
                         // EXCEPT for upload timeouts
                         if (all 
-                                || ((0 == ii)
+                                || ((RT_DOWNLOAD == rt)
                                         && LL_ASSET_STORAGE_TIMEOUT < (mt_secs - tmp->mTime)))
                         {
-                                llwarns << "Asset " << REQUEST_TYPE[ii] << " request "
+                                llwarns << "Asset " << getRequestName((ERequestType)rt) << " request "
                                                 << (all ? "aborted" : "timed out") << " for "
                                                 << tmp->getUUID() << "."
                                                 << LLAssetType::lookup(tmp->getType()) << llendl;
 
                                 timed_out.push_front(tmp);
-                                iter = requests[ii]->erase(curiter);
+                                iter = requests->erase(curiter);
                         }
                 }
         }
 
         LLAssetInfo     info;
-        for (std::list<LLAssetRequest*>::iterator iter = timed_out.begin();
+        for (request_list_t::iterator iter = timed_out.begin();
                  iter != timed_out.end();  )
         {
-                std::list<LLAssetRequest*>::iterator curiter = iter++;
+                request_list_t::iterator curiter = iter++;
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mUpCallback)
                 {
@@ -401,7 +425,7 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
                 BOOL duplicate = FALSE;
                 
                 // check to see if there's a pending download of this uuid already
-                for (std::list<LLAssetRequest*>::iterator iter = mPendingDownloads.begin();
+                for (request_list_t::iterator iter = mPendingDownloads.begin();
                          iter != mPendingDownloads.end(); ++iter )
                 {
                         LLAssetRequest  *tmp = *iter;
@@ -523,11 +547,11 @@ void LLAssetStorage::downloadCompleteCallback(
         // find and callback ALL pending requests for this UUID
         // SJB: We process the callbacks in reverse order, I do not know if this is important,
         //      but I didn't want to mess with it.
-        std::list<LLAssetRequest*> requests;
-        for (std::list<LLAssetRequest*>::iterator iter = gAssetStorage->mPendingDownloads.begin();
+        request_list_t requests;
+        for (request_list_t::iterator iter = gAssetStorage->mPendingDownloads.begin();
                  iter != gAssetStorage->mPendingDownloads.end();  )
         {
-                std::list<LLAssetRequest*>::iterator curiter = iter++;
+                request_list_t::iterator curiter = iter++;
                 LLAssetRequest* tmp = *curiter;
                 if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
                 {
@@ -535,10 +559,10 @@ void LLAssetStorage::downloadCompleteCallback(
                         iter = gAssetStorage->mPendingDownloads.erase(curiter);
                 }
         }
-        for (std::list<LLAssetRequest*>::iterator iter = requests.begin();
+        for (request_list_t::iterator iter = requests.begin();
                  iter != requests.end();  )
         {
-                std::list<LLAssetRequest*>::iterator curiter = iter++;
+                request_list_t::iterator curiter = iter++;
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mDownCallback)
                 {
@@ -896,11 +920,11 @@ void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType
 {
         // SJB: We process the callbacks in reverse order, I do not know if this is important,
         //      but I didn't want to mess with it.
-        std::list<LLAssetRequest*> requests;
-        for (std::list<LLAssetRequest*>::iterator iter = mPendingUploads.begin();
+        request_list_t requests;
+        for (request_list_t::iterator iter = mPendingUploads.begin();
                  iter != mPendingUploads.end();  )
         {
-                std::list<LLAssetRequest*>::iterator curiter = iter++;
+                request_list_t::iterator curiter = iter++;
                 LLAssetRequest* req = *curiter;
                 if ((req->getUUID() == uuid) && (req->getType() == asset_type))
                 {
@@ -908,10 +932,10 @@ void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType
                         iter = mPendingUploads.erase(curiter);
                 }
         }
-        for (std::list<LLAssetRequest*>::iterator iter = mPendingLocalUploads.begin();
+        for (request_list_t::iterator iter = mPendingLocalUploads.begin();
                  iter != mPendingLocalUploads.end();  )
         {
-                std::list<LLAssetRequest*>::iterator curiter = iter++;
+                request_list_t::iterator curiter = iter++;
                 LLAssetRequest* req = *curiter;
                 if ((req->getUUID() == uuid) && (req->getType() == asset_type))
                 {
@@ -919,10 +943,10 @@ void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType
                         iter = mPendingLocalUploads.erase(curiter);
                 }
         }
-        for (std::list<LLAssetRequest*>::iterator iter = requests.begin();
+        for (request_list_t::iterator iter = requests.begin();
                  iter != requests.end();  )
         {
-                std::list<LLAssetRequest*>::iterator curiter = iter++;
+                request_list_t::iterator curiter = iter++;
                 LLAssetRequest* req = *curiter;
                 if (req->mUpCallback)
                 {
@@ -932,45 +956,239 @@ void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType
         }
 }
 
+LLAssetStorage::request_list_t* LLAssetStorage::getRequestList(LLAssetStorage::ERequestType rt)
+{
+        switch (rt)
+        {
+        case RT_DOWNLOAD:
+                return &mPendingDownloads;
+        case RT_UPLOAD:
+                return &mPendingUploads;
+        case RT_LOCALUPLOAD:
+                return &mPendingLocalUploads;
+        default:
+                llwarns << "Unable to find request list for request type '" << rt << "'" << llendl;
+                return NULL;
+        }
+}
+
+const LLAssetStorage::request_list_t* LLAssetStorage::getRequestList(LLAssetStorage::ERequestType rt) const
+{
+        switch (rt)
+        {
+        case RT_DOWNLOAD:
+                return &mPendingDownloads;
+        case RT_UPLOAD:
+                return &mPendingUploads;
+        case RT_LOCALUPLOAD:
+                return &mPendingLocalUploads;
+        default:
+                llwarns << "Unable to find request list for request type '" << rt << "'" << llendl;
+                return NULL;
+        }
+}
+
+// static
+std::string LLAssetStorage::getRequestName(LLAssetStorage::ERequestType rt)
+{
+        switch (rt)
+        {
+        case RT_DOWNLOAD:
+                return "download";
+        case RT_UPLOAD:
+                return "upload";
+        case RT_LOCALUPLOAD:
+                return "localupload";
+        default:
+                llwarns << "Unable to find request name for request type '" << rt << "'" << llendl;
+                return "";
+        }
+}
+
+S32 LLAssetStorage::getNumPending(LLAssetStorage::ERequestType rt) const
+{
+        const request_list_t* requests = getRequestList(rt);
+        S32 num_pending = -1;
+        if (requests)
+        {
+                num_pending = requests->size();
+        }
+        return num_pending;
+}
 
 S32 LLAssetStorage::getNumPendingDownloads() const
 {
-        return mPendingDownloads.size();
+        return getNumPending(RT_DOWNLOAD);
 }
 
 S32 LLAssetStorage::getNumPendingUploads() const
 {
-        return mPendingUploads.size();
+        return getNumPending(RT_UPLOAD);
 }
 
 S32 LLAssetStorage::getNumPendingLocalUploads()
 {
-        return mPendingLocalUploads.size();
+        return getNumPending(RT_LOCALUPLOAD);
+}
+
+// virtual
+LLSD LLAssetStorage::getPendingDetails(LLAssetStorage::ERequestType rt,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const std::string& detail_prefix) const
+{
+        const request_list_t* requests = getRequestList(rt);
+        LLSD sd;
+        sd["requests"] = getPendingDetails(requests, asset_type, detail_prefix);
+        return sd;
+}
+
+// virtual
+LLSD LLAssetStorage::getPendingDetails(const LLAssetStorage::request_list_t* requests,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const std::string& detail_prefix) const
+{
+        LLSD details;
+        if (requests)
+        {
+                request_list_t::const_iterator it = requests->begin();
+                request_list_t::const_iterator end = requests->end();
+                for ( ; it != end; ++it)
+                {
+                        LLAssetRequest* req = *it;
+                        if (   (LLAssetType::AT_NONE == asset_type)
+                                || (req->getType() == asset_type) )
+                        {
+                                LLSD row = req->getTerseDetails();
+
+                                std::ostringstream detail;
+                                detail  << detail_prefix << "/" << LLAssetType::lookup(req->getType())
+                                                << "/" << req->getUUID();
+                                row["detail"] = LLURI(detail.str());
+
+                                details.append(row);
+                        }
+                }
+        }
+        return details;
+}
+
+
+// static
+const LLAssetRequest* LLAssetStorage::findRequest(const LLAssetStorage::request_list_t* requests,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id)
+{
+        if (requests) 
+        {
+                // Search the requests list for the asset.
+                request_list_t::const_iterator iter = requests->begin();
+                request_list_t::const_iterator end  = requests->end();
+                for (; iter != end; ++iter)
+                {
+                        const LLAssetRequest* req = *iter;
+                        if (asset_type == req->getType() &&
+                                asset_id == req->getUUID() )
+                        {
+                                return req;
+                        }
+                }
+        }
+        return NULL;
 }
 
-LLSD LLAssetStorage::getPendingTypes(const std::list<LLAssetRequest*>& requests) const
+// static
+LLAssetRequest* LLAssetStorage::findRequest(LLAssetStorage::request_list_t* requests,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id)
 {
-        LLSD type_counts;
-        std::list<LLAssetRequest*>::const_iterator it = requests.begin();
-        std::list<LLAssetRequest*>::const_iterator end = requests.end();
-        for ( ; it != end; ++it)
+        if (requests) 
         {
-                LLAssetRequest* req = *it;
+                // Search the requests list for the asset.
+                request_list_t::iterator iter = requests->begin();
+                request_list_t::iterator end  = requests->end();
+                for (; iter != end; ++iter)
+                {
+                        LLAssetRequest* req = *iter;
+                        if (asset_type == req->getType() &&
+                                asset_id == req->getUUID() )
+                        {
+                                return req;
+                        }
+                }
+        }
+        return NULL;
+}
+
 
-                const char* type_name = LLAssetType::lookupHumanReadable(req->getType());
-                type_counts[type_name] = type_counts[type_name].asInteger() + 1;
+// virtual
+LLSD LLAssetStorage::getPendingRequest(LLAssetStorage::ERequestType rt,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id) const
+{
+        const request_list_t* requests = getRequestList(rt);
+        return getPendingRequest(requests, asset_type, asset_id);
+}
+
+// virtual
+LLSD LLAssetStorage::getPendingRequest(const LLAssetStorage::request_list_t* requests,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id) const
+{
+        LLSD sd;
+        const LLAssetRequest* req = findRequest(requests, asset_type, asset_id);
+        if (req)
+        {
+                sd = req->getFullDetails();
         }
-        return type_counts;
+        return sd;
 }
 
-LLSD LLAssetStorage::getPendingDownloadTypes() const
+// virtual
+bool LLAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
+                                                                                        LLAssetType::EType asset_type,
+                                                                                        const LLUUID& asset_id)
 {
-        return getPendingTypes(mPendingDownloads);
+        request_list_t* requests = getRequestList(rt);
+        if (deletePendingRequest(requests, asset_type, asset_id))
+        {
+                llinfos << "Asset " << getRequestName(rt) << " request for "
+                                << asset_id << "." << LLAssetType::lookup(asset_type)
+                                << " removed from pending queue." << llendl;
+                return true;
+        }
+        return false;
 }
 
-LLSD LLAssetStorage::getPendingUploadTypes() const
+// virtual
+bool LLAssetStorage::deletePendingRequest(LLAssetStorage::request_list_t* requests,
+                                                                                        LLAssetType::EType asset_type,
+                                                                                        const LLUUID& asset_id)
 {
-        return getPendingTypes(mPendingUploads);
+        LLAssetRequest* req = findRequest(requests, asset_type, asset_id);
+        if (req)
+        {
+                // Remove the request from this list.
+                requests->remove(req);
+                S32 error = LL_ERR_TCP_TIMEOUT;
+                // Run callbacks.
+                if (req->mUpCallback)
+                {
+                        req->mUpCallback(req->getUUID(), req->mUserData, error);
+                }
+                if (req->mDownCallback)
+                {
+                        req->mDownCallback(mVFS, req->getUUID(), req->getType(), req->mUserData, error);
+                }
+                if (req->mInfoCallback)
+                {
+                        LLAssetInfo info;
+                        req->mInfoCallback(&info, req->mUserData, error);
+                }
+                delete req;
+                return true;
+        }
+        
+        return false;
 }
 
 // static
@@ -1015,7 +1233,7 @@ const char* LLAssetStorage::getErrorString(S32 status)
 void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(const char*, const LLUUID&, void *, S32), void *user_data, BOOL is_priority)
 {
         // check for duplicates here, since we're about to fool the normal duplicate checker
-        for (std::list<LLAssetRequest*>::iterator iter = mPendingDownloads.begin();
+        for (request_list_t::iterator iter = mPendingDownloads.begin();
                  iter != mPendingDownloads.end();  )
         {
                 LLAssetRequest* tmp = *iter++;
@@ -1056,12 +1274,12 @@ void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAss
                 uuid.toString(uuid_str);
                 snprintf(filename,sizeof(filename),"%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));   /* Flawfinder: ignore */ 
 
-                FILE *fp = LLFile::fopen(filename, "wb");       /* Flawfinder: ignore */ 
+                FILE* fp = LLFile::fopen(filename, "wb");       /* Flawfinder: ignore */ 
                 if (fp)
                 {
                         const S32 buf_size = 65536;
                         U8 copy_buf[buf_size];
-                        while (file.read(copy_buf, buf_size))
+                        while (file.read(copy_buf, buf_size))   /* Flawfinder: ignore */
                         {
                                 if (fwrite(copy_buf, file.getLastBytesRead(), 1, fp) < 1)
                                 {
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index deccad3..639ab59 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -109,6 +109,19 @@ public:
         BOOL    mDataSentInFirstPacket;
         BOOL    mDataIsInVFS;
         LLUUID  mRequestingAgentID;     // Only valid for uploads from an agent
+
+        virtual LLSD getTerseDetails() const;
+        virtual LLSD getFullDetails() const;
+};
+
+template <class T>
+struct ll_asset_request_equal : public std::equal_to<T>
+{
+        bool operator()(const T& x, const T& y) const 
+        { 
+                return (        x->getType() == y->getType()
+                                &&      x->getUUID() == y->getUUID() );
+        }
 };
 
 
@@ -184,6 +197,15 @@ public:
         LLVFS *mVFS;
         typedef void (*LLStoreAssetCallback)(const LLUUID &asset_id, void *user_data, S32 status);
 
+        enum ERequestType
+        {
+                RT_INVALID = -1,
+                RT_DOWNLOAD = 0,
+                RT_UPLOAD = 1,
+                RT_LOCALUPLOAD = 2,
+                RT_COUNT = 3
+        };
+
 protected:
         BOOL mShutDown;
         LLHost mUpstreamHost;
@@ -191,9 +213,11 @@ protected:
         LLMessageSystem *mMessageSys;
         LLXferManager   *mXferManager;
 
-        std::list<LLAssetRequest*> mPendingDownloads;
-        std::list<LLAssetRequest*> mPendingUploads;
-        std::list<LLAssetRequest*> mPendingLocalUploads;
+
+        typedef std::list<LLAssetRequest*> request_list_t;
+        request_list_t mPendingDownloads;
+        request_list_t mPendingUploads;
+        request_list_t mPendingLocalUploads;
         
 public:
         LLAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
@@ -258,14 +282,48 @@ public:
                                                  const LLUUID &asset_id, LLAssetType::EType atype,
                                                  LLGetAssetCallback cb, void *user_data, BOOL is_priority = FALSE); // Get a particular inventory item.
 
+protected:
+        virtual LLSD getPendingDetails(const request_list_t* requests,
+                                        LLAssetType::EType asset_type,
+                                        const std::string& detail_prefix) const;
+
+        virtual LLSD getPendingRequest(const request_list_t* requests,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id) const;
+
+        virtual bool deletePendingRequest(request_list_t* requests,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id);
+
+public:
+        static const LLAssetRequest* findRequest(const request_list_t* requests,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id);
+        static LLAssetRequest* findRequest(request_list_t* requests,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id);
+
+        request_list_t* getRequestList(ERequestType rt);
+        const request_list_t* getRequestList(ERequestType rt) const;
+        static std::string getRequestName(ERequestType rt);
 
         S32 getNumPendingDownloads() const;
         S32 getNumPendingUploads() const;
         S32 getNumPendingLocalUploads();
+        S32 getNumPending(ERequestType rt) const;
+
+        virtual LLSD getPendingDetails(ERequestType rt,
+                                        LLAssetType::EType asset_type,
+                                        const std::string& detail_prefix) const;
+
+        virtual LLSD getPendingRequest(ERequestType rt,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id) const;
+
+        virtual bool deletePendingRequest(ERequestType rt,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id);
 
-        // Returns a map from type to num pending, eg 'texture' => 5, 'object' => 10
-        LLSD getPendingDownloadTypes() const;
-        LLSD getPendingUploadTypes() const;
 
         // download process callbacks
         static void downloadCompleteCallback(
@@ -349,8 +407,6 @@ private:
                            LLXferManager *xfer,
                            LLVFS *vfs,
                            const LLHost &upstream_host);
-        LLSD getPendingTypes(const std::list<LLAssetRequest*>& requests) const;
-
 };
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
new file mode 100644
index 0000000..f9a68ab
--- /dev/null
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -0,0 +1,154 @@
+/** 
+ * @file llblowcipher.cpp
+ * @brief Wrapper around OpenSSL Blowfish encryption algorithm.
+ *
+ * We do not have OpenSSL headers or libraries on Windows, so this
+ * class only works on Linux.
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+
+#include "llblowfishcipher.h"
+
+
+LLBlowfishCipher::LLBlowfishCipher(const U8* secret, size_t secret_size)
+:       LLCipher()
+{
+        llassert(secret);
+
+        mSecretSize = secret_size;
+        mSecret = new U8[mSecretSize];
+        memcpy(mSecret, secret, mSecretSize);
+}
+
+LLBlowfishCipher::~LLBlowfishCipher()
+{
+        delete [] mSecret;
+        mSecret = NULL;
+}
+
+
+#if LL_LINUX
+
+#include <openssl/evp.h>
+
+// virtual
+U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+{
+        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_EncryptInit_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_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 output_len = 0;
+    if (!EVP_EncryptUpdate(&context,
+                dst,
+                &output_len,
+                src,
+                src_len))
+    {
+        llwarns << "LLBlowfishCipher::encrypt EVP_EncryptUpdate failure" << llendl;
+        return 0;
+    }
+
+        // There may be some final data left to encrypt if the input is
+        // not an exact multiple of the block size.
+    int temp_len = 0;
+    if (!EVP_EncryptFinal_ex(&context, (unsigned char*)(dst + output_len), &temp_len))
+    {
+        llwarns << "LLBlowfishCipher::encrypt EVP_EncryptFinal failure" << llendl;
+        return 0;
+    }
+    output_len += temp_len;
+        return output_len;
+}
+
+// virtual
+U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+{
+        llerrs << "LLBlowfishCipher decrypt unsupported" << llendl;
+        return 0;
+}
+
+// virtual
+U32 LLBlowfishCipher::requiredEncryptionSpace(U32 len) const
+{
+        // *HACK: We know blowfish uses an 8 byte block size.
+        // Oddly, sometimes EVP_Encrypt produces an extra block
+        // if the input is an exact multiple of the block size.
+        // So round up.
+        const U32 BLOCK_SIZE = 8;
+        len += BLOCK_SIZE;
+        len -= (len % BLOCK_SIZE);
+        return len;
+}
+
+#else   // !LL_LINUX
+
+// virtual
+U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+{
+        llerrs << "LLBlowfishCipher only supported on Linux" << llendl;
+        return 0;
+}
+
+// virtual
+U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+{
+        llerrs << "LLBlowfishCipher only supported on Linux" << llendl;
+        return 0;
+}
+
+// virtual
+U32 LLBlowfishCipher::requiredEncryptionSpace(U32 len) const
+{
+        llerrs << "LLBlowfishCipher only supported on Linux" << llendl;
+        return 0;
+}
+
+#endif
+
diff --git a/linden/indra/newview/lltexturebar.h b/linden/indra/llmessage/llblowfishcipher.h
index ea704a2..2557598 100644
--- a/linden/indra/newview/lltexturebar.h
+++ b/linden/indra/llmessage/llblowfishcipher.h
@@ -1,8 +1,11 @@
 /** 
- * @file lltexturebar.h
- * @brief LLTextureBar class definition
+ * @file llblowfishcipher.h
+ * @brief A symmetric block cipher, designed in 1993 by Bruce Schneier.
+ * We use it because it has an 8 byte block size, allowing encryption of
+ * two UUIDs and a timestamp (16x2 + 4 = 36 bytes) with only 40 bytes of
+ * output.  AES has a block size of 32 bytes, so this would require 64 bytes.
  *
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2007-2007, Linden Research, Inc.
  * 
  * 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
@@ -25,51 +28,31 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
-#ifndef LL_LLTEXTUREBAR_H
-#define LL_LLTEXTUREBAR_H
+#ifndef LLBLOWFISHCIPHER_H
+#define LLBLOWFISHCIPHER_H
 
-#include "llview.h"
-#include "lltimer.h"
-#include "llviewerimage.h"
+#include "llcipher.h"
 
-class LLAssetInfo;
-class LLTimer;
 
-
-class LLTextureBar : public LLView
+class LLBlowfishCipher : public LLCipher
 {
 public:
-        LLPointer<LLViewerImage> mImagep;
-        S32 mHilite;
-
-public:
-        LLTextureBar(const std::string& name, const LLRect& r);
-
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
-
-        virtual void draw();
-
-        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-
-        virtual LLRect getRequiredRect();       // Return the height of this object, given the set options.
-};
-
-class LLGLTexMemBar : public LLView
-{
-public:
-        LLGLTexMemBar(const std::string& name);
-
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
-
-        virtual void draw();
-        
-        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-
-        virtual LLRect getRequiredRect();       // Return the height of this object, given the set options.
-
-protected:
+        // Secret may be up to 56 bytes in length per Blowfish spec.
+        LLBlowfishCipher(const U8* secret, size_t secret_size);
+        virtual ~LLBlowfishCipher();
+
+        // See llcipher.h for documentation.
+        /*virtual*/ U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        /*virtual*/ U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        /*virtual*/ U32 requiredEncryptionSpace(U32 src_len) const;
+
+#ifdef _DEBUG
+        static BOOL testHarness();
+#endif
+
+private:
+        U8* mSecret;
+        size_t mSecretSize;
 };
 
-#endif // LL_TEXTURE_BAR_
+#endif // LL_LLCRYPTO_H
diff --git a/linden/indra/llmessage/llbuffer.cpp b/linden/indra/llmessage/llbuffer.cpp
index 07c730a..3dd34a0 100644
--- a/linden/indra/llmessage/llbuffer.cpp
+++ b/linden/indra/llmessage/llbuffer.cpp
@@ -109,7 +109,7 @@ LLHeapBuffer::LLHeapBuffer(const U8* src, S32 len)
                 allocate(len);
                 if(mBuffer)
                 {
-                        memcpy(mBuffer, src, len);
+                        memcpy(mBuffer, src, len);      /*Flawfinder: ignore*/
                 }
         }
         else
@@ -735,7 +735,7 @@ bool LLBufferArray::copyIntoBuffers(
                 }
                 segments.push_back(segment);
                 S32 bytes = llmin(segment.size(), len);
-                memcpy(segment.data(), src + copied, bytes);  /* Flawfinder Ignore */
+                memcpy(segment.data(), src + copied, bytes);  /* Flawfinder: Ignore */
                 copied += bytes;
                 len -= bytes;
                 if(0 == len)
@@ -757,7 +757,7 @@ bool LLBufferArray::copyIntoBuffers(
                         return false;
                 }
                 segments.push_back(segment);
-                memcpy(segment.data(), src + copied, segment.size());
+                memcpy(segment.data(), src + copied, segment.size());   /*Flawfinder: ignore*/
                 copied += segment.size();
                 len -= segment.size();
         }
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 3a92812..e92c72f 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -276,6 +276,40 @@ void LLCacheName::addObserver(LLCacheNameCallback callback)
         impl.mObservers.push_back(callback);
 }
 
+void LLCacheName::removeObserver(LLCacheNameCallback callback)
+{
+        Observers::iterator it = impl.mObservers.begin();
+        Observers::iterator end = impl.mObservers.end();
+
+        for ( ; it != end; ++it)
+        {
+                const LLCacheNameCallback& cb = (*it);
+                if (cb == callback)
+                {
+                        impl.mObservers.erase(it);
+                        return;
+                }
+        }
+}
+
+void LLCacheName::cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data)
+{
+        ReplyQueue::iterator it = impl.mReplyQueue.begin();
+        ReplyQueue::iterator end = impl.mReplyQueue.end();
+        
+        for(; it != end; ++it)
+        {
+                const PendingReply& reply = (*it);
+
+                if ((callback == reply.mCallback)
+                        && (id == reply.mID)
+                        && (user_data == reply.mData) )
+                {
+                        impl.mReplyQueue.erase(it);
+                        return;
+                }
+        }
+}
 
 void LLCacheName::importFile(FILE* fp)
 {
@@ -297,7 +331,10 @@ void LLCacheName::importFile(FILE* fp)
         // *NOTE: This buffer size is hardcoded into sscanf() below
         char version_string[BUFFER_SIZE]; /*Flawfinder: ignore*/
         S32 version = 0;
-        S32 match = sscanf(buffer, "%1023s %d", version_string, &version);
+        S32 match = sscanf(     /* Flawfinder: ignore */
+                buffer,
+                "%1023s %d",
+                version_string, &version);
         if (   match != 2
                 || strcmp(version_string, "version")
                 || version != CN_FILE_VERSION)
@@ -316,7 +353,7 @@ void LLCacheName::importFile(FILE* fp)
                 valid = fgets(buffer, BUFFER_SIZE, fp);
                 if (!valid) break;
 
-                match = sscanf(
+                match = sscanf( /* Flawfinder: ignore */
                         buffer,
                         "%254s %u %254s %254s",
                         id_string, 
@@ -395,7 +432,7 @@ BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
         {
                 // The function signature needs to change to pass in the
                 // length of first and last.
-                strcpy(first, CN_NOBODY);
+                strcpy(first, CN_NOBODY);       /*Flawfinder: ignore*/
                 last[0] = '\0';
                 return FALSE;
         }
@@ -405,8 +442,8 @@ BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
         {
                 // The function signature needs to change to pass in the
                 // length of first and last.
-                strcpy(first, entry->mFirstName);
-                strcpy(last,  entry->mLastName);
+                strcpy(first, entry->mFirstName);       /*Flawfinder: ignore*/
+                strcpy(last,  entry->mLastName);        /*Flawfinder: ignore*/
                 return TRUE;
         }
         else
@@ -416,7 +453,7 @@ BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
                 strcpy(first,(ll_frand() < HIPPO_PROBABILITY)
                                                 ? CN_HIPPOS 
                                                 : CN_WAITING);
-                strcpy(last, "");
+                strcpy(last, "");       /*Flawfinder: ignore*/
 
                 impl.mAskNameQueue.push_back(id);
                 return FALSE;
@@ -432,7 +469,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, char* group)
         {
                 // The function signature needs to change to pass in the
                 // length of first and last.
-                strcpy(group, CN_NONE);
+                strcpy(group, CN_NONE); /*Flawfinder: ignore*/
                 return FALSE;
         }
 
@@ -450,14 +487,14 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, char* group)
         {
                 // The function signature needs to change to pass in the length
                 // of group.
-                strcpy(group, entry->mGroupName);
+                strcpy(group, entry->mGroupName);       /*Flawfinder: ignore*/
                 return TRUE;
         }
         else 
         {
                 // The function signature needs to change to pass in the length
                 // of first and last.
-                strcpy(group, CN_WAITING);
+                strcpy(group, CN_WAITING);      /*Flawfinder: ignore*/
 
                 impl.mAskGroupQueue.push_back(id);
                 return FALSE;
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index 4dd42cb..9987f11 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -60,6 +60,8 @@ public:
         void addObserver(LLCacheNameCallback callback);
         void removeObserver(LLCacheNameCallback callback);
 
+        void cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL);
+
         // storing cache on disk; for viewer, in name.cache
         void importFile(FILE* fp);
         void exportFile(FILE* fp);
diff --git a/linden/indra/llmessage/llcipher.h b/linden/indra/llmessage/llcipher.h
new file mode 100644
index 0000000..c1f88ff
--- /dev/null
+++ b/linden/indra/llmessage/llcipher.h
@@ -0,0 +1,57 @@
+/** 
+ * @file llcipher.h
+ * @brief Abstract base class for encryption ciphers.
+ *
+ * Copyright (c) 2003-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LLCIPHER_H
+#define LLCIPHER_H
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLCipher
+//
+// Abstract base class for a cipher object.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLCipher
+{
+public:
+        virtual ~LLCipher() {}
+
+        // encrypt src and place result into dst. returns TRUE if
+        // Returns number of bytes written into dst, or 0 on error.
+        virtual U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
+
+        // decrypt src and place result into dst. 
+        // Returns number of bytes written into dst, or 0 on error.
+        virtual U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
+
+        // returns the minimum amount of space required to encrypt for a 
+        // unencrypted source buffer of length len.
+        // *NOTE: This is estimated space and you should check the return value
+        // of the encrypt function.
+        virtual U32 requiredEncryptionSpace(U32 src_len) const = 0 ;
+};
+
+#endif
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
new file mode 100644
index 0000000..886697e
--- /dev/null
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -0,0 +1,343 @@
+/*
+ *  llcurl.cpp
+ *  MacTester
+ *
+ *  Created by Zero Linden on 10/15/06.
+ *  Copyright 2006 __MyCompanyName__. All rights reserved.
+ *
+ */
+
+#include "llcurl.h"
+
+#include <iomanip>
+
+#include "llsdserialize.h"
+
+//////////////////////////////////////////////////////////////////////////////
+/*
+        The trick to getting curl to do keep-alives is to reuse the
+        same easy handle for the requests.  It appears that curl
+        keeps a pool of connections alive for each easy handle, but
+        doesn't share them between easy handles.  Therefore it is
+        important to keep a pool of easy handles and reuse them,
+        rather than create and destroy them with each request.  This
+        code does this.
+
+        Furthermore, it would behoove us to keep track of which
+        hosts an easy handle was used for and pick an easy handle
+        that matches the next request.  This code does not current
+        do this.
+ */
+
+using namespace std;
+        
+LLCurl::Responder::Responder()
+        : mReferenceCount(0)
+{
+}
+LLCurl::Responder::~Responder()
+{
+}
+
+// virtual
+void LLCurl::Responder::error(U32 status, const std::stringstream& content)
+{
+        llinfos << "LLCurl::Responder::error " << status << ": " << content.str() << llendl;
+}
+
+// virtual
+void LLCurl::Responder::result(const std::stringstream& content)
+{
+}
+
+// virtual
+void LLCurl::Responder::completed(U32 status, const std::stringstream& content)
+{
+        if (200 <= status &&  status < 300)
+        {
+                result(content);
+        }
+        else
+        {
+                error(status, content);
+        }
+}
+
+
+namespace boost
+{
+        void intrusive_ptr_add_ref(LLCurl::Responder* p)
+        {
+                ++p->mReferenceCount;
+        }
+        
+        void intrusive_ptr_release(LLCurl::Responder* p)
+        {
+                if(0 == --p->mReferenceCount)
+                {
+                        delete p;
+                }
+        }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+size_t
+curlOutputCallback(void* data, size_t size, size_t nmemb, void* user_data)
+{
+        stringstream& output = *(stringstream*)user_data;
+        
+        size_t n = size * nmemb;
+        output.write((const char*)data, n);
+        if (!((istream&)output).good()) {
+                std::cerr << "WHAT!?!?!? istream side bad" << std::endl;
+        }
+        if (!((ostream&)output).good()) {
+                std::cerr << "WHAT!?!?!? ostream side bad" << std::endl;
+        }
+
+        return n;
+}
+
+// Only used if request contained a body (post or put), Not currently implemented.
+// size_t
+// curlRequestCallback(void* data, size_t size, size_t nmemb, void* user_data)
+// {
+//      stringstream& request = *(stringstream*)user_data;
+        
+//      size_t n = size * nmemb;
+//      request.read((char*)data, n);
+//      return request.gcount();
+// }
+
+
+
+
+
+LLCurl::Easy::Easy()
+{
+        mHeaders = 0;
+        mHeaders = curl_slist_append(mHeaders, "Connection: keep-alive");
+        mHeaders = curl_slist_append(mHeaders, "Keep-alive: 300");
+        mHeaders = curl_slist_append(mHeaders, "Content-Type: application/xml");
+                // FIXME: shouldn't be there for GET/DELETE
+                // FIXME: should have ACCEPT headers
+                
+        mHandle = curl_easy_init();
+}
+
+LLCurl::Easy::~Easy()
+{
+        curl_easy_cleanup(mHandle);
+        curl_slist_free_all(mHeaders);
+}
+
+void
+LLCurl::Easy::get(const string& url, ResponderPtr responder)
+{
+        prep(url, responder);
+        curl_easy_setopt(mHandle, CURLOPT_HTTPGET, 1);
+}
+
+void
+LLCurl::Easy::getByteRange(const string& url, S32 offset, S32 length, ResponderPtr responder)
+{
+        mRange = llformat("Range: bytes=%d-%d", offset,offset+length-1);
+        mHeaders = curl_slist_append(mHeaders, mRange.c_str());
+        prep(url, responder);
+        curl_easy_setopt(mHandle, CURLOPT_HTTPGET, 1);
+}
+
+void
+LLCurl::Easy::perform()
+{
+        report(curl_easy_perform(mHandle));
+}
+
+void
+LLCurl::Easy::prep(const std::string& url, ResponderPtr responder)
+{
+#if !LL_DARWIN
+        curl_easy_reset(mHandle); // SJB: doesn't exisit on OSX 10.3.9
+#else
+        // SJB: equivalent? fast?
+        curl_easy_cleanup(mHandle);
+        mHandle = curl_easy_init();
+#endif
+        
+        curl_easy_setopt(mHandle, CURLOPT_PRIVATE, this);
+
+//      curl_easy_setopt(mHandle, CURLOPT_VERBOSE, 1); // usefull for debugging
+        curl_easy_setopt(mHandle, CURLOPT_NOSIGNAL, 1);
+        curl_easy_setopt(mHandle, CURLOPT_WRITEFUNCTION, &curlOutputCallback);
+        curl_easy_setopt(mHandle, CURLOPT_WRITEDATA, &mOutput);
+#if 1 // For debug
+        curl_easy_setopt(mHandle, CURLOPT_HEADERFUNCTION, &curlOutputCallback);
+        curl_easy_setopt(mHandle, CURLOPT_HEADERDATA, &mHeaderOutput);
+#endif
+        curl_easy_setopt(mHandle, CURLOPT_ERRORBUFFER, &mErrorBuffer);
+        curl_easy_setopt(mHandle, CURLOPT_ENCODING, "");
+        curl_easy_setopt(mHandle, CURLOPT_SSL_VERIFYPEER, false);
+        curl_easy_setopt(mHandle, CURLOPT_HTTPHEADER, mHeaders);
+
+        mOutput.str("");
+        if (!((istream&)mOutput).good()) {
+                std::cerr << "WHAT!?!?!? istream side bad" << std::endl;
+        }
+        if (!((ostream&)mOutput).good()) {
+                std::cerr << "WHAT!?!?!? ostream side bad" << std::endl;
+        }
+
+        mURL = url;
+        curl_easy_setopt(mHandle, CURLOPT_URL, mURL.c_str());
+
+        mResponder = responder;
+}
+
+void
+LLCurl::Easy::report(CURLcode code)
+{
+        if (!mResponder) return;
+        
+        long responseCode;
+        
+        if (code == CURLE_OK)
+        {
+                curl_easy_getinfo(mHandle, CURLINFO_RESPONSE_CODE, &responseCode);
+        }
+        else
+        {
+                responseCode = 499;
+        }
+        
+        mResponder->completed(responseCode, mOutput);
+        mResponder = NULL;
+}
+
+
+
+
+
+
+LLCurl::Multi::Multi()
+{
+        mHandle = curl_multi_init();
+}
+
+LLCurl::Multi::~Multi()
+{
+        // FIXME: should clean up excess handles in mFreeEasy
+        curl_multi_cleanup(mHandle);
+}
+
+
+void
+LLCurl::Multi::get(const std::string& url, ResponderPtr responder)
+{
+        LLCurl::Easy* easy = easyAlloc();
+        easy->get(url, responder);
+        curl_multi_add_handle(mHandle, easy->mHandle);
+}
+        
+void
+LLCurl::Multi::getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder)
+{
+        LLCurl::Easy* easy = easyAlloc();
+        easy->getByteRange(url, offset, length, responder);
+        curl_multi_add_handle(mHandle, easy->mHandle);
+}
+        
+void
+LLCurl::Multi::process()
+{
+        int count;
+        for (int call_count = 0; call_count < 5; call_count += 1)
+        {
+                if (CURLM_CALL_MULTI_PERFORM != curl_multi_perform(mHandle, &count))
+                {
+                        break;
+                }
+        }
+                
+        CURLMsg* msg;
+        int msgs_in_queue;
+        while ((msg = curl_multi_info_read(mHandle, &msgs_in_queue)))
+        {
+                if (msg->msg != CURLMSG_DONE) continue;
+                Easy* easy = 0;
+                curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &easy);
+                if (!easy) continue;
+                easy->report(msg->data.result);
+                
+                curl_multi_remove_handle(mHandle, easy->mHandle);
+                easyFree(easy);
+        }
+}
+
+
+
+LLCurl::Easy*
+LLCurl::Multi::easyAlloc()
+{
+        Easy* easy = 0;
+        
+        if (mFreeEasy.empty())
+        {
+                easy = new Easy();
+        }
+        else
+        {
+                easy = mFreeEasy.back();
+                mFreeEasy.pop_back();
+        }
+
+        return easy;
+}
+
+void
+LLCurl::Multi::easyFree(Easy* easy)
+{
+        if (mFreeEasy.size() < 5)
+        {
+                mFreeEasy.push_back(easy);
+        }
+        else
+        {
+                delete easy;
+        }
+}
+
+
+
+namespace
+{
+        static LLCurl::Multi* sMainMulti = 0;
+        
+        LLCurl::Multi*
+        mainMulti()
+        {
+                if (!sMainMulti) {
+                        sMainMulti = new LLCurl::Multi();
+                }
+                return sMainMulti;
+        }
+}
+
+void
+LLCurl::get(const std::string& url, ResponderPtr responder)
+{
+        mainMulti()->get(url, responder);
+}
+        
+void
+LLCurl::getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder)
+{
+        mainMulti()->getByteRange(url, offset, length, responder);
+}
+        
+void
+LLCurl::process()
+{
+        mainMulti()->process();
+}
+
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
new file mode 100644
index 0000000..4f1b5e6
--- /dev/null
+++ b/linden/indra/llmessage/llcurl.h
@@ -0,0 +1,118 @@
+/*
+ *  llcurl.h
+ *  MacTester
+ *
+ *  Created by Zero Linden on 10/15/06.
+ *  Copyright 2006 __MyCompanyName__. All rights reserved.
+ *
+ */
+ 
+#ifndef LL_LLCURL_H
+#define LL_LLCURL_H
+
+#include "linden_common.h"
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include <boost/intrusive_ptr.hpp>
+#include <curl/curl.h>
+
+// #include "llhttpclient.h"
+
+class LLCurl
+{
+public:
+        class Multi;
+
+        class Responder
+        {
+        public:
+                Responder();
+                virtual ~Responder();
+
+                virtual void error(U32 status, const std::stringstream& content);       // called with bad status codes
+                
+                virtual void result(const std::stringstream& content);
+                
+                virtual void completed(U32 status, const std::stringstream& content);
+                        /**< The default implemetnation calls
+                                either:
+                                * result(), or
+                                * error() 
+                        */
+                        
+        public: /* but not really -- don't touch this */
+                U32 mReferenceCount;
+        };
+        typedef boost::intrusive_ptr<Responder> ResponderPtr;
+        
+        class Easy
+        {
+        public:
+                Easy();
+                ~Easy();
+                
+                void get(const std::string& url, ResponderPtr);
+                void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr);
+
+                void perform();
+
+        private:
+                void prep(const std::string& url, ResponderPtr);
+                void report(CURLcode);
+                
+                CURL*                           mHandle;
+                struct curl_slist*      mHeaders;
+                
+                std::string                     mURL;
+                std::string                     mRange;
+                std::stringstream       mRequest;
+
+                std::stringstream       mOutput;
+                char                            mErrorBuffer[CURL_ERROR_SIZE];
+
+                std::stringstream       mHeaderOutput; // Debug
+                
+                ResponderPtr            mResponder;
+
+                friend class Multi;
+        };
+
+
+        class Multi
+        {
+        public:
+                Multi();
+                ~Multi();
+
+                void get(const std::string& url, ResponderPtr);
+                void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr);
+
+                void process();
+                
+        private:
+                Easy* easyAlloc();
+                void easyFree(Easy*);
+                
+                CURLM* mHandle;
+                
+                typedef std::vector<Easy*>      EasyList;
+                EasyList mFreeEasy;
+        };
+
+
+        static void get(const std::string& url, ResponderPtr);
+        static void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder);
+        
+        static void process();
+};
+
+namespace boost
+{
+        void intrusive_ptr_add_ref(LLCurl::Responder* p);
+        void intrusive_ptr_release(LLCurl::Responder* p);
+};
+
+#endif // LL_LLCURL_H
diff --git a/linden/indra/llmessage/lldatapacker.cpp b/linden/indra/llmessage/lldatapacker.cpp
index 4a15d8b..d4c8704 100644
--- a/linden/indra/llmessage/lldatapacker.cpp
+++ b/linden/indra/llmessage/lldatapacker.cpp
@@ -543,7 +543,7 @@ const LLDataPackerBinaryBuffer&	LLDataPackerBinaryBuffer::operator=(const LLData
                 // We've got problems, ack!
                 llerrs << "Trying to do an assignment with not enough room in the target." << llendl;
         }
-        memcpy(mBufferp, a.mBufferp, a.getBufferSize());
+        memcpy(mBufferp, a.mBufferp, a.getBufferSize());        /*Flawfinder: ignore*/
         return *this;
 }
 
@@ -1236,7 +1236,7 @@ BOOL LLDataPackerAsciiBuffer::unpackUUID(LLUUID &value, const char *name)
         }
 
         char tmp_str[64];       /* Flawfinder: ignore */
-        sscanf(valuestr, "%63s", tmp_str);
+        sscanf(valuestr, "%63s", tmp_str);      /* Flawfinder: ignore */
         value.set(tmp_str);
 
         return success;
@@ -1258,7 +1258,7 @@ void LLDataPackerAsciiBuffer::writeIndentedName(const char *name)
                 }
                 else
                 {
-                        numCopied = (S32)strlen(name) + 1; //name + tab            /* Flawfinder: ignore */
+                        numCopied = (S32)strlen(name) + 1;      /* Flawfinder: ignore */ //name + tab   
                 }
 
                 // snprintf returns number of bytes that would have been written had the 
@@ -1288,9 +1288,9 @@ BOOL LLDataPackerAsciiBuffer::getValueStr(const char *name, char *out_value, S32
                 // Read both the name and the value, and validate the name.
                 sscanf(mCurBufferp, "%511[^\n]", buffer);
                 // Skip the \n
-                mCurBufferp += (S32)strlen(buffer) + 1;
+                mCurBufferp += (S32)strlen(buffer) + 1; /* Flawfinder: ignore */
 
-                sscanf(buffer, "%511s %511[^\n]", keyword, value);
+                sscanf(buffer, "%511s %511[^\n]", keyword, value);      /* Flawfinder: ignore */
 
                 if (strcmp(keyword, name))
                 {
@@ -1794,7 +1794,7 @@ BOOL LLDataPackerAsciiFile::unpackUUID(LLUUID &value, const char *name)
         }
 
         char tmp_str[64]; /*Flawfinder: ignore */
-        sscanf(valuestr,"%63s",tmp_str);
+        sscanf(valuestr,"%63s",tmp_str);        /* Flawfinder: ignore */
         value.set(tmp_str);
 
         return success;
@@ -1838,7 +1838,7 @@ BOOL LLDataPackerAsciiFile::getValueStr(const char *name, char *out_value, S32 v
                 fgetpos(mFP, &last_pos);
                 fgets(buffer, DP_BUFSIZE, mFP);
         
-                sscanf(buffer, "%511s %511[^\n]", keyword, value);
+                sscanf(buffer, "%511s %511[^\n]", keyword, value);      /* Flawfinder: ignore */
         
                 if (!keyword[0])
                 {
@@ -1863,7 +1863,7 @@ BOOL LLDataPackerAsciiFile::getValueStr(const char *name, char *out_value, S32 v
         {
                 mInputStream->getline(buffer, DP_BUFSIZE);
         
-                sscanf(buffer, "%511s %511[^\n]", keyword, value);
+                sscanf(buffer, "%511s %511[^\n]", keyword, value);      /* Flawfinder: ignore */
                 if (!keyword[0])
                 {
                         llwarns << "Data packer could not get the keyword!" << llendl;
diff --git a/linden/indra/llmessage/lldispatcher.cpp b/linden/indra/llmessage/lldispatcher.cpp
index cf83079..7ba9f44 100644
--- a/linden/indra/llmessage/lldispatcher.cpp
+++ b/linden/indra/llmessage/lldispatcher.cpp
@@ -76,6 +76,7 @@ bool LLDispatcher::dispatch(
                 LLDispatchHandler* func = (*it).second;
                 return (*func)(this, name, invoice, strings);
         }
+        llwarns << "Unable to find handler for Generic message: " << name << llendl;
         return false;
 }
 
diff --git a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
index feae47a..63913d5 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -267,6 +267,7 @@ void LLFilterSD2XMLRPC::streamOut(std::ostream& ostr, const LLSD& sd)
                 LLSD::Binary buffer = sd.asBinary();
                 if(!buffer.empty())
                 {
+                        // *TODO: convert to LLBase64
                         int b64_buffer_length = apr_base64_encode_len(buffer.size());
                         char* b64_buffer = new char[b64_buffer_length];
                         b64_buffer_length = apr_base64_encode_binary(
diff --git a/linden/indra/llmessage/llhost.cpp b/linden/indra/llmessage/llhost.cpp
index c071063..c1ca4b0 100644
--- a/linden/indra/llmessage/llhost.cpp
+++ b/linden/indra/llmessage/llhost.cpp
@@ -87,7 +87,7 @@ void LLHost::getIPString(char* buffer, S32 length) const
 
 std::string LLHost::getIPandPort() const
 {
-        char buffer[MAXADDRSTR + 1 + 5];
+        char buffer[MAXADDRSTR + 1 + 5];        /*Flawfinder: ignore*/
         getString(buffer, sizeof(buffer));
         return buffer;
 }
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 2b64385..6c57499 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -30,12 +30,15 @@
 
 #include "llhttpassetstorage.h"
 
+#include <sys/stat.h>
+
 #include "indra_constants.h"
 #include "llvfile.h"
 #include "llvfs.h"
 
 #include "zlib/zlib.h"
 
+const U32 MAX_RUNNING_REQUESTS = 4;
 const F32 MAX_PROCESSING_TIME = 0.005f;
 const S32 CURL_XFER_BUFFER_SIZE = 65536;
 // Try for 30 minutes for now.
@@ -68,7 +71,9 @@ struct LLTempAssetData
 class LLHTTPAssetRequest : public LLAssetRequest
 {
 public:
-        LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const LLUUID &uuid, LLAssetType::EType type, const char *url, CURLM *curl_multi);
+        LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const LLUUID &uuid, 
+                                        LLAssetType::EType type, LLAssetStorage::ERequestType rt,
+                                        const char *url, CURLM *curl_multi);
         virtual ~LLHTTPAssetRequest();
         
         void setupCurlHandle();
@@ -80,6 +85,9 @@ public:
         static size_t curlCompressedUploadCallback(
                                         void *data, size_t size, size_t nmemb, void *user_data);
 
+        virtual LLSD getTerseDetails() const;
+        virtual LLSD getFullDetails() const;
+
 public:
         LLHTTPAssetStorage *mAssetStoragep;
 
@@ -89,9 +97,7 @@ public:
         struct curl_slist *mHTTPHeaders;
         LLVFile *mVFile;
         LLUUID  mTmpUUID;
-        BOOL    mIsUpload;
-        BOOL    mIsLocalUpload;
-        BOOL    mIsDownload;
+        LLAssetStorage::ERequestType mRequestType;
 
         bool            mZInitialized;
         z_stream        mZStream;
@@ -102,7 +108,12 @@ public:
 };
 
 
-LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const LLUUID &uuid, LLAssetType::EType type, const char *url, CURLM *curl_multi)
+LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp, 
+                                                const LLUUID &uuid, 
+                                                LLAssetType::EType type, 
+                                                LLAssetStorage::ERequestType rt,
+                                                const char *url, 
+                                                CURLM *curl_multi)
         : LLAssetRequest(uuid, type),
         mZInitialized(false)
 {
@@ -110,15 +121,16 @@ LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const LLUUID &uu
         mCurlHandle = NULL;
         mCurlMultiHandle = curl_multi;
         mVFile = NULL;
-        mIsUpload = FALSE;
-        mIsLocalUpload = FALSE;
-        mIsDownload = FALSE;
+        mRequestType = rt;
         mHTTPHeaders = NULL;
+        mFP = NULL;
+        mZInputBuffer = NULL;
+        mZInputExhausted = false;
         
         mURLBuffer = new char[strlen(url) + 1]; /*Flawfinder: ignore*/
         if (mURLBuffer)
         {
-            strcpy(mURLBuffer, url);
+            strcpy(mURLBuffer, url);    /*Flawfinder: ignore*/
         }
 }
 
@@ -132,22 +144,7 @@ LLHTTPAssetRequest::~LLHTTPAssetRequest()
                 if (mAssetStoragep)
                 {
                         // Terminating a request.  Thus upload or download is no longer pending.
-                        if (mIsUpload)
-                        {
-                                mAssetStoragep->clearPendingUpload();
-                        }
-                        else if (mIsLocalUpload)
-                        {
-                                mAssetStoragep->clearPendingLocalUpload();
-                        }
-                        else if (mIsDownload)
-                        {
-                                mAssetStoragep->clearPendingDownload();
-                        }
-                        else
-                        {
-                                llerrs << "LLHTTPAssetRequest::~LLHTTPAssetRequest - Destroyed request is not upload OR download, this is bad!" << llendl;
-                        }
+                        mAssetStoragep->removeRunningRequest(mRequestType, this);
                 }
                 else
                 {
@@ -163,6 +160,82 @@ LLHTTPAssetRequest::~LLHTTPAssetRequest()
         finishCompressedUpload();
 }
 
+// virtual
+LLSD LLHTTPAssetRequest::getTerseDetails() const
+{
+        LLSD sd = LLAssetRequest::getTerseDetails();
+
+        sd["url"] = mURLBuffer;
+
+        return sd;
+}
+
+// virtual
+LLSD LLHTTPAssetRequest::getFullDetails() const
+{
+        LLSD sd = LLAssetRequest::getFullDetails();
+
+        if (mCurlHandle)
+        {
+                long curl_response = -1;
+                long curl_connect = -1;
+                double curl_total_time = -1.0f;
+                double curl_size_upload = -1.0f;
+                double curl_size_download = -1.0f;
+                long curl_content_length_upload = -1;
+                long curl_content_length_download = -1;
+                long curl_request_size = -1;
+                const char* curl_content_type = NULL;
+
+                curl_easy_getinfo(mCurlHandle, CURLINFO_HTTP_CODE, &curl_response);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_HTTP_CONNECTCODE, &curl_connect);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_TOTAL_TIME, &curl_total_time);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_UPLOAD,  &curl_size_upload);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_SIZE_DOWNLOAD, &curl_size_download);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_CONTENT_LENGTH_UPLOAD,   &curl_content_length_upload);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &curl_content_length_download);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_REQUEST_SIZE, &curl_request_size);
+                curl_easy_getinfo(mCurlHandle, CURLINFO_CONTENT_TYPE, &curl_content_type);
+
+                sd["curl_response_code"] = (int) curl_response;
+                sd["curl_http_connect_code"] = (int) curl_connect;
+                sd["curl_total_time"] = curl_total_time;
+                sd["curl_size_upload"]   = curl_size_upload;
+                sd["curl_size_download"] = curl_size_download;
+                sd["curl_content_length_upload"]   = (int) curl_content_length_upload;
+                sd["curl_content_length_download"] = (int) curl_content_length_download;
+                sd["curl_request_size"] = (int) curl_request_size;
+                if (curl_content_type)
+                {
+                        sd["curl_content_type"] = curl_content_type;
+                }
+                else
+                {
+                        sd["curl_content_type"] = "";
+                }
+        }
+
+        sd["temp_id"] = mTmpUUID;
+        sd["request_type"] = LLAssetStorage::getRequestName(mRequestType);
+        sd["z_initialized"] = mZInitialized;
+        sd["z_input_exhausted"] = mZInputExhausted;
+
+        S32 file_size = -1;
+        if (mFP)
+        {
+                struct stat file_stat;
+                int file_desc = fileno(mFP);
+                if ( fstat(file_desc, &file_stat) == 0)
+                {
+                        file_size = file_stat.st_size;
+                }
+        }
+        sd["file_size"] = file_size;
+
+        return sd;
+}
+
+
 void LLHTTPAssetRequest::setupCurlHandle()
 {
         mCurlHandle = curl_easy_init();
@@ -170,7 +243,7 @@ void LLHTTPAssetRequest::setupCurlHandle()
         curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1);
         curl_easy_setopt(mCurlHandle, CURLOPT_URL, mURLBuffer);
         curl_easy_setopt(mCurlHandle, CURLOPT_PRIVATE, this);
-        if (mIsDownload)
+        if (LLAssetStorage::RT_DOWNLOAD == mRequestType)
         {
                 curl_easy_setopt(mCurlHandle, CURLOPT_ENCODING, "");
                 // only do this on downloads, as uploads 
@@ -193,22 +266,7 @@ void LLHTTPAssetRequest::setupCurlHandle()
         if (mAssetStoragep)
         {
                 // Set the appropriate pending upload or download flag
-                if (mIsUpload)
-                {
-                        mAssetStoragep->setPendingUpload();
-                }
-                else if (mIsLocalUpload)
-                {
-                        mAssetStoragep->setPendingLocalUpload();
-                }
-                else if (mIsDownload)
-                {
-                        mAssetStoragep->setPendingDownload();
-                }
-                else
-                {
-                        llerrs << "LLHTTPAssetRequest::setupCurlHandle - Request is not upload OR download, this is bad!" << llendl;
-                }
+                mAssetStoragep->addRunningRequest(mRequestType, this);
         }
         else
         {
@@ -342,10 +400,6 @@ void LLHTTPAssetStorage::_init(const char *web_host, const char *local_web_host,
         curl_global_init(CURL_GLOBAL_ALL);
 
         mCurlMultiHandle = curl_multi_init();
-
-        mPendingDownload = FALSE;
-        mPendingUpload = FALSE;
-        mPendingLocalUpload = FALSE;
 }
 
 LLHTTPAssetStorage::~LLHTTPAssetStorage()
@@ -457,6 +511,113 @@ void LLHTTPAssetStorage::storeAssetData(
         }
 }
 
+// virtual
+LLSD LLHTTPAssetStorage::getPendingDetails(LLAssetStorage::ERequestType rt,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const std::string& detail_prefix) const
+{
+        LLSD sd = LLAssetStorage::getPendingDetails(rt, asset_type, detail_prefix);
+        const request_list_t* running = getRunningList(rt);
+        if (running)
+        {
+                // Loop through the pending requests sd, and add extra info about its running status.
+                S32 num_pending = sd["requests"].size();
+                S32 i;
+                for (i = 0; i < num_pending; ++i)
+                {
+                        LLSD& pending = sd["requests"][i];
+                        // See if this pending request is running.
+                        const LLAssetRequest* req = findRequest(running, 
+                                                                        LLAssetType::lookup(pending["type"].asString().c_str()),
+                                                                        pending["asset_id"]);
+                        if (req)
+                        {
+                                // Keep the detail_url so we don't have to rebuild it.
+                                LLURI detail_url = pending["detail"];
+                                pending = req->getTerseDetails();
+                                pending["detail"] = detail_url;
+                                pending["is_running"] = true;
+                        }
+                        else
+                        {
+                                pending["is_running"] = false;
+                        }
+                }
+        }
+        return sd;
+}
+
+// virtual
+LLSD LLHTTPAssetStorage::getPendingRequest(LLAssetStorage::ERequestType rt,
+                                                                                LLAssetType::EType asset_type,
+                                                                                const LLUUID& asset_id) const
+{
+        // Look for this asset in the running list first.
+        const request_list_t* running = getRunningList(rt);
+        if (running)
+        {
+                LLSD sd = LLAssetStorage::getPendingRequest(running, asset_type, asset_id);
+                if (sd)
+                {
+                        sd["is_running"] = true;
+                        return sd;
+                }
+        }
+        LLSD sd = LLAssetStorage::getPendingRequest(rt, asset_type, asset_id);
+        if (sd)
+        {
+                sd["is_running"] = false;
+        }
+        return sd;
+}
+
+// virtual
+bool LLHTTPAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
+                                                                                        LLAssetType::EType asset_type,
+                                                                                        const LLUUID& asset_id)
+{
+        // Try removing this from the running list first.
+        request_list_t* running = getRunningList(rt);
+        if (running)
+        {
+                LLAssetRequest* req = findRequest(running, asset_type, asset_id);
+                if (req)
+                {
+                        // Remove this request from the running list to get it out of curl.
+                        running->remove(req);
+                        
+                        // Find this request in the pending list, so we can move it to the end of the line.
+                        request_list_t* pending = getRequestList(rt);
+                        if (pending)
+                        {
+                                request_list_t::iterator result = std::find_if(pending->begin(), pending->end(),
+                                                                                std::bind2nd(ll_asset_request_equal<LLAssetRequest*>(), req));
+                                if (pending->end() != result)
+                                {
+                                        // This request was found in the pending list.  Move it to the end!
+                                        LLAssetRequest* pending_req = *result;
+                                        pending->remove(pending_req);
+                                        pending->push_back(pending_req);
+
+                                        llinfos << "Asset " << getRequestName(rt) << " request for "
+                                                        << asset_id << "." << LLAssetType::lookup(asset_type)
+                                                        << " removed from curl and placed at the end of the pending queue."
+                                                        << llendl;
+                                }
+                                else
+                                {
+                                        llwarns << "Unable to find pending " << getRequestName(rt) << " request for "
+                                                        << asset_id << "." << LLAssetType::lookup(asset_type) << llendl;
+                                }
+                        }
+                        delete req;
+
+                        return true;
+                }
+        }
+        return LLAssetStorage::deletePendingRequest(rt, asset_type, asset_id);
+}
+
 // internal requester, used by getAssetData in superclass
 void LLHTTPAssetStorage::_queueDataRequest(const LLUUID& uuid, LLAssetType::EType type,
                                                                                   void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32),
@@ -488,13 +649,41 @@ void LLHTTPAssetStorage::_queueDataRequest(const LLUUID& uuid, LLAssetType::ETyp
         }
 }
 
+LLAssetRequest* LLHTTPAssetStorage::findNextRequest(LLAssetStorage::request_list_t& pending, 
+                                                                                                        LLAssetStorage::request_list_t& running)
+{
+        // Early exit if the running list is full, or we don't have more pending than running.
+        if (running.size() >= MAX_RUNNING_REQUESTS
+                || pending.size() <= running.size()) return NULL;
+
+        // Look for the first pending request that is not already running.
+        request_list_t::iterator running_begin = running.begin();
+        request_list_t::iterator running_end   = running.end();
+
+        request_list_t::iterator pending_iter = pending.begin();
+        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)
+        {
+                LLAssetRequest* req = *pending_iter;
+                // Look for this pending request in the running list.
+                if (running_end == std::find_if(running_begin, running_end, 
+                                                std::bind2nd(ll_asset_request_equal<LLAssetRequest*>(), req)))
+                {
+                        // It isn't running!  Return it.
+                        return req;
+                }
+        }
+        return NULL;
+}
+
 // overloaded to additionally move data to/from the webserver
 void LLHTTPAssetStorage::checkForTimeouts()
 {
-        LLAssetRequest *req = NULL;
-        if (mPendingDownloads.size() > 0  && !mPendingDownload)
-        {       
-                req = mPendingDownloads.front();
+        CURLMcode mcode;
+        LLAssetRequest *req;
+        while (req = findNextRequest(mPendingDownloads, mRunningDownloads))
+        {
                 // Setup this curl download request
                 // We need to generate a new request here
                 // since the one in the list could go away
@@ -504,9 +693,9 @@ void LLHTTPAssetStorage::checkForTimeouts()
                 std::string base_url = getBaseURL(req->getUUID(), req->getType());
                 snprintf(tmp_url, sizeof(tmp_url), "%s/%36s.%s", base_url.c_str() , uuid_str, LLAssetType::lookup(req->getType())); /*Flawfinder: ignore*/
 
-                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), req->getType(), tmp_url, mCurlMultiHandle);
+                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
+                                                                                req->getType(), RT_DOWNLOAD, tmp_url, mCurlMultiHandle);
                 new_req->mTmpUUID.generate();
-                new_req->mIsDownload = TRUE;
 
                 // Sets pending download flag internally
                 new_req->setupCurlHandle();
@@ -514,15 +703,22 @@ void LLHTTPAssetStorage::checkForTimeouts()
                 curl_easy_setopt(new_req->mCurlHandle, CURLOPT_WRITEFUNCTION, &curlDownCallback);
                 curl_easy_setopt(new_req->mCurlHandle, CURLOPT_WRITEDATA, new_req->mCurlHandle);
         
-                curl_multi_add_handle(mCurlMultiHandle, new_req->mCurlHandle);
-                llinfos << "Requesting " << new_req->mURLBuffer << llendl;
-
+                mcode = curl_multi_add_handle(mCurlMultiHandle, new_req->mCurlHandle);
+                if (mcode > CURLM_OK)
+                {
+                        // Failure.  Deleting the pending request will remove it from the running
+                        // queue, and push it to the end of the pending queue.
+                        deletePendingRequest(RT_DOWNLOAD, req->getType(), req->getUUID());
+                        break;
+                }
+                else
+                {
+                        llinfos << "Requesting " << new_req->mURLBuffer << llendl;
+                }
         }
 
-        
-        if (mPendingUploads.size() > 0 && !mPendingUpload)
+        while (req = findNextRequest(mPendingUploads, mRunningUploads))
         {
-                req = mPendingUploads.front();
                 // setup this curl upload request
 
                 bool do_compress = req->getType() == LLAssetType::AT_OBJECT;
@@ -534,8 +730,8 @@ void LLHTTPAssetStorage::checkForTimeouts()
                                 do_compress ? "%s/%s.%s.gz" : "%s/%s.%s",
                                 mBaseURL.c_str(), uuid_str, LLAssetType::lookup(req->getType())); 
 
-                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), req->getType(), tmp_url, mCurlMultiHandle);
-                new_req->mIsUpload = TRUE;
+                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
+                                                                        req->getType(), RT_UPLOAD, tmp_url, mCurlMultiHandle);
                 if (do_compress)
                 {
                         new_req->prepareCompressedUpload();
@@ -560,15 +756,23 @@ void LLHTTPAssetStorage::checkForTimeouts()
                 }
                 curl_easy_setopt(new_req->mCurlHandle, CURLOPT_READDATA, new_req->mCurlHandle);
         
-                curl_multi_add_handle(mCurlMultiHandle, new_req->mCurlHandle);
-                llinfos << "Requesting PUT " << new_req->mURLBuffer << llendl;
+                mcode = curl_multi_add_handle(mCurlMultiHandle, new_req->mCurlHandle);
+                if (mcode > CURLM_OK)
+                {
+                        // Failure.  Deleting the pending request will remove it from the running
+                        // queue, and push it to the end of the pending queue.
+                        deletePendingRequest(RT_UPLOAD, req->getType(), req->getUUID());
+                        break;
+                }
+                else
+                {
+                        llinfos << "Requesting PUT " << new_req->mURLBuffer << llendl;
+                }
                 // Pending upload will have been flagged by the request
         }
 
-
-        if (mPendingLocalUploads.size() > 0 && !mPendingLocalUpload)
+        while (req = findNextRequest(mPendingLocalUploads, mRunningLocalUploads))
         {
-                req = mPendingLocalUploads.front();
                 // setup this curl upload request
                 LLVFile file(mVFS, req->getUUID(), req->getType());
 
@@ -579,8 +783,8 @@ void LLHTTPAssetStorage::checkForTimeouts()
                 // KLW - All temporary uploads are saved locally "http://localhost:12041/asset"
                 snprintf(tmp_url, sizeof(tmp_url), "%s/%36s.%s", mLocalBaseURL.c_str(), uuid_str, LLAssetType::lookup(req->getType())); /*Flawfinder: ignore*/
 
-                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), req->getType(), tmp_url, mCurlMultiHandle);
-                new_req->mIsLocalUpload = TRUE;
+                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
+                                                                                req->getType(), RT_LOCALUPLOAD, tmp_url, mCurlMultiHandle);
                 new_req->mRequestingAgentID = req->mRequestingAgentID;
 
                 // Sets pending upload flag internally
@@ -591,13 +795,22 @@ void LLHTTPAssetStorage::checkForTimeouts()
                 curl_easy_setopt(new_req->mCurlHandle, CURLOPT_READFUNCTION, &curlUpCallback);
                 curl_easy_setopt(new_req->mCurlHandle, CURLOPT_READDATA, new_req->mCurlHandle);
         
-                curl_multi_add_handle(mCurlMultiHandle, new_req->mCurlHandle);
-                llinfos << "TAT: LLHTTPAssetStorage::checkForTimeouts() : pending local!"
-                        << " Requesting PUT " << new_req->mURLBuffer << llendl;
+                mcode = curl_multi_add_handle(mCurlMultiHandle, new_req->mCurlHandle);
+                if (mcode > CURLM_OK)
+                {
+                        // Failure.  Deleting the pending request will remove it from the running
+                        // queue, and push it to the end of the pending queue.
+                        deletePendingRequest(RT_LOCALUPLOAD, req->getType(), req->getUUID());
+                        break;
+                }
+                else
+                {
+                        llinfos << "TAT: LLHTTPAssetStorage::checkForTimeouts() : pending local!"
+                                << " Requesting PUT " << new_req->mURLBuffer << llendl;
+                }
                 // Pending upload will have been flagged by the request
         }
         S32 count = 0;
-        CURLMcode mcode;
         int queue_length;
         do
         {
@@ -618,12 +831,15 @@ void LLHTTPAssetStorage::checkForTimeouts()
                         curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_PRIVATE, &req);
                                                                 
                         curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_HTTP_CODE, &curl_result);
-                        if (req->mIsUpload || req->mIsLocalUpload)
+                        if (RT_UPLOAD == req->mRequestType || RT_LOCALUPLOAD == req->mRequestType)
                         {
-                                if (curl_msg->data.result == CURLE_OK && (curl_result == HTTP_OK || curl_result == HTTP_PUT_OK || curl_result == HTTP_NO_CONTENT))
+                                if (curl_msg->data.result == CURLE_OK && 
+                                        (   curl_result == HTTP_OK 
+                                         || curl_result == HTTP_PUT_OK 
+                                         || curl_result == HTTP_NO_CONTENT))
                                 {
                                         llinfos << "Success uploading " << req->getUUID() << " to " << req->mURLBuffer << llendl;
-                                        if (req->mIsLocalUpload)
+                                        if (RT_LOCALUPLOAD == req->mRequestType)
                                         {
                                                 addTempAssetData(req->getUUID(), req->mRequestingAgentID, mHostName);
                                         }
@@ -655,7 +871,7 @@ void LLHTTPAssetStorage::checkForTimeouts()
                                         // Pending upload flag will get cleared when the request is deleted
                                 }
                         }
-                        else if (req->mIsDownload)
+                        else if (RT_DOWNLOAD == req->mRequestType)
                         {
                                 if (curl_result == HTTP_OK && curl_msg->data.result == CURLE_OK)
                                 {
@@ -667,7 +883,7 @@ void LLHTTPAssetStorage::checkForTimeouts()
                                         }
                                         else
                                         {
-                                                // TODO: if this actually indicates a bad asset on the server
+                                                // *TODO: if this actually indicates a bad asset on the server
                                                 // (not certain at this point), then delete it
                                                 llwarns << "Found " << req->mURLBuffer << " to be zero size" << llendl;
                                                 xfer_result = LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE;
@@ -793,9 +1009,8 @@ S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asse
         }
 
         // make sure we use the normal curl setup, even though we don't really need a request object
-        LLHTTPAssetRequest req(this, uuid, asset_type, url.c_str(), mCurlMultiHandle);
+        LLHTTPAssetRequest req(this, uuid, asset_type, RT_DOWNLOAD, url.c_str(), mCurlMultiHandle);
         req.mFP = fp;
-        req.mIsDownload = TRUE;
         
         req.setupCurlHandle();
         curl_easy_setopt(req.mCurlHandle, CURLOPT_FOLLOWLOCATION, TRUE);
@@ -887,6 +1102,63 @@ size_t LLHTTPAssetStorage::curlFileDownCallback(void *data, size_t size, size_t
         return fwrite(data, size, nmemb, req->mFP);
 }
 
+LLAssetStorage::request_list_t* LLHTTPAssetStorage::getRunningList(LLAssetStorage::ERequestType rt)
+{
+        switch (rt)
+        {
+        case RT_DOWNLOAD:
+                return &mRunningDownloads;
+        case RT_UPLOAD:
+                return &mRunningUploads;
+        case RT_LOCALUPLOAD:
+                return &mRunningLocalUploads;
+        default:
+                return NULL;
+        }
+}
+
+const LLAssetStorage::request_list_t* LLHTTPAssetStorage::getRunningList(LLAssetStorage::ERequestType rt) const
+{
+        switch (rt)
+        {
+        case RT_DOWNLOAD:
+                return &mRunningDownloads;
+        case RT_UPLOAD:
+                return &mRunningUploads;
+        case RT_LOCALUPLOAD:
+                return &mRunningLocalUploads;
+        default:
+                return NULL;
+        }
+}
+
+
+void LLHTTPAssetStorage::addRunningRequest(ERequestType rt, LLHTTPAssetRequest* request)
+{
+        request_list_t* requests = getRunningList(rt);
+        if (requests)
+        {
+                requests->push_back(request);
+        }
+        else
+        {
+                llerrs << "LLHTTPAssetStorage::addRunningRequest - Request is not an upload OR download, this is bad!" << llendl;
+        }
+}
+
+void LLHTTPAssetStorage::removeRunningRequest(ERequestType rt, LLHTTPAssetRequest* request)
+{
+        request_list_t* requests = getRunningList(rt);
+        if (requests)
+        {
+                requests->remove(request);
+        }
+        else
+        {
+                llerrs << "LLHTTPAssetStorage::removeRunningRequest - Destroyed request is not an upload OR download, this is bad!" << llendl;
+        }
+}
+
 // virtual 
 void LLHTTPAssetStorage::addTempAssetData(const LLUUID& asset_id, const LLUUID& agent_id, const std::string& host_name)
 {
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index d09e2ce..d98af45 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -32,6 +32,7 @@
 #include "curl/curl.h"
 
 class LLVFile;
+class LLHTTPAssetRequest;
 typedef void (*progress_callback)(void* userdata);
 
 struct LLTempAssetData;
@@ -75,11 +76,25 @@ public:
                 bool temp_file,
                 bool is_priority);
 
+        virtual LLSD getPendingDetails(ERequestType rt,
+                                        LLAssetType::EType asset_type,
+                                        const std::string& detail_prefix) const;
+
+        virtual LLSD getPendingRequest(ERequestType rt,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id) const;
+
+        virtual bool deletePendingRequest(ERequestType rt,
+                                                        LLAssetType::EType asset_type,
+                                                        const LLUUID& asset_id);
+
         // Hack.  One off curl download an URL to a file.  Probably should be elsewhere.
         // Only used by lldynamicstate.  The API is broken, and should be replaced with
         // a generic HTTP file fetch - Doug 9/25/06
         S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata);
         
+        LLAssetRequest* findNextRequest(request_list_t& pending, request_list_t& running);
+
         void checkForTimeouts();
         
         static size_t curlDownCallback(void *data, size_t size, size_t nmemb, void *user_data);
@@ -88,12 +103,11 @@ public:
         static size_t nullOutputCallback(void *data, size_t size, size_t nmemb, void *user_data);
 
         // Should only be used by the LLHTTPAssetRequest
-        void setPendingUpload()                 { mPendingUpload = TRUE; }
-        void setPendingLocalUpload()    { mPendingLocalUpload = TRUE; }
-        void setPendingDownload()               { mPendingDownload = TRUE; }
-        void clearPendingUpload()               { mPendingUpload = FALSE; }
-        void clearPendingLocalUpload()  { mPendingLocalUpload = FALSE; }
-        void clearPendingDownload()             { mPendingDownload = FALSE; }
+        void addRunningRequest(ERequestType rt, LLHTTPAssetRequest* request);
+        void removeRunningRequest(ERequestType rt, LLHTTPAssetRequest* request);
+
+        request_list_t* getRunningList(ERequestType rt);
+        const request_list_t* getRunningList(ERequestType rt) const;
 
         // Temp assets are stored on sim nodes, they have agent ID and location data associated with them.
         virtual void addTempAssetData(const LLUUID& asset_id, const LLUUID& agent_id, const std::string& host_name);
@@ -125,9 +139,9 @@ protected:
 
         CURLM  *mCurlMultiHandle;
 
-        BOOL mPendingDownload;
-        BOOL mPendingUpload;
-        BOOL mPendingLocalUpload;
+        request_list_t mRunningDownloads;
+        request_list_t mRunningUploads;
+        request_list_t mRunningLocalUploads;
 
         uuid_tempdata_map mTempAssets;
 };
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index d94918e..3755ae0 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -37,6 +37,8 @@
 #include "llvfile.h"
 #include "llvfs.h"
 
+#include <curl/curl.h>
+
 static const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;
 
 static std::string gCABundle;
@@ -148,6 +150,27 @@ namespace
 
                 const LLSD mSD;
         };
+
+        class RawInjector : public Injector
+        {
+        public:
+                RawInjector(const U8* data, S32 size) : mData(data), mSize(size) {}
+                virtual ~RawInjector() {}
+
+                const char* contentType() { return "application/octet-stream"; }
+
+                virtual EStatus process_impl(const LLChannelDescriptors& channels,
+                        buffer_ptr_t& buffer, bool& eos, LLSD& context, LLPumpIO* pump)
+                {
+                        LLBufferStream ostream(channels, buffer.get());
+                        ostream.write((const char *)mData, mSize);  // hopefully chars are always U8s
+                        eos = true;
+                        return STATUS_DONE;
+                }
+
+                const U8* mData;
+                S32 mSize;
+        };
         
         class FileInjector : public Injector
         {
@@ -243,6 +266,84 @@ void LLHTTPClient::get(const std::string& url, ResponderPtr responder)
         request(url, LLURLRequest::HTTP_GET, NULL, responder);
 }
 
+// A simple class for managing data returned from a curl http request.
+class LLHTTPBuffer
+{
+public:
+        LLHTTPBuffer() { }
+
+        static size_t curl_write( void *ptr, size_t size, size_t nmemb, void *user_data)
+        {
+                LLHTTPBuffer* self = (LLHTTPBuffer*)user_data;
+                
+                size_t bytes = (size * nmemb);
+                self->mBuffer.append((char*)ptr,bytes);
+                return nmemb;
+        }
+
+        LLSD asLLSD()
+        {
+                LLSD content;
+
+                if (mBuffer.empty()) return content;
+                
+                std::istringstream istr(mBuffer);
+                LLSDSerialize::fromXML(content, istr);
+                return content;
+        }
+
+        std::string asString()
+        {
+                return mBuffer;
+        }
+
+private:
+        std::string mBuffer;
+};
+
+// This call is blocking! This is probably usually bad. :(
+LLSD LLHTTPClient::blockingGet(const std::string& url)
+{
+        llinfos << "blockingGet of " << url << llendl;
+
+        // Returns an LLSD map: {status: integer, body: map}
+        char curl_error_buffer[CURL_ERROR_SIZE];
+        CURL* curlp = curl_easy_init();
+
+        LLHTTPBuffer http_buffer;
+
+        curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, LLHTTPBuffer::curl_write);
+        curl_easy_setopt(curlp, CURLOPT_WRITEDATA, &http_buffer);
+        curl_easy_setopt(curlp, CURLOPT_URL, url.c_str());
+        curl_easy_setopt(curlp, CURLOPT_ERRORBUFFER, curl_error_buffer);
+        curl_easy_setopt(curlp, CURLOPT_FAILONERROR, 1);
+
+        LLSD response = LLSD::emptyMap();
+
+        S32 curl_success = curl_easy_perform(curlp);
+
+        S32 http_status = 499;
+        curl_easy_getinfo(curlp,CURLINFO_RESPONSE_CODE, &http_status);
+
+        response["status"] = http_status;
+
+        if (curl_success != 0 
+                && http_status != 404)  // We expect 404s, don't spam for them.
+        {
+                llwarns << "CURL ERROR: " << curl_error_buffer << llendl;
+                
+                response["body"] = http_buffer.asString();
+        }
+        else
+        {
+                response["body"] = http_buffer.asLLSD();
+        }
+        
+        curl_easy_cleanup(curlp);
+
+        return response;
+}
+
 void LLHTTPClient::put(const std::string& url, const LLSD& body, ResponderPtr responder)
 {
         request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder);
@@ -253,6 +354,11 @@ void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr r
         request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder);
 }
 
+void LLHTTPClient::post(const std::string& url, const U8* data, S32 size, ResponderPtr responder)
+{
+        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder);
+}
+
 void LLHTTPClient::del(const std::string& url, ResponderPtr responder)
 {
         request(url, LLURLRequest::HTTP_DELETE, NULL, responder);
@@ -301,4 +407,3 @@ namespace boost
                 }
         }
 };
-
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index d48d084..93859eb 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -73,10 +73,14 @@ public:
         static void put(const std::string& url, const LLSD& body, ResponderPtr);
                 ///< non-blocking
         static void post(const std::string& url, const LLSD& body, ResponderPtr);
+        static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder);
         static void postFile(const std::string& url, const std::string& filename, ResponderPtr);
         static void postFile(const std::string& url, const LLUUID& uuid,
                 LLAssetType::EType asset_type, ResponderPtr responder);
 
+        // Blocking HTTP get that returns an LLSD map of status and body.
+        static LLSD blockingGet(const std::string& url);
+
         static void del(const std::string& url, ResponderPtr);
                 ///< sends a DELETE method, but we can't call it delete in c++
         
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index f1f4514..6f6e022 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -226,8 +226,8 @@ void pack_instant_message_block(
         S32 bytes_left = MTUBYTES;
         if(message)
         {
-                char buffer[MTUBYTES];
-                bytes_left -= snprintf(buffer, MTUBYTES, "%s", message);
+                char buffer[MTUBYTES];  /*Flawfinder: ignore*/
+                bytes_left -= snprintf(buffer, MTUBYTES, "%s", message);        /*Flawfinder: ignore*/
                 bytes_left = llmax(0, bytes_left);
                 msg->addStringFast(_PREHASH_Message, buffer);
         }
@@ -263,11 +263,11 @@ void LLIMInfo::unpackMessageBlock(LLMessageSystem* msg)
         mIMType = (EInstantMessage) dialog;
         msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ID, mID);
         msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_Timestamp, mTimeStamp);
-        char name[DB_FULL_NAME_BUF_SIZE];
+        char name[DB_FULL_NAME_BUF_SIZE];       /*Flawfinder: ignore*/
         msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, DB_FULL_NAME_BUF_SIZE, name);
         mName.assign(name);
 
-        char message[DB_IM_MSG_BUF_SIZE];
+        char message[DB_IM_MSG_BUF_SIZE];       /*Flawfinder: ignore*/
         msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, DB_IM_MSG_BUF_SIZE, message);
         mMessage.assign(message);
 
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index e84d097..aea3689 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -27,6 +27,8 @@
 
 #include "linden_common.h"
 
+#include "llmail.h"
+
 // APR on Windows needs full windows headers
 #ifdef LL_WINDOWS
 #       undef WIN32_LEAN_AND_MEAN
@@ -38,14 +40,16 @@
 #include <sstream>
 #include <boost/regex.hpp>
 
-#include "llmail.h"
-
 #include "apr-1/apr_pools.h"
 #include "apr-1/apr_network_io.h"
 
 #include "llapr.h"
+#include "llbase32.h"   // IM-to-email address
+#include "llblowfishcipher.h"
 #include "llerror.h"
 #include "llhost.h"
+#include "llstring.h"
+#include "lluuid.h"
 #include "net.h"
 
 //
@@ -105,11 +109,12 @@ void disconnect_smtp()
 
 // Returns TRUE on success.
 // message should NOT be SMTP escaped.
-BOOL send_mail(const char* from_name, const char* from_address,
+// static
+BOOL LLMail::send(const char* from_name, const char* from_address,
                            const char* to_name, const char* to_address,
                            const char* subject, const char* message)
 {
-        std::string header = build_smtp_transaction(
+        std::string header = buildSMTPTransaction(
                 from_name,
                 from_address,
                 to_name,
@@ -125,12 +130,13 @@ BOOL send_mail(const char* from_name, const char* from_address,
         {
                 message_str = message;
         }
-        bool rv = send_mail(header, message_str, to_address, from_address);
+        bool rv = send(header, message_str, to_address, from_address);
         if(rv) return TRUE;
         return FALSE;
 }
 
-void init_mail(const std::string& hostname, apr_pool_t* pool)
+// static
+void LLMail::init(const std::string& hostname, apr_pool_t* pool)
 {
         gMailSocket = NULL;
         if(hostname.empty() || !pool)
@@ -157,12 +163,14 @@ void init_mail(const std::string& hostname, apr_pool_t* pool)
         }
 }
 
-void enable_mail(bool mail_enabled)
+// static
+void LLMail::enable(bool mail_enabled)
 {
         gMailEnabled = mail_enabled;
 }
 
-std::string build_smtp_transaction(
+// static
+std::string LLMail::buildSMTPTransaction(
         const char* from_name,
         const char* from_address,
         const char* to_name,
@@ -216,7 +224,8 @@ std::string build_smtp_transaction(
         return header.str();
 }
 
-bool send_mail(
+// static
+bool LLMail::send(
         const std::string& header,
         const std::string& message,
         const char* from_address,
@@ -309,3 +318,40 @@ bool send_mail(
 #endif
         return true;
 }
+
+
+// static
+std::string LLMail::encryptIMEmailAddress(const LLUUID& from_agent_id,
+                                                                                        const LLUUID& to_agent_id,
+                                                                                        U32 time,
+                                                                                        const U8* secret,
+                                                                                        size_t secret_size)
+{
+#if LL_WINDOWS
+        return "blowfish-not-supported-on-windows";
+#else
+        size_t data_size = 4 + UUID_BYTES + UUID_BYTES;
+        // Convert input data into a binary blob
+        std::vector<U8> data;
+        data.resize(data_size);
+        // *NOTE: This may suffer from endian issues.  Could be htonmemcpy.
+        memcpy(&data[0], &time, 4);
+        memcpy(&data[4], &from_agent_id.mData[0], UUID_BYTES);
+        memcpy(&data[4 + UUID_BYTES], &to_agent_id.mData[0], UUID_BYTES);
+        
+        // Encrypt the blob
+        LLBlowfishCipher cipher(secret, secret_size);
+        size_t encrypted_size = cipher.requiredEncryptionSpace(data.size());
+        U8* encrypted = new U8[encrypted_size];
+        cipher.encrypt(&data[0], data_size, encrypted, encrypted_size);
+
+        std::string address = LLBase32::encode(encrypted, encrypted_size);
+
+        // Make it more pretty for humans.
+        LLString::toLower(address);
+
+        delete [] encrypted;
+
+        return address;
+#endif
+}
diff --git a/linden/indra/llmessage/llmail.h b/linden/indra/llmessage/llmail.h
index 82c272f..b1dc3b5 100644
--- a/linden/indra/llmessage/llmail.h
+++ b/linden/indra/llmessage/llmail.h
@@ -30,55 +30,84 @@
 
 typedef struct apr_pool_t apr_pool_t;
 
-// if hostname is NULL, then the host is resolved as 'mail'
-void init_mail(const std::string& hostname, apr_pool_t* pool);
+class LLUUID;
 
-// Allow all email transmission to be disabled/enabled.
-void enable_mail(bool mail_enabled);
+class LLMail
+{
+public:
+        // if hostname is NULL, then the host is resolved as 'mail'
+        static void init(const std::string& hostname, apr_pool_t* pool);
 
-// returns TRUE if the call succeeds, FALSE otherwise.
-//
-// Results in:
-// From: "from_name" <from_address>
-// To:   "to_name" <to_address>
-// Subject: subject
-// message
-BOOL send_mail(const char* from_name, const char* from_address,
-                           const char* to_name, const char* to_address,
-                           const char* subject, const char* message);
+        // Allow all email transmission to be disabled/enabled.
+        static void enable(bool mail_enabled);
 
-/**
- * @brief build the complete smtp transaction & header for use in an
- * mail.
- *
- * @param from_name The name of the email sender
- * @param from_address The email address for the sender
- * @param to_name The name of the email recipient
- * @param to_name The email recipient address
- * @param subject The subject of the email
- * @return Returns the complete SMTP transaction mail header.
- */
-std::string build_smtp_transaction(
-        const char* from_name,
-        const char* from_address,
-        const char* to_name,
-        const char* to_address,
-        const char* subject);
+        // returns TRUE if the call succeeds, FALSE otherwise.
+        //
+        // Results in:
+        // From: "from_name" <from_address>
+        // To:   "to_name" <to_address>
+        // Subject: subject
+        // message
+        static BOOL send(const char* from_name, const char* from_address,
+                                const char* to_name, const char* to_address,
+                                const char* subject, const char* message);
 
-/**
- * @brief send an email with header and body.
- *
- * @param header The email header. Use build_mail_header().
- * @param message The unescaped email message.
- * @param from_address Used for debugging
- * @param to_address Used for debugging
- * @return Returns true if the message could be sent.
- */
-bool send_mail(
-        const std::string& header,
-        const std::string& message,
-        const char* from_address,
-        const char* to_address);
+        /**
+        * @brief build the complete smtp transaction & header for use in an
+        * mail.
+        *
+        * @param from_name The name of the email sender
+        * @param from_address The email address for the sender
+        * @param to_name The name of the email recipient
+        * @param to_name The email recipient address
+        * @param subject The subject of the email
+        * @return Returns the complete SMTP transaction mail header.
+        */
+        static std::string buildSMTPTransaction(
+                const char* from_name,
+                const char* from_address,
+                const char* to_name,
+                const char* to_address,
+                const char* subject);
+
+        /**
+        * @brief send an email with header and body.
+        *
+        * @param header The email header. Use build_mail_header().
+        * @param message The unescaped email message.
+        * @param from_address Used for debugging
+        * @param to_address Used for debugging
+        * @return Returns true if the message could be sent.
+        */
+        static bool send(
+                const std::string& header,
+                const std::string& message,
+                const char* from_address,
+                const char* to_address);
+
+        // IM-to-email sessions use a "session id" based on an encrypted
+        // combination of from agent_id, to agent_id, and timestamp.  When
+        // a user replies to an email we use the from_id to determine the
+        // sender's name and the to_id to route the message.  The address
+        // is encrypted to prevent users from building addresses to spoof
+        // IMs from other users.  The timestamps allow the "sessions" to 
+        // expire, in case one of the sessions is stolen/hijacked.
+        //
+        // indra/tools/mailglue is responsible for parsing the inbound mail.
+        //
+        // secret: binary blob passed to blowfish, max length 56 bytes
+        // secret_size: length of blob, in bytes
+        //
+        // Returns: "base64" encoded email local-part, with _ and - as the
+        // non-alphanumeric characters.  This allows better compatibility
+        // with email systems than the default / and + extra chars.  JC
+        static std::string encryptIMEmailAddress(
+                const LLUUID& from_agent_id,
+                const LLUUID& to_agent_id,
+                U32 time,
+                const U8* secret,
+                size_t secret_size);
+};
 
 extern const size_t LL_MAX_KNOWN_GOOD_MAIL_SIZE;
 
diff --git a/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj
index 3043ee5..11f4dbf 100644
--- a/linden/indra/llmessage/llmessage.vcproj
+++ b/linden/indra/llmessage/llmessage.vcproj
@@ -153,6 +153,9 @@
                                 RelativePath=".\llassetstorage.cpp">
                         </File>
                         <File
+                                RelativePath=".\llblowfishcipher.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llbuffer.cpp">
                         </File>
                         <File
@@ -171,6 +174,9 @@
                                 RelativePath=".\llclassifiedflags.cpp">
                         </File>
                         <File
+                                RelativePath=".\llcurl.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\lldatapacker.cpp">
                         </File>
                         <File
@@ -344,6 +350,9 @@
                                 RelativePath=".\llassetstorage.h">
                         </File>
                         <File
+                                RelativePath=".\llblowfishcipher.h">
+                        </File>
+                        <File
                                 RelativePath=".\llbuffer.h">
                         </File>
                         <File
@@ -362,6 +371,9 @@
                                 RelativePath=".\llchainio.h">
                         </File>
                         <File
+                                RelativePath=".\llcipher.h">
+                        </File>
+                        <File
                                 RelativePath=".\llcircuit.h">
                         </File>
                         <File
@@ -371,7 +383,7 @@
                                 RelativePath=".\llcoordframe.h">
                         </File>
                         <File
-                                RelativePath=".\llcrypto.h">
+                                RelativePath=".\llcurl.h">
                         </File>
                         <File
                                 RelativePath=".\lldatapacker.h">
@@ -440,6 +452,9 @@
                                 RelativePath=".\llnamevalue.h">
                         </File>
                         <File
+                                RelativePath=".\llnullcipher.h">
+                        </File>
+                        <File
                                 RelativePath=".\llpacketack.h">
                         </File>
                         <File
@@ -530,6 +545,9 @@
                                 RelativePath=".\llxfermanager.h">
                         </File>
                         <File
+                                RelativePath=".\llxorcipher.h">
+                        </File>
+                        <File
                                 RelativePath=".\machine.h">
                         </File>
                         <File
diff --git a/linden/indra/llmessage/llmessage_vc8.vcproj b/linden/indra/llmessage/llmessage_vc8.vcproj
new file mode 100644
index 0000000..ac32525
--- /dev/null
+++ b/linden/indra/llmessage/llmessage_vc8.vcproj
@@ -0,0 +1,843 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llmessage"

+        ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"

+        RootNamespace="llmessage"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmessage.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmessage.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llmessage.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llassetstorage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llblowfishcipher.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbuffer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbufferstream.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcachename.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llchainio.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcircuit.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclassifiedflags.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcurl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldatapacker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldispatcher.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfiltersd2xmlrpc.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhost.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhttpassetstorage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhttpassetstorage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhttpclient.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhttpnode.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinstantmessage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliobuffer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliohttpserver.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliopipe.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliosocket.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llioutil.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllogtextmessage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmail.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmessagethrottle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmime.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnamevalue.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnullcipher.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpacketbuffer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpacketring.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpartdata.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpumpio.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdappservices.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdhttpserver.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdmessagesystem.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdrpcclient.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdrpcserver.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llservice.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llthrottle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfermanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfersourceasset.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfersourcefile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfertargetfile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfertargetvfile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llurlrequest.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluseroperation.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer_file.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer_mem.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer_vfile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfermanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxorcipher.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\message.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\message_prehash.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\message_string_table.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\net.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\network.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\partsyspacket.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\patch_code.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\patch_dct.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\patch_idct.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\camera.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\coordframe.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llassetstorage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llblowfishcipher.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbuffer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbufferstream.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcachename.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallbacklisth.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcamera.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llchainio.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcipher.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcircuit.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclassifiedflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcoordframe.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcurl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldatapacker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldbstrings.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldispatcher.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfiltersd2xmlrpc.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfollowcamparams.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhost.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhttpclient.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinstantmessage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinvite.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliobuffer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliohttpserver.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliopipe.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliosocket.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llioutil.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llloginflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllogtextmessage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllsltransmit.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmail.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmessagethrottle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmime.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnamevalue.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnullcipher.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpacketack.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpacketbuffer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpacketring.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpartdata.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpumpio.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llqueryflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llregionflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llregionhandle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdappservices.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdhttpserver.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdmessagesystem.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdrpcclient.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdrpcserver.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llservice.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltaskname.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llteleportflags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llthrottle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfermanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfersourceasset.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfersourcefile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfertargetfile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltransfertargetvfile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llurlrequest.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluseroperation.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvehicleparams.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer_file.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer_mem.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfer_vfile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxfermanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxorcipher.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\machine.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\mean_collision_data.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\message.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\message_prehash.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\net.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\network.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\partsyspacket.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\patch_code.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\patch_dct.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\sound_ids.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+                <File

+                        RelativePath="..\..\scripts\messages\message_template.msg"

+                        >

+                        <FileConfiguration

+                                Name="Debug|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description=""

+                                        CommandLine=""

+                                        Outputs=""

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="Release|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description=""

+                                        CommandLine=""

+                                        Outputs=""

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="ReleaseNoOpt|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description=""

+                                        CommandLine=""

+                                        Outputs=""

+                                />

+                        </FileConfiguration>

+                </File>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index 0b4f0b6..1304923 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -59,7 +59,7 @@ user_callback_map_t gUserCallbackMap;
 
 LLStringTable   gNVNameTable(16384);
 
-char NameValueTypeStrings[NVT_EOF][NAME_VALUE_TYPE_STRING_LENGTH] =
+char NameValueTypeStrings[NVT_EOF][NAME_VALUE_TYPE_STRING_LENGTH] = /*Flawfinder: Ignore*/
 {
         "NULL",
         "STRING",
@@ -70,17 +70,17 @@ char NameValueTypeStrings[NVT_EOF][NAME_VALUE_TYPE_STRING_LENGTH] =
         "CAMERA", // Deprecated, but leaving in case removing completely would cause problems
         "ASSET",
         "U64"
-};              /*Flawfinder: Ignore*/
+};              
 
-char NameValueClassStrings[NVC_EOF][NAME_VALUE_CLASS_STRING_LENGTH] =
+char NameValueClassStrings[NVC_EOF][NAME_VALUE_CLASS_STRING_LENGTH] = /*Flawfinder: Ignore*/
 {
         "NULL",
         "R",                    // read only
         "RW",                   // read write
         "CB"                    // callback
-};              /*Flawfinder: Ignore*/
+};              
 
-char NameValueSendtoStrings[NVS_EOF][NAME_VALUE_SENDTO_STRING_LENGTH] =
+char NameValueSendtoStrings[NVS_EOF][NAME_VALUE_SENDTO_STRING_LENGTH] = /*Flawfinder: Ignore*/
 {
         "NULL",
         "S",    // "Sim", formerly SIM
@@ -412,11 +412,11 @@ LLNameValue::LLNameValue(const char *name, const char *type, const char *nvclass
 LLNameValue::LLNameValue(const char *data)
 {
         baseInit();
-        static char name[NV_BUFFER_LEN];
-        static char type[NV_BUFFER_LEN];
-        static char nvclass[NV_BUFFER_LEN];
-        static char nvsendto[NV_BUFFER_LEN];
-        static char nvdata[NV_BUFFER_LEN];
+        static char name[NV_BUFFER_LEN];        /*Flawfinder: ignore*/
+        static char type[NV_BUFFER_LEN];        /*Flawfinder: ignore*/
+        static char nvclass[NV_BUFFER_LEN];     /*Flawfinder: ignore*/
+        static char nvsendto[NV_BUFFER_LEN];    /*Flawfinder: ignore*/
+        static char nvdata[NV_BUFFER_LEN];      /*Flawfinder: ignore*/
 
         S32 i;
 
@@ -440,7 +440,7 @@ LLNameValue::LLNameValue(const char *data)
         }
 
         // read in the name
-        sscanf((data + character_count), "%2047s", name);
+        sscanf((data + character_count), "%2047s", name);       /*Flawfinder: ignore*/
 
         // bump past it and add null terminator
         length = (S32)strlen(name);                     /* Flawfinder: ignore */
@@ -464,7 +464,7 @@ LLNameValue::LLNameValue(const char *data)
         }
 
         // read in the type
-        sscanf((data + character_count), "%2047s", type);
+        sscanf((data + character_count), "%2047s", type);       /*Flawfinder: ignore*/
 
         // bump past it and add null terminator
         length = (S32)strlen(type);             /* Flawfinder: ignore */
@@ -500,7 +500,7 @@ LLNameValue::LLNameValue(const char *data)
         {
                 // yes we do!
                 // read in the class
-                sscanf((data + character_count), "%2047s", nvclass);
+                sscanf((data + character_count), "%2047s", nvclass);    /*Flawfinder: ignore*/
 
                 // bump past it and add null terminator
                 length = (S32)strlen(nvclass);          /* Flawfinder: ignore */
@@ -542,7 +542,7 @@ LLNameValue::LLNameValue(const char *data)
         if (i != NVS_EOF)
         {
                 // found a sendto argument
-                sscanf((data + character_count), "%2047s", nvsendto);
+                sscanf((data + character_count), "%2047s", nvsendto);   /*Flawfinder: ignore*/
 
                 // add null terminator
                 length = (S32)strlen(nvsendto);         /* Flawfinder: ignore */
diff --git a/linden/indra/llmessage/llnullcipher.cpp b/linden/indra/llmessage/llnullcipher.cpp
index 1b60e44..ad2b25f 100644
--- a/linden/indra/llmessage/llnullcipher.cpp
+++ b/linden/indra/llmessage/llnullcipher.cpp
@@ -27,33 +27,33 @@
 
 #include "linden_common.h"
 
-#include "llcrypto.h"
+#include "llnullcipher.h"
 
 ///----------------------------------------------------------------------------
 /// Class LLNullCipher
 ///----------------------------------------------------------------------------
 
-BOOL LLNullCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+U32  LLNullCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
         if((src_len == dst_len) && src && dst)
         {
                 memmove(dst, src, src_len);
-                return TRUE;
+                return src_len;
         }
-        return FALSE;
+        return 0;
 }
 
-BOOL LLNullCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+U32 LLNullCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
         if((src_len == dst_len) && src && dst)
         {
                 memmove(dst, src, src_len);
-                return TRUE;
+                return src_len;
         }
-        return FALSE;
+        return 0;
 }
 
-U32 LLNullCipher::requiredEncryptionSpace(U32 len)
+U32 LLNullCipher::requiredEncryptionSpace(U32 len) const
 {
         return len;
 }
diff --git a/linden/indra/llmessage/llnullcipher.h b/linden/indra/llmessage/llnullcipher.h
new file mode 100644
index 0000000..75d022d
--- /dev/null
+++ b/linden/indra/llmessage/llnullcipher.h
@@ -0,0 +1,49 @@
+/** 
+ * @file llnullcipher.h
+ *
+ * Copyright (c) 2003-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LLNULLCIPHER_H
+#define LLNULLCIPHER_H
+
+#include "llcipher.h"
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLNullCipher
+//
+// A class which implements LLCipher, but does not transform src
+// during encryption.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLNullCipher : public LLCipher
+{
+public:
+        LLNullCipher() {}
+        virtual ~LLNullCipher() {}
+        virtual U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        virtual U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        virtual U32 requiredEncryptionSpace(U32 src_len) const;
+};
+
+#endif
diff --git a/linden/indra/llmessage/llpacketack.h b/linden/indra/llmessage/llpacketack.h
index d7d960e..e8d598a 100644
--- a/linden/indra/llmessage/llpacketack.h
+++ b/linden/indra/llmessage/llpacketack.h
@@ -130,7 +130,7 @@ public:
                         mBuffer = new U8[buf_len];
                         if (mBuffer != NULL)
                         {
-                                memcpy(mBuffer,buf_ptr,buf_len);
+                                memcpy(mBuffer,buf_ptr,buf_len);        /*Flawfinder: ignore*/
                                 mBufferLength = buf_len;
                         }
                         
diff --git a/linden/indra/llmessage/llpacketbuffer.cpp b/linden/indra/llmessage/llpacketbuffer.cpp
index 3559ecb..855fb40 100644
--- a/linden/indra/llmessage/llpacketbuffer.cpp
+++ b/linden/indra/llmessage/llpacketbuffer.cpp
@@ -44,7 +44,7 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32
 
         if (datap != NULL)
         {
-                memcpy(mData, datap, size);
+                memcpy(mData, datap, size);     /*Flawfinder: ignore*/
                 mSize = size;
         }
         
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 6a6a456..a2e6eb9 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -132,7 +132,7 @@ S32 LLPacketRing::receiveFromRing (S32 socket, char *datap)
         packet_size = packetp->getSize();
         if (packetp->getData() != NULL)
         {
-                memcpy(datap, packetp->getData(), packet_size);
+                memcpy(datap, packetp->getData(), packet_size); /*Flawfinder: ignore*/
         }
         // need to set sender IP/port!!
         mLastSender = packetp->getHost();
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index 11969d0..de0cb13 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -231,6 +231,20 @@ BOOL LLPartSysData::unpack(LLDataPacker &dp)
         return TRUE;
 }
 
+std::ostream& operator<<(std::ostream& s, const LLPartSysData &data)
+{
+        s << "Flags: " << std::hex << data.mFlags;
+        s << " Pattern: " << std::hex << (U32) data.mPattern << "\n";
+        s << "Age: [" << data.mStartAge << ", " << data.mMaxAge << "]\n";
+        s << "Angle: [" << data.mInnerAngle << ", " << data.mOuterAngle << "]\n";
+        s << "Burst Rate: " << data.mBurstRate << "\n";
+        s << "Burst Radius: " << data.mBurstRadius << "\n";
+        s << "Burst Speed: [" << data.mBurstSpeedMin << ", " << data.mBurstSpeedMax << "]\n";
+        s << "Burst Part Count: " << std::hex << (U32) data.mBurstPartCount << "\n";
+        s << "Angular Velocity: " << data.mAngularVelocity << "\n";
+        s << "Accel: " << data.mPartAccel;
+        return s;
+}
 
 BOOL LLPartSysData::isNullPS(const S32 block_num)
 {
diff --git a/linden/indra/llmessage/llpartdata.h b/linden/indra/llmessage/llpartdata.h
index 4045ada..55d22d5 100644
--- a/linden/indra/llmessage/llpartdata.h
+++ b/linden/indra/llmessage/llpartdata.h
@@ -186,6 +186,9 @@ public:
         // a combination of multiple parameters, we
         // need to clamp it using a separate method instead of an accessor.
         void clampSourceParticleRate();
+        
+        friend std::ostream&     operator<<(std::ostream& s, const LLPartSysData &data);                // Stream a
+        
 public:
         // Public because I'm lazy....
 
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index b1495f6..c1f1821 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -887,7 +887,7 @@ void LLPumpIO::processChain(LLChainInfo& chain)
                         PUMP_DEBUG;
                         if(LLIOPipe::isError(status))
                         {
-                                llinfos << "Pump generated pipe error: '"
+                                llinfos << "Pump generated pipe err: '"
 #if LL_DEBUG_PIPE_TYPE_IN_PUMP
                                                 << typeid(*((*it).mPipe)).name() << "':'"
 #endif
diff --git a/linden/indra/llmessage/llsdappservices.cpp b/linden/indra/llmessage/llsdappservices.cpp
index d923b22..8574f87 100644
--- a/linden/indra/llmessage/llsdappservices.cpp
+++ b/linden/indra/llmessage/llsdappservices.cpp
@@ -261,7 +261,7 @@ public:
                 llinfos << "LLHTTPLiveConfigSingleService::validate(" << name
                         << ")" << llendl;
                 LLSD option = LLApp::instance()->getOption(name);
-                if(option) return true;
+                if(option.isDefined()) return true;
                 else return false;
         }
 
diff --git a/linden/indra/llmessage/llsdmessagesystem.cpp b/linden/indra/llmessage/llsdmessagesystem.cpp
index 7d508f0..66382ea 100644
--- a/linden/indra/llmessage/llsdmessagesystem.cpp
+++ b/linden/indra/llmessage/llsdmessagesystem.cpp
@@ -25,6 +25,7 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
 #include "llsdmessagesystem.h"
 
 #include "llhttpnode.h"
@@ -98,7 +99,7 @@ void LLSDMessageSystem::getStringFast(const char *block, const char *var, S32 bu
         std::string data = getLLSD(mInput, block, var, blocknum).asString();
         S32 length = data.length();
         memset(buffer, 0, buffer_size);
-        strncpy(buffer, data.c_str(), llmin(length, buffer_size));
+        strncpy(buffer, data.c_str(), llmin(length, buffer_size));      /* Flawfinder: ignore */
 }
 
 //virtual 
diff --git a/linden/indra/llmessage/lltransfermanager.cpp b/linden/indra/llmessage/lltransfermanager.cpp
index bfeedd0..43afa78 100644
--- a/linden/indra/llmessage/lltransfermanager.cpp
+++ b/linden/indra/llmessage/lltransfermanager.cpp
@@ -354,7 +354,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
                 {
                         // Perhaps this stuff should be inside a method in LLTransferPacket?
                         // I'm too lazy to do it now, though.
-                        llinfos << "Playing back delayed packet " << packet_id << llendl;
+//                      llinfos << "Playing back delayed packet " << packet_id << llendl;
                         LLTransferPacket *packetp = ttp->mDelayedPacketMap[packet_id];
 
                         // This is somewhat inefficient, but avoids us having to duplicate
@@ -365,7 +365,7 @@ void LLTransferManager::processTransferInfo(LLMessageSystem *msgp, void **)
                         {
                                 if ((packetp->mDatap != NULL) && (size<(S32)sizeof(tmp_data)))
                                 {
-                                        memcpy(tmp_data, packetp->mDatap, size);
+                                        memcpy(tmp_data, packetp->mDatap, size);        /*Flawfinder: ignore*/
                                 }
                         }
                         status = packetp->mStatus;
@@ -474,6 +474,8 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                         ttcp->deleteTransfer(ttp);
                         return;
                 }
+#if 0
+                // Spammy!
                 const S32 LL_TRANSFER_WARN_GAP = 10;
                 if(!ttp->gotInfo())
                 {
@@ -487,6 +489,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                                 << " from " << msgp->getSender() << ", got " << packet_id
                                 << " expecting " << ttp->getNextPacketID() << llendl;
                 }
+#endif
                 return;
         }
 
@@ -527,7 +530,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                 {
                         // Perhaps this stuff should be inside a method in LLTransferPacket?
                         // I'm too lazy to do it now, though.
-                        llinfos << "Playing back delayed packet " << packet_id << llendl;
+//                      llinfos << "Playing back delayed packet " << packet_id << llendl;
                         LLTransferPacket *packetp = ttp->mDelayedPacketMap[packet_id];
 
                         // This is somewhat inefficient, but avoids us having to duplicate
@@ -538,7 +541,7 @@ void LLTransferManager::processTransferPacket(LLMessageSystem *msgp, void **)
                         {
                                 if ((packetp->mDatap != NULL) && (size<(S32)sizeof(tmp_data)))
                                 {
-                                        memcpy(tmp_data, packetp->mDatap, size);
+                                        memcpy(tmp_data, packetp->mDatap, size);        /*Flawfinder: ignore*/
                                 }
                         }
                         status = packetp->mStatus;
@@ -738,8 +741,11 @@ LLTransferSourceChannel::LLTransferSourceChannel(const LLTransferChannelType cha
 
 LLTransferSourceChannel::~LLTransferSourceChannel()
 {
-        LLPriQueueMap<LLTransferSource *>::pqm_iter iter;
-        for (iter = mTransferSources.mMap.begin(); iter != mTransferSources.mMap.end(); iter++)
+        LLPriQueueMap<LLTransferSource*>::pqm_iter iter =
+                mTransferSources.mMap.begin();
+        LLPriQueueMap<LLTransferSource*>::pqm_iter end =
+                mTransferSources.mMap.end();
+        for (; iter != end; ++iter)
         {
                 // Just kill off all of the transfers
                 (*iter).second->abortTransfer();
@@ -1176,7 +1182,7 @@ LLTransferPacket::LLTransferPacket(const S32 packet_id, const LLTSCode status, c
         mDatap = new U8[size];
         if (mDatap != NULL)
         {
-                memcpy(mDatap, datap, size);
+                memcpy(mDatap, datap, size);    /*Flawfinder: ignore*/
         }
 }
 
diff --git a/linden/indra/llmessage/lltransfertargetvfile.cpp b/linden/indra/llmessage/lltransfertargetvfile.cpp
index ce21605..5a1acf3 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetvfile.cpp
@@ -34,33 +34,8 @@
 #include "llvfile.h"
 
 //static
-std::list<LLTransferTargetParamsVFile*> LLTransferTargetVFile::sCallbackQueue;
-
-//static
 void LLTransferTargetVFile::updateQueue(bool shutdown)
 {
-        for(std::list<LLTransferTargetParamsVFile*>::iterator iter = sCallbackQueue.begin();
-                iter != sCallbackQueue.end(); )
-        {
-                std::list<LLTransferTargetParamsVFile*>::iterator curiter = iter++;
-                LLTransferTargetParamsVFile* params = *curiter;
-                LLVFSThread::status_t s = LLVFile::getVFSThread()->getRequestStatus(params->mHandle);
-                if (s == LLVFSThread::STATUS_COMPLETE || s == LLVFSThread::STATUS_EXPIRED)
-                {
-                        params->mCompleteCallback(
-                                params->mErrCode,
-                                params->getAssetID(),
-                                params->getAssetType(),
-                                params->mUserDatap);
-                        delete params;
-                        iter = sCallbackQueue.erase(curiter);
-                }
-                else if (shutdown)
-                {
-                        delete params;
-                        iter = sCallbackQueue.erase(curiter);
-                }
-        }
 }
 
 
@@ -69,8 +44,7 @@ LLTransferTargetParamsVFile::LLTransferTargetParamsVFile() :
         mAssetType(LLAssetType::AT_NONE),
         mCompleteCallback(NULL),
         mUserDatap(NULL),
-        mErrCode(0),
-        mHandle(LLVFSThread::nullHandle())
+        mErrCode(0)
 {
 }
 
@@ -185,7 +159,6 @@ void LLTransferTargetVFile::completionCallback(const LLTSCode status)
                 llwarns << "Aborting vfile transfer after asset storage shut down!" << llendl;
                 return;
         }
-        LLVFSThread::handle_t handle = LLVFSThread::nullHandle();
         
         // Still need to gracefully handle error conditions.
         S32 err_code = 0;
@@ -194,11 +167,11 @@ void LLTransferTargetVFile::completionCallback(const LLTSCode status)
           case LLTS_DONE:
                 if (!mNeedsCreate)
                 {
-                        handle = LLVFile::getVFSThread()->rename(
-                                gAssetStorage->mVFS,
-                                mTempID, mParams.getAssetType(),
-                                mParams.getAssetID(), mParams.getAssetType(),
-                                LLVFSThread::AUTO_DELETE);
+                        LLVFile file(gAssetStorage->mVFS, mTempID, mParams.getAssetType(), LLVFile::WRITE);
+                        if (!file.rename(mParams.getAssetID(), mParams.getAssetType()))
+                        {
+                                llerrs << "LLTransferTargetVFile: rename failed" << llendl;
+                        }
                 }
                 err_code = LL_ERR_NOERR;
                 lldebugs << "LLTransferTargetVFile::completionCallback for "
@@ -238,20 +211,9 @@ void LLTransferTargetVFile::completionCallback(const LLTSCode status)
         }
         if (mParams.mCompleteCallback)
         {
-                if (handle != LLVFSThread::nullHandle())
-                {
-                        LLTransferTargetParamsVFile* params = new LLTransferTargetParamsVFile(mParams);
-                        params->mErrCode = err_code;
-                        params->mHandle = handle;
-                        sCallbackQueue.push_back(params);
-                }
-                else
-                {
-                        mParams.mCompleteCallback(
-                                err_code,
-                                mParams.getAssetID(),
-                                mParams.getAssetType(),
-                                mParams.mUserDatap);
-                }
+                mParams.mCompleteCallback(err_code,
+                                                                  mParams.getAssetID(),
+                                                                  mParams.getAssetType(),
+                                                                  mParams.mUserDatap);
         }
 }
diff --git a/linden/indra/llmessage/lltransfertargetvfile.h b/linden/indra/llmessage/lltransfertargetvfile.h
index a4b6f93..4c915dc 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.h
+++ b/linden/indra/llmessage/lltransfertargetvfile.h
@@ -90,8 +90,6 @@ protected:
 
         BOOL mNeedsCreate;
         LLUUID mTempID;
-
-        static std::list<LLTransferTargetParamsVFile*> sCallbackQueue;
 };
 
 #endif // LL_LLTRANSFERTARGETFILE_H
diff --git a/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index f02d106..507b820 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/indra/llmessage/llxfer.cpp
@@ -135,7 +135,7 @@ S32 LLXfer::receiveData (char *datap, S32 data_size)
         {
                 if (datap != NULL)
                 {
-                        memcpy(&mBuffer[mBufferLength],datap,data_size);
+                        memcpy(&mBuffer[mBufferLength],datap,data_size);        /*Flawfinder: ignore*/
                         mBufferLength += data_size;
                 }
                 else
@@ -212,7 +212,7 @@ void LLXfer::sendPacket(S32 packet_num)
                 num_copy = llmin(num_copy, (S32)(mBufferLength - desired_read_position));
                 if (num_copy > 0)
                 {
-                        memcpy(fdata_buf,&mBuffer[desired_read_position],num_copy);
+                        memcpy(fdata_buf,&mBuffer[desired_read_position],num_copy);     /*Flawfinder: ignore*/
                 }
         }
         else  
@@ -225,7 +225,7 @@ void LLXfer::sendPacket(S32 packet_num)
                         (S32)(mBufferLength - desired_read_position));
                 if (num_copy > 0)
                 {
-                        memcpy(
+                        memcpy( /*Flawfinder: ignore*/
                                 fdata_buf + sizeof(S32),
                                 &mBuffer[desired_read_position],
                                 num_copy);
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index 8d38644..2fec06b 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -413,8 +413,8 @@ U32 LLXfer_File::getXferTypeTag()
 S32 copy_file(const char* from, const char* to)
 {
         S32 rv = 0;
-        FILE* in = LLFile::fopen(from, "rb");
-        FILE* out = LLFile::fopen(to, "wb");
+        FILE* in = LLFile::fopen(from, "rb");   /*Flawfinder: ignore*/
+        FILE* out = LLFile::fopen(to, "wb");    /*Flawfinder: ignore*/
         if(in && out)
         {
                 S32 read = 0;
diff --git a/linden/indra/llmessage/llxorcipher.cpp b/linden/indra/llmessage/llxorcipher.cpp
index 7a72866..3c3f690 100644
--- a/linden/indra/llmessage/llxorcipher.cpp
+++ b/linden/indra/llmessage/llxorcipher.cpp
@@ -27,7 +27,8 @@
 
 #include "linden_common.h"
 
-#include "llcrypto.h"
+#include "llxorcipher.h"
+
 #include "llerror.h"
 
 ///----------------------------------------------------------------------------
@@ -63,25 +64,26 @@ LLXORCipher& LLXORCipher::operator=(const LLXORCipher& cipher)
         return *this;
 }
 
-BOOL LLXORCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+U32 LLXORCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
-        if(!src || !src_len || !dst || !dst_len || !mPad) return FALSE;
+        if(!src || !src_len || !dst || !dst_len || !mPad) return 0;
         U8* pad_end = mPad + mPadLen;
-        while(src_len--)
+        U32 count = src_len;
+        while(count--)
         {
                 *dst++ = *src++ ^ *mHead++;
                 if(mHead >= pad_end) mHead = mPad;
         }
-        return TRUE;
+        return src_len;
 }
 
-BOOL LLXORCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
+U32 LLXORCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
         // xor is a symetric cipher, thus, just call the other function.
         return encrypt(src, src_len, dst, dst_len);
 }
 
-U32 LLXORCipher::requiredEncryptionSpace(U32 len)
+U32 LLXORCipher::requiredEncryptionSpace(U32 len) const
 {
         return len;
 }
diff --git a/linden/indra/llmessage/llcrypto.h b/linden/indra/llmessage/llxorcipher.h
index b142d25..fbb879e 100644
--- a/linden/indra/llmessage/llcrypto.h
+++ b/linden/indra/llmessage/llxorcipher.h
@@ -1,8 +1,5 @@
 /** 
- * @file llcrypto.h
- * @brief llcrypto library module header. For now, all crypto classes
- * are here, and as we grow the library, we can split these things
- * out.
+ * @file llxorcipher.h
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
@@ -27,50 +24,10 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
-#ifndef LL_LLCRYPTO_H
-#define LL_LLCRYPTO_H
+#ifndef LLXORCIPHER_H
+#define LLXORCIPHER_H
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLCipher
-//
-// Abstract base class for a cipher object.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLCipher
-{
-public:
-        virtual ~LLCipher() {}
-
-        // encrypt src and place result into dst. returns TRUE if
-        // encryption was successful, otherwise FALSE.
-        virtual BOOL encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
-
-        // decrypt src and place result into dst. returns TRUE if
-        // encryption was successful, otherwise FALSE. 
-        virtual BOOL decrpyt(const U8* src, U32 src_len, U8* dst, U32 dst_len) = 0;
-
-        // returns the space required to encrypt for a unencrypted source
-        // buffer of length len.
-        virtual U32 requiredEncryptionSpace(U32 src_len) const = 0 ;
-};
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLNullCipher
-//
-// A class which implements LLCipher, but does not transform src
-// during encryption.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLNullCipher
-{
-public:
-        LLNullCipher() {}
-        virtual ~LLNullCipher() {}
-        virtual BOOL encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual BOOL decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual U32 requiredEncryptionSpace(U32 src_len);
-};
+#include "llcipher.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLXORCipher
@@ -78,7 +35,7 @@ public:
 // Implementation of LLCipher which encrypts using a XOR pad.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-class LLXORCipher
+class LLXORCipher : public LLCipher
 {
 public:
         LLXORCipher(const U8* pad, U32 pad_len);
@@ -87,9 +44,9 @@ public:
         LLXORCipher& operator=(const LLXORCipher& cipher);
 
         // Cipher functions
-        virtual BOOL encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual BOOL decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-        virtual U32 requiredEncryptionSpace(U32 src_len);
+        /*virtual*/ U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        /*virtual*/ U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+        /*virtual*/ U32 requiredEncryptionSpace(U32 src_len) const;
 
         // special syntactic-sugar since xor can be performed in place.
         BOOL encrypt(U8* buf, U32 len) { return encrypt((const U8*)buf, len, buf, len); }
@@ -108,4 +65,4 @@ protected:
         U32 mPadLen;
 };
 
-#endif // LL_LLCRYPTO_H
+#endif
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 5baefff..2e7cb6a 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -987,7 +987,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
 
         LLMessageVariable       var;
         char                            var_name[MAX_MESSAGE_INTERNAL_NAME_SIZE];               /* Flawfinder: ignore */ 
-        char                            formatString[MAX_MESSAGE_INTERNAL_NAME_SIZE];
+        char                            formatString[MAX_MESSAGE_INTERNAL_NAME_SIZE];           /* Flawfinder: ignore */
 
         FILE* messagefilep = NULL;
         mMessageFileChecksum = 0;
@@ -995,14 +995,19 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
         S32 checksum_offset = 0;
         char* checkp = NULL;
 
-        snprintf(formatString, sizeof(formatString), "%%%ds", MAX_MESSAGE_INTERNAL_NAME_SIZE);
-        messagefilep = LLFile::fopen(filename, "r");
+        // scanf needs 1 byte more than width, thus the MAX_... -1.
+        snprintf(       /* Flawfinder: ignore */
+                formatString,
+                sizeof(formatString),
+                "%%%ds",
+                MAX_MESSAGE_INTERNAL_NAME_SIZE - 1);
+        messagefilep = LLFile::fopen(filename, "r");    /* Flawfinder: ignore */
         if (messagefilep)
         {
 //              mName = gMessageStringTable.getString(filename); 
 
                 fseek(messagefilep, 0L, SEEK_SET );
-                while(fscanf(messagefilep, formatString, token) != EOF)
+                while(fscanf(messagefilep, formatString, token) != EOF) /* Flawfinder: ignore */
                 {
                         // skip comments
                         if (token[0] == '/')
@@ -1132,7 +1137,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 b_template = FALSE;
 
                                 // name first
-                                if (fscanf(messagefilep, formatString, template_name) == EOF)
+                                if (fscanf(messagefilep, formatString, template_name) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected message template name, but file ended"
@@ -1164,7 +1169,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 }
 
                                 // ok, now get Frequency ("High", "Medium", or "Low")
-                                if (fscanf(messagefilep, formatString, token) == EOF)
+                                if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected message template frequency, found EOF."
@@ -1245,7 +1250,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 else if (!strcmp(token, "Fixed"))
                                 {
                                         U32 message_num = 0;
-                                        if (fscanf(messagefilep, formatString, token) == EOF)
+                                        if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                         {
                                                 // oops, file ended
                                                 llerrs << "Expected message template number (fixed),"
@@ -1279,7 +1284,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 }
 
                                 // Now get trust ("Trusted", "NotTrusted")
-                                if (fscanf(messagefilep, formatString, token) == EOF)
+                                if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // File ended
                                         llerrs << "Expected message template "
@@ -1316,7 +1321,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 }
 
                                 // get encoding
-                                if (fscanf(messagefilep, formatString, token) == EOF)
+                                if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // File ended
                                         llerrs << "Expected message encoding, but file ended."
@@ -1362,7 +1367,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 // ok, need to pull header info
 
                                 // name first
-                                if (fscanf(messagefilep, formatString, block_name) == EOF)
+                                if (fscanf(messagefilep, formatString, block_name) == EOF)      /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected block name, but file ended" << llendl;
@@ -1390,7 +1395,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 }
                                 
                                 // now, block type ("Single", "Multiple", or "Variable")
-                                if (fscanf(messagefilep, formatString, token) == EOF)
+                                if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected block type, but file ended." << llendl;
@@ -1415,7 +1420,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 else if (!strcmp(token, "Multiple"))
                                 {
                                         // need to get the number of repeats
-                                        if (fscanf(messagefilep, formatString, token) == EOF)
+                                        if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                         {
                                                 // oops, file ended
                                                 llerrs << "Expected block multiple count,"
@@ -1471,7 +1476,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 // ok, need to pull header info
 
                                 // name first
-                                if (fscanf(messagefilep, formatString, var_name) == EOF)
+                                if (fscanf(messagefilep, formatString, var_name) == EOF)        /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected variable name, but file ended."
@@ -1500,7 +1505,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 }
                                 
                                 // now, variable type ("Fixed" or "Variable")
-                                if (fscanf(messagefilep, formatString, token) == EOF)
+                                if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected variable type, but file ended"
@@ -1594,7 +1599,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 else if (!strcmp(token, "Fixed"))
                                 {
                                         // need to get the variable size
-                                        if (fscanf(messagefilep, formatString, token) == EOF)
+                                        if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                         {
                                                 // oops, file ended
                                                 llerrs << "Expected variable size, but file ended"
@@ -1627,7 +1632,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                 else if (!strcmp(token, "Variable"))
                                 {
                                         // need to get the variable size
-                                        if (fscanf(messagefilep, formatString, token) == EOF)
+                                        if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                         {
                                                 // oops, file ended
                                                 llerrs << "Expected variable size, but file ended"
@@ -1676,7 +1681,7 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                         if (!strcmp(token, "version"))
                         {
                                 // version number 
-                                if (fscanf(messagefilep, formatString, token) == EOF)
+                                if (fscanf(messagefilep, formatString, token) == EOF)   /* Flawfinder: ignore */
                                 {
                                         // oops, file ended
                                         llerrs << "Expected version number, but file ended" 
@@ -1815,14 +1820,27 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                 else
                 {
                         LLHost host;
-                        LLCircuitData *cdp;
+                        LLCircuitData* cdp;
                         
                         // note if packet acks are appended.
                         if(buffer[0] & LL_ACK_FLAG)
                         {
                                 acks += buffer[--mReceiveSize];
                                 true_rcv_size = mReceiveSize;
-                                mReceiveSize -= acks * sizeof(TPACKETID);
+                                if(mReceiveSize >= ((S32)(acks * sizeof(TPACKETID) + LL_MINIMUM_VALID_PACKET_SIZE)))
+                                {
+                                        mReceiveSize -= acks * sizeof(TPACKETID);
+                                }
+                                else
+                                {
+                                        // mal-formed packet. ignore it and continue with
+                                        // the next one
+                                        llwarns << "Malformed packet received. Packet size "
+                                                << mReceiveSize << " with invalid no. of acks " << acks
+                                                << llendl;
+                                        valid_packet = FALSE;
+                                        continue;
+                                }
                         }
 
                         // process the message as normal
@@ -2734,7 +2752,7 @@ void LLMessageSystem::buildMessage()
                                 temp_block_number = (U8)mbci->mBlockNumber;
                                 if ((S32)(mSendSize + sizeof(U8)) < MAX_BUFFER_SIZE)
                                 {
-                                    memcpy(&mSendBuffer[mSendSize], &temp_block_number, sizeof(U8));
+                                    memcpy(&mSendBuffer[mSendSize], &temp_block_number, sizeof(U8));    /* Flawfinder: ignore */
                                     mSendSize += sizeof(U8);
                                 }
                                 else
@@ -2811,7 +2829,7 @@ void LLMessageSystem::buildMessage()
                                 {
                                         if(mSendSize + mvci.getSize() < (S32)sizeof(mSendBuffer))
                                         {
-                                            memcpy(
+                                            memcpy( /* Flawfinder: ignore */
                                                         &mSendBuffer[mSendSize],
                                                         mvci.getData(),
                                                         mvci.getSize());
@@ -3077,7 +3095,7 @@ S32 LLMessageSystem::sendMessage(const LLHost &host)
 
                         if((S32)(buffer_length + sizeof(TPACKETID)) < MAX_BUFFER_SIZE)
                         {
-                            memcpy(&buf_ptr[buffer_length], &packet_id, sizeof(TPACKETID));
+                            memcpy(&buf_ptr[buffer_length], &packet_id, sizeof(TPACKETID));     /* Flawfinder: ignore */
                             // Do the accounting
                             buffer_length += sizeof(TPACKETID);
                         }
@@ -3185,7 +3203,7 @@ BOOL LLMessageSystem::decodeTemplate(
                 // it appears that if there is a NULL in the message #, it won't copy it....
                 // what was the goal?
                 //if(header[2])
-                memcpy(&message_id_U16, &header[2], 2);
+                memcpy(&message_id_U16, &header[2], 2); /* Flawfinder: ignore */
 
                 // dependant on endian-ness:
                 //              U32     temp = (255 << 24) | (255 << 16) | header[2];
@@ -3343,7 +3361,7 @@ BOOL LLMessageSystem::decodeData(const U8* buffer, const LLHost& sender )
 
         // create base working data set
         mCurrentRMessageData = new LLMsgData(mCurrentRMessageTemplate->mName);
-
+        
         // loop through the template building the data structure as we go
         for (LLMessageTemplate::message_block_map_t::iterator iter = mCurrentRMessageTemplate->mMemberBlocks.begin();
                  iter != mCurrentRMessageTemplate->mMemberBlocks.end(); iter++)
@@ -3596,7 +3614,7 @@ void LLMessageSystem::getDataFast(const char *blockname, const char *varname, vo
                         ((U32*)datap)[1] = ((U32*)vardata.getData())[1];
                         break;
                 default:
-                        memcpy(datap, vardata.getData(), vardata_size);
+                        memcpy(datap, vardata.getData(), vardata_size); /* Flawfinder: ignore */
                         break;
                 }
         }
@@ -3608,7 +3626,7 @@ void LLMessageSystem::getDataFast(const char *blockname, const char *varname, vo
                         << " but truncated to max size of " << max_size
                         << llendl;
 
-                memcpy(datap, vardata.getData(), max_size);
+                memcpy(datap, vardata.getData(), max_size);     /* Flawfinder: ignore */
         }
 }
 
@@ -4403,33 +4421,6 @@ void process_secured_template_checksum_request(LLMessageSystem* msg, void**)
         send_template_reply(msg, token);
 }
 
-void process_log_control(LLMessageSystem* msg, void**)
-{
-        U8 level;
-        U32 mask;
-        BOOL time;
-        BOOL location;
-        BOOL remote_infos;
-
-        msg->getU8Fast(_PREHASH_Options, _PREHASH_Level, level);
-        msg->getU32Fast(_PREHASH_Options, _PREHASH_Mask, mask);
-        msg->getBOOLFast(_PREHASH_Options, _PREHASH_Time, time);
-        msg->getBOOLFast(_PREHASH_Options, _PREHASH_Location, location);
-        msg->getBOOLFast(_PREHASH_Options, _PREHASH_RemoteInfos, remote_infos);
-
-        gErrorStream.setLevel(LLErrorStream::ELevel(level));
-        gErrorStream.setDebugMask(mask);
-        gErrorStream.setTime(time);
-        gErrorStream.setPrintLocation(location);
-        gErrorStream.setElevatedRemote(remote_infos);
-
-        llinfos << "Logging set to level " << gErrorStream.getLevel() 
-                << " mask " << std::hex << gErrorStream.getDebugMask() << std::dec
-                << " time " << gErrorStream.getTime()
-                << " loc " << gErrorStream.getPrintLocation()
-                << llendl;
-}
-
 void process_log_messages(LLMessageSystem* msg, void**)
 {
         U8 log_message;
@@ -4475,7 +4466,7 @@ void process_create_trusted_circuit(LLMessageSystem *msg, void **)
                 return;
         }
 
-        char their_digest[MD5HEX_STR_SIZE];
+        char their_digest[MD5HEX_STR_SIZE];     /* Flawfinder: ignore */
         S32 size = msg->getSizeFast(_PREHASH_DataBlock, _PREHASH_Digest);
         if(size != MD5HEX_STR_BYTES)
         {
@@ -4555,7 +4546,7 @@ void encrypt_template(const char *src_name, const char *dest_name)
 BOOL decrypt_template(const char *src_name, const char *dest_name)
 {
         S32 buf_length = LL_ENCRYPT_BUF_LENGTH;
-        char buf[LL_ENCRYPT_BUF_LENGTH];
+        char buf[LL_ENCRYPT_BUF_LENGTH];        /* Flawfinder: ignore */
         
         FILE* infp = NULL;
         FILE* outfp = NULL;
@@ -4570,7 +4561,7 @@ BOOL decrypt_template(const char *src_name, const char *dest_name)
                  goto exit;
         }
 
-        infp = LLFile::fopen(src_name,"rb");
+        infp = LLFile::fopen(src_name,"rb");    /* Flawfinder: ignore */
         if (!infp)
         {
                 llwarns << "could not open " << src_name << " for reading" << llendl;
@@ -4583,7 +4574,7 @@ BOOL decrypt_template(const char *src_name, const char *dest_name)
                  goto exit;
         }
 
-        outfp = LLFile::fopen(dest_name,"w+b");
+        outfp = LLFile::fopen(dest_name,"w+b"); /* Flawfinder: ignore */
         if (!outfp)
         {
                 llwarns << "could not open " << src_name << " for writing" << llendl;
@@ -4618,7 +4609,7 @@ BOOL decrypt_template(const char *src_name, const char *dest_name)
 void dump_prehash_files()
 {
         U32 i;
-        FILE *fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w");
+        FILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w");       /* Flawfinder: ignore */
         if (fp)
         {
                 fprintf(
@@ -4650,7 +4641,7 @@ void dump_prehash_files()
                 fprintf(fp, "\n\n#endif\n");
                 fclose(fp);
         }
-        fp = LLFile::fopen("../../indra/llmessage/message_prehash.cpp", "w");
+        fp = LLFile::fopen("../../indra/llmessage/message_prehash.cpp", "w");   /* Flawfinder: ignore */
         if (fp)
         {
                 fprintf(
@@ -4750,7 +4741,6 @@ BOOL start_messaging_system(
         gMessageSystem->setHandlerFuncFast(_PREHASH_PacketAck,             process_packet_ack,      NULL);
         gMessageSystem->setHandlerFuncFast(_PREHASH_TemplateChecksumRequest,  process_template_checksum_request,        NULL);
         gMessageSystem->setHandlerFuncFast(_PREHASH_SecuredTemplateChecksumRequest,  process_secured_template_checksum_request, NULL);
-        gMessageSystem->setHandlerFuncFast(_PREHASH_LogControl,                 process_log_control,    NULL);
         gMessageSystem->setHandlerFuncFast(_PREHASH_LogMessages,                        process_log_messages,   NULL);
         gMessageSystem->setHandlerFuncFast(_PREHASH_CreateTrustedCircuit,
                                        process_create_trusted_circuit,
@@ -5565,13 +5555,21 @@ void LLMessageSystem::getUUID(const char *block, const char *var, LLUUID &u, S32
         getDataFast(gMessageStringTable.getString(block), gMessageStringTable.getString(var), u.mData, sizeof(u.mData), blocknum);
 }
 
-bool LLMessageSystem::generateDigestForNumberAndUUIDs(char* digest, const U32 number, const LLUUID &id1, const LLUUID &id2) const
+bool LLMessageSystem::generateDigestForNumberAndUUIDs(
+        char* digest,
+        const U32 number,
+        const LLUUID& id1,
+        const LLUUID& id2) const
 {
+        // *NOTE: This method is needlessly inefficient. Instead of
+        // calling LLUUID::asString, it should just call
+        // LLUUID::toString().
+
         const char *colon = ":";
         char tbuf[16];  /* Flawfinder: ignore */ 
         LLMD5 d;
-        LLString id1string = id1.getString();
-        LLString id2string = id2.getString();
+        std::string id1string = id1.asString();
+        std::string id2string = id2.asString();
         std::string shared_secret = get_shared_secret();
         unsigned char * secret = (unsigned char*)shared_secret.c_str();
         unsigned char * id1str = (unsigned char*)id1string.c_str();
@@ -5581,7 +5579,7 @@ bool LLMessageSystem::generateDigestForNumberAndUUIDs(char* digest, const U32 nu
         
         if( secret != NULL)
         {
-                d.update(secret, (U32)strlen((char *) secret));
+                d.update(secret, (U32)strlen((char *) secret)); /* Flawfinder: ignore */
         }
 
         d.update((const unsigned char *) colon, (U32)strlen(colon));    /* Flawfinder: ignore */ 
@@ -5592,13 +5590,13 @@ bool LLMessageSystem::generateDigestForNumberAndUUIDs(char* digest, const U32 nu
         d.update((const unsigned char *) colon, (U32)strlen(colon));    /* Flawfinder: ignore */ 
         if( (char*) id1str != NULL)
         {
-                d.update(id1str, (U32)strlen((char *) id1str));  
+                d.update(id1str, (U32)strlen((char *) id1str)); /* Flawfinder: ignore */         
         }
         d.update((const unsigned char *) colon, (U32)strlen(colon));    /* Flawfinder: ignore */ 
         
         if( (char*) id2str != NULL)
         {
-                d.update(id2str, (U32)strlen((char *) id2str)); 
+                d.update(id2str, (U32)strlen((char *) id2str)); /* Flawfinder: ignore */        
         }
         
         d.finalize();
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index df062e7..5cc3ec1 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -206,6 +206,8 @@ class LLMessagePollInfo;
 
 class LLMessageSystem
 {
+        LOG_CLASS(LLMessageSystem);
+        
 public:
         U8                                                                              mSendBuffer[MAX_BUFFER_SIZE];
         // Encoded send buffer needs to be slightly larger since the zero
@@ -438,6 +440,7 @@ public:
         void    addStringFast( const char* varname, const std::string& s);                              // typed, checks storage space
         void    addString( const char* varname, const std::string& s);                          // typed, checks storage space
 
+        TPACKETID getCurrentRecvPacketID() { return mCurrentRecvPacketID; }
         S32 getCurrentSendTotal() const { return mCurrentSendTotal; }
 
         // This method checks for current send total and returns true if
@@ -776,7 +779,6 @@ BOOL start_messaging_system(
 void end_messaging_system();
 
 void null_message_callback(LLMessageSystem *msg, void **data);
-void process_log_control(LLMessageSystem* msg, void**);
 
 //
 // Inlines
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 2753c87..ef01c82 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -508,7 +508,6 @@ char * _PREHASH_NVPair;
 char * _PREHASH_ObjectSpinStart;
 char * _PREHASH_UseEstateSun;
 char * _PREHASH_LogoutBlock;
-char * _PREHASH_RelayLogControl;
 char * _PREHASH_RegionID;
 char * _PREHASH_Creator;
 char * _PREHASH_ProposalText;
@@ -1313,7 +1312,6 @@ char * _PREHASH_AssetBlock;
 char * _PREHASH_AcceptNotices;
 char * _PREHASH_SetGroupAcceptNotices;
 char * _PREHASH_CloseCircuit;
-char * _PREHASH_LogControl;
 char * _PREHASH_TeleportFinish;
 char * _PREHASH_PathRevolutions;
 char * _PREHASH_ClassifiedInfoReply;
@@ -1982,7 +1980,6 @@ void init_prehash_data()
         _PREHASH_ObjectSpinStart = gMessageStringTable.getString("ObjectSpinStart");
         _PREHASH_UseEstateSun = gMessageStringTable.getString("UseEstateSun");
         _PREHASH_LogoutBlock = gMessageStringTable.getString("LogoutBlock");
-        _PREHASH_RelayLogControl = gMessageStringTable.getString("RelayLogControl");
         _PREHASH_RegionID = gMessageStringTable.getString("RegionID");
         _PREHASH_Creator = gMessageStringTable.getString("Creator");
         _PREHASH_ProposalText = gMessageStringTable.getString("ProposalText");
@@ -2787,7 +2784,6 @@ void init_prehash_data()
         _PREHASH_AcceptNotices = gMessageStringTable.getString("AcceptNotices");
         _PREHASH_SetGroupAcceptNotices = gMessageStringTable.getString("SetGroupAcceptNotices");
         _PREHASH_CloseCircuit = gMessageStringTable.getString("CloseCircuit");
-        _PREHASH_LogControl = gMessageStringTable.getString("LogControl");
         _PREHASH_TeleportFinish = gMessageStringTable.getString("TeleportFinish");
         _PREHASH_PathRevolutions = gMessageStringTable.getString("PathRevolutions");
         _PREHASH_ClassifiedInfoReply = gMessageStringTable.getString("ClassifiedInfoReply");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index aee8045..9cb4884 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -508,7 +508,6 @@ extern char * _PREHASH_NVPair;
 extern char * _PREHASH_ObjectSpinStart;
 extern char * _PREHASH_UseEstateSun;
 extern char * _PREHASH_LogoutBlock;
-extern char * _PREHASH_RelayLogControl;
 extern char * _PREHASH_RegionID;
 extern char * _PREHASH_Creator;
 extern char * _PREHASH_ProposalText;
@@ -1313,7 +1312,6 @@ extern char * _PREHASH_AssetBlock;
 extern char * _PREHASH_AcceptNotices;
 extern char * _PREHASH_SetGroupAcceptNotices;
 extern char * _PREHASH_CloseCircuit;
-extern char * _PREHASH_LogControl;
 extern char * _PREHASH_TeleportFinish;
 extern char * _PREHASH_PathRevolutions;
 extern char * _PREHASH_ClassifiedInfoReply;
diff --git a/linden/indra/llmessage/message_string_table.cpp b/linden/indra/llmessage/message_string_table.cpp
index 88e073b..7fea048 100644
--- a/linden/indra/llmessage/message_string_table.cpp
+++ b/linden/indra/llmessage/message_string_table.cpp
@@ -76,7 +76,7 @@ char* LLMessageStringTable::getString(const char *str)
                 }
         }
         // not found, so add!
-        strncpy(mString[hash_value], str, MESSAGE_MAX_STRINGS_LENGTH);
+        strncpy(mString[hash_value], str, MESSAGE_MAX_STRINGS_LENGTH);  /* Flawfinder: ignore */
         mString[hash_value][MESSAGE_MAX_STRINGS_LENGTH - 1] = 0;
         mEmpty[hash_value] = FALSE;
         mUsed++;
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index d21165e..de19ef8 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -143,7 +143,7 @@ char *u32_to_ip_string(U32 ip, char *ip_string)
         if (result != NULL)
         {
                 //the function signature needs to change to pass in the lengfth of first and last.
-                strcpy(ip_string, result);
+                strcpy(ip_string, result);      /*Flawfinder: ignore*/
                 return ip_string;
         }
         else
diff --git a/linden/indra/llmessage/partsyspacket.cpp b/linden/indra/llmessage/partsyspacket.cpp
index d491540..d6ba11e 100644
--- a/linden/indra/llmessage/partsyspacket.cpp
+++ b/linden/indra/llmessage/partsyspacket.cpp
@@ -1265,7 +1265,7 @@ BOOL LLPartSysCompressedPacket::fromUnsignedBytes(U8 *in, U32 bytesUsed)
 {
         if ((in != NULL) && (bytesUsed <= sizeof(mData)))
         {
-                memcpy(mData, in, bytesUsed);
+                memcpy(mData, in, bytesUsed);   /* Flawfinder: ignore */
                 mNumBytes = bytesUsed;
                 return TRUE;
         }
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h
index 12be1e9..a472274 100644
--- a/linden/indra/llprimitive/llmaterialtable.h
+++ b/linden/indra/llprimitive/llmaterialtable.h
@@ -38,7 +38,7 @@ class LLMaterialInfo
 {
 public:
         U8                  mMCode;
-        char            mName[LLMATERIAL_INFO_NAME_LENGTH];
+        char            mName[LLMATERIAL_INFO_NAME_LENGTH];     /* Flawfinder: ignore */
         LLUUID          mDefaultTextureID;
         LLUUID          mShatterSoundID;
         F32         mDensity;           // kg/m^3
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 5fb95c8..859a34f 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -707,13 +707,13 @@ U8 LLPrimitive::pCodeToLegacy(const LLPCode pcode)
 // Don't crash or llerrs here!  This function is used for debug strings.
 const char * LLPrimitive::pCodeToString(const LLPCode pcode)
 {
-        static char pcode_string[255];
+        static char pcode_string[255];  /* Flawfinder: ignore */
 
         U8 base_code = pcode & LL_PCODE_BASE_MASK;
         pcode_string[0] = 0;
         if (!pcode)
         {
-                sprintf(pcode_string, "null");
+                snprintf(pcode_string, sizeof(pcode_string), "null");   /* Flawfinder: ignore */
         }
         else if ((base_code) == LL_PCODE_LEGACY)
         {
@@ -721,66 +721,66 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode)
                 switch (pcode)
                 {
                 case LL_PCODE_LEGACY_GRASS:
-                        sprintf(pcode_string, "grass");
+                        snprintf(pcode_string, sizeof(pcode_string), "grass");  /* Flawfinder: ignore */
                         break;
                 case LL_PCODE_LEGACY_PART_SYS:
-                        sprintf(pcode_string, "particle system");
+                        snprintf(pcode_string, sizeof(pcode_string), "particle system");        /* Flawfinder: ignore */
                         break;
                 case LL_PCODE_LEGACY_AVATAR:
-                        sprintf(pcode_string, "avatar");
+                        snprintf(pcode_string, sizeof(pcode_string), "avatar"); /* Flawfinder: ignore */
                         break;
                 case LL_PCODE_LEGACY_TEXT_BUBBLE:
-                        sprintf(pcode_string, "text bubble");
+                        snprintf(pcode_string, sizeof(pcode_string), "text bubble");    /* Flawfinder: ignore */
                         break;
                 case LL_PCODE_LEGACY_TREE:
-                        sprintf(pcode_string, "tree");
+                        snprintf(pcode_string, sizeof(pcode_string), "tree");   /* Flawfinder: ignore */
                         break;
                 case LL_PCODE_TREE_NEW:
-                        sprintf(pcode_string, "tree_new");
+                        snprintf(pcode_string, sizeof(pcode_string), "tree_new");       /* Flawfinder: ignore */
                         break;
                 default:
-                        sprintf(pcode_string, "unknown legacy pcode %i",(U32)pcode);
+                        snprintf(pcode_string, sizeof(pcode_string), "unknown legacy pcode %i",(U32)pcode);     /* Flawfinder: ignore */
                 }
         }
         else
         {
-                char shape[32];
-                char mask[32];
+                char shape[32]; /* Flawfinder: ignore */
+                char mask[32];  /* Flawfinder: ignore */
                 if (base_code == LL_PCODE_CUBE)
                 {
-                        sprintf(shape, "cube");
+                        snprintf(shape, sizeof(shape), "cube"); /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_CYLINDER)
                 {
-                        sprintf(shape, "cylinder");
+                        snprintf(shape, sizeof(shape), "cylinder");     /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_CONE)
                 {
-                        sprintf(shape, "cone");
+                        snprintf(shape, sizeof(shape), "cone"); /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_PRISM)
                 {
-                        sprintf(shape, "prism");
+                        snprintf(shape, sizeof(shape), "prism");        /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_PYRAMID)
                 {
-                        sprintf(shape, "pyramid");
+                        snprintf(shape, sizeof(shape), "pyramid");      /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_SPHERE)
                 {
-                        sprintf(shape, "sphere");
+                        snprintf(shape, sizeof(shape), "sphere");       /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_TETRAHEDRON)
                 {
-                        sprintf(shape, "tetrahedron");
+                        snprintf(shape, sizeof(shape), "tetrahedron");  /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_VOLUME)
                 {
-                        sprintf(shape, "volume");
+                        snprintf(shape, sizeof(shape), "volume");       /* Flawfinder: ignore */
                 }
                 else if (base_code == LL_PCODE_APP)
                 {
-                        sprintf(shape, "app");
+                        snprintf(shape, sizeof(shape), "app");  /* Flawfinder: ignore */
                 }
                 else
                 {
@@ -790,15 +790,15 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode)
                 U8 mask_code = pcode & (~LL_PCODE_BASE_MASK);
                 if (base_code == LL_PCODE_APP)
                 {
-                        sprintf(mask, "%x", mask_code);
+                        snprintf(mask, sizeof(mask), "%x", mask_code);  /* Flawfinder: ignore */
                 }
                 else if (mask_code & LL_PCODE_HEMI_MASK)
                 {
-                        sprintf(mask, "hemi");
+                        snprintf(mask, sizeof(mask), "hemi");   /* Flawfinder: ignore */
                 }
                 else if (mask != 0)
                 {
-                        sprintf(mask, "%x", mask_code);
+                        snprintf(mask, sizeof(mask), "%x", mask_code);  /* Flawfinder: ignore */
                 }
                 else
                 {
@@ -807,11 +807,11 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode)
 
                 if (mask[0])
                 {
-                        sprintf(pcode_string, "%s-%s", shape, mask);
+                        snprintf(pcode_string, sizeof(pcode_string), "%s-%s", shape, mask);     /* Flawfinder: ignore */
                 }
                 else
                 {
-                        sprintf(pcode_string, "%s", shape);
+                        snprintf(pcode_string, sizeof(pcode_string), "%s", shape);      /* Flawfinder: ignore */
                 }
         }
         return pcode_string;
@@ -1197,7 +1197,7 @@ S32 LLPrimitive::packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_fa
                         { 
                                 if (!memcmp(data_ptr+(data_size *face_index), data_ptr+(data_size *i), data_size))
                                 {
-                                        exception_faces |= (1 << i); 
+                                        exception_faces |= ((U64)1 << i); 
                                 }
                         }
                         
@@ -1238,7 +1238,7 @@ S32 LLPrimitive::unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 dat
         for (i = 1; i < face_count; i++)
         {
                 // Already unswizzled, don't need to unswizzle it again!
-                memcpy(data_ptr+(i*data_size),data_ptr,data_size);
+                memcpy(data_ptr+(i*data_size),data_ptr,data_size);      /* Flawfinder: ignore */ 
         }
         
         while ((cur_ptr < buffer_end) && (*cur_ptr != 0))
@@ -1301,7 +1301,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
                 for (face_index = 0; face_index <= last_face_index; face_index++)
                 {
                         // Directly sending image_ids is not safe!
-                        memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16);
+                        memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16);  /* Flawfinder: ignore */ 
 
                         // Cast LLColor4 to LLColor4U
                         coloru.setVec( getTE(face_index)->getColor() );
@@ -1377,7 +1377,7 @@ BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const
                 for (face_index = 0; face_index <= last_face_index; face_index++)
                 {
                         // Directly sending image_ids is not safe!
-                        memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16);
+                        memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16);  /* Flawfinder: ignore */ 
 
                         // Cast LLColor4 to LLColor4U
                         coloru.setVec( getTE(face_index)->getColor() );
@@ -1588,7 +1588,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
         for (i = 0; i < face_count; i++)
         {
 //              llinfos << "BUMP unpack (Datapacker) [" << i << "]=" << S32(bump[i]) <<llendl;
-                memcpy(image_ids[i].mData,&image_data[i*16],16);
+                memcpy(image_ids[i].mData,&image_data[i*16],16);        /* Flawfinder: ignore */        
         }
         
         LLColor4 color;
@@ -1628,6 +1628,24 @@ void LLPrimitive::setTextureList(LLTextureEntry *listp)
 
 //============================================================================
 
+//static 
+BOOL LLNetworkData::isValid(U16 param_type, U32 size)
+{
+        // ew - better mechanism needed
+        
+        switch(param_type)
+        {
+        case PARAMS_FLEXIBLE:
+                return (size == 16);
+        case PARAMS_LIGHT:
+                return (size == 16);
+        }
+        
+        return FALSE;
+}
+
+//============================================================================
+
 LLLightParams::LLLightParams()
 {
         mColor.setToWhite();
@@ -1650,12 +1668,22 @@ BOOL LLLightParams::pack(LLDataPacker &dp) const
 
 BOOL LLLightParams::unpack(LLDataPacker &dp)
 {
-        LLColor4U color4u;
-        dp.unpackColor4U(color4u, "color");
-        mColor = LLColor4(color4u);
-        dp.unpackF32(mRadius, "radius");
-        dp.unpackF32(mCutoff, "cutoff");
-        dp.unpackF32(mFalloff, "falloff");
+        LLColor4U color;
+        dp.unpackColor4U(color, "color");
+        setColor(LLColor4(color));
+
+        F32 radius;
+        dp.unpackF32(radius, "radius");
+        setRadius(radius);
+
+        F32 cutoff;
+        dp.unpackF32(cutoff, "cutoff");
+        setCutoff(cutoff);
+
+        F32 falloff;
+        dp.unpackF32(falloff, "falloff");
+        setFalloff(falloff);
+        
         return TRUE;
 }
 
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index e51fdcf..953d284 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -108,6 +108,7 @@ public:
         virtual BOOL unpack(LLDataPacker &dp) = 0;
         virtual bool operator==(const LLNetworkData& data) const = 0;
         virtual void copy(const LLNetworkData& data) = 0;
+        static BOOL isValid(U16 param_type, U32 size);
 };
 
 extern const F32 LIGHT_MIN_RADIUS;
diff --git a/linden/indra/llprimitive/llprimitive_vc8.vcproj b/linden/indra/llprimitive/llprimitive_vc8.vcproj
new file mode 100644
index 0000000..5fbcbb1
--- /dev/null
+++ b/linden/indra/llprimitive/llprimitive_vc8.vcproj
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llprimitive"

+        ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llprimitive.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llprimitive.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llprimitive.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llmaterialtable.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprimitive.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextureanim.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextureentry.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltreeparams.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumemessage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumexml.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\legacy_object_types.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmaterialtable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprimitive.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextureanim.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextureentry.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltree_common.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltreeparams.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumemessage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumexml.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\material_codes.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\object_flags.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llprimitive/llvolumemessage.cpp b/linden/indra/llprimitive/llvolumemessage.cpp
index cecd2c2..b00bbc5 100644
--- a/linden/indra/llprimitive/llvolumemessage.cpp
+++ b/linden/indra/llprimitive/llvolumemessage.cpp
@@ -448,41 +448,36 @@ bool LLVolumeMessage::unpackPathParams(LLPathParams* params, LLDataPacker &dp)
 // static
 bool LLVolumeMessage::constrainVolumeParams(LLVolumeParams& params)
 {
-        bool ok = true;
+        U32 bad = 0;
 
         // This is called immediately after an unpack. feed the raw data
         // through the checked setters to constraint it to a valid set of
         // volume params.
-        ok &= params.setType(
-                params.getProfileParams().getCurveType(),
-                params.getPathParams().getCurveType());
-        ok &= params.setBeginAndEndS(
-                params.getProfileParams().getBegin(),
-                params.getProfileParams().getEnd());
-        ok &= params.setBeginAndEndT(
-                params.getPathParams().getBegin(),
-                params.getPathParams().getEnd());
-        ok &= params.setHollow(params.getProfileParams().getHollow());
-        ok &= params.setTwistBegin(params.getPathParams().getTwistBegin());
-        ok &= params.setTwistEnd(params.getPathParams().getTwistEnd());
-        ok &= params.setRatio(
-                params.getPathParams().getScaleX(),
-                params.getPathParams().getScaleY());
-        ok &= params.setShear(
-                params.getPathParams().getShearX(),
-                params.getPathParams().getShearY());
-        ok &= params.setTaper(
-                params.getPathParams().getTaperX(),
-                params.getPathParams().getTaperY());
-        ok &= params.setRevolutions(params.getPathParams().getRevolutions());
-        ok &= params.setRadiusOffset(params.getPathParams().getRadiusOffset());
-        ok &= params.setSkew(params.getPathParams().getSkew());
-        if(!ok)
+        bad |= params.setType(params.getProfileParams().getCurveType(),
+                                                 params.getPathParams().getCurveType()) ? 0 : 1;
+        bad |= params.setBeginAndEndS(params.getProfileParams().getBegin(),
+                                                                  params.getProfileParams().getEnd()) ? 0 : 2;
+        bad |= params.setBeginAndEndT(params.getPathParams().getBegin(),
+                                                                  params.getPathParams().getEnd()) ? 0 : 4;
+        bad |= params.setHollow(params.getProfileParams().getHollow()) ? 0 : 8;
+        bad |= params.setTwistBegin(params.getPathParams().getTwistBegin()) ? 0 : 0x10;
+        bad |= params.setTwistEnd(params.getPathParams().getTwistEnd()) ? 0 : 0x20;
+        bad |= params.setRatio(params.getPathParams().getScaleX(),
+                                                   params.getPathParams().getScaleY()) ? 0 : 0x40;
+        bad |= params.setShear(params.getPathParams().getShearX(),
+                                                   params.getPathParams().getShearY()) ? 0 : 0x80;
+        bad |= params.setTaper(params.getPathParams().getTaperX(),
+                                                   params.getPathParams().getTaperY()) ? 0 : 0x100;
+        bad |= params.setRevolutions(params.getPathParams().getRevolutions()) ? 0 : 0x200;
+        bad |= params.setRadiusOffset(params.getPathParams().getRadiusOffset()) ? 0 : 0x400;
+        bad |= params.setSkew(params.getPathParams().getSkew()) ? 0 : 0x800;
+        if(bad)
         {
                 llwarns << "LLVolumeMessage::constrainVolumeParams() - "
-                        << "forced to constrain incoming volume params." << llendl;
+                                << "forced to constrain incoming volume params: "
+                                << llformat("0x%04x",bad) << llendl;
         }
-        return ok;
+        return bad ? false : true;
 }
 
 bool LLVolumeMessage::packVolumeParams(const LLVolumeParams* params, LLMessageSystem *mesgsys)
diff --git a/linden/indra/llrender/files.lst b/linden/indra/llrender/files.lst
index e7b3cec..a813342 100644
--- a/linden/indra/llrender/files.lst
+++ b/linden/indra/llrender/files.lst
@@ -1,8 +1,6 @@
-llrender/llagpmempoolarb.cpp
-llrender/llagpmempool.cpp
 llrender/llfont.cpp
 llrender/llfontgl.cpp
 llrender/llgldbg.cpp
 llrender/llimagegl.cpp
-llrender/llvertexprogramgl.cpp
+llrender/llvertexbuffer.cpp
 llrender/text_out.cpp
diff --git a/linden/indra/llrender/llagpmempool.cpp b/linden/indra/llrender/llagpmempool.cpp
deleted file mode 100644
index 39cd3e8..0000000
--- a/linden/indra/llrender/llagpmempool.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/** 
- * @file llagpmempool.cpp
- * @brief LLAGPMemPool base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "linden_common.h"
-
-#include "llagpmempool.h"
-#include "llgl.h"
-
-#include "llagpmempoolarb.h"
-#include "llagpmempoolnv.h"
-#include "llagpmempoolati.h"
-
-#if LL_DARWIN
-#include "llagpmempoolapple.h"
-#endif // LL_DARWIN
-
-//static
-S32 LLAGPMemPool::LLFreeBlock::sNumBlocks = 0;
-
-LLAGPMemPool::LLAGPMemPool()
-{
-        mSize = 0;
-        mTotalAllocated = 0;
-}
-
-LLAGPMemPool::~LLAGPMemPool()
-{
-        mFreeList.deleteAll();
-}
-
-LLAGPMemPool *LLAGPMemPool::createPool(const U32 size, const BOOL use_vbo)
-{
-        if (gGLManager.mHasVertexBufferObject && use_vbo)
-        { 
-                return new LLAGPMemPoolARB(size);
-        }
-#if LL_WINDOWS  // *FIX: linux can use these, too, with some work.
-        if (gGLManager.mHasNVFence)
-        {
-                return new LLAGPMemPoolNV(size);
-        }
-        else if (gGLManager.mHasATIVAO)
-        {
-                return new LLAGPMemPoolATI(size);
-        }
-        else
-#elif LL_DARWIN
-        if (gGLManager.mHasAPPLEFence && gGLManager.mHasAPPLEVertexArrayRange)
-        { 
-                return new LLAGPMemPoolAPPLE(size);
-        }
-        else
-#endif
-        {
-                // No AGP memory allocation at all!
-                return NULL;
-        }
-}
-
-
-LLAGPMemBlock *LLAGPMemPool::allocBlock(const S32 size)
-{
-        S32 aligned_size = size;
-        if (size & 0x0f)
-        {
-                aligned_size += 16 - (size & 0x0f);
-        }
-        
-        if (aligned_size > (mSize - mTotalAllocated))
-        {
-                // We're totally out of AGP memory, bail.
-                return NULL;
-        }
-
-        LLFreeBlock *free_block = mFreeList.getFirst();
-
-        while (free_block && free_block->mSize < aligned_size)
-        {
-                free_block = free_block->getNext();
-        }
-
-        U32 offset = 0;
-
-        if (free_block)
-        {
-                if (free_block->mSize == aligned_size)
-                {
-                        free_block->unlink();
-                        offset = free_block->mOffset;
-                        delete free_block;
-                }
-                else
-                {
-                        offset = free_block->mOffset + free_block->mSize - aligned_size;
-                        free_block->mSize -= aligned_size;
-                        if (0 == free_block->mSize)
-                        {
-                                free_block->unlink();
-                        }
-                }
-        }
-        else
-        {
-                //llwarns << "LLAGPMemPool unable to allocate " << size << " bytes" << llendl;
-                return NULL;
-        }
-
-        mTotalAllocated += aligned_size;
-        return createBlock(offset, aligned_size);
-}
-
-
-void LLAGPMemPool::freeBlock(LLAGPMemBlock *blockp)
-{
-        if (!blockp->getSize())
-        {
-                return;
-        }
-
-        LLFreeBlock *prev_free = NULL;
-        LLFreeBlock *cur_free = mFreeList.getFirst();
-
-        while (cur_free && blockp->getOffset() > (U32)cur_free->mOffset)
-        {
-                prev_free = cur_free;
-                cur_free = cur_free->getNext();
-        }
-
-        LLFreeBlock *new_free = new LLFreeBlock(blockp->getOffset(), blockp->getSize());
-
-        if (prev_free)
-        {
-                prev_free->append(*new_free);
-                coalesce(new_free);
-                coalesce(prev_free);
-        }
-        else
-        {
-                mFreeList.append(*new_free);
-                coalesce(new_free);
-        }
-        mTotalAllocated -= blockp->getSize();
-}
-
-void LLAGPMemPool::coalesce(LLFreeBlock *free_block)
-{
-        LLFreeBlock *next = free_block->getNext();
-
-        if (next && (free_block->mOffset + free_block->mSize == next->mOffset))
-        {
-                free_block->mSize += next->mSize;
-
-                next->unlink();
-                delete next;
-
-                coalesce(free_block);
-        }
-}
-
-void LLAGPMemPool::printFreeList()
-{
-        LLFreeBlock *cur_block = mFreeList.getFirst();
-        while (cur_block)
-        {
-                llinfos << "Cur block begin: " << cur_block->mOffset << llendl;
-                llinfos << "Cur block end:   " << cur_block->mOffset + cur_block->mSize << llendl;
-                cur_block = cur_block->getNext();
-        }
-}
-
diff --git a/linden/indra/llrender/llagpmempool.h b/linden/indra/llrender/llagpmempool.h
deleted file mode 100644
index f992876..0000000
--- a/linden/indra/llrender/llagpmempool.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/** 
- * @file llagpmempool.h
- * @brief LLAGPMemPool base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLAGPMEMPOOL_H
-#define LL_LLAGPMEMPOOL_H
-
-#include "stdtypes.h"
-#include "lldlinked.h"
-
-// Raw memory handling abstraction, which handles interaction with
-// the nVidia and ATI AGP extensions.
-
-// Minimum size we allow allocation for, in order to allow AGP usage...
-const S32 MIN_AGP_SIZE = 8000000;
-
-class LLAGPMemBlock;
-
-class LLAGPMemPool
-{
-public:
-        LLAGPMemPool();
-        virtual ~LLAGPMemPool();
-
-        virtual LLAGPMemBlock *allocBlock(const S32 size);
-        virtual void freeBlock(LLAGPMemBlock *blockp);
-
-        virtual void flush() = 0;
-        virtual void dump() = 0;
-        virtual void enable() = 0;
-        virtual void disable() = 0;
-        virtual void bind() = 0;
-
-        virtual S32    getSize()                { return mSize; }
-
-        S32 getTotalAllocated() const   { return mTotalAllocated; }
-        static LLAGPMemPool *createPool(const U32 size, const BOOL use_vbo);
-
-        struct LLFreeBlock: public LLDLinked<LLFreeBlock>
-        {
-                S32  mOffset;
-                S32  mSize;
-                LLFreeBlock(const S32 offset, const S32 size) { mOffset = offset; mSize = size; sNumBlocks++; }
-                ~LLFreeBlock() { sNumBlocks--; }
-
-                static S32 sNumBlocks;
-        };
-
-        // Fencing (for nVidia and Apple) - default is to do nothing (ATI, ARB do not need fencing)
-        virtual U32  createFence() { return 0; }
-        virtual void deleteFence(const U32 fence) {}
-        virtual void sendFence(U32 fence) {}
-        virtual void waitFence(U32 fence) {}
-
-        void printFreeList();
-protected:
-
-        void coalesce(LLFreeBlock *free_block);
-        virtual LLAGPMemBlock *createBlock(const U32 offset, const U32 size) = 0;
-        LLDLinked<LLFreeBlock> mFreeList;
-
-        S32 mSize;
-        S32 mTotalAllocated;
-};
-
-// An AGP memory block, which contains all the info needed to
-// copy data in/out.
-class LLAGPMemBlock
-{
-public:
-        LLAGPMemBlock(LLAGPMemPool *mem_poolp) : mMemPoolp(mem_poolp) {}
-        virtual ~LLAGPMemBlock()                                        {}
-        virtual void copy     (void *source, const U32 size_bytes) = 0;
-        virtual void copyColor(void *source, const U32 size_bytes) = 0;
-
-        virtual void bindGLVertexPointer(const U32 stride, const U32 offset) = 0;
-        virtual void bindGLNormalPointer(const U32 stride, const U32 offset) = 0;
-        virtual void bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset) = 0;
-        virtual void bindGLColorPointer(const U32 stride, const U32 offset) = 0;
-        virtual void bindGLTexCoordPointer(const U32 stride, const U32 offset) = 0;
-        virtual void bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset) = 0;
-        virtual void bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset) = 0;
-
-        virtual BOOL hasMappedMem() const = 0;
-        virtual U8*     getMappedMem() = 0;
-
-        virtual U32  createFence() = 0;
-        virtual void deleteFence(const U32 fence) = 0;
-        virtual void sendFence(U32 fence) = 0;
-        virtual void waitFence(U32 fence) = 0;
-
-        virtual U32 getOffset() const = 0;
-        virtual U32 getSize() const = 0;
-protected:
-        LLAGPMemPool *mMemPoolp;
-};
-
-#endif // LL_LLAGPMEMPOOL_H
diff --git a/linden/indra/llrender/llagpmempoolapple.cpp b/linden/indra/llrender/llagpmempoolapple.cpp
deleted file mode 100644
index 9aa4993..0000000
--- a/linden/indra/llrender/llagpmempoolapple.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/** 
- * @file llagpmempoolapple.cpp
- * @brief LLAGPMemPoolAPPLE base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifdef LL_DARWIN
-
-#include "linden_common.h"
-
-#include "llagpmempoolapple.h"
-#include "llgl.h"
-
-#include "llglheaders.h"
-
-LLAGPMemPoolAPPLE::LLAGPMemPoolAPPLE(S32 request) : LLAGPMemPool()
-{
-        llinfos << "Creating LLAGPMemPoolAPPLE" << llendl;
-        stop_glerror();
-        if (!gGLManager.mHasAPPLEFence || !gGLManager.mHasAPPLEVertexArrayRange)
-        {
-                llerrs << "necessary extensions not present!" << llendl;
-        }
-        
-        // No special allocation is necessary for the Apple extensions
-        mBase    = (U8*)::malloc(request);
-        mSize     = request;
-
-        if (mBase)
-        {
-                mFreeList.append(*(new LLFreeBlock(0,mSize)));
-        }
-        else
-        {
-                mSize = 0;
-        }
-
-        flush_glerror();
-}
-
-LLAGPMemBlockAPPLE::~LLAGPMemBlockAPPLE()
-{
-        mMemPoolp->freeBlock(this); 
-}
- 
-LLAGPMemBlock *LLAGPMemPoolAPPLE::createBlock(const U32 offset, const U32 size)
-{
-        return new LLAGPMemBlockAPPLE(this, mBase, offset, size);
-}
-
-LLAGPMemPoolAPPLE::~LLAGPMemPoolAPPLE()
-{       
-        if (mBase)
-        {
-                // MBW -- This really belongs in a call which is the opposite of bind()...
-                glVertexArrayRangeAPPLE(0, 0);
-                ::free(mBase);
-        }
-}
-
-void LLAGPMemPoolAPPLE::bind()
-{
-        if(mBase)
-        {
-                glVertexArrayRangeAPPLE(mSize, mBase);
-        }
-}
-
-void LLAGPMemPoolAPPLE::enable()
-{
-        glEnableClientState(GL_VERTEX_ARRAY_RANGE_APPLE);
-}
-
-void LLAGPMemPoolAPPLE::disable()
-{
-        glDisableClientState(GL_VERTEX_ARRAY_RANGE_APPLE);
-}
-
-void LLAGPMemPoolAPPLE::flush()
-{
-        if(mBase)
-        {
-                glFlushVertexArrayRangeAPPLE(mSize, mBase);
-        }
-}
-
-void LLAGPMemPoolAPPLE::dump()
-{
-        LLFreeBlock *prev = 0;
-        LLFreeBlock *block = mFreeList.getFirst();
-
-        int d=0;
-
-        int i=0;
-        while (block)
-        {
-                i++;
-                if (prev)
-                {
-                        d = (S32)block->mOffset - ((S32)prev->mOffset + prev->mSize);
-                }
-                else d = 0;
-
-                prev  = block;
-                block = block->getNext();
-        }
-}
-
-
-U32  LLAGPMemPoolAPPLE::createFence()
-{
-        U32 fence;
-    glGenFencesAPPLE(1, (GLuint*)&fence);
-        glSetFenceAPPLE(fence);
-    glFinishFenceAPPLE(fence);
-        return fence;
-}
-
-
-void  LLAGPMemPoolAPPLE::deleteFence(const U32 fence)
-{
-    glDeleteFencesAPPLE(1, (GLuint*)&fence);
-}
-
-
-void LLAGPMemPoolAPPLE::sendFence(U32 fence)
-{
-    glSetFenceAPPLE(fence);
-}
-
-
-void LLAGPMemPoolAPPLE::waitFence(U32 fence)
-{
-    if(!glTestFenceAPPLE(fence))
-    {
-        glFinishFenceAPPLE(fence);
-        }
-}
-
-
-/////////////////////////////
-//
-// LLAGPMemBlockAPPLE
-//
-// APPLE Implementation of an AGP memory block
-//
-
-LLAGPMemBlockAPPLE::LLAGPMemBlockAPPLE(LLAGPMemPool *mem_poolp, U8 *baseptr, S32 offset, const U32 size) : LLAGPMemBlock(mem_poolp)
-{
-        mMemp = baseptr + offset;
-        mOffset = offset;
-        mSize = size;
-}
-
-
-void LLAGPMemBlockAPPLE::bindGLVertexPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex array" << llendl;
-        }
-        glVertexPointer(3, GL_FLOAT, stride, mMemp + offset);
-}
-
-void LLAGPMemBlockAPPLE::bindGLNormalPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty normal array" << llendl;
-        }
-        glNormalPointer(GL_FLOAT, stride, mMemp + offset);
-}
-
-
-void LLAGPMemBlockAPPLE::bindGLColorPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty color array" << llendl;
-        }
-        glColorPointer(4, GL_UNSIGNED_BYTE, stride, mMemp + offset);
-}
-
-
-void LLAGPMemBlockAPPLE::bindGLTexCoordPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty texcoord array" << llendl;
-        }
-        glTexCoordPointer(2, GL_FLOAT, stride, mMemp + offset);
-}
-
-
-void LLAGPMemBlockAPPLE::bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex weight array" << llendl;
-        }
-
-        if (index > 0) glVertexAttribPointerARB(index, 3, GL_FLOAT, FALSE, stride, (F32 *)(mMemp + offset));
-}
-
-void LLAGPMemBlockAPPLE::bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex weight array" << llendl;
-        }
-
-        if (index > 0) glVertexAttribPointerARB(index, 1, GL_FLOAT, FALSE, 0, (F32 *)(mMemp + offset));
-}
-
-void LLAGPMemBlockAPPLE::bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex weight array" << llendl;
-        }
-        set_vertex_clothing_weights(index, stride, (LLVector4 *)(mMemp + offset));
-}
-
-U8* LLAGPMemBlockAPPLE::getMappedMem()
-{
-        return mMemp;
-}
-
-
-void LLAGPMemBlockAPPLE::copy(void *mem, const U32 size)
-{
-        if (!mMemp || !mem)
-        {
-                return;
-        }
-        llassert(size <= mSize);
-
-        memcpy( mMemp, mem, size );
-        
-        glFlushVertexArrayRangeAPPLE(size, mMemp);
-}
-
-void LLAGPMemBlockAPPLE::copyColor(void *mem, const U32 size)
-{
-        if (!mMemp || !mem)
-        {
-                return;
-        }
-        llassert(size <= mSize);
-
-        memcpy( mMemp, mem, size );
-        
-        glFlushVertexArrayRangeAPPLE(size, mMemp);
-}
-
-
-
-U32  LLAGPMemBlockAPPLE::createFence()
-{
-        U32 fence;
-    glGenFencesAPPLE(1, (GLuint*)&fence);
-        glSetFenceAPPLE(fence);
-    glFinishFenceAPPLE(fence);
-        return fence;
-}
-
-void  LLAGPMemBlockAPPLE::deleteFence(const U32 fence)
-{
-    glDeleteFencesAPPLE(1, (GLuint*)&fence);
-}
-
-void LLAGPMemBlockAPPLE::sendFence(U32 fence)
-{
-    glSetFenceAPPLE(fence);
-}
-
-void LLAGPMemBlockAPPLE::waitFence(U32 fence)
-{
-    if(!glTestFenceAPPLE(fence))
-    {
-        glFinishFenceAPPLE(fence);
-        }
-}
-
-// MBW -- May want this at some point...
-#if 0
-void LLAGPMemBlockAPPLE::flush()
-{
-        glFlushVertexArrayRangeAPPLE(mSize, mMemp);
-}
-#endif
-
-#endif // LL_DARWIN
diff --git a/linden/indra/llrender/llagpmempoolapple.h b/linden/indra/llrender/llagpmempoolapple.h
deleted file mode 100644
index 4a72a28..0000000
--- a/linden/indra/llrender/llagpmempoolapple.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/** 
- * @file llagpmempoolapple.h
- * @brief LLAGPMemPoolAPPLE base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLAGPMEMPOOLAPPLE_H
-#define LL_LLAGPMEMPOOLAPPLE_H
-
-#include "llagpmempool.h"
-
-#if LL_DARWIN
-class LLAGPMemPoolAPPLE : public LLAGPMemPool
-{
-public:
-        LLAGPMemPoolAPPLE(S32 request);
-        virtual ~LLAGPMemPoolAPPLE();
-
-        /*virtual*/ void flush();
-        /*virtual*/ void dump();
-        /*virtual*/ void enable();
-        /*virtual*/ void disable();
-        /*virtual*/ void bind();
-
-        /*virtual*/ U32  createFence();
-        /*virtual*/ void deleteFence(const U32 fence);
-        /*virtual*/ void sendFence(U32 fence);
-        /*virtual*/ void waitFence(U32 fence);
-
-protected:
-        /*virtual*/ LLAGPMemBlock *createBlock(const U32 offset, const U32 size);
-
-protected:
-        U8 *mBase;
-};
-
-class LLAGPMemBlockAPPLE : public LLAGPMemBlock
-{
-public:
-        LLAGPMemBlockAPPLE(LLAGPMemPool *mem_poolp, U8 *baseptr, const S32 offset, const U32 size);
-        virtual ~LLAGPMemBlockAPPLE();
-
-        /*virtual*/ void copy     (void *source, const U32 size_bytes);
-        /*virtual*/ void copyColor(void *source, const U32 size_bytes);
-        /*virtual*/ void free();
-
-        /*virtual*/ void bindGLVertexPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLNormalPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLColorPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLTexCoordPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset);
-
-        /*virtual*/ U32 getOffset()        const { return mOffset; }
-        /*virtual*/ U32 getSize()          const { return mSize; }
-
-        /*virtual*/ BOOL hasMappedMem() const           { return TRUE; }
-        /*virtual*/ U8*  getMappedMem();
-        /*virtual*/ U32  createFence();
-        /*virtual*/ void deleteFence(const U32 fence);
-        /*virtual*/ void sendFence(U32 fence);
-        /*virtual*/ void waitFence(U32 fence);
-
-private:
-        U8 *mMemp;
-        U32 mOffset; // Offset from base
-        U32 mSize;
-        friend class LLAGPMemPoolAPPLE;
-};
-
-#endif // LL_DARWIN
-
-#endif // LL_LLAGPMEMPOOLAPPLE_H
diff --git a/linden/indra/llrender/llagpmempoolarb.cpp b/linden/indra/llrender/llagpmempoolarb.cpp
deleted file mode 100644
index ab97c97..0000000
--- a/linden/indra/llrender/llagpmempoolarb.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/** 
- * @file llagpmempoolarb.cpp
- * @brief LLAGPMemPoolARB base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "linden_common.h"
-#include "llagpmempoolarb.h"
-#include "llgl.h"
-
-#include "llglheaders.h"
-
-LLAGPMemPoolARB::LLAGPMemPoolARB(S32 request) : LLAGPMemPool()
-{
-        llinfos << "Creating LLAGPMemPoolARB" << llendl;
-        stop_glerror();
-        if (!gGLManager.mHasVertexBufferObject)
-        {
-                llerrs << "No ARB vertex buffer object extension!" << llendl;
-        }
-
-        mName = 0;
-
-        mSize = request;
-        flush_glerror();
-}
-
-
-LLAGPMemPoolARB::~LLAGPMemPoolARB()
-{
-}
-
-
-LLAGPMemBlock* LLAGPMemPoolARB::allocBlock(const S32 size) 
-{
-        return allocBlock(size, GL_ARRAY_BUFFER_ARB); 
-}
-
-LLAGPMemBlock *LLAGPMemPoolARB::allocBlock(const S32 size, U32 target)
-{
-        S32 aligned_size = size;
-        if (size & 0x0f)
-        {
-                aligned_size += 16 - (size & 0x0f);
-        }
-        
-        if (aligned_size > (mSize - mTotalAllocated))
-        {
-                // We're totally out of AGP memory, bail.
-                return (LLAGPMemBlock *)0;
-        }
-
-        mTotalAllocated += aligned_size;
-        return createBlock(0, aligned_size, target);
-}
-
-
-void LLAGPMemPoolARB::freeBlock(LLAGPMemBlock *blockp)
-{
-        if (!blockp->getSize())
-        {
-                return;
-        }
-        LLAGPMemBlockARB *arb_blockp = (LLAGPMemBlockARB*)blockp;
-        U32 name[1];
-        name[0] = arb_blockp->getName();
-        stop_glerror();
-        glDeleteBuffersARB(1, (GLuint*)name);
-        stop_glerror();
-        mTotalAllocated -= blockp->getSize();
-}
-
-LLAGPMemBlock *LLAGPMemPoolARB::createBlock(const U32 offset, const U32 size)
-{
-        return createBlock(offset, size, GL_ARRAY_BUFFER_ARB);
-}
-
-LLAGPMemBlock *LLAGPMemPoolARB::createBlock(const U32 offset, const U32 size, const U32 target)
-{
-        U32 name[1];
-        stop_glerror();
-        glGenBuffersARB(1, (GLuint*)name);
-        stop_glerror();
-        return new LLAGPMemBlockARB(this, name[0], offset, size, target);
-}
-
-void LLAGPMemPoolARB::disable()
-{
-}
-
-void LLAGPMemPoolARB::dump()
-{
-}
-
-
-/////////////////////////////
-//
-// LLAGPMemBlockARB
-//
-// ARB ImplementARBon of an AGP memory block
-//
-
-LLAGPMemBlockARB::LLAGPMemBlockARB(LLAGPMemPool *mem_poolp, const U32 name, const U32 offset, const U32 size, U32 target) :
-        LLAGPMemBlock(mem_poolp), mTarget(target)
-{
-        llassert(name > 0);
-        mName = name;
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        stop_glerror();
-        
-        glBufferDataARB(mTarget, size, NULL, GL_DYNAMIC_DRAW_ARB);
-        
-        stop_glerror();
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-        mSize = size;
-}
-
-
-void LLAGPMemBlockARB::bindGLVertexPointer(const U32 stride, const U32 offset)
-{
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        glVertexPointer(3, GL_FLOAT, stride, (GLvoid*)((intptr_t)offset));
-        glBindBufferARB(mTarget, 0);
-}
-
-
-void LLAGPMemBlockARB::bindGLNormalPointer(const U32 stride, const U32 offset)
-{
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        glNormalPointer(GL_FLOAT, stride, (GLvoid*)((intptr_t)offset));
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-
-void LLAGPMemBlockARB::bindGLColorPointer(const U32 stride, const U32 offset)
-{
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        glColorPointer(4, GL_UNSIGNED_BYTE, stride, (GLvoid*)((intptr_t)offset));
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-
-void LLAGPMemBlockARB::bindGLTexCoordPointer(const U32 stride, const U32 offset)
-{
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        glTexCoordPointer(2, GL_FLOAT, stride, (GLvoid*)((intptr_t)offset));
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-
-void LLAGPMemBlockARB::bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        set_vertex_weights(index, (F32*)(intptr_t)offset);
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-void LLAGPMemBlockARB::bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        stop_glerror();
-        glBindBufferARB(mTarget, mName);
-        set_binormals(index, stride, (LLVector3*)(intptr_t)offset);
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-
-void LLAGPMemBlockARB::bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        return;
-}
-
-
-void LLAGPMemBlockARB::copy(void *mem, const U32 size)
-{
-        stop_glerror();
-        llassert(size <= mSize);
-        glBindBufferARB(mTarget, mName);
-        glBufferSubDataARB(mTarget, 0, size, mem);
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-void LLAGPMemBlockARB::copyColor(void *mem, const U32 size)
-{
-        stop_glerror();
-        llassert(size <= mSize);
-        glBindBufferARB(mTarget, mName);
-        glBufferSubDataARB(mTarget, 0, size, mem);
-        glBindBufferARB(mTarget, 0);
-        stop_glerror();
-}
-
-
-U8*     LLAGPMemBlockARB::getMappedMem()
-{
-        return NULL;
-}
diff --git a/linden/indra/llrender/llagpmempoolarb.h b/linden/indra/llrender/llagpmempoolarb.h
deleted file mode 100644
index 7358862..0000000
--- a/linden/indra/llrender/llagpmempoolarb.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/** 
- * @file llagpmempoolarb.h
- * @brief LLAGPMemPoolARB base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLAGPMEMPOOLARB_H
-#define LL_LLAGPMEMPOOLARB_H
-
-#include "llagpmempool.h"
-
-class LLAGPMemPoolARB : public LLAGPMemPool
-{
-public:
-        LLAGPMemPoolARB(S32 request);
-        virtual ~LLAGPMemPoolARB();
-
-        /*virtual*/ LLAGPMemBlock* allocBlock(const S32 size);
-        LLAGPMemBlock *allocBlock(const S32 size, U32 target);
-        /*virtual*/ void freeBlock(LLAGPMemBlock *blockp);
-
-        void bind() {}
-
-        void enable() {}
-
-        /*virtual*/ void disable();
-
-        void flush() {}
-
-        // No point in these being inline, is there?  They're virtual functions anyway...
-        /*virtual*/ inline LLAGPMemBlock *alloc(S32 size);
-        /*virtual*/ inline void free(LLAGPMemBlock *block);
-        /*virtual*/ inline void dump();
-protected:
-        /*virtual*/ LLAGPMemBlock *createBlock(const U32 offset, const U32 size);
-        LLAGPMemBlock *createBlock(const U32 offset, const U32 size, const U32 target);
-
-protected:
-        U32  mName;
-};
-
-class LLAGPMemBlockARB : public LLAGPMemBlock
-{
-public:
-        LLAGPMemBlockARB(LLAGPMemPool *mem_poolp, const U32 name, const U32 offset, const U32 size, U32 target);
-        virtual ~LLAGPMemBlockARB() { mMemPoolp->freeBlock(this); };
-
-        /*virtual*/ void copy     (void *source, const U32 size_bytes);
-        /*virtual*/ void copyColor(void *source, const U32 size_bytes);
-        /*virtual*/ void free();
-
-        /*virtual*/ void bind();
-        /*virtual*/ void unbind();
-
-        /*virtual*/ void bindGLVertexPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLNormalPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLColorPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLTexCoordPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset);
-
-        /*virtual*/ U32 getOffset()        const { return 0; }
-        /*virtual*/ U32 getSize()          const { return mSize; }
-
-        /*virtual*/ BOOL hasMappedMem() const           { return FALSE; }
-        /*virtual*/ U8* getMappedMem();
-        /*virtual*/ U32  createFence() { return 0; } 
-        /*virtual*/ void deleteFence(const U32 fence) {}
-        /*virtual*/ void sendFence(U32 fence) { }
-        /*virtual*/ void waitFence(U32 fence) { }
-
-        U32 getName() const                                     {       return mName; }
-private:
-        U32 mName;
-        U32 mSize;
-        U32 mTarget;
-
-        friend class LLAGPMemPoolARB;
-};
-
-#endif // LL_LLAGPMEMPOOLARB_H
diff --git a/linden/indra/llrender/llagpmempoolati.cpp b/linden/indra/llrender/llagpmempoolati.cpp
deleted file mode 100644
index f29db95..0000000
--- a/linden/indra/llrender/llagpmempoolati.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/** 
- * @file llagpmempoolati.cpp
- * @brief LLAGPMemPoolATI base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "linden_common.h"
-
-#include "llagpmempoolati.h"
-#include "llgl.h"
-
-#include "llglheaders.h"
-
-LLAGPMemPoolATI::LLAGPMemPoolATI(S32 request) : LLAGPMemPool()
-{
-        llinfos << "Creating LLAGPMemPoolATI" << llendl;
-        stop_glerror();
-        if (!gGLManager.mHasATIVAO)
-        {
-                llerrs << "No ATI AGI memory extension!" << llendl;
-        }
-
-        mName = 0;
-
-        // More than 4MB of agp available
-        while (!mName && (request > 0))
-        {
-                mName = glNewObjectBufferATI(request, NULL, GL_DYNAMIC_ATI);
-                mSize     = request;
-                request >>= 1;
-        }
-
-        if (mName)
-        {
-                mFreeList.append(*(new LLFreeBlock(0, mSize)));
-        }
-        else
-        {
-                llinfos << "Unable to allocate AGP memory!" << llendl;
-                mSize = 0;
-        }
-        flush_glerror();
-}
-
-
-LLAGPMemPoolATI::~LLAGPMemPoolATI()
-{
-        if (mName)
-        {
-                glFreeObjectBufferATI(mName);
-        } 
-}
-
-
-LLAGPMemBlock *LLAGPMemPoolATI::createBlock(const U32 offset, const U32 size)
-{
-        return new LLAGPMemBlockATI(this, mName, offset, size);
-}
-
-
-void LLAGPMemPoolATI::dump()
-{
-}
-
-
-/////////////////////////////
-//
-// LLAGPMemBlockATI
-//
-// ATI Implementation of an AGP memory block
-//
-
-LLAGPMemBlockATI::LLAGPMemBlockATI(LLAGPMemPool *mem_poolp, const U32 name, const U32 offset, const U32 size) :
-        LLAGPMemBlock(mem_poolp)
-{
-        mName = name;
-        mOffset = offset;
-        mSize = size;
-}
-
-
-void LLAGPMemBlockATI::bindGLVertexPointer(const U32 stride, const U32 offset)
-{
-        glArrayObjectATI(GL_VERTEX_ARRAY, 3, GL_FLOAT, stride, mName, mOffset + offset);
-}
-
-
-void LLAGPMemBlockATI::bindGLNormalPointer(const U32 stride, const U32 offset)
-{
-        glArrayObjectATI(GL_NORMAL_ARRAY, 3, GL_FLOAT, stride, mName, mOffset + offset);
-}
-
-
-void LLAGPMemBlockATI::bindGLColorPointer(const U32 stride, const U32 offset)
-{
-        glArrayObjectATI(GL_COLOR_ARRAY, 4, GL_UNSIGNED_BYTE, stride, mName, mOffset + offset);
-}
-
-
-void LLAGPMemBlockATI::bindGLTexCoordPointer(const U32 stride, const U32 offset)
-{
-        glArrayObjectATI(GL_TEXTURE_COORD_ARRAY, 2, GL_FLOAT, stride, mName, mOffset + offset);
-}
-
-
-void LLAGPMemBlockATI::bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        glVertexAttribArrayObjectATI(index, 3, GL_FLOAT, FALSE, stride, mName, mOffset + offset);
-}
-
-
-void LLAGPMemBlockATI::bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        //glArrayObjectATI(GL_WEIGHT_ARRAY_ARB, 1, GL_FLOAT, stride, mName, mOffset + offset);
-        glVertexAttribArrayObjectATI(index, 1, GL_FLOAT, FALSE, stride, mName, mOffset + offset);
-}
-
-void LLAGPMemBlockATI::bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        glVertexAttribArrayObjectATI(index, 4, GL_FLOAT, FALSE, stride, mName, mOffset + offset);
-}
-
-U8* LLAGPMemBlockATI::getMappedMem()
-{
-        return NULL;
-}
-
-void LLAGPMemBlockATI::copy(void *mem, const U32 size)
-{
-        llassert(size <= mSize);
-        glUpdateObjectBufferATI(mName, mOffset, size, mem, GL_PRESERVE_ATI);
-}
-
-void LLAGPMemBlockATI::copyColor(void *mem, const U32 size)
-{
-        llassert(size <= mSize);
-        glUpdateObjectBufferATI(mName, mOffset, size, mem, GL_PRESERVE_ATI);
-}
-
diff --git a/linden/indra/llrender/llagpmempoolati.h b/linden/indra/llrender/llagpmempoolati.h
deleted file mode 100644
index 67803f6..0000000
--- a/linden/indra/llrender/llagpmempoolati.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/** 
- * @file llagpmempoolati.h
- * @brief LLAGPMemPoolATI base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLAGPMEMPOOLATI_H
-#define LL_LLAGPMEMPOOLATI_H
-
-#include "llagpmempool.h"
-
-class LLAGPMemPoolATI : public LLAGPMemPool
-{
-public:
-        LLAGPMemPoolATI(S32 request);
-        virtual ~LLAGPMemPoolATI();
-
-        void bind() {}
-
-        void enable() {}
-
-        void disable() {}
-
-        void flush() {}
-
-        // No point in these being inline, is there?  They're virtual functions anyway...
-        /*virtual*/ inline LLAGPMemBlock *alloc(S32 size);
-        /*virtual*/ inline void free(LLAGPMemBlock *block);
-        /*virtual*/ inline void dump();
-protected:
-        /*virtual*/ LLAGPMemBlock *createBlock(const U32 offset, const U32 size);
-
-protected:
-        U32  mName;
-};
-
-class LLAGPMemBlockATI : public LLAGPMemBlock
-{
-public:
-        LLAGPMemBlockATI(LLAGPMemPool *mem_poolp, const U32 name, const U32 offset, const U32 size);
-        virtual ~LLAGPMemBlockATI() { mMemPoolp->freeBlock(this); };
-
-        /*virtual*/ void copy     (void *source, const U32 size_bytes);
-        /*virtual*/ void copyColor(void *source, const U32 size_bytes);
-        /*virtual*/ void free();
-        /*virtual*/ void bindGLVertexPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLNormalPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLBinormalPointer(const S32 index, const U32 stride,const U32 offset);
-        /*virtual*/ void bindGLColorPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLTexCoordPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset);
-
-        /*virtual*/ U32 getOffset()        const { return mOffset; }
-        /*virtual*/ U32 getSize()          const { return mSize; }
-
-        /*virtual*/ BOOL hasMappedMem() const           { return TRUE; }
-        /*virtual*/ U8*  getMappedMem();
-        /*virtual*/ U32  createFence() { return 0; } 
-        /*virtual*/ void deleteFence(const U32 fence) {}
-        /*virtual*/ void sendFence(U32 fence) { }
-        /*virtual*/ void waitFence(U32 fence) { }
-private:
-        U32 mName;
-        U32 mOffset;
-        U32 mSize;
-
-        friend class LLAGPMemPoolATI;
-};
-
-#endif // LL_LLAGPMEMPOOLATI_H
diff --git a/linden/indra/llrender/llagpmempoolnv.cpp b/linden/indra/llrender/llagpmempoolnv.cpp
deleted file mode 100644
index 8bbaef9..0000000
--- a/linden/indra/llrender/llagpmempoolnv.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/** 
- * @file llagpmempoolnv.cpp
- * @brief LLAGPMemPoolNV base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "linden_common.h"
-
-#ifndef LL_LINUX
-
-#include "llagpmempoolnv.h"
-#include "llgl.h"
-
-#include "llglheaders.h"
-
-#if LL_WINDOWS
-//#define LL_USE_NEW_MEM_OPS 1
-#endif
-#if LL_USE_NEW_MEM_OPS
-#include "new_mem_ops.h"
-#endif
-
-BOOL LLAGPMemPoolNV::sWriteOK = TRUE;
-
-LLAGPMemPoolNV::LLAGPMemPoolNV(int request) : LLAGPMemPool()
-{
-        llinfos << "Creating LLAGPMemPoolNV" << llendl;
-        stop_glerror();
-        if (!gGLManager.mHasNVFence)
-        {
-                llerrs << "wglAllocateMemoryNV not defined!" << llendl;
-        }
-
-        mBase = 0;
-
-        if (!mBase)
-        {
-                // More than 4MB of AGP available
-                while (!mBase && (request > 0))
-                {
-                        // Stupid arbitrary nVidia magic numbers.
-                        // read freq, write freq, priority
-                        // AGP: 0.0, 0.1, 0.5
-                        // Video: 0.0, 0.1, 1.0
-                        mBase    = (U8*)wglAllocateMemoryNV(request, 0.0f, 0.1f, 0.5f);
-                        mSize     = request;
-                        request >>= 1;
-                }
-        }
-
-        if (mBase)
-        {
-                mFreeList.append(*(new LLFreeBlock(0,mSize)));
-        }
-        else
-        {
-                mSize = 0;
-        }
-
-        sWriteOK = TRUE;
-        flush_glerror();
-}
-
-
-LLAGPMemBlock *LLAGPMemPoolNV::createBlock(const U32 offset, const U32 size)
-{
-        return new LLAGPMemBlockNV(this, mBase, offset, size);
-}
-
-LLAGPMemPoolNV::~LLAGPMemPoolNV()
-{
-        if (mBase)
-        {
-                wglFreeMemoryNV(mBase);
-        }
-}
-
-void LLAGPMemPoolNV::bind()
-{
-        glVertexArrayRangeNV(mSize, mBase);
-}
-
-void LLAGPMemPoolNV::enable()
-{
-        glEnableClientState(GL_VERTEX_ARRAY_RANGE_NV);
-        sWriteOK = FALSE;
-}
-
-void LLAGPMemPoolNV::disable()
-{
-        glDisableClientState(GL_VERTEX_ARRAY_RANGE_NV);
-        sWriteOK = TRUE;
-}
-
-void LLAGPMemPoolNV::flush()
-{
-        glFlushVertexArrayRangeNV();
-}
-
-U32  LLAGPMemPoolNV::createFence()
-{
-        U32 fence;
-    glGenFencesNV(1, &fence);
-        glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
-    glFinishFenceNV(fence);
-        return fence;
-}
-
-void LLAGPMemPoolNV::deleteFence(const U32 fence)
-{
-        glDeleteFencesNV(1, &fence);
-}
-
-void LLAGPMemPoolNV::sendFence(U32 fence)
-{
-    glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
-}
-
-void LLAGPMemPoolNV::waitFence(U32 fence)
-{
-    if(!glTestFenceNV(fence))
-    {
-        glFinishFenceNV(fence);
-        }
-}
-
-
-//static
-BOOL LLAGPMemPoolNV::isWriteOK()
-{
-        return sWriteOK;
-}
-
-void LLAGPMemPoolNV::dump()
-{
-        LLFreeBlock *prev = 0;
-        LLFreeBlock *block = mFreeList.getFirst();
-
-        int d=0;
-
-        int i=0;
-        while (block)
-        {
-                i++;
-                if (prev)
-                {
-                        d = (S32)block->mOffset - ((S32)prev->mOffset + prev->mSize);
-                }
-                else d = 0;
-
-                prev  = block;
-                block = block->getNext();
-        }
-}
-
-
-LLAGPMemBlockNV::LLAGPMemBlockNV(LLAGPMemPool *mem_poolp, U8 *baseptr, S32 offset, const U32 size) : LLAGPMemBlock(mem_poolp)
-{
-        mMemp = baseptr + offset;
-        mOffset = offset;
-        mSize = size;
-}
-
-extern U8* gAGPVertices;
-
-void LLAGPMemBlockNV::bindGLVertexPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex array" << llendl;
-        }
-        glVertexPointer(3, GL_FLOAT, stride, mMemp + offset);
-}
-
-void LLAGPMemBlockNV::bindGLNormalPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty normal array" << llendl;
-        }
-        glNormalPointer(GL_FLOAT, stride, mMemp + offset);
-}
-
-
-void LLAGPMemBlockNV::bindGLColorPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty color array" << llendl;
-        }
-        glColorPointer(4, GL_UNSIGNED_BYTE, stride, mMemp + offset);
-}
-
-
-void LLAGPMemBlockNV::bindGLTexCoordPointer(const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty texcoord array" << llendl;
-        }
-        glTexCoordPointer(2, GL_FLOAT, stride, mMemp + offset);
-}
-
-
-void LLAGPMemBlockNV::bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex weight array" << llendl;
-        }
-
-        glVertexAttribPointerARB(index, 3, GL_FLOAT, FALSE, stride, (F32 *)(mMemp + offset));
-}
-
-void LLAGPMemBlockNV::bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex weight array" << llendl;
-        }
-
-        glVertexAttribPointerARB(index, 1, GL_FLOAT, FALSE, 0, (F32 *)(mMemp + offset));
-}
-
-void LLAGPMemBlockNV::bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (!mMemp)
-        {
-                llerrs << "Binding empty vertex weight array" << llendl;
-        }
-        set_vertex_clothing_weights(index, stride, (LLVector4 *)(mMemp + offset));
-}
-
-U8* LLAGPMemBlockNV::getMappedMem()
-{
-        return mMemp;
-}
-
-void LLAGPMemBlockNV::copy(void *mem, const U32 size)
-{
-        if (!mMemp || !mem)
-        {
-                return;
-        }
-        llassert(LLAGPMemPoolNV::isWriteOK());
-        llassert(size <= mSize);
-
-#if LL_USE_NEW_MEM_OPS
-        inline_new_memcpy( mMemp, mem, size );
-#else
-        memcpy( mMemp, mem, size );
-#endif
-}
-
-void LLAGPMemBlockNV::copyColor(void *mem, const U32 size)
-{
-        if (!mMemp || !mem)
-        {
-                return;
-        }
-        llassert(LLAGPMemPoolNV::isWriteOK());
-        llassert(size <= mSize);
-
-#if LL_USE_NEW_MEM_OPS
-        inline_new_memcpy( mMemp, mem, size );
-#else
-        memcpy( mMemp, mem, size );
-#endif
-}
-
-
-U32  LLAGPMemBlockNV::createFence()
-{
-        U32 fence;
-    glGenFencesNV(1, &fence);
-        glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
-    glFinishFenceNV(fence);
-        return fence;
-}
-
-void LLAGPMemBlockNV::deleteFence(const U32 fence)
-{
-        glDeleteFencesNV(1, &fence);
-}
-
-void LLAGPMemBlockNV::sendFence(U32 fence)
-{
-    glSetFenceNV(fence, GL_ALL_COMPLETED_NV);
-}
-
-void LLAGPMemBlockNV::waitFence(U32 fence)
-{
-    if(!glTestFenceNV(fence))
-    {
-        glFinishFenceNV(fence);
-        }
-}
-
-#endif //LL_LINUX
diff --git a/linden/indra/llrender/llagpmempoolnv.h b/linden/indra/llrender/llagpmempoolnv.h
deleted file mode 100644
index cffe397..0000000
--- a/linden/indra/llrender/llagpmempoolnv.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/** 
- * @file llagpmempoolnv.h
- * @brief LLAGPMemPoolNV base class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLAGPMEMPOOLNV_H
-#define LL_LLAGPMEMPOOLNV_H
-
-#include "llagpmempool.h"
-
-class LLAGPMemPoolNV : public LLAGPMemPool
-{
-public:
-        LLAGPMemPoolNV(int request);
-        virtual ~LLAGPMemPoolNV();
-
-        /*virtual*/ void flush();
-        /*virtual*/ void dump();
-        /*virtual*/ void enable();
-        /*virtual*/ void disable();
-        /*virtual*/ void bind();
-
-        static BOOL isWriteOK();
-
-        /*virtual*/ U32  createFence();
-        /*virtual*/ void deleteFence(const U32 fence);
-        /*virtual*/ void sendFence(U32 fence);
-        /*virtual*/ void waitFence(U32 fence);
-protected:
-        /*virtual*/ LLAGPMemBlock *createBlock(const U32 offset, const U32 size);
-
-protected:
-        U8 *mBase;
-
-        static BOOL sWriteOK;
-};
-
-class LLAGPMemBlockNV : public LLAGPMemBlock
-{
-public:
-        LLAGPMemBlockNV(LLAGPMemPool *mem_poolp, U8 *baseptr, const S32 offset, const U32 size);
-        virtual ~LLAGPMemBlockNV() { mMemPoolp->freeBlock(this); };
-
-        /*virtual*/ void copy     (void *source, const U32 size_bytes);
-        /*virtual*/ void copyColor(void *source, const U32 size_bytes);
-        /*virtual*/ void free();
-
-        /*virtual*/ void bindGLVertexPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLNormalPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLColorPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLTexCoordPointer(const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset);
-        /*virtual*/ void bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset);
-
-        /*virtual*/ U32 getOffset()        const { return mOffset; }
-        /*virtual*/ U32 getSize()          const { return mSize; }
-
-        /*virtual*/ BOOL hasMappedMem() const           { return TRUE; }
-        /*virtual*/ U8*  getMappedMem();
-        /*virtual*/ U32  createFence();
-        /*virtual*/ void deleteFence(const U32 fence);
-        /*virtual*/ void sendFence(U32 fence);
-        /*virtual*/ void waitFence(U32 fence);
-
-private:
-        U8 *mMemp;
-        U32 mOffset; // Offset from base
-        U32 mSize;
-        friend class LLAGPMemPoolNV;
-};
-
-#endif // LL_LLAGPMEMPOOLNV_H
diff --git a/linden/indra/llrender/llfont.h b/linden/indra/llrender/llfont.h
index dadeafd..a84a302 100644
--- a/linden/indra/llrender/llfont.h
+++ b/linden/indra/llrender/llfont.h
@@ -31,6 +31,7 @@
 #include <map>
 //#include "lllocalidhashmap.h"
 #include "llmemory.h"
+#include "llstl.h"
 
 class LLImageRaw;
 class LLFontManager;
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 2774e8d..2740c6c 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -33,6 +33,7 @@
 #include "llfontgl.h"
 #include "llgl.h"
 #include "v4color.h"
+#include "llstl.h"
 
 const S32 BOLD_OFFSET = 1;
 
@@ -155,7 +156,7 @@ LLString LLFontGL::getFontPathSystem()
         // Try to figure out where the system's font files are stored.
         char *system_root = NULL;
 #if LL_WINDOWS
-        system_root = getenv("SystemRoot");
+        system_root = getenv("SystemRoot");     /* Flawfinder: ignore */
         if (!system_root)
         {
                 llwarns << "SystemRoot not found, attempting to load fonts from default path." << llendl;
@@ -647,7 +648,7 @@ S32 LLFontGL::render(const LLWString &wstr,
         case LEFT:
                 break;
         case RIGHT:
-                cur_x -= (F32)getWidth(wstr.c_str(), 0, length) * sScaleX;
+                cur_x -= llmin(scaled_max_pixels, llround(getWidthF32(wstr.c_str(), 0, length) * sScaleX));
                 break;
         case HCENTER:
             cur_x -= llmin(scaled_max_pixels, llround(getWidthF32(wstr.c_str(), 0, length) * sScaleX)) / 2;
@@ -672,12 +673,13 @@ S32 LLFontGL::render(const LLWString &wstr,
 
 
         BOOL draw_ellipses = FALSE;
-        if (use_ellipses)
+        if (use_ellipses && halign == LEFT)
         {
                 // check for too long of a string
                 if (getWidthF32(wstr.c_str(), 0, max_chars) > scaled_max_pixels)
                 {
-                        const LLWString dots(utf8str_to_wstring(LLString("...")));
+                        // use four dots for ellipsis width to generate padding
+                        const LLWString dots(utf8str_to_wstring(LLString("....")));
                         scaled_max_pixels = llmax(0, scaled_max_pixels - llround(getWidthF32(dots.c_str())));
                         draw_ellipses = TRUE;
                 }
@@ -1330,7 +1332,7 @@ LLString LLFontGL::nameFromFont(const LLFontGL* fontp)
 {
         if (fontp == sSansSerifHuge)
         {
-                return LLString("SansSerifHude");
+                return LLString("SansSerifHuge");
         }
         else if (fontp == sSansSerifSmall)
         {
diff --git a/linden/indra/llrender/llgldbg.cpp b/linden/indra/llrender/llgldbg.cpp
index 4d9f5f9..ab35353 100644
--- a/linden/indra/llrender/llgldbg.cpp
+++ b/linden/indra/llrender/llgldbg.cpp
@@ -89,8 +89,8 @@ char *fv4(F32 *f)
 //------------------------------------------------------------------------
 char *fv3(F32 *f)
 {
-        static char str[128];
-        sprintf(str, "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]);
+        static char str[128];   /* Flawfinder: ignore */
+        snprintf(str, sizeof(str), "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]);    /* Flawfinder: ignore */
         return str;
 }
 
@@ -99,8 +99,8 @@ char *fv3(F32 *f)
 //------------------------------------------------------------------------
 char *fv1(F32 *f)
 {
-        static char str[128];
-        sprintf(str, "%8.3f", f[0]);
+        static char str[128];   /* Flawfinder: ignore */
+        snprintf(str, sizeof(str), "%8.3f", f[0]);      /* Flawfinder: ignore */
         return str;
 }
 
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 5ea7322..8386e95 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -134,6 +134,15 @@ void LLImageGL::unbindTexture(S32 stage, LLGLenum bind_target)
         sCurrentBoundTextures[stage] = 0;
 }
 
+// static (duplicated for speed and to avoid GL_TEXTURE_2D default argument which requires GL header dependency)
+void LLImageGL::unbindTexture(S32 stage)
+{
+        glActiveTextureARB(GL_TEXTURE0_ARB + stage);
+        glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        sCurrentBoundTextures[stage] = 0;
+}
+
 // static
 void LLImageGL::updateStats(F32 current_time)
 {
@@ -390,13 +399,8 @@ BOOL LLImageGL::bindTextureInternal(const S32 stage) const
                 llwarns << "Trying to bind a texture while GL is disabled!" << llendl;
         }
 
-        stop_glerror();
-        
         glActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        //glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        
-        stop_glerror();
-
+                
         if (sCurrentBoundTextures[stage] && sCurrentBoundTextures[stage] == mTexName)
         {
                 // already set!
@@ -411,7 +415,6 @@ BOOL LLImageGL::bindTextureInternal(const S32 stage) const
 
                 glBindTexture(mBindTarget, mTexName);
                 sCurrentBoundTextures[stage] = mTexName;
-                stop_glerror();
 
                 if (mLastBindTime != sLastFrameTime)
                 {
@@ -650,6 +653,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
                 }
                 mHasMipMaps = FALSE;
         }
+        glFlush();
         stop_glerror();
 }
 
@@ -664,6 +668,11 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
                 llwarns << "Setting subimage on image without GL texture" << llendl;
                 return FALSE;
         }
+        if (datap == NULL)
+        {
+                llwarns << "Setting subimage on image with NULL datap" << llendl;
+                return FALSE;
+        }
         
         if (x_pos == 0 && y_pos == 0 && width == getWidth() && height == getHeight())
         {
@@ -676,7 +685,9 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
                         dump();
                         llerrs << "setSubImage called with mipmapped image (not supported)" << llendl;
                 }
-                llassert(mCurrentDiscardLevel == 0);
+                llassert_always(mCurrentDiscardLevel == 0);
+                llassert_always(x_pos >= 0 && y_pos >= 0);
+                
                 if (((x_pos + width) > getWidth()) || 
                         (y_pos + height) > getHeight())
                 {
@@ -717,9 +728,12 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
 
                 datap += (y_pos * data_width + x_pos) * getComponents();
                 // Update the GL texture
-                llverify(bindTextureInternal(0));
+                BOOL res = bindTextureInternal(0);
+                if (!res) llerrs << "LLImageGL::setSubImage(): bindTexture failed" << llendl;
                 stop_glerror();
 
+                LLGLEnable tex( GL_TEXTURE_2D ); 
+
                 glTexSubImage2D(mTarget, 0, x_pos, y_pos, 
                                                 width, height, mFormatPrimary, mFormatType, datap);
                 stop_glerror();
@@ -733,7 +747,7 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
                 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                 stop_glerror();
         }
-        
+        glFlush();
         return TRUE;
 }
 
diff --git a/linden/indra/llrender/llimagegl.h b/linden/indra/llrender/llimagegl.h
index 6356703..20c31d1 100644
--- a/linden/indra/llrender/llimagegl.h
+++ b/linden/indra/llrender/llimagegl.h
@@ -36,7 +36,7 @@
 
 //============================================================================
 
-class LLImageGL : public LLThreadSafeRefCount
+class LLImageGL : public LLRefCount
 {
 public:
         // Size calculation
@@ -48,6 +48,7 @@ public:
         // Usually you want stage = 0 and bind_target = GL_TEXTURE_2D
         static void bindExternalTexture( LLGLuint gl_name, S32 stage, LLGLenum bind_target);
         static void unbindTexture(S32 stage, LLGLenum target);
+        static void unbindTexture(S32 stage); // Uses GL_TEXTURE_2D (not a default arg to avoid gl.h dependency)
 
         // needs to be called every frame
         static void updateStats(F32 current_time);
diff --git a/linden/indra/llrender/llrender.vcproj b/linden/indra/llrender/llrender.vcproj
index 9ca9b03..d13384d 100644
--- a/linden/indra/llrender/llrender.vcproj
+++ b/linden/indra/llrender/llrender.vcproj
@@ -154,18 +154,6 @@
                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
-                                RelativePath=".\llagpmempool.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llagpmempoolarb.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llagpmempoolati.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llagpmempoolnv.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\llfont.cpp">
                         </File>
                         <File
@@ -178,6 +166,9 @@
                                 RelativePath=".\llimagegl.cpp">
                         </File>
                         <File
+                                RelativePath=".\llvertexbuffer.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\text_out.cpp">
                         </File>
                 </Filter>
@@ -213,6 +204,9 @@
                                 RelativePath=".\llimagegl.h">
                         </File>
                         <File
+                                RelativePath=".\llvertexbuffer.h">
+                        </File>
+                        <File
                                 RelativePath=".\llvertexprogramgl.h">
                         </File>
                         <File
diff --git a/linden/indra/llrender/llrender_vc8.vcproj b/linden/indra/llrender/llrender_vc8.vcproj
new file mode 100644
index 0000000..daa2cfc
--- /dev/null
+++ b/linden/indra/llrender/llrender_vc8.vcproj
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llrender"

+        ProjectGUID="{2ADE3C14-94C4-40BF-B033-70F3C954EE90}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llrender.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                InlineFunctionExpansion="2"

+                                EnableIntrinsicFunctions="true"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llrender.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llimage;..\llwindow;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llrender.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llfont.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfontgl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgldbg.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagegl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvertexbuffer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\text_out.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\glext.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfont.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfontgl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgldbg.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimagegl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvertexbuffer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvertexprogramgl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\text_out.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llrender/llvertexbuffer.cpp b/linden/indra/llrender/llvertexbuffer.cpp
new file mode 100644
index 0000000..b94f593
--- /dev/null
+++ b/linden/indra/llrender/llvertexbuffer.cpp
@@ -0,0 +1,922 @@
+#include "linden_common.h"
+
+#include "llvertexbuffer.h"
+// #include "llrender.h"
+#include "llglheaders.h"
+#include "llmemory.h"
+#include "llmemtype.h"
+
+//============================================================================
+
+//static
+S32 LLVertexBuffer::sCount = 0;
+S32 LLVertexBuffer::sGLCount = 0;
+BOOL LLVertexBuffer::sEnableVBOs = TRUE;
+U32 LLVertexBuffer::sGLRenderBuffer = 0;
+U32 LLVertexBuffer::sGLRenderIndices = 0;
+U32 LLVertexBuffer::sLastMask = 0;
+BOOL LLVertexBuffer::sVBOActive = FALSE;
+BOOL LLVertexBuffer::sIBOActive = FALSE;
+U32 LLVertexBuffer::sAllocatedBytes = 0;
+BOOL LLVertexBuffer::sRenderActive = FALSE;
+
+std::vector<U32> LLVertexBuffer::sDeleteList;
+LLVertexBuffer::buffer_list_t LLVertexBuffer::sLockedList;
+
+S32 LLVertexBuffer::sTypeOffsets[LLVertexBuffer::TYPE_MAX] =
+{
+        sizeof(LLVector3), // TYPE_VERTEX,
+        sizeof(LLVector3), // TYPE_NORMAL,
+        sizeof(LLVector2), // TYPE_TEXCOORD,
+        sizeof(LLVector2), // TYPE_TEXCOORD2,
+        sizeof(LLColor4U), // TYPE_COLOR,
+        sizeof(LLVector3), // TYPE_BINORMAL,
+        sizeof(F32),       // TYPE_WEIGHT,
+        sizeof(LLVector4), // TYPE_CLOTHWEIGHT,
+};
+
+//static
+void LLVertexBuffer::initClass(bool use_vbo)
+{
+        sEnableVBOs = use_vbo;
+}
+
+//static 
+void LLVertexBuffer::unbind()
+{
+        if (sVBOActive)
+        {
+                glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+                sVBOActive = FALSE;
+        }
+        if (sIBOActive)
+        {
+                glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+                sIBOActive = FALSE;
+        }
+
+        sGLRenderBuffer = 0;
+        sGLRenderIndices = 0;
+}
+
+//static
+void LLVertexBuffer::cleanupClass()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        sLockedList.clear();
+        startRender(); 
+        stopRender();
+        clientCopy(); // deletes GL buffers
+}
+
+//static, call before rendering VBOs
+void LLVertexBuffer::startRender()
+{               
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (sEnableVBOs)
+        {
+                glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+                glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+                sVBOActive = FALSE;
+                sIBOActive = FALSE;
+        }
+        
+        sRenderActive = TRUE;
+        sGLRenderBuffer = 0;
+        sGLRenderIndices = 0;
+        sLastMask = 0;
+}
+
+void LLVertexBuffer::stopRender()
+{
+        sRenderActive = FALSE;
+}
+
+void LLVertexBuffer::clientCopy(F64 max_time)
+{
+        if (!sDeleteList.empty())
+        {
+                size_t num = sDeleteList.size();
+                glDeleteBuffersARB(sDeleteList.size(), (GLuint*) &(sDeleteList[0]));
+                sDeleteList.clear();
+                sGLCount -= num;
+        }
+
+        if (sEnableVBOs)
+        {
+                LLTimer timer;
+                BOOL reset = TRUE;
+                buffer_list_t::iterator iter = sLockedList.begin();
+                while(iter != sLockedList.end())
+                {
+                        LLVertexBuffer* buffer = *iter;
+                        if (buffer->isLocked() && buffer->useVBOs())
+                        {
+                                buffer->setBuffer(0);
+                        }
+                        ++iter;
+                        if (reset)
+                        {
+                                reset = FALSE;
+                                timer.reset(); //skip first copy (don't count pipeline stall)
+                        }
+                        else
+                        {
+                                if (timer.getElapsedTimeF64() > max_time)
+                                {
+                                        break;
+                                }
+                        }
+
+                }
+
+                sLockedList.erase(sLockedList.begin(), iter);
+        }
+}
+
+//----------------------------------------------------------------------------
+
+// For debugging
+struct VTNC /// Simple
+{
+        F32 v1,v2,v3;
+        F32 n1,n2,n3;
+        F32 t1,t2;
+        U32 c;
+};
+static VTNC dbg_vtnc;
+
+struct VTUNCB // Simple + Bump
+{
+        F32 v1,v2,v3;
+        F32 n1,n2,n3;
+        F32 t1,t2;
+        F32 u1,u2;
+        F32 b1,b2,b3;
+        U32 c;
+};
+static VTUNCB dbg_vtuncb;
+
+struct VTUNC // Surfacepatch
+{
+        F32 v1,v2,v3;
+        F32 n1,n2,n3;
+        F32 t1,t2;
+        F32 u1,u2;
+        U32 c;
+};
+static VTUNC dbg_vtunc;
+
+struct VTNW /// Avatar
+{
+        F32 v1,v2,v3;
+        F32 n1,n2,n3;
+        F32 t1,t2;
+        F32 w;
+};
+static VTNW dbg_vtnw;
+
+struct VTNPAD /// Avatar Output
+{
+        F32 v1,v2,v3,p1;
+        F32 n1,n2,n3,p2;
+        F32 t1,t2,p3,p4;
+};
+static VTNPAD dbg_vtnpad;
+
+//----------------------------------------------------------------------------
+
+LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) :
+        LLRefCount(),
+        mNumVerts(0), mNumIndices(0), mUsage(usage), mGLBuffer(0), mGLIndices(0), 
+        mMappedData(NULL),
+        mMappedIndexData(NULL), mLocked(FALSE),
+        mFinal(FALSE),
+        mFilthy(FALSE),
+        mEmpty(TRUE),
+        mResized(FALSE)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (!sEnableVBOs)
+        {
+                mUsage = GL_STREAM_DRAW_ARB;
+        }
+        
+        S32 stride = 0;
+        for (S32 i=0; i<TYPE_MAX; i++)
+        {
+                U32 mask = 1<<i;
+                if (typemask & mask)
+                {
+                        mOffsets[i] = stride;
+                        stride += sTypeOffsets[i];
+                }
+        }
+        mTypeMask = typemask;
+        mStride = stride;
+        sCount++;
+}
+
+// protected, use unref()
+//virtual
+LLVertexBuffer::~LLVertexBuffer()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        destroyGLBuffer();
+        destroyGLIndices();
+        sCount--;
+        
+        if (mLocked)
+        {
+                //pull off of locked list
+                for (buffer_list_t::iterator i = sLockedList.begin(); i != sLockedList.end(); ++i)
+                {
+                        if (*i == this)
+                        {
+                                sLockedList.erase(i);
+                                break;
+                        }
+                }
+        }
+};
+
+//----------------------------------------------------------------------------
+
+void LLVertexBuffer::createGLBuffer()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+
+        U32 size = getSize();
+        if (mGLBuffer)
+        {
+                destroyGLBuffer();
+        }
+
+        if (size == 0)
+        {
+                return;
+        }
+
+        mMappedData = new U8[size];
+        memset(mMappedData, 0, size);
+        mEmpty = TRUE;
+
+        if (useVBOs())
+        {
+                glGenBuffersARB(1, (GLuint*) &mGLBuffer);
+                mResized = TRUE;
+                sGLCount++;
+        }
+        else
+        {
+                static int gl_buffer_idx = 0;
+                mGLBuffer = ++gl_buffer_idx;
+        }
+}
+
+void LLVertexBuffer::createGLIndices()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        U32 size = getIndicesSize();
+
+        if (mGLIndices)
+        {
+                destroyGLIndices();
+        }
+        
+        if (size == 0)
+        {
+                return;
+        }
+
+        mMappedIndexData = new U8[size];
+        memset(mMappedIndexData, 0, size);
+        mEmpty = TRUE;
+
+        if (useVBOs())
+        {
+                glGenBuffersARB(1, (GLuint*) &mGLIndices);
+                mResized = TRUE;
+                sGLCount++;
+        }
+        else
+        {
+                static int gl_buffer_idx = 0;
+                mGLIndices = ++gl_buffer_idx;
+        }
+}
+
+void LLVertexBuffer::destroyGLBuffer()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (mGLBuffer)
+        {
+                if (useVBOs())
+                {
+                        sDeleteList.push_back(mGLBuffer);
+                }
+                
+                delete [] mMappedData;
+                mMappedData = NULL;
+                mEmpty = TRUE;
+                sAllocatedBytes -= getSize();
+        }
+        
+        mGLBuffer = 0;
+}
+
+void LLVertexBuffer::destroyGLIndices()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (mGLIndices)
+        {
+                if (useVBOs())
+                {
+                        sDeleteList.push_back(mGLIndices);
+                }
+                
+                delete [] mMappedIndexData;
+                mMappedIndexData = NULL;
+                mEmpty = TRUE;
+                sAllocatedBytes -= getIndicesSize();
+        }
+
+        mGLIndices = 0;
+}
+
+void LLVertexBuffer::updateNumVerts(S32 nverts)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (!mDynamicSize)
+        {
+                mNumVerts = nverts;
+        }
+        else if (mUsage == GL_STATIC_DRAW_ARB ||
+                nverts > mNumVerts ||
+                nverts < mNumVerts/2)
+        {
+                if (mUsage != GL_STATIC_DRAW_ARB)
+                {
+                        nverts += nverts/4;
+                }
+
+                mNumVerts = nverts;
+        }
+}
+
+void LLVertexBuffer::updateNumIndices(S32 nindices)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (!mDynamicSize)
+        {
+                mNumIndices = nindices;
+        }
+        else if (mUsage == GL_STATIC_DRAW_ARB ||
+                nindices > mNumIndices ||
+                nindices < mNumIndices/2)
+        {
+                if (mUsage != GL_STATIC_DRAW_ARB)
+                {
+                        nindices += nindices/4;
+                }
+
+                mNumIndices = nindices;
+        }
+}
+
+void LLVertexBuffer::makeStatic()
+{
+        if (!sEnableVBOs)
+        {
+                return;
+        }
+        
+        if (sRenderActive)
+        {
+                llerrs << "Make static called during render." << llendl;
+        }
+        
+        if (mUsage != GL_STATIC_DRAW_ARB)
+        {
+                if (useVBOs())
+                {
+                        if (mGLBuffer)
+                        {
+                                sDeleteList.push_back(mGLBuffer);
+                        }
+                        if (mGLIndices)
+                        {
+                                sDeleteList.push_back(mGLIndices);
+                        }
+                }
+        
+                if (mGLBuffer)
+                {
+                        sGLCount++;
+                        glGenBuffersARB(1, (GLuint*) &mGLBuffer);
+                }
+                if (mGLIndices)
+                {
+                        sGLCount++;
+                        glGenBuffersARB(1, (GLuint*) &mGLIndices);
+                }
+                        
+                mUsage = GL_STATIC_DRAW_ARB;
+                mResized = TRUE;
+
+                if (!mLocked)
+                {
+                        mLocked = TRUE;
+                        sLockedList.push_back(this);
+                }
+        }
+}
+
+void LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+                
+        updateNumVerts(nverts);
+        updateNumIndices(nindices);
+        
+        if (mMappedData)
+        {
+                llerrs << "LLVertexBuffer::allocateBuffer() called redundantly." << llendl;
+        }
+        if (create && (nverts || nindices))
+        {
+                createGLBuffer();
+                createGLIndices();
+        }
+        
+        sAllocatedBytes += getSize() + getIndicesSize();
+}
+
+void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        mDynamicSize = TRUE;
+        if (mUsage == GL_STATIC_DRAW_ARB)
+        { //always delete/allocate static buffers on resize
+                destroyGLBuffer();
+                destroyGLIndices();
+                allocateBuffer(newnverts, newnindices, TRUE);
+                mFinal = FALSE;
+        }
+        else if (newnverts > mNumVerts || newnindices > mNumIndices ||
+                         newnverts < mNumVerts/2 || newnindices < mNumIndices/2)
+        {
+                sAllocatedBytes -= getSize() + getIndicesSize();
+                
+                S32 oldsize = getSize();
+                S32 old_index_size = getIndicesSize();
+
+                updateNumVerts(newnverts);              
+                updateNumIndices(newnindices);
+                
+                S32 newsize = getSize();
+                S32 new_index_size = getIndicesSize();
+
+                sAllocatedBytes += newsize + new_index_size;
+
+                if (newsize)
+                {
+                        if (!mGLBuffer)
+                        { //no buffer exists, create a new one
+                                createGLBuffer();
+                        }
+                        else
+                        {
+                                //delete old buffer, keep GL buffer for now
+                                U8* old = mMappedData;
+                                mMappedData = new U8[newsize];
+                                if (old)
+                                {       
+                                        memcpy(mMappedData, old, llmin(newsize, oldsize));
+                                        if (newsize > oldsize)
+                                        {
+                                                memset(mMappedData+oldsize, 0, newsize-oldsize);
+                                        }
+
+                                        delete [] old;
+                                }
+                                else
+                                {
+                                        memset(mMappedData, 0, newsize);
+                                        mEmpty = TRUE;
+                                }
+                                mResized = TRUE;
+                        }
+                }
+                else if (mGLBuffer)
+                {
+                        destroyGLBuffer();
+                }
+                
+                if (new_index_size)
+                {
+                        if (!mGLIndices)
+                        {
+                                createGLIndices();
+                        }
+                        else
+                        {
+                                //delete old buffer, keep GL buffer for now
+                                U8* old = mMappedIndexData;
+                                mMappedIndexData = new U8[new_index_size];
+                                if (old)
+                                {       
+                                        memcpy(mMappedIndexData, old, llmin(new_index_size, old_index_size));
+                                        if (new_index_size > old_index_size)
+                                        {
+                                                memset(mMappedIndexData+old_index_size, 0, new_index_size - old_index_size);
+                                        }
+                                        delete [] old;
+                                }
+                                else
+                                {
+                                        memset(mMappedIndexData, 0, new_index_size);
+                                        mEmpty = TRUE;
+                                }
+                                mResized = TRUE;
+                        }
+                }
+                else if (mGLIndices)
+                {
+                        destroyGLIndices();
+                }
+        }
+}
+
+BOOL LLVertexBuffer::useVBOs() const
+{
+        //it's generally ineffective to use VBO for things that are streaming
+        //when we already have a client buffer around
+        if (mUsage == GL_STREAM_DRAW_ARB)
+        {
+                return FALSE;
+        }
+
+        return sEnableVBOs && (!sRenderActive || !mLocked);
+}
+
+//----------------------------------------------------------------------------
+
+// Map for data access
+U8* LLVertexBuffer::mapBuffer(S32 access)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (sRenderActive)
+        {
+                llwarns << "Buffer mapped during render frame!" << llendl;
+        }
+        if (!mGLBuffer && !mGLIndices)
+        {
+                llerrs << "LLVertexBuffer::mapBuffer() called  before createGLBuffer" << llendl;
+        }
+        if (mFinal)
+        {
+                llerrs << "LLVertexBuffer::mapBuffer() called on a finalized buffer." << llendl;
+        }
+        if (!mMappedData && !mMappedIndexData)
+        {
+                llerrs << "LLVertexBuffer::mapBuffer() called on unallocated buffer." << llendl;
+        }
+        
+        if (!mLocked && useVBOs())
+        {
+                mLocked = TRUE;
+                sLockedList.push_back(this);
+        }
+        
+        return mMappedData;
+}
+
+void LLVertexBuffer::unmapBuffer()
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (mMappedData || mMappedIndexData)
+        {
+                if (useVBOs() && mLocked)
+                {
+                        if (mGLBuffer)
+                        {
+                                if (mResized)
+                                {
+                                        glBufferDataARB(GL_ARRAY_BUFFER_ARB, getSize(), mMappedData, mUsage);
+                                }
+                                else
+                                {
+                                        if (mEmpty || mDirtyRegions.empty())
+                                        {
+                                                glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, getSize(), mMappedData);
+                                        }
+                                        else
+                                        {
+                                                for (std::vector<DirtyRegion>::iterator i = mDirtyRegions.begin(); i != mDirtyRegions.end(); ++i)
+                                                {
+                                                        DirtyRegion& region = *i;
+                                                        glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, region.mIndex*mStride, region.mCount*mStride, mMappedData + region.mIndex*mStride);
+                                                }
+                                        }
+                                }
+                        }
+                        
+                        if (mGLIndices)
+                        {
+                                if (mResized)
+                                {
+                                        glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, getIndicesSize(), mMappedIndexData, mUsage);
+                                }
+                                else
+                                {
+                                        if (mEmpty || mDirtyRegions.empty())
+                                        {
+                                                glBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0, getIndicesSize(), mMappedIndexData);
+                                        }
+                                        else
+                                        {
+                                                for (std::vector<DirtyRegion>::iterator i = mDirtyRegions.begin(); i != mDirtyRegions.end(); ++i)
+                                                {
+                                                        DirtyRegion& region = *i;
+                                                        glBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, region.mIndicesIndex*sizeof(U32), 
+                                                                region.mIndicesCount*sizeof(U32), mMappedIndexData + region.mIndicesIndex*sizeof(U32));
+                                                }
+                                        }
+                                }
+                        }
+
+                        mDirtyRegions.clear();
+                        mFilthy = FALSE;
+                        mResized = FALSE;
+
+                        if (mUsage == GL_STATIC_DRAW_ARB)
+                        { //static draw buffers can only be mapped a single time
+                                //throw out client data (we won't be using it again)
+                                delete [] mMappedData;
+                                delete [] mMappedIndexData;
+                                mMappedIndexData = NULL;
+                                mMappedData = NULL;
+                                mEmpty = TRUE;
+                                mFinal = TRUE;
+                        }
+                        else
+                        {
+                                mEmpty = FALSE;
+                        }
+                        
+                        mLocked = FALSE;
+                        
+                        glFlush();
+                }
+        }
+}
+
+//----------------------------------------------------------------------------
+
+template <class T,S32 type> struct VertexBufferStrider
+{
+        typedef LLStrider<T> strider_t;
+        static bool get(LLVertexBuffer& vbo, 
+                                        strider_t& strider, 
+                                        S32 index)
+        {
+                vbo.mapBuffer();
+                if (type == LLVertexBuffer::TYPE_INDEX)
+                {
+                        S32 stride = sizeof(T);
+                        strider = (T*)(vbo.getMappedIndices() + index*stride);
+                        strider.setStride(0);
+                        return TRUE;
+                }
+                else if (vbo.hasDataType(type))
+                {
+                        S32 stride = vbo.getStride();
+                        strider = (T*)(vbo.getMappedData() + vbo.getOffset(type) + index*stride);
+                        strider.setStride(stride);
+                        return TRUE;
+                }
+                else
+                {
+                        llerrs << "VertexBufferStrider could not find valid vertex data." << llendl;
+                }
+                return FALSE;
+        }
+};
+
+
+bool LLVertexBuffer::getVertexStrider(LLStrider<LLVector3>& strider, S32 index)
+{
+        return VertexBufferStrider<LLVector3,TYPE_VERTEX>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getIndexStrider(LLStrider<U32>& strider, S32 index)
+{
+        return VertexBufferStrider<U32,TYPE_INDEX>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getTexCoordStrider(LLStrider<LLVector2>& strider, S32 index)
+{
+        return VertexBufferStrider<LLVector2,TYPE_TEXCOORD>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getTexCoord2Strider(LLStrider<LLVector2>& strider, S32 index)
+{
+        return VertexBufferStrider<LLVector2,TYPE_TEXCOORD2>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getNormalStrider(LLStrider<LLVector3>& strider, S32 index)
+{
+        return VertexBufferStrider<LLVector3,TYPE_NORMAL>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getBinormalStrider(LLStrider<LLVector3>& strider, S32 index)
+{
+        return VertexBufferStrider<LLVector3,TYPE_BINORMAL>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getColorStrider(LLStrider<LLColor4U>& strider, S32 index)
+{
+        return VertexBufferStrider<LLColor4U,TYPE_COLOR>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getWeightStrider(LLStrider<F32>& strider, S32 index)
+{
+        return VertexBufferStrider<F32,TYPE_WEIGHT>::get(*this, strider, index);
+}
+bool LLVertexBuffer::getClothWeightStrider(LLStrider<LLVector4>& strider, S32 index)
+{
+        return VertexBufferStrider<LLVector4,TYPE_CLOTHWEIGHT>::get(*this, strider, index);
+}
+
+void LLVertexBuffer::setStride(S32 type, S32 new_stride)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        if (mNumVerts)
+        {
+                llerrs << "LLVertexBuffer::setOffset called with mNumVerts = " << mNumVerts << llendl;
+        }
+        // This code assumes that setStride() will only be called once per VBO per type.
+        S32 delta = new_stride - sTypeOffsets[type];
+        for (S32 i=type+1; i<TYPE_MAX; i++)
+        {
+                if (mTypeMask & (1<<i))
+                {
+                        mOffsets[i] += delta;
+                }
+        }
+        mStride += delta;
+}
+
+//----------------------------------------------------------------------------
+
+// Set for rendering
+void LLVertexBuffer::setBuffer(U32 data_mask)
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        //set up pointers if the data mask is different ...
+        BOOL setup = (sLastMask != data_mask);
+
+        if (useVBOs())
+        {
+                if (mGLBuffer && (mGLBuffer != sGLRenderBuffer || !sVBOActive))
+                {
+                        glBindBufferARB(GL_ARRAY_BUFFER_ARB, mGLBuffer);
+                        sVBOActive = TRUE;
+                        setup = TRUE; // ... or the bound buffer changed
+                }
+                if (mGLIndices && (mGLIndices != sGLRenderIndices || !sIBOActive))
+                {
+                        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mGLIndices);
+                        sIBOActive = TRUE;
+                }
+                
+                unmapBuffer();
+        }
+        else
+        {               
+                if (mGLBuffer)
+                {
+                        if (sEnableVBOs && sVBOActive)
+                        {
+                                glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+                                sVBOActive = FALSE;
+                                setup = TRUE; // ... or a VBO is deactivated
+                        }
+                        if (sGLRenderBuffer != mGLBuffer)
+                        {
+                                setup = TRUE; // ... or a client memory pointer changed
+                        }
+                }
+                if (sEnableVBOs && mGLIndices && sIBOActive)
+                {
+                        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+                        sIBOActive = FALSE;
+                }
+        }
+        
+        if (mGLIndices)
+        {
+                sGLRenderIndices = mGLIndices;
+        }
+        if (mGLBuffer)
+        {
+                sGLRenderBuffer = mGLBuffer;
+                if (data_mask && setup)
+                {
+                        if (!sRenderActive)
+                        {
+                                llwarns << "Vertex buffer set for rendering outside of render frame." << llendl;
+                        }
+                        setupVertexBuffer(data_mask); // subclass specific setup (virtual function)
+                        sLastMask = data_mask;
+                }
+        }
+}
+
+// virtual (default)
+void LLVertexBuffer::setupVertexBuffer(U32 data_mask) const
+{
+        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
+        stop_glerror();
+        U8* base = useVBOs() ? NULL : mMappedData;
+        S32 stride = mStride;
+
+        if ((data_mask & mTypeMask) != data_mask)
+        {
+                llerrs << "LLVertexBuffer::setupVertexBuffer missing required components for supplied data mask." << llendl;
+        }
+
+        if (data_mask & MAP_VERTEX)
+        {
+                glVertexPointer(3,GL_FLOAT, stride, (void*)(base + 0));
+        }
+        if (data_mask & MAP_NORMAL)
+        {
+                glNormalPointer(GL_FLOAT, stride, (void*)(base + mOffsets[TYPE_NORMAL]));
+        }
+        if (data_mask & MAP_TEXCOORD2)
+        {
+                glClientActiveTextureARB(GL_TEXTURE1_ARB);
+                glTexCoordPointer(2,GL_FLOAT, stride, (void*)(base + mOffsets[TYPE_TEXCOORD2]));
+        }
+        if (data_mask & MAP_TEXCOORD)
+        {
+                glClientActiveTextureARB(GL_TEXTURE0_ARB);
+                glTexCoordPointer(2,GL_FLOAT, stride, (void*)(base + mOffsets[TYPE_TEXCOORD]));
+        }
+        if (data_mask & MAP_COLOR)
+        {
+                glColorPointer(4, GL_UNSIGNED_BYTE, stride, (void*)(base + mOffsets[TYPE_COLOR]));
+        }
+        if (data_mask & MAP_BINORMAL)
+        {
+                glVertexAttribPointerARB(6, 3, GL_FLOAT, FALSE,  stride, (void*)(base + mOffsets[TYPE_BINORMAL]));
+        }
+        if (data_mask & MAP_WEIGHT)
+        {
+                glVertexAttribPointerARB(1, 1, GL_FLOAT, FALSE, stride, (void*)(base + mOffsets[TYPE_WEIGHT]));
+        }
+        if (data_mask & MAP_CLOTHWEIGHT)
+        {
+                glVertexAttribPointerARB(4, 4, GL_FLOAT, TRUE,  stride, (void*)(base + mOffsets[TYPE_CLOTHWEIGHT]));
+        }
+
+        llglassertok();
+}
+
+void LLVertexBuffer::markDirty(U32 vert_index, U32 vert_count, U32 indices_index, U32 indices_count)
+{
+        if (useVBOs() && !mFilthy)
+        {
+                if (!mDirtyRegions.empty())
+                {
+                        DirtyRegion& region = *(mDirtyRegions.rbegin());
+                        
+                        if (region.mIndex+region.mCount > vert_index)
+                        {
+                                //this buffer has received multiple updates since the last copy, mark it filthy
+                                mFilthy = TRUE;
+                                mDirtyRegions.clear();
+                                return;
+                        }
+                        
+                        if (region.mIndex + region.mCount == vert_index &&
+                                region.mIndicesIndex + region.mIndicesCount == indices_index)
+                        {
+                                region.mCount += vert_count;
+                                region.mIndicesCount += indices_count;
+                                return;
+                        }
+                }
+
+                mDirtyRegions.push_back(DirtyRegion(vert_index,vert_count,indices_index,indices_count));
+        }
+}
+
+void LLVertexBuffer::markClean()
+{
+        if (!mResized && !mEmpty && !mFilthy)
+        {
+                buffer_list_t::reverse_iterator iter = sLockedList.rbegin();
+                if (*iter == this)
+                {
+                        mLocked = FALSE;
+                        sLockedList.pop_back();
+                }
+        }
+}
+
diff --git a/linden/indra/llrender/llvertexbuffer.h b/linden/indra/llrender/llvertexbuffer.h
new file mode 100644
index 0000000..b221d35
--- /dev/null
+++ b/linden/indra/llrender/llvertexbuffer.h
@@ -0,0 +1,179 @@
+#ifndef LL_LLVERTEXBUFFER_H
+#define LL_LLVERTEXBUFFER_H
+
+#include "llgl.h"
+#include "v2math.h"
+#include "v3math.h"
+#include "v4math.h"
+#include "v4coloru.h"
+#include "llstrider.h"
+#include "llmemory.h"
+#include <set>
+#include <vector>
+
+//============================================================================
+// NOTES
+// Threading:
+//  All constructors should take an 'create' paramater which should only be
+//  'true' when called from the main thread. Otherwise createGLBuffer() will
+//  be called as soon as getVertexPointer(), etc is called (which MUST ONLY be
+//  called from the main (i.e OpenGL) thread)
+
+//============================================================================
+// base class
+
+class LLVertexBuffer : public LLRefCount
+{
+public:
+        static void initClass(bool use_vbo);
+        static void cleanupClass();
+        static void startRender(); //between start and stop render, no client copies will occur
+        static void stopRender(); //any buffer not copied to GL will be rendered from client memory
+        static void clientCopy(F64 max_time = 0.005); //copy data from client to GL
+        static void unbind(); //unbind any bound vertex buffer
+
+        enum {
+                TYPE_VERTEX,
+                TYPE_NORMAL,
+                TYPE_TEXCOORD,
+                TYPE_TEXCOORD2,
+                TYPE_COLOR,
+                // These use VertexAttribPointer and should possibly be made generic
+                TYPE_BINORMAL,
+                TYPE_WEIGHT,
+                TYPE_CLOTHWEIGHT,
+                TYPE_MAX,
+                TYPE_INDEX,
+        };
+        enum {
+                MAP_VERTEX = (1<<TYPE_VERTEX),
+                MAP_NORMAL = (1<<TYPE_NORMAL),
+                MAP_TEXCOORD = (1<<TYPE_TEXCOORD),
+                MAP_TEXCOORD2 = (1<<TYPE_TEXCOORD2),
+                MAP_COLOR = (1<<TYPE_COLOR),
+                // These use VertexAttribPointer and should possibly be made generic
+                MAP_BINORMAL = (1<<TYPE_BINORMAL),
+                MAP_WEIGHT = (1<<TYPE_WEIGHT),
+                MAP_CLOTHWEIGHT = (1<<TYPE_CLOTHWEIGHT),
+                MAP_DRAW = 0x2000, // Buffer is in draw (read-only) mode
+                MAP_MAPPED = 0x4000, // Indicates that buffer has been mapped, but not to any type of data
+                MAP_UNMAPPED = 0x8000 // Indicates that buffer has been logically un-mapped
+        };
+        
+protected:
+        virtual ~LLVertexBuffer(); // use unref()
+
+        virtual void setupVertexBuffer(U32 data_mask) const; // pure virtual, called from mapBuffer()
+
+        void    createGLBuffer();
+        void    createGLIndices();
+        void    destroyGLBuffer();
+        void    destroyGLIndices();
+        void    updateNumVerts(S32 nverts);
+        void    updateNumIndices(S32 nindices); 
+        virtual BOOL    useVBOs() const;
+        void    unmapBuffer();
+        
+public:
+        LLVertexBuffer(U32 typemask, S32 usage);
+        
+        // map for data access
+        U8*             mapBuffer(S32 access = -1);
+        // set for rendering
+        virtual void    setBuffer(U32 data_mask);       // calls  setupVertexBuffer() if data_mask is not 0
+        // allocate buffer
+        void    allocateBuffer(S32 nverts, S32 nindices, bool create);
+        virtual void resizeBuffer(S32 newnverts, S32 newnindices);
+        void    makeStatic();
+        
+        // Only call each getVertexPointer, etc, once before calling unmapBuffer()
+        // call unmapBuffer() after calls to getXXXStrider() before any cals to setBuffer()
+        // example:
+        //   vb->getVertexBuffer(verts);
+        //   vb->getNormalStrider(norms);
+        //   setVertsNorms(verts, norms);
+        //   vb->unmapBuffer();
+        bool getVertexStrider(LLStrider<LLVector3>& strider, S32 index=0);
+        bool getIndexStrider(LLStrider<U32>& strider, S32 index=0);
+        bool getTexCoordStrider(LLStrider<LLVector2>& strider, S32 index=0);
+        bool getTexCoord2Strider(LLStrider<LLVector2>& strider, S32 index=0);
+        bool getNormalStrider(LLStrider<LLVector3>& strider, S32 index=0);
+        bool getBinormalStrider(LLStrider<LLVector3>& strider, S32 index=0);
+        bool getColorStrider(LLStrider<LLColor4U>& strider, S32 index=0);
+        bool getWeightStrider(LLStrider<F32>& strider, S32 index=0);
+        bool getClothWeightStrider(LLStrider<LLVector4>& strider, S32 index=0);
+        
+        BOOL isEmpty() const                                    { return mEmpty; }
+        BOOL isLocked() const                                   { return mLocked; }
+        S32 getNumVerts() const                                 { return mNumVerts; }
+        S32 getNumIndices() const                               { return mNumIndices; }
+        U8* getIndicesPointer() const                   { return useVBOs() ? NULL : mMappedIndexData; }
+        U8* getVerticesPointer() const                  { return useVBOs() ? NULL : mMappedData; }
+        S32 getStride() const                                   { return mStride; }
+        S32 getTypeMask() const                                 { return mTypeMask; }
+        BOOL hasDataType(S32 type) const                { return ((1 << type) & getTypeMask()) ? TRUE : FALSE; }
+        S32 getSize() const                                             { return mNumVerts*mStride; }
+        S32 getIndicesSize() const                              { return mNumIndices * sizeof(U32); }
+        U8* getMappedData() const                               { return mMappedData; }
+        U8* getMappedIndices() const                    { return mMappedIndexData; }
+        S32 getOffset(S32 type) const                   { return mOffsets[type]; }
+        S32 getUsage() const                                    { return mUsage; }
+
+        void setStride(S32 type, S32 new_stride);
+        
+        void markDirty(U32 vert_index, U32 vert_count, U32 indices_index, U32 indices_count);
+        void markClean();
+
+protected:      
+        S32             mNumVerts;              // Number of vertices
+        S32             mNumIndices;    // Number of indices
+        S32             mStride;
+        U32             mTypeMask;
+        S32             mUsage;                 // GL usage
+        U32             mGLBuffer;              // GL VBO handle
+        U32             mGLIndices;             // GL IBO handle
+        U8*             mMappedData;    // pointer to currently mapped data (NULL if unmapped)
+        U8*             mMappedIndexData;       // pointer to currently mapped indices (NULL if unmapped)
+        BOOL    mLocked;                        // if TRUE, buffer is being or has been written to in client memory
+        BOOL    mFinal;                 // if TRUE, buffer can not be mapped again
+        BOOL    mFilthy;                // if TRUE, entire buffer must be copied (used to prevent redundant dirty flags)
+        BOOL    mEmpty;                 // if TRUE, client buffer is empty (or NULL). Old values have been discarded.
+        S32             mOffsets[TYPE_MAX];
+        BOOL    mResized;               // if TRUE, client buffer has been resized and GL buffer has not
+        BOOL    mDynamicSize;   // if TRUE, buffer has been resized at least once (and should be padded)
+
+        class DirtyRegion
+        {
+        public:
+                U32 mIndex;
+                U32 mCount;
+                U32 mIndicesIndex;
+                U32 mIndicesCount;
+
+                DirtyRegion(U32 vi, U32 vc, U32 ii, U32 ic)
+                        : mIndex(vi), mCount(vc), mIndicesIndex(ii), mIndicesCount(ic)
+                { }     
+        };
+
+        std::vector<DirtyRegion> mDirtyRegions; //vector of dirty regions to rebuild
+
+public:
+        static BOOL sRenderActive;
+        static S32 sCount;
+        static S32 sGLCount;
+        static std::vector<U32> sDeleteList;
+        typedef std::list<LLVertexBuffer*> buffer_list_t;
+        static buffer_list_t sLockedList;
+        
+        static BOOL sEnableVBOs;
+        static S32 sTypeOffsets[TYPE_MAX];
+        static U32 sGLRenderBuffer;
+        static U32 sGLRenderIndices;
+        static BOOL sVBOActive;
+        static BOOL sIBOActive;
+        static U32 sLastMask;
+        static U32 sAllocatedBytes;
+};
+
+
+#endif // LL_LLVERTEXBUFFER_H
diff --git a/linden/indra/llrender/llvertexprogramgl.cpp b/linden/indra/llrender/llvertexprogramgl.cpp
index bc00a64..4ccdf01 100644
--- a/linden/indra/llrender/llvertexprogramgl.cpp
+++ b/linden/indra/llrender/llvertexprogramgl.cpp
@@ -92,13 +92,13 @@ BOOL LLVertexProgramGL::load(const char * filename)
                         line_num++;
                         next_token = strchr(next_token, '\n');
                 } 
-                char output[1024];
                 char bad_code[11];
                 strncpy(bad_code, text_buffer + error_pos, 10);
                 bad_code[10] = '\0';
 
-                sprintf(output, "%s(%d): Vertex Program Error: %s at (%s)\n", filename, line_num, program_error_string, bad_code);
-                gErrorStream << output << std::endl;
+                llerrs << filename << "(" << line_num << "): Vertex Program Error: "
+                        << program_error_string << " at (" << bad_code<< ")"
+                        << llendl;
                 // clean up buffer
                 delete[] text_buffer;
                 return FALSE;
diff --git a/linden/indra/llrender/text_out.cpp b/linden/indra/llrender/text_out.cpp
index f4892b2..572ed03 100644
--- a/linden/indra/llrender/text_out.cpp
+++ b/linden/indra/llrender/text_out.cpp
@@ -52,7 +52,7 @@ typedef struct s_text_line
 //      const LLFontGL  *font;
 //      U8              color[3];
 //      U8              bg_color[3];
-        char    line[MAX_TEXT_LINE_LENGTH];
+        char    line[MAX_TEXT_LINE_LENGTH];     /* Flawfinder: ignore */
         S32             x, y;
 //      ETextModifiers  tm;
 //      ETextColorModifiers fcm;
@@ -84,7 +84,7 @@ void add_text(S32 x, S32 y, char *text) // , ETextModifiers tm, ETextColorModifi
 
         TEXT_LINE *linep = &gTextLine[gNumTextLines++]; 
 
-        strcpy(linep->line, text);
+        strcpy(linep->line, text);      /* Flawfinder: ignore */ 
         linep->x = x;
         linep->y = y;
 }
diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp
index 861bbc6..6523e44 100644
--- a/linden/indra/llui/llalertdialog.cpp
+++ b/linden/indra/llui/llalertdialog.cpp
@@ -218,7 +218,7 @@ bool LLAlertDialog::show()
         }
         startModal();
         gFloaterView->adjustToFitScreen(this, FALSE);
-        open();
+        open(); /* Flawfinder: ignore */
         setFocus(TRUE);
         if (mLineEditor)
         {
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 736bc59..41c2269 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -603,7 +603,7 @@ void LLButton::draw()
                 else
                 {
                         // no image
-                        llalerts << "No image for button " << mName << llendl;
+                        llwarns << "No image for button " << mName << llendl;
                         // draw it in pink so we can find it
                         gl_rect_2d(0, mRect.getHeight(), mRect.getWidth(), 0, LLColor4::pink1, FALSE);
                 }
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index b19be9a..7c3755a 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -62,6 +62,7 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
         mDrawButton(TRUE),
         mTextEntry(NULL),
         mArrowImage(NULL),
+        mArrowImageWidth(8),
         mAllowTextEntry(FALSE),
         mMaxChars(20),
         mTextEntryTentative(TRUE),
@@ -118,6 +119,7 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
 
         LLUUID arrow_image_id( LLUI::sAssetsGroup->getString("combobox_arrow.tga") );
         mArrowImage = LLUI::sImageProvider->getUIImageByID(arrow_image_id);
+        mArrowImageWidth = llmax(8,mArrowImage->getWidth()); // In case image hasn't loaded yet
 }
 
 
@@ -521,7 +523,7 @@ void LLComboBox::setButtonVisible(BOOL visible)
                 LLRect text_entry_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
                 if (visible)
                 {
-                        text_entry_rect.mRight -= mArrowImage->getWidth() + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+                        text_entry_rect.mRight -= mArrowImageWidth + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
                 }
                 //mTextEntry->setRect(text_entry_rect);
                 mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
@@ -544,7 +546,7 @@ void LLComboBox::draw()
                         // Paste the graphic on the right edge
                         if (!mArrowImage.isNull())
                         {
-                                S32 left = mRect.getWidth() - mArrowImage->getWidth() - LLUI::sConfigGroup->getS32("DropShadowButton");
+                                S32 left = mRect.getWidth() - mArrowImageWidth - LLUI::sConfigGroup->getS32("DropShadowButton");
 
                                 gl_draw_image( left, 0, mArrowImage,
                                         LLColor4::white);
@@ -844,7 +846,7 @@ void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative
         if (allow && !mAllowTextEntry)
         {
                 S32 shadow_size = LLUI::sConfigGroup->getS32("DropShadowButton");
-                mButton->setRect(LLRect( mRect.getWidth() - mArrowImage->getWidth() - 2 * shadow_size,
+                mButton->setRect(LLRect( mRect.getWidth() - mArrowImageWidth - 2 * shadow_size,
                                                                 rect.mTop, rect.mRight, rect.mBottom));
                 mButton->setTabStop(FALSE);
 
@@ -854,7 +856,7 @@ void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative
                 if (!mTextEntry)
                 {
                         LLRect text_entry_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
-                        text_entry_rect.mRight -= mArrowImage->getWidth() + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+                        text_entry_rect.mRight -= mArrowImageWidth + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
                         mTextEntry = new LLLineEditor("combo_text_entry",
                                                                                 text_entry_rect,
                                                                                 "",
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index b1dd468..5de9463 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -186,8 +186,9 @@ protected:
         BOOL                            mDrawButton;
         LLLineEditor*           mTextEntry;
         LLPointer<LLImageGL>    mArrowImage;
+        S32                                     mArrowImageWidth;
         BOOL                            mAllowTextEntry;
-        S32                             mMaxChars;
+        S32                                     mMaxChars;
         BOOL                            mTextEntryTentative;
         void                            (*mPrearrangeCallback)(LLUICtrl*,void*);
         void                            (*mTextEntryCallback)(LLLineEditor*, void*);
diff --git a/linden/indra/llui/llctrlselectioninterface.cpp b/linden/indra/llui/llctrlselectioninterface.cpp
index 5478d61..446eb63 100644
--- a/linden/indra/llui/llctrlselectioninterface.cpp
+++ b/linden/indra/llui/llctrlselectioninterface.cpp
@@ -1,8 +1,8 @@
-/** 

- * @file llctrlselectioninterface.cpp

- * @brief Programmatic selection of items in a list.

- *

- * Copyright (c) 2006-2007, Linden Research, Inc.

+/** 
+ * @file llctrlselectioninterface.cpp
+ * @brief Programmatic selection of items in a list.
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,42 +22,42 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#include "llctrlselectioninterface.h"

-

-#include "llsd.h"

-

-// virtual

-LLCtrlSelectionInterface::~LLCtrlSelectionInterface()

-{ }

-

-BOOL LLCtrlSelectionInterface::selectByValue(LLSD value)

-{

-        return setSelectedByValue(value, TRUE);

-}

-

-BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)

-{ 

-        return setSelectedByValue(value, FALSE); 

-}

-

-

-// virtual

-LLCtrlListInterface::~LLCtrlListInterface()

-{ }

-

-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value)

-{

-        return addSimpleElement(value, ADD_BOTTOM, LLSD());

-}

-

-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value, EAddPosition pos)

-{

-        return addSimpleElement(value, pos, LLSD());

-}

-

-// virtual

-LLCtrlScrollInterface::~LLCtrlScrollInterface()

-{ }

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include "llctrlselectioninterface.h"
+
+#include "llsd.h"
+
+// virtual
+LLCtrlSelectionInterface::~LLCtrlSelectionInterface()
+{ }
+
+BOOL LLCtrlSelectionInterface::selectByValue(LLSD value)
+{
+        return setSelectedByValue(value, TRUE);
+}
+
+BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)
+{ 
+        return setSelectedByValue(value, FALSE); 
+}
+
+
+// virtual
+LLCtrlListInterface::~LLCtrlListInterface()
+{ }
+
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value)
+{
+        return addSimpleElement(value, ADD_BOTTOM, LLSD());
+}
+
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value, EAddPosition pos)
+{
+        return addSimpleElement(value, pos, LLSD());
+}
+
+// virtual
+LLCtrlScrollInterface::~LLCtrlScrollInterface()
+{ }
diff --git a/linden/indra/llui/llctrlselectioninterface.h b/linden/indra/llui/llctrlselectioninterface.h
index 8f422f4..189d2e1 100644
--- a/linden/indra/llui/llctrlselectioninterface.h
+++ b/linden/indra/llui/llctrlselectioninterface.h
@@ -1,8 +1,8 @@
-/** 

- * @file llctrlselectioninterface.h

- * @brief Programmatic selection of items in a list.

- *

- * Copyright (c) 2006-2007, Linden Research, Inc.

+/** 
+ * @file llctrlselectioninterface.h
+ * @brief Programmatic selection of items in a list.
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,82 +22,82 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#ifndef LLCTRLSELECTIONINTERFACE_H

-#define LLCTRLSELECTIONINTERFACE_H

-

-#include "stdtypes.h"

-#include "stdenums.h"

-#include "llstring.h"

-

-class LLSD;

-class LLUUID;

-class LLScrollListItem;

-

-class LLCtrlSelectionInterface

-{

-public:

-        virtual ~LLCtrlSelectionInterface();

-        

-        enum EOperation

-        {

-                OP_DELETE = 1,

-                OP_SELECT,

-                OP_DESELECT,

-        };

-

-        virtual BOOL    getCanSelect() const = 0;

-

-        virtual BOOL    selectFirstItem() = 0;

-        virtual BOOL    selectNthItem( S32 index ) = 0;

-

-        virtual S32             getFirstSelectedIndex() = 0;

-

-        // TomY TODO: Simply cast the UUIDs to LLSDs, using the selectByValue function

-        virtual BOOL    setCurrentByID( const LLUUID& id ) = 0;

-        virtual LLUUID  getCurrentID() = 0;

-

-                        BOOL    selectByValue(LLSD value);

-                        BOOL    deselectByValue(LLSD value);

-        virtual BOOL    setSelectedByValue(LLSD value, BOOL selected) = 0;

-        virtual LLSD    getSimpleSelectedValue() = 0;

-

-        virtual BOOL    isSelected(LLSD value) = 0;

-

-        virtual BOOL    operateOnSelection(EOperation op) = 0;

-        virtual BOOL    operateOnAll(EOperation op) = 0;

-};

-

-class LLCtrlListInterface : public LLCtrlSelectionInterface

-{

-public:

-        virtual ~LLCtrlListInterface();

-        

-        virtual S32 getItemCount() const = 0;

-        virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) = 0;

-        virtual void clearColumns() = 0;

-        virtual void setColumnLabel(const LLString& column, const LLString& label) = 0;

-        // TomY TODO: Document this

-        virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL) = 0;

-

-        LLScrollListItem* addSimpleElement(const LLString& value); // defaults to bottom

-        LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos); // defaults to no LLSD() id

-        virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos, const LLSD& id) = 0;

-

-        virtual void clearRows() = 0;

-        virtual void sortByColumn(LLString name, BOOL ascending) = 0;

-};

-

-class LLCtrlScrollInterface

-{

-public:

-        virtual ~LLCtrlScrollInterface();

-        

-        virtual S32 getScrollPos() = 0;

-        virtual void setScrollPos( S32 pos ) = 0;

-        virtual void scrollToShowSelected() = 0;

-};

-

-#endif

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#ifndef LLCTRLSELECTIONINTERFACE_H
+#define LLCTRLSELECTIONINTERFACE_H
+
+#include "stdtypes.h"
+#include "stdenums.h"
+#include "llstring.h"
+
+class LLSD;
+class LLUUID;
+class LLScrollListItem;
+
+class LLCtrlSelectionInterface
+{
+public:
+        virtual ~LLCtrlSelectionInterface();
+        
+        enum EOperation
+        {
+                OP_DELETE = 1,
+                OP_SELECT,
+                OP_DESELECT,
+        };
+
+        virtual BOOL    getCanSelect() const = 0;
+
+        virtual BOOL    selectFirstItem() = 0;
+        virtual BOOL    selectNthItem( S32 index ) = 0;
+
+        virtual S32             getFirstSelectedIndex() = 0;
+
+        // TomY TODO: Simply cast the UUIDs to LLSDs, using the selectByValue function
+        virtual BOOL    setCurrentByID( const LLUUID& id ) = 0;
+        virtual LLUUID  getCurrentID() = 0;
+
+                        BOOL    selectByValue(LLSD value);
+                        BOOL    deselectByValue(LLSD value);
+        virtual BOOL    setSelectedByValue(LLSD value, BOOL selected) = 0;
+        virtual LLSD    getSimpleSelectedValue() = 0;
+
+        virtual BOOL    isSelected(LLSD value) = 0;
+
+        virtual BOOL    operateOnSelection(EOperation op) = 0;
+        virtual BOOL    operateOnAll(EOperation op) = 0;
+};
+
+class LLCtrlListInterface : public LLCtrlSelectionInterface
+{
+public:
+        virtual ~LLCtrlListInterface();
+        
+        virtual S32 getItemCount() const = 0;
+        virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) = 0;
+        virtual void clearColumns() = 0;
+        virtual void setColumnLabel(const LLString& column, const LLString& label) = 0;
+        // TomY TODO: Document this
+        virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL) = 0;
+
+        LLScrollListItem* addSimpleElement(const LLString& value); // defaults to bottom
+        LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos); // defaults to no LLSD() id
+        virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos, const LLSD& id) = 0;
+
+        virtual void clearRows() = 0;
+        virtual void sortByColumn(LLString name, BOOL ascending) = 0;
+};
+
+class LLCtrlScrollInterface
+{
+public:
+        virtual ~LLCtrlScrollInterface();
+        
+        virtual S32 getScrollPos() = 0;
+        virtual void setScrollPos( S32 pos ) = 0;
+        virtual void scrollToShowSelected() = 0;
+};
+
+#endif
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index bc5f197..02a410e 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -506,26 +506,25 @@ void LLFloater::setVisible( BOOL visible )
         }
 }
 
-LLView* LLFloater::getRootMostFastFrameView()
+void LLFloater::open()  /* Flawfinder: ignore */
 {
-        // trying to render a background floater in a fast frame, abort!!!
-        //if (!isFrontmost())
-        //{
-        //      gViewerWindow->finishFastFrame();
-        //}
-
-        return LLView::getRootMostFastFrameView();
-}
+        if (mSoundFlags != SILENT 
+        // don't play open sound for hosted (tabbed) windows
+                && !getHost() 
+                && !sHostp
+                && (!getVisible() || isMinimized()))
+        {
+                make_ui_sound("UISndWindowOpen");
+        }
 
-void LLFloater::open()
-{
         //RN: for now, we don't allow rehosting from one multifloater to another
         // just need to fix the bugs
         LLMultiFloater* hostp = getHost();
         if (sHostp != NULL && hostp == NULL)
         {
                 // needs a host
-                sHostp->addFloater(this, TRUE);
+                // only select tabs if window they are hosted in is visible
+                sHostp->addFloater(this, sHostp->getVisible());
         }
         else if (hostp != NULL)
         {
@@ -538,13 +537,7 @@ void LLFloater::open()
                 setVisibleAndFrontmost(mAutoFocus);
         }
 
-        if (mSoundFlags != SILENT)
-        {
-                if (!getVisible() || isMinimized())
-                {
-                        make_ui_sound("UISndWindowOpen");
-                }
-        }
+        onOpen();
 }
 
 void LLFloater::close(bool app_quitting)
@@ -562,6 +555,7 @@ void LLFloater::close(bool app_quitting)
 
                 if (mSoundFlags != SILENT
                         && getVisible()
+                        && !getHost()
                         && !app_quitting)
                 {
                         make_ui_sound("UISndWindowClose");
@@ -689,7 +683,7 @@ const LLString& LLFloater::getTitle() const
 
 void LLFloater::translate(S32 x, S32 y)
 {
-        LLView::translate(x, y);
+        LLPanel::translate(x, y);
 
         if (x != 0 || y != 0)
         {
@@ -719,7 +713,7 @@ BOOL LLFloater::canSnapTo(LLView* other_view)
                 }
         }
 
-        return LLView::canSnapTo(other_view);
+        return LLPanel::canSnapTo(other_view);
 }
 
 void LLFloater::snappedTo(LLView* snap_view)
@@ -783,8 +777,6 @@ void LLFloater::setMinimized(BOOL minimize)
 
         if (minimize)
         {
-                mMinimized = TRUE;
-
                 mPreviousRect = mRect;
 
                 reshape( MINIMIZED_WIDTH, LLFLOATER_HEADER_SIZE, TRUE);
@@ -830,6 +822,8 @@ void LLFloater::setMinimized(BOOL minimize)
                         ++dependent_it;
                 }
 
+                mMinimized = TRUE;
+
                 // Lose keyboard focus when minimized
                 releaseFocus();
         }
@@ -1207,12 +1201,12 @@ void LLFloater::onClickTearOff(void *userdata)
 
                 new_rect.setLeftTopAndSize(host_floater->getRect().mLeft + 5, host_floater->getRect().mTop - LLFLOATER_HEADER_SIZE - 5, self->mRect.getWidth(), self->mRect.getHeight());
 
-                self->open();
+                self->open();   /* Flawfinder: ignore */
                 self->setRect(new_rect);
                 gFloaterView->adjustToFitScreen(self, FALSE);
-                self->setCanDrag(TRUE);         
-                self->setCanResize(TRUE);               
-                self->setCanMinimize(TRUE);
+                self->setCanDrag(TRUE);
+                // give focus to new window to keep continuity for the user
+                self->setFocus(TRUE);
         }
         else  //Attach to parent.
         {
@@ -1234,24 +1228,36 @@ void LLFloater::onClickEdit(void *userdata)
 }
 
 // static
-void LLFloater::closeByMenu( void* userdata )
+void LLFloater::closeFocusedFloater()
 {
-        LLFloater* self = (LLFloater*) userdata;
-        if (!self || self->getHost()) return;
+        LLFloater* focused_floater = NULL;
 
-        LLFloaterView* parent = (LLFloaterView*) self->getParent();
+        std::map<LLViewHandle, LLFloater*>::iterator iter;
+        for(iter = sFloaterMap.begin(); iter != sFloaterMap.end(); ++iter)
+        {
+                focused_floater = iter->second;
+                if (focused_floater->hasFocus())
+                {
+                        break;
+                }
+        }
 
-        // grab focus status before close just in case floater is deleted
-        BOOL has_focus = gFocusMgr.childHasKeyboardFocus(self);
-        self->close();
+        if (iter == sFloaterMap.end())
+        {
+                // nothing found, return
+                return;
+        }
+
+        focused_floater->close();
 
-        // if this floater used to have focus and now nothing took focus
+        // if nothing took focus after closing focused floater
         // give it to next floater (to allow closing multiple windows via keyboard in rapid succession)
-        if (has_focus && gFocusMgr.getKeyboardFocus() == NULL)
+        if (gFocusMgr.getKeyboardFocus() == NULL)
         {
-                parent->focusFrontFloater();
+                // HACK: use gFloaterView directly in case we are using Ctrl-W to close snapshot window
+                // which sits in gSnapshotFloaterView, and needs to pass focus on to normal floater view
+                gFloaterView->focusFrontFloater();
         }
-
 }
 
 
@@ -1351,10 +1357,26 @@ void LLFloater::draw()
                         focused_child->setVisible(TRUE);
                 }
                 drawChild(focused_child);
+
+                // update tearoff button for torn off floaters
+                // when last host goes away
+                if (mCanTearOff && !getHost())
+                {
+                        LLFloater* old_host = gFloaterView->getFloaterByHandle(mLastHostHandle);
+                        if (!old_host)
+                        {
+                                setCanTearOff(FALSE);
+                        }
+                }
         }
 }
 
 // virtual
+void LLFloater::onOpen()
+{
+}
+
+// virtual
 void LLFloater::onClose(bool app_quitting)
 {
         destroy();
@@ -2018,23 +2040,52 @@ void LLFloaterView::focusFrontFloater()
 
 void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
 {
-        // count the number of minimized children
-        S32 count = 0;
-        for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
-        {
-                LLView* viewp = *child_it;
-                LLFloater *floater = (LLFloater *)viewp;
-                if (floater->isMinimized())
-                {
-                        count++;
-                }
+        S32 col = 0;
+        LLRect snap_rect_local = getSnapRect();
+        snap_rect_local.translate(-mRect.mLeft, -mRect.mBottom);
+        for(S32 row = snap_rect_local.mBottom;
+                row < snap_rect_local.getHeight() - LLFLOATER_HEADER_SIZE;
+                row += LLFLOATER_HEADER_SIZE ) //loop rows
+        {
+                for(col = snap_rect_local.mLeft;
+                        col < snap_rect_local.getWidth() - MINIMIZED_WIDTH;
+                        col += MINIMIZED_WIDTH)
+                {
+                        bool foundGap = TRUE;
+                        for(child_list_const_iter_t child_it = getChildList()->begin();
+                                child_it != getChildList()->end();
+                                ++child_it) //loop floaters
+                        {
+                                // Examine minimized children.
+                                LLFloater* floater = (LLFloater*)((LLView*)*child_it);
+                                if(floater->isMinimized()) 
+                                {
+                                        LLRect r = floater->getRect();
+                                        if((r.mBottom < (row + LLFLOATER_HEADER_SIZE))
+                                           && (r.mBottom > (row - LLFLOATER_HEADER_SIZE))
+                                           && (r.mLeft < (col + MINIMIZED_WIDTH))
+                                           && (r.mLeft > (col - MINIMIZED_WIDTH)))
+                                        {
+                                                // needs the check for off grid. can't drag,
+                                                // but window resize makes them off
+                                                foundGap = FALSE;
+                                                break;
+                                        }
+                                }
+                        } //done floaters
+                        if(foundGap)
+                        {
+                                *left = col;
+                                *bottom = row;
+                                return; //done
+                        }
+                } //done this col
         }
 
-        // space over for that many and up if necessary
-        S32 tiles_per_row = mRect.getWidth() / MINIMIZED_WIDTH;
-
-        *left = (count % tiles_per_row) * MINIMIZED_WIDTH;
-        *bottom = (count / tiles_per_row) * LLFLOATER_HEADER_SIZE;
+        // crude - stack'em all at 0,0 when screen is full of minimized
+        // floaters.
+        *left = snap_rect_local.mLeft;
+        *bottom = snap_rect_local.mBottom;
 }
 
 
@@ -2211,7 +2262,7 @@ LLFloater *LLFloaterView::getFrontmost()
         for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
         {
                 LLView* viewp = *child_it;
-                if ( viewp->getVisible() )
+                if ( viewp->getVisible() && !viewp->isDead())
                 {
                         return (LLFloater *)viewp;
                 }
@@ -2423,31 +2474,11 @@ LLString LLMultiFloater::getWidgetTag() const
         return LL_MULTI_FLOATER_TAG;
 }
 
-void LLMultiFloater::init(const LLString& title, BOOL resizable, 
-                                                S32 min_width, S32 min_height, BOOL drag_on_left,
-                                                BOOL minimizable, BOOL close_btn)
-{
-        LLFloater::init(title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
-
-        /*mTabContainer = new LLTabContainer("Preview Tabs", 
-                LLRect(LLPANEL_BORDER_WIDTH, mRect.getHeight() - LLFLOATER_HEADER_SIZE, mRect.getWidth() - LLPANEL_BORDER_WIDTH, 0), 
-                mTabPos, 
-                NULL, 
-                NULL);
-        mTabContainer->setFollowsAll();
-        if (mResizable && mTabPos == LLTabContainerCommon::BOTTOM)
-        {
-                mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
-        }
-
-        addChild(mTabContainer);*/
-}
-
-void LLMultiFloater::open()
+void LLMultiFloater::open()     /* Flawfinder: ignore */
 {
         if (mTabContainer->getTabCount() > 0)
         {
-                LLFloater::open();
+                LLFloater::open();      /* Flawfinder: ignore */
         }
         else
         {
@@ -2519,16 +2550,9 @@ void LLMultiFloater::growToFit(LLFloater* floaterp, S32 width, S32 height)
                 // store new width and height with this floater so that it will keep its size when detached
                 found_data_it->second.mWidth = width;
                 found_data_it->second.mHeight = height;
-
-                S32 cur_height = mRect.getHeight();
-                reshape(llmax(mRect.getWidth(), width + LLPANEL_BORDER_WIDTH * 2), llmax(mRect.getHeight(), height + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT + (LLPANEL_BORDER_WIDTH * 2)));
-                
-                // make sure upper left corner doesn't move
-                translate(0, mRect.getHeight() - cur_height);
-
-                // Try to keep whole view onscreen, don't allow partial offscreen.
-                gFloaterView->adjustToFitScreen(this, FALSE);
         }
+
+        resizeToContents();
 }
 
 /**
@@ -2597,8 +2621,6 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
         if ( select_added_floater )
         {
                 mTabContainer->selectLastTab();
-                // explicitly call tabopen to load preview assets, etc.
-                tabOpen((LLFloater*)mTabContainer->getCurrentPanel(), true);
         }
 
         floaterp->setHost(this);
@@ -2671,24 +2693,7 @@ void LLMultiFloater::removeFloater(LLFloater* floaterp)
 
         if (mAutoResize)
         {
-                floater_data_map_t::iterator floater_it;
-                S32 new_width = 0;
-                S32 new_height = 0;
-                for (floater_it = mFloaterDataMap.begin(); floater_it != mFloaterDataMap.end(); ++floater_it)
-                {
-                        new_width = llmax(new_width, floater_it->second.mWidth + LLPANEL_BORDER_WIDTH * 2);
-                        new_height = llmax(new_height, floater_it->second.mHeight + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT);
-                }       
-
-                S32 cur_height = mRect.getHeight();
-
-                reshape(new_width, new_height);
-
-                // make sure upper left corner doesn't move
-                translate(0, cur_height - new_height);
-
-                // Try to keep whole view onscreen, don't allow partial offscreen.
-                gFloaterView->adjustToFitScreen(this, FALSE);
+                resizeToContents();
         }
 
         tabOpen((LLFloater*)mTabContainer->getCurrentPanel(), false);
@@ -2721,6 +2726,13 @@ void LLMultiFloater::setVisible(BOOL visible)
                 {
                         cur_floaterp->setVisible(visible);
                 }
+
+                // if no tab selected, and we're being shown,
+                // select last tab to be added
+                if (visible && !cur_floaterp)
+                {
+                        mTabContainer->selectLastTab();
+                }
         }
 }
 
@@ -2823,6 +2835,43 @@ BOOL LLMultiFloater::postBuild()
         return FALSE;
 }
 
+void LLMultiFloater::resizeToContents()
+{
+        // we're already in the middle of a reshape, don't interrupt it
+        floater_data_map_t::iterator floater_it;
+        S32 new_width = 0;
+        S32 new_height = 0;
+        for (floater_it = mFloaterDataMap.begin(); floater_it != mFloaterDataMap.end(); ++floater_it)
+        {
+                new_width = llmax(new_width, floater_it->second.mWidth + LLPANEL_BORDER_WIDTH * 2);
+                new_height = llmax(new_height, floater_it->second.mHeight + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT);
+        }       
+
+        S32 new_min_width = 0;
+        S32 new_min_height = 0;
+        S32 tab_idx;
+        for (tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
+        {
+                LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(tab_idx);
+                if (floaterp)
+                {
+                        new_min_width = llmax(new_min_width, floaterp->getMinWidth() + LLPANEL_BORDER_WIDTH * 2);
+                        new_min_height = llmax(new_min_height, floaterp->getMinHeight() + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT);
+                }
+        }
+        setResizeLimits(new_min_width, new_min_height);
+
+        S32 cur_height = mRect.getHeight();
+
+        reshape(new_width, new_height);
+
+        // make sure upper left corner doesn't move
+        translate(0, cur_height - new_height);
+
+        // Try to keep whole view onscreen, don't allow partial offscreen.
+        gFloaterView->adjustToFitScreen(this, FALSE);
+}
+
 // virtual
 LLXMLNodePtr LLFloater::getXML(bool save_children) const
 {
@@ -2872,7 +2921,7 @@ LLView* LLFloater::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
         return floaterp;
 }
 
-void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open)
+void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open)  /* Flawfinder: ignore */
 {
         LLString name(getName());
         LLString title(getTitle());
@@ -2946,8 +2995,8 @@ void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
         }
 
         applyRectControl();
-        if (open)
+        if (open)       /* Flawfinder: ignore */
         {
-                this->open();
+                this->open();   /* Flawfinder: ignore */
         }
 }
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 4826648..25b2697 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -122,7 +122,7 @@ public:
         virtual EWidgetType getWidgetType() const;
         virtual LLString getWidgetTag() const;
 
-        virtual void    open();
+        virtual void    open(); /* Flawfinder: ignore */
 
         // If allowed, close the floater cleanly, releasing focus.
         // app_quitting is passed to onClose() below.
@@ -176,6 +176,9 @@ public:
 
         virtual void    draw();
 
+        // does nothing by default
+        virtual void    onOpen();
+
         // Call destroy() to free memory, or setVisible(FALSE) to keep it
         // If app_quitting, you might not want to save your visibility.
         // Defaults to destroy().
@@ -197,9 +200,8 @@ public:
         void                    clearSnapTarget() { mSnappedTo.markDead(); }
         LLViewHandle    getSnapTarget() { return mSnappedTo; }
 
-        /*virtual*/ LLView*     getRootMostFastFrameView();
+        static void             closeFocusedFloater();
 
-        static void             closeByMenu(void *userdata);
         static void             onClickClose(void *userdata);
         static void             onClickMinimize(void *userdata);
         static void             onClickTearOff(void *userdata);
@@ -356,12 +358,8 @@ public:
         LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = FALSE);
         virtual ~LLMultiFloater();
 
-        virtual void init(const LLString& title, BOOL resizable, 
-                                                S32 min_width, S32 min_height, BOOL drag_on_left,
-                                                BOOL minimizable, BOOL close_btn);
-
         virtual BOOL postBuild();
-        /*virtual*/ void open();
+        /*virtual*/ void open();        /* Flawfinder: ignore */
         /*virtual*/ void onClose(bool app_quitting);
         /*virtual*/ void draw();
         /*virtual*/ void setVisible(BOOL visible);
@@ -393,6 +391,8 @@ public:
         void setTabContainer(LLTabContainerCommon* tab_container) { if (!mTabContainer) mTabContainer = tab_container; }
         static void onTabSelected(void* userdata, bool);
 
+        virtual void resizeToContents();
+
 protected:
         struct LLFloaterData
         {
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index fd224d8..05ec652 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -73,10 +73,10 @@ BOOL LLKeywords::loadFromFile( const LLString& filename )
         // File header
 
         const S32 BUFFER_SIZE = 1024;
-        char    buffer[BUFFER_SIZE];
+        char    buffer[BUFFER_SIZE];    /* Flawfinder: ignore */
 
         llifstream file;
-        file.open(filename.c_str());
+        file.open(filename.c_str());    /* Flawfinder: ignore */
         if( file.fail() )
         {
                 llinfos << "LLKeywords::loadFromFile()  Unable to open file: " << filename << llendl;
@@ -114,34 +114,34 @@ BOOL LLKeywords::loadFromFile( const LLString& filename )
         while (!file.eof())
         {
                 file.getline( buffer, BUFFER_SIZE );
-                if( !strncmp( buffer, SOL_COMMENT, strlen(SOL_COMMENT) ) )
+                if( !strncmp( buffer, SOL_COMMENT, strlen(SOL_COMMENT) ) )      /* Flawfinder: ignore */
                 {
                         continue;
                 }
                 else
-                if( !strncmp( buffer, SOL_WORD, strlen(SOL_WORD) ) )
+                if( !strncmp( buffer, SOL_WORD, strlen(SOL_WORD) ) )    /* Flawfinder: ignore */
                 {
-                        cur_color = readColor( buffer + strlen(SOL_WORD) );
+                        cur_color = readColor( buffer + strlen(SOL_WORD) );     /* Flawfinder: ignore */
                         cur_type = LLKeywordToken::WORD;
                         continue;
                 }
                 else
-                if( !strncmp( buffer, SOL_LINE, strlen(SOL_LINE) ) )
+                if( !strncmp( buffer, SOL_LINE, strlen(SOL_LINE) ) )    /* Flawfinder: ignore */
                 {
-                        cur_color = readColor( buffer + strlen(SOL_LINE) );
+                        cur_color = readColor( buffer + strlen(SOL_LINE) );     /* Flawfinder: ignore */
                         cur_type = LLKeywordToken::LINE;
                         continue;
                 }
                 else
-                if( !strncmp( buffer, SOL_TWO_SIDED_DELIMITER, strlen(SOL_TWO_SIDED_DELIMITER) ) )
+                if( !strncmp( buffer, SOL_TWO_SIDED_DELIMITER, strlen(SOL_TWO_SIDED_DELIMITER) ) )      /* Flawfinder: ignore */
                 {
-                        cur_color = readColor( buffer + strlen(SOL_TWO_SIDED_DELIMITER) );
+                        cur_color = readColor( buffer + strlen(SOL_TWO_SIDED_DELIMITER) );      /* Flawfinder: ignore */
                         cur_type = LLKeywordToken::TWO_SIDED_DELIMITER;
                         continue;
                 }
-                if( !strncmp( buffer, SOL_ONE_SIDED_DELIMITER, strlen(SOL_ONE_SIDED_DELIMITER) ) )
+                if( !strncmp( buffer, SOL_ONE_SIDED_DELIMITER, strlen(SOL_ONE_SIDED_DELIMITER) ) )      /* Flawfinder: ignore */
                 {
-                        cur_color = readColor( buffer + strlen(SOL_ONE_SIDED_DELIMITER) );
+                        cur_color = readColor( buffer + strlen(SOL_ONE_SIDED_DELIMITER) );      /* Flawfinder: ignore */
                         cur_type = LLKeywordToken::ONE_SIDED_DELIMITER;
                         continue;
                 }
@@ -220,7 +220,7 @@ LLColor3 LLKeywords::readColor( const LLString& s )
         F32 r, g, b;
         r = g = b = 0.0f;
         S32 read = sscanf(s.c_str(), "%f, %f, %f]", &r, &g, &b );
-        if( read != 3 )
+        if( read != 3 ) /* Flawfinder: ignore */
         {
                 llinfos << " poorly formed color in keyword file" << llendl;
         }
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 97069fa..1748956 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -62,7 +62,7 @@
 #include <boost/tokenizer.hpp>
 
 // static
-LLView *LLMenuGL::sDefaultMenuContainer = NULL;
+LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
 
 S32 MENU_BAR_HEIGHT = 0;
 S32 MENU_BAR_WIDTH = 0;
@@ -404,14 +404,10 @@ void LLMenuItemGL::doIt( void )
 {
         // close all open menus by default
         // if parent menu is actually visible (and we are not triggering menu item via accelerator)
-        // HACK: do not call hidemenus() from a pie menu item, as most pie menu operations
-        // assume that the thing you clicked on stays selected (parcel and/or object) after the
-        // pie menu is gone --RN
-        if (getMenu()->getWidgetType() != WIDGET_TYPE_PIE_MENU 
-                && !getMenu()->getTornOff() 
+        if (!getMenu()->getTornOff() 
                 && getMenu()->getVisible())
         {
-                ((LLMenuHolderGL*)getMenu()->getParent())->hideMenus();
+                LLMenuGL::sMenuContainer->hideMenus();
         }
 }
 
@@ -473,18 +469,28 @@ BOOL LLMenuItemGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
 
 BOOL LLMenuItemGL::handleMouseUp( S32 x, S32 y, MASK )
 {
-        //llinfos << mLabel.c_str() << " handleMouseUp " << x << "," << y
-        //      << llendl;
         if (mEnabled)
         {
                 // switch to mouse navigation mode
                 LLMenuGL::setKeyboardMode(FALSE);
 
                 doIt();
-                setHighlight(FALSE);
                 make_ui_sound("UISndClickRelease");
                 return TRUE;
         }
+        return FALSE;
+}
+
+BOOL LLMenuItemGL::handleMouseDown( S32 x, S32 y, MASK )
+{
+        if (mEnabled)
+        {
+                // switch to mouse navigation mode
+                LLMenuGL::setKeyboardMode(FALSE);
+
+                setHighlight(TRUE);
+                return TRUE;
+        }
         else
         {
                 return FALSE;
@@ -1168,70 +1174,6 @@ void LLMenuItemToggleGL::doIt( void )
 }
 
 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLMenuItemBranchGL
-//
-// The LLMenuItemBranchGL represents a menu item that has a
-// sub-menu. This is used to make cascading menus.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLMenuItemBranchGL : public LLMenuItemGL
-{
-protected:
-        LLMenuGL* mBranch;
-
-public:
-        LLMenuItemBranchGL( const LLString& name, const LLString& label, LLMenuGL* branch,
-                                                KEY key = KEY_NONE, MASK mask = MASK_NONE );
-        virtual LLXMLNodePtr getXML(bool save_children = true) const;
-
-        virtual LLView* getChildByName(const LLString& name, BOOL recurse) const;
-
-        virtual LLString getType() const        { return "menu"; }
-
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
-
-        virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-
-        virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
-
-        // check if we've used these accelerators already
-        virtual BOOL addToAcceleratorList(std::list <LLKeyBinding*> *listp);
-
-        // called to rebuild the draw label
-        virtual void buildDrawLabel( void );
-
-        // doIt() - do the primary funcationality of the menu item.
-        virtual void doIt( void );
-
-        virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
-        virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
-
-        // set the hover status (called by it's menu) and if the object is
-        // active. This is used for behavior transfer.
-        virtual void setHighlight( BOOL highlight );
-
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
-
-        virtual BOOL isActive() const;
-
-        virtual BOOL isOpen() const;
-
-        LLMenuGL *getBranch() const { return mBranch; }
-
-        virtual void updateBranchParent( LLView* parentp );
-
-        // LLView Functionality
-        virtual void onVisibilityChange( BOOL curVisibilityIn );
-
-        virtual void draw();
-
-        virtual void setEnabledSubMenus(BOOL enabled);
-
-        virtual void openMenu();
-};
-
 LLMenuItemBranchGL::LLMenuItemBranchGL( const LLString& name, const LLString& label, LLMenuGL* branch,
                                                                                 KEY key, MASK mask ) :
         LLMenuItemGL( name, label, key, mask ),
@@ -1502,6 +1444,9 @@ void LLMenuItemBranchGL::openMenu()
         }
         else if( !mBranch->getVisible() )
         {
+                // get valid rectangle for menus
+                const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
+
                 mBranch->arrange();
 
                 LLRect rect = mBranch->getRect();
@@ -1524,13 +1469,13 @@ void LLMenuItemBranchGL::openMenu()
                 mBranch->localPointToOtherView( 0, 0, &x, &y, mBranch->getParent() ); 
                 S32 delta_x = 0;
                 S32 delta_y = 0;
-                if( y < 0 )
+                if( y < menu_region_rect.mBottom )
                 {
-                        delta_y = -y;
+                        delta_y = menu_region_rect.mBottom - y;
                 }
 
-                S32 window_width = mBranch->getParent()->getRect().getWidth();
-                if( x > window_width - rect.getWidth() )
+                S32 menu_region_width = menu_region_rect.getWidth();
+                if( x - menu_region_rect.mLeft > menu_region_width - rect.getWidth() )
                 {
                         // move sub-menu over to left side
                         delta_x = llmax(-x, (-1 * (rect.getWidth() + mRect.getWidth())));
@@ -1709,7 +1654,7 @@ BOOL LLMenuItemBranchDownGL::handleAcceleratorKey(KEY key, MASK mask)
 {
         BOOL branch_visible = mBranch->getVisible();
         BOOL handled = mBranch->handleAcceleratorKey(key, mask);
-        if (handled && !branch_visible)
+        if (handled && !branch_visible && getVisible())
         {
                 // flash this menu entry because we triggered an invisible menu item
                 LLMenuHolderGL::setActivatedItem(this);
@@ -1721,7 +1666,8 @@ BOOL LLMenuItemBranchDownGL::handleAcceleratorKey(KEY key, MASK mask)
 BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
 {
         BOOL menu_open = mBranch->getVisible();
-        if (getHighlight() && getMenu()->getVisible())
+        // don't do keyboard navigation of top-level menus unless in keyboard mode, or menu expanded
+        if (getHighlight() && getMenu()->getVisible() && (isActive() || LLMenuGL::getKeyboardMode()))
         {
                 if (key == KEY_LEFT)
                 {
@@ -1961,9 +1907,9 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
                 // SUBMENU
                 LLMenuGL *submenu = (LLMenuGL*)LLMenuGL::fromXML(child, parent, factory);
                 appendMenu(submenu);
-                if (LLMenuGL::sDefaultMenuContainer != NULL)
+                if (LLMenuGL::sMenuContainer != NULL)
                 {
-                        submenu->updateParent(LLMenuGL::sDefaultMenuContainer);
+                        submenu->updateParent(LLMenuGL::sMenuContainer);
                 }
                 else
                 {
@@ -2337,6 +2283,12 @@ void LLMenuGL::setBackgroundColor( const LLColor4& color )
         mBackgroundColor = color;
 }
 
+LLColor4 LLMenuGL::getBackgroundColor()
+{
+        return mBackgroundColor;
+}
+
+
 // rearrange the child rects so they fit the shape of the menu.
 void LLMenuGL::arrange( void )
 {
@@ -2350,8 +2302,10 @@ void LLMenuGL::arrange( void )
 
         if( mItems.size() ) 
         {
-                U32 max_width = (getParent() != NULL) ? getParent()->getRect().getWidth() : U32_MAX;
-                U32 max_height = (getParent() != NULL) ? getParent()->getRect().getHeight() : U32_MAX;
+                const LLRect menu_region_rect = LLMenuGL::sMenuContainer ? LLMenuGL::sMenuContainer->getMenuRect() : LLRect(0, S32_MAX, S32_MAX, 0);
+
+                U32 max_width = menu_region_rect.getWidth();
+                U32 max_height = menu_region_rect.getHeight();
                 // *FIX: create the item first and then ask for its dimensions?
                 S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::sSansSerif->getWidth( "More" );
                 S32 spillover_item_height = llround(LLFontGL::sSansSerif->getLineHeight()) + MENU_ITEM_PADDING;
@@ -2472,7 +2426,7 @@ void LLMenuGL::createSpilloverBranch()
                 // technically, you can't tear off spillover menus, but we're passing the handle
                 // along just to be safe
                 mSpilloverMenu = new LLMenuGL("More", "More", mParentFloaterHandle);
-                mSpilloverMenu->updateParent(getParent());
+                mSpilloverMenu->updateParent(LLMenuGL::sMenuContainer);
                 // Inherit colors
                 mSpilloverMenu->setBackgroundColor( mBackgroundColor );
                 mSpilloverMenu->setCanTearOff(FALSE);
@@ -3110,7 +3064,6 @@ void LLMenuGL::setVisible(BOOL visible)
                         mFadeTimer.stop();
                 }
 
-                //gViewerWindow->finishFastFrame();
                 LLView::setVisible(visible);
         }
 }
@@ -3157,6 +3110,8 @@ void hide_top_view( LLView* view )
 // static
 void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 {
+        const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
+
         const S32 HPAD = 2;
         LLRect rect = menu->getRect();
         //LLView* cur_view = spawning_view;
@@ -3177,13 +3132,15 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
         //                                                                      &left, &bottom ); 
         S32 delta_x = 0;
         S32 delta_y = 0;
-        if( bottom < 0 )
+        if( bottom < menu_region_rect.mBottom )
         {
-                delta_y = -bottom;
+                // At this point, we need to move the context menu to the
+                // other side of the mouse.
+                //delta_y = menu_region_rect.mBottom - bottom;
+                delta_y = (rect.getHeight() + 2 * HPAD);
         }
 
-        S32 parent_width = menu->getParent()->getRect().getWidth();
-        if( left > parent_width - rect.getWidth() )
+        if( left > menu_region_rect.mRight - rect.getWidth() )
         {
                 // At this point, we need to move the context menu to the
                 // other side of the mouse.
@@ -3283,7 +3240,7 @@ void LLPieMenuBranch::doIt( void )
         S32 center_y;
         parent->localPointToScreen(rect.getWidth() / 2, rect.getHeight() / 2, &center_x, &center_y);
 
-        parent->hide(TRUE);
+        parent->hide(FALSE);
         mBranch->show(  center_x, center_y, FALSE );
 }
 
@@ -3473,6 +3430,11 @@ BOOL LLPieMenu::handleMouseDown( S32 x, S32 y, MASK mask )
                 // to make sure it's within the item's rectangle
                 handled = item->handleMouseDown( 0, 0, mask );
         }
+        else if (!mRightMouseDown)
+        {
+                // call hidemenus to make sure transient selections get cleared
+                ((LLMenuHolderGL*)getParent())->hideMenus();
+        }
 
         // always handle mouse down as mouse up will close open menus
         return handled;
@@ -3546,6 +3508,11 @@ BOOL LLPieMenu::handleMouseUp( S32 x, S32 y, MASK mask )
                         hide(TRUE);
                 }
         }
+        else if (!mRightMouseDown)
+        {
+                // call hidemenus to make sure transient selections get cleared
+                ((LLMenuHolderGL*)getParent())->hideMenus();
+        }
 
         if (handled)
         {
@@ -3555,7 +3522,7 @@ BOOL LLPieMenu::handleMouseUp( S32 x, S32 y, MASK mask )
         if (!handled && !mUseInfiniteRadius)
         {
                 // call hidemenus to make sure transient selections get cleared
-                ((LLMenuHolderGL*)getParent())->hideMenus();
+                sMenuContainer->hideMenus();
         }
 
         if (mFirstMouseDown)
@@ -3866,10 +3833,9 @@ void LLPieMenu::show(S32 x, S32 y, BOOL mouse_down)
         S32 width = mRect.getWidth();
         S32 height = mRect.getHeight();
 
-        LLView* parent_view = getParent();
-        S32 menu_region_width = parent_view->getRect().getWidth();
-        S32 menu_region_height = parent_view->getRect().getHeight();
+        const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
 
+        LLView* parent_view = getParent();
         BOOL moved = FALSE;
 
         S32 local_x, local_y;
@@ -3879,36 +3845,36 @@ void LLPieMenu::show(S32 x, S32 y, BOOL mouse_down)
         arrange();
 
         // Adjust the pie rectangle to keep it on screen
-        if (mRect.mLeft < 0) 
+        if (mRect.mLeft < menu_region_rect.mLeft) 
         {
-                //mShiftHoriz = 0 - mRect.mLeft;
+                //mShiftHoriz = menu_region_rect.mLeft - mRect.mLeft;
                 //mRect.translate( mShiftHoriz, 0 );
-                mRect.translate( 0 - mRect.mLeft, 0 );
+                mRect.translate( menu_region_rect.mLeft - mRect.mLeft, 0 );
                 moved = TRUE;
         }
 
-        if (mRect.mRight > menu_region_width) 
+        if (mRect.mRight > menu_region_rect.mRight) 
         {
-                //mShiftHoriz = menu_region_width - mRect.mRight;
+                //mShiftHoriz = menu_region_rect.mRight - mRect.mRight;
                 //mRect.translate( mShiftHoriz, 0);
-                mRect.translate( menu_region_width - mRect.mRight, 0 );
+                mRect.translate( menu_region_rect.mRight - mRect.mRight, 0 );
                 moved = TRUE;
         }
 
-        if (mRect.mBottom < 0)
+        if (mRect.mBottom < menu_region_rect.mBottom)
         {
-                //mShiftVert = -mRect.mBottom;
+                //mShiftVert = menu_region_rect.mBottom - mRect.mBottom;
                 //mRect.translate( 0, mShiftVert );
-                mRect.translate( 0, 0 - mRect.mBottom );
+                mRect.translate( 0, menu_region_rect.mBottom - mRect.mBottom );
                 moved = TRUE;
         }
 
 
-        if (mRect.mTop > menu_region_height)
+        if (mRect.mTop > menu_region_rect.mTop)
         {
-                //mShiftVert = menu_region_height - mRect.mTop;
+                //mShiftVert = menu_region_rect.mTop - mRect.mTop;
                 //mRect.translate( 0, mShiftVert );
-                mRect.translate( 0, menu_region_height - mRect.mTop );
+                mRect.translate( 0, menu_region_rect.mTop - mRect.mTop );
                 moved = TRUE;
         }
 
@@ -4067,9 +4033,9 @@ LLView* LLMenuBarGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
                                 menu->setCanTearOff(TRUE, parent_handle);
                         }
                         menubar->appendMenu(menu);
-                        if (LLMenuGL::sDefaultMenuContainer != NULL)
+                        if (LLMenuGL::sMenuContainer != NULL)
                         {
-                                menu->updateParent(LLMenuGL::sDefaultMenuContainer);
+                                menu->updateParent(LLMenuGL::sMenuContainer);
                         }
                         else
                         {
@@ -4198,9 +4164,9 @@ void LLMenuBarGL::checkMenuTrigger()
 
 BOOL LLMenuBarGL::jumpKeysActive()
 {
-        // require item to be highlighted to activate key triggers
-        // as menu bars are always visible
-        return getHighlightedItem() && LLMenuGL::jumpKeysActive();
+        // require user to be in keyboard navigation mode to activate key triggers
+        // as menu bars are always visible and it is easy to leave the mouse cursor over them
+        return LLMenuGL::getKeyboardMode() && getHighlightedItem() && LLMenuGL::jumpKeysActive();
 }
 
 // rearrange the child rects so they fit the shape of the menu bar.
@@ -4218,6 +4184,7 @@ void LLMenuBarGL::arrange( void )
                 item->setRect( rect );
                 item->buildDrawLabel();
         }
+        reshape(rect.mRight, rect.getHeight());
 }
 
 
@@ -4430,12 +4397,12 @@ void LLMenuHolderGL::reshape(S32 width, S32 height, BOOL called_from_parent)
         LLView::reshape(width, height, called_from_parent);
 }
 
-BOOL LLMenuHolderGL::hasVisibleMenu()
+BOOL LLMenuHolderGL::hasVisibleMenu() const
 {
         for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
         {
                 LLView* viewp = *child_it;
-                if (viewp->getVisible())
+                if (viewp->getVisible() && viewp->getWidgetType() != WIDGET_TYPE_MENU_BAR)
                 {
                         return TRUE;
                 }
@@ -4443,6 +4410,11 @@ BOOL LLMenuHolderGL::hasVisibleMenu()
         return FALSE;
 }
 
+const LLRect LLMenuHolderGL::getMenuRect() const
+{
+        return getLocalRect();
+}
+
 BOOL LLMenuHolderGL::hideMenus()
 {
         if (!mCanHide)
@@ -4452,11 +4424,13 @@ BOOL LLMenuHolderGL::hideMenus()
         BOOL menu_visible = hasVisibleMenu();
         if (menu_visible)
         {
+                LLMenuGL::setKeyboardMode(FALSE);
                 // clicked off of menu, hide them all
                 for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
                 {
                         LLView* viewp = *child_it;
-                        if (viewp->getVisible())
+                        // clicks off of menu do not hide menu bar
+                        if (viewp->getWidgetType() != WIDGET_TYPE_MENU_BAR && viewp->getVisible())
                         {
                                 viewp->setVisible(FALSE);
                         }
@@ -4598,7 +4572,7 @@ LLTearOffMenu* LLTearOffMenu::create(LLMenuGL* menup)
         LLTearOffMenu* tearoffp = new LLTearOffMenu(menup);
         // keep onscreen
         gFloaterView->adjustToFitScreen(tearoffp, FALSE);
-        tearoffp->open();
+        tearoffp->open();       /* Flawfinder: ignore */
         return tearoffp;
 }
 
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 77e2b31..c4a0043 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -41,6 +41,7 @@
 #include "llview.h"
 
 class LLMenuItemGL;
+class LLMenuHolderGL;
 
 extern S32 MENU_BAR_HEIGHT;
 extern S32 MENU_BAR_WIDTH;
@@ -163,6 +164,7 @@ public:
 
         // LLView Functionality
         virtual BOOL handleKeyHere( KEY key, MASK mask, BOOL called_from_parent );
+        virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
         virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
         virtual void draw( void );
 
@@ -441,6 +443,7 @@ public:
 
         static void setDefaultBackgroundColor( const LLColor4& color );
         void setBackgroundColor( const LLColor4& color );
+        LLColor4 getBackgroundColor();
         void setBackgroundVisible( BOOL b )     { mBgVisible = b; }
         void setCanTearOff(BOOL tear_off, LLViewHandle parent_floater_handle = LLViewHandle::sDeadHandle);
 
@@ -523,7 +526,8 @@ public:
         static BOOL getKeyboardMode() { return sKeyboardMode; }
 
         static void onFocusLost(LLView* old_focus);
-        static LLView *sDefaultMenuContainer;
+
+        static LLMenuHolderGL* sMenuContainer;
         
 protected:
         void createSpilloverBranch();
@@ -558,6 +562,75 @@ protected:
         KEY                             mJumpKey;
 };
 
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLMenuItemBranchGL
+//
+// The LLMenuItemBranchGL represents a menu item that has a
+// sub-menu. This is used to make cascading menus.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLMenuItemBranchGL : public LLMenuItemGL
+{
+protected:
+        LLMenuGL* mBranch;
+
+public:
+        LLMenuItemBranchGL( const LLString& name, const LLString& label, LLMenuGL* branch,
+                                                KEY key = KEY_NONE, MASK mask = MASK_NONE );
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
+
+        virtual LLView* getChildByName(const LLString& name, BOOL recurse) const;
+
+        virtual LLString getType() const        { return "menu"; }
+
+        virtual EWidgetType getWidgetType() const;
+        virtual LLString getWidgetTag() const;
+
+        virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+
+        virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
+
+        // check if we've used these accelerators already
+        virtual BOOL addToAcceleratorList(std::list <LLKeyBinding*> *listp);
+
+        // called to rebuild the draw label
+        virtual void buildDrawLabel( void );
+
+        // doIt() - do the primary funcationality of the menu item.
+        virtual void doIt( void );
+
+        virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+
+        // set the hover status (called by it's menu) and if the object is
+        // active. This is used for behavior transfer.
+        virtual void setHighlight( BOOL highlight );
+
+        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+
+        virtual BOOL isActive() const;
+
+        virtual BOOL isOpen() const;
+
+        LLMenuGL *getBranch() const { return mBranch; }
+
+        virtual void updateBranchParent( LLView* parentp );
+
+        // LLView Functionality
+        virtual void onVisibilityChange( BOOL curVisibilityIn );
+
+        virtual void draw();
+
+        virtual void setEnabledSubMenus(BOOL enabled);
+
+        virtual void openMenu();
+};
+
+
+
+
 //-----------------------------------------------------------------------------
 // class LLPieMenu
 // A circular menu of items, icons, etc.
@@ -698,8 +771,10 @@ public:
         virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
         virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
 
+        virtual const LLRect getMenuRect() const;
+        virtual BOOL hasVisibleMenu() const;
+
         static void setActivatedItem(LLMenuItemGL* item);
-        BOOL hasVisibleMenu();
 
 protected:
         static LLViewHandle sItemLastSelectedHandle;
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index c2c29bb..8d3fba6 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -183,10 +183,11 @@ void LLPanel::draw()
                 // draw background
                 if( mBgVisible )
                 {
-                        S32 left = LLPANEL_BORDER_WIDTH;
-                        S32 top = mRect.getHeight() - LLPANEL_BORDER_WIDTH;
-                        S32 right = mRect.getWidth() - LLPANEL_BORDER_WIDTH;
-                        S32 bottom = LLPANEL_BORDER_WIDTH;
+                        //RN: I don't see the point of this
+                        S32 left = 0;//LLPANEL_BORDER_WIDTH;
+                        S32 top = mRect.getHeight();// - LLPANEL_BORDER_WIDTH;
+                        S32 right = mRect.getWidth();// - LLPANEL_BORDER_WIDTH;
+                        S32 bottom = 0;//LLPANEL_BORDER_WIDTH;
 
                         if (mBgOpaque )
                         {
@@ -357,16 +358,6 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                 gFocusMgr.childHasKeyboardFocus(this) && !called_from_parent )
         {
                 LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
-                if (key == KEY_RETURN && mask == MASK_NONE)
-                {
-                        // set keyboard focus to self to trigger commitOnFocusLost behavior on current ctrl
-                        if (cur_focus && cur_focus->acceptsTextInput())
-                        {
-                                cur_focus->onCommit();
-                                handled = TRUE;
-                        }
-                }
-
                 // If we have a default button, click it when
                 // return is pressed, unless current focus is a return-capturing button
                 // in which case *that* button will handle the return key
@@ -382,6 +373,16 @@ BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                                 handled = TRUE;
                         }
                 }
+
+                if (key == KEY_RETURN && mask == MASK_NONE)
+                {
+                        // set keyboard focus to self to trigger commitOnFocusLost behavior on current ctrl
+                        if (cur_focus && cur_focus->acceptsTextInput())
+                        {
+                                cur_focus->onCommit();
+                                handled = TRUE;
+                        }
+                }
         }
 
         return handled;
@@ -478,6 +479,11 @@ void LLPanel::setBackgroundColor(const LLColor4& color)
         mBgColorOpaque = color;
 }
 
+LLColor4 LLPanel::getBackgroundColor()
+{
+        return mBgColorOpaque;
+}
+
 void LLPanel::setTransparentColor(const LLColor4& color)
 {
         mBgColorAlpha = color;
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index 975c747..d9bd19c 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -36,6 +36,7 @@
 #include "llviewborder.h"
 #include "v4color.h"
 #include <list>
+#include <queue>
 
 const S32 LLPANEL_BORDER_WIDTH = 1;
 const BOOL BORDER_YES = TRUE;
@@ -105,6 +106,7 @@ public:
         static BOOL             nextAlert(LLAlertInfo &alert);
 
         void                    setBackgroundColor( const LLColor4& color );
+        LLColor4                getBackgroundColor(); 
         void                    setTransparentColor(const LLColor4& color);
         void                    setBackgroundVisible( BOOL b )  { mBgVisible = b; }
         void                    setBackgroundOpaque(BOOL b)             { mBgOpaque = b; }
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 3c54cf6..a73b487 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -321,8 +321,8 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const
         }
         S32 group_count = cur_group;
 
-        char reversed_output[20] = "";
-        char forward_output[20] = "";
+        char reversed_output[20] = "";  /* Flawfinder: ignore */
+        char forward_output[20] = "";   /* Flawfinder: ignore */
         S32 output_pos = 0;
         
         cur_group = 0;
diff --git a/linden/indra/llui/llrootview.cpp b/linden/indra/llui/llrootview.cpp
index 699a2f6..49e512c 100644
--- a/linden/indra/llui/llrootview.cpp
+++ b/linden/indra/llui/llrootview.cpp
@@ -1,8 +1,8 @@
-/** 

- * @file llrootview.cpp

- * @brief Container for all other views in an application

- *

- * Copyright (c) 2006-2007, Linden Research, Inc.

+/** 
+ * @file llrootview.cpp
+ * @brief Container for all other views in an application
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,23 +22,23 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#include "llrootview.h"

-

-LLRootView::LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)

-: LLView(name,rect,mouse_opaque,follows) 

-{ }

-

-// virtual

-EWidgetType LLRootView::getWidgetType() const

-{

-        return WIDGET_TYPE_ROOT_VIEW;

-}

-

-// virtual

-LLString LLRootView::getWidgetTag() const 

-{ 

-        return LL_ROOT_VIEW_TAG; 

-}

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include "llrootview.h"
+
+LLRootView::LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)
+: LLView(name,rect,mouse_opaque,follows) 
+{ }
+
+// virtual
+EWidgetType LLRootView::getWidgetType() const
+{
+        return WIDGET_TYPE_ROOT_VIEW;
+}
+
+// virtual
+LLString LLRootView::getWidgetTag() const 
+{ 
+        return LL_ROOT_VIEW_TAG; 
+}
diff --git a/linden/indra/llui/llrootview.h b/linden/indra/llui/llrootview.h
index 212b93b..84a989b 100644
--- a/linden/indra/llui/llrootview.h
+++ b/linden/indra/llui/llrootview.h
@@ -1,8 +1,8 @@
-/** 

- * @file llrootview.h

- * @brief Container for all other views in an application

- *

- * Copyright (c) 2006-2007, Linden Research, Inc.

+/** 
+ * @file llrootview.h
+ * @brief Container for all other views in an application
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,21 +22,21 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#ifndef LLROOTVIEW_H

-#define LLROOTVIEW_H

-

-#include "llview.h"

-

-class LLRootView : public LLView

-{

-public:

-        LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);

-

-        /*virtual*/ EWidgetType getWidgetType() const;

-        /*virtual*/ LLString getWidgetTag() const;

-};

-

-#endif

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#ifndef LLROOTVIEW_H
+#define LLROOTVIEW_H
+
+#include "llview.h"
+
+class LLRootView : public LLView
+{
+public:
+        LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
+
+        /*virtual*/ EWidgetType getWidgetType() const;
+        /*virtual*/ LLString getWidgetTag() const;
+};
+
+#endif
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index da3e472..578fdb1 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -405,21 +405,23 @@ BOOL LLScrollbar::handleScrollWheel(S32 x, S32 y, S32 clicks)
 BOOL LLScrollbar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                         EDragAndDropType cargo_type, void *carge_data, EAcceptance *accept, LLString &tooltip_msg)
 {
-        if (!drop)
-        {
-                //TODO: refactor this
-                S32 variable_lines = getDocPosMax();
-                S32 pos = (VERTICAL == mOrientation) ? y : x;
-                S32 thumb_length = (VERTICAL == mOrientation) ? mThumbRect.getHeight() : mThumbRect.getWidth();
-                S32 thumb_track_length = (VERTICAL == mOrientation) ? (mRect.getHeight() - 2 * SCROLLBAR_SIZE) : (mRect.getWidth() - 2 * SCROLLBAR_SIZE);
-                S32 usable_track_length = thumb_track_length - thumb_length;
-                F32 ratio = (VERTICAL == mOrientation) ? F32(pos - SCROLLBAR_SIZE - thumb_length) / usable_track_length
-                        : F32(pos - SCROLLBAR_SIZE) / usable_track_length;      
-                S32 new_pos = (VERTICAL == mOrientation) ? llclamp( S32(variable_lines - ratio * variable_lines + 0.5f), 0, variable_lines )
-                        : llclamp( S32(ratio * variable_lines + 0.5f), 0, variable_lines );
-                changeLine( new_pos - mDocPos, TRUE );
-        }
-        return TRUE;
+        // enable this to get drag and drop to control scrollbars
+        //if (!drop)
+        //{
+        //      //TODO: refactor this
+        //      S32 variable_lines = getDocPosMax();
+        //      S32 pos = (VERTICAL == mOrientation) ? y : x;
+        //      S32 thumb_length = (VERTICAL == mOrientation) ? mThumbRect.getHeight() : mThumbRect.getWidth();
+        //      S32 thumb_track_length = (VERTICAL == mOrientation) ? (mRect.getHeight() - 2 * SCROLLBAR_SIZE) : (mRect.getWidth() - 2 * SCROLLBAR_SIZE);
+        //      S32 usable_track_length = thumb_track_length - thumb_length;
+        //      F32 ratio = (VERTICAL == mOrientation) ? F32(pos - SCROLLBAR_SIZE - thumb_length) / usable_track_length
+        //              : F32(pos - SCROLLBAR_SIZE) / usable_track_length;      
+        //      S32 new_pos = (VERTICAL == mOrientation) ? llclamp( S32(variable_lines - ratio * variable_lines + 0.5f), 0, variable_lines )
+        //              : llclamp( S32(ratio * variable_lines + 0.5f), 0, variable_lines );
+        //      changeLine( new_pos - mDocPos, TRUE );
+        //}
+        //return TRUE;
+        return FALSE;
 }
 
 BOOL LLScrollbar::handleMouseUp(S32 x, S32 y, MASK mask)
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index df4ca64..4d5c49f 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -95,7 +95,7 @@ protected:
 // LLScrollListIcon
 //
 LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id) :
-mIcon(icon), mImageUUID(image_id.getString())
+mIcon(icon), mImageUUID(image_id.asString())
 {
         if (width)
         {
@@ -156,13 +156,15 @@ BOOL LLScrollListCheck::handleClick()
 //
 U32 LLScrollListText::sCount = 0;
 
-LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font, S32 width, U8 font_style, LLColor4& color, BOOL use_color, BOOL visible)
+LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
 :       mText( text ),
         mFont( font ),
         mFontStyle( font_style ),
+        mFontAlignment( font_alignment ),
         mWidth( width ),
         mVisible( visible ),
-        mHighlightChars( 0 )
+        mHighlightCount( 0 ),
+        mHighlightOffset( 0 )
 {
         if (use_color)
         {
@@ -181,10 +183,6 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
         {
                 mRoundedRectImage = LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("rounded_square.tga")));
         }
-
-        // Yes, that's four dots, because we want it to have a little
-        // padding, in proportion to the font size.
-        mEllipsisWidth = (S32)mFont->getWidth("....");
 }
 
 LLScrollListText::~LLScrollListText()
@@ -216,13 +214,26 @@ void LLScrollListText::drawToWidth(S32 width, const LLColor4& color, const LLCol
                 display_color = &color;
         }
 
-        if (mHighlightChars > 0)
+        if (mHighlightCount > 0)
         {
                 mRoundedRectImage->bind();
                 glColor4fv(highlight_color.mV);
-                gl_segmented_rect_2d_tex(-2, 
+                S32 left = 0;
+                switch(mFontAlignment)
+                {
+                case LLFontGL::LEFT:
+                        left = mFont->getWidth(mText.getString(), 0, mHighlightOffset);
+                        break;
+                case LLFontGL::RIGHT:
+                        left = width - mFont->getWidth(mText.getString(), mHighlightOffset, S32_MAX);
+                        break;
+                case LLFontGL::HCENTER:
+                        left = (width - mFont->getWidth(mText.getString())) / 2;
+                        break;
+                }
+                gl_segmented_rect_2d_tex(left - 2, 
                                 llround(mFont->getLineHeight()) + 1, 
-                                mFont->getWidth(mText.getString(), 0, mHighlightChars) + 1, 
+                                left + mFont->getWidth(mText.getString(), mHighlightOffset, mHighlightCount) + 1, 
                                 1, 
                                 mRoundedRectImage->getWidth(), 
                                 mRoundedRectImage->getHeight(), 
@@ -232,21 +243,28 @@ void LLScrollListText::drawToWidth(S32 width, const LLColor4& color, const LLCol
         // Try to draw the entire string
         F32 right_x;
         U32 string_chars = mText.length();
-        U32 drawn_chars = mFont->render(mText.getWString(), 0, 0, 2,
-                                                                        *display_color,
-                                                                        LLFontGL::LEFT,
-                                                                        LLFontGL::BOTTOM, 
-                                                                        mFontStyle,
-                                                                        string_chars, 
-                                                                        width - mEllipsisWidth,
-                                                                        &right_x, FALSE);
-
-        // If we didn't get the whole string, abbreviate
-        if (drawn_chars < string_chars && drawn_chars)
-        {
-                mFont->renderUTF8("...", 0, right_x, 0.f, color, LLFontGL::LEFT, LLFontGL::BOTTOM, mFontStyle,
-                                                  S32_MAX, S32_MAX, NULL, FALSE);
-        }
+        F32 start_x = 0.f;
+        switch(mFontAlignment)
+        {
+        case LLFontGL::LEFT:
+                start_x = 0.f;
+                break;
+        case LLFontGL::RIGHT:
+                start_x = (F32)width;
+                break;
+        case LLFontGL::HCENTER:
+                start_x = (F32)width * 0.5f;
+                break;
+        }
+        mFont->render(mText.getWString(), 0, 
+                                                start_x, 2.f,
+                                                *display_color,
+                                                mFontAlignment,
+                                                LLFontGL::BOTTOM, 
+                                                mFontStyle,
+                                                string_chars, 
+                                                width,
+                                                &right_x, FALSE, TRUE);
 }
 
 
@@ -378,20 +396,21 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ),
         mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ),
         mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ),
-        mHighlightedItem(-1),
         mBorderThickness( 2 ),
         mOnDoubleClickCallback( NULL ),
         mOnMaximumSelectCallback( NULL ),
         mOnSortChangedCallback( NULL ),
-        mDrewSelected(FALSE),
+        mHighlightedItem(-1),
         mBorder(NULL),
-        mSearchColumn(0),
         mDefaultColumn("SIMPLE"),
+        mSearchColumn(0),
 
         mNumDynamicWidthColumns(0),
         mTotalStaticColumnWidth(0),
         mSortColumn(0),
-        mSortAscending(TRUE)
+        mSortAscending(TRUE),
+
+        mDrewSelected(FALSE)
 {
         mItemListRect.setOriginAndSize(
                 mBorderThickness + LIST_BORDER_PAD,
@@ -1160,11 +1179,17 @@ BOOL LLScrollListCtrl::selectSimpleItemByPrefix(const LLWString& target, BOOL ca
                         {
                                 LLWString::toLower(item_label);
                         }
+                        // remove extraneous whitespace from searchable label
+                        LLWString trimmed_label = item_label;
+                        LLWString::trim(trimmed_label);
                         
-                        BOOL select = item->getEnabled() && !item_label.compare(0, target_len, target_trimmed);
+                        BOOL select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
 
                         if (select)
                         {
+                                // find offset of matching text (might have leading whitespace)
+                                S32 offset = item_label.find(target_trimmed);
+                                cellp->highlightText(offset, target_trimmed.size());
                                 selectItem(item);
                                 found = TRUE;
                                 break;
@@ -1466,6 +1491,9 @@ BOOL LLScrollListCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         BOOL handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
 
+        // set keyboard focus first, in case click action wants to move focus elsewhere
+        setFocus(TRUE);
+
         if( !handled && mCanSelect)
         {
                 LLScrollListItem* hit_item = hitItem(x, y);
@@ -1558,8 +1586,6 @@ BOOL LLScrollListCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
                 }
         }
 
-        gFocusMgr.setKeyboardFocus(this, NULL);
-
         return TRUE;
 }
 
@@ -1758,7 +1784,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask, BOOL called_from_parent
                                                 LLScrollListCell* cellp = getFirstSelected()->getColumn(mSearchColumn);
                                                 if (cellp)
                                                 {
-                                                        cellp->highlightText(0);
+                                                        cellp->highlightText(0, 0);
                                                 }
                                         }
                                 }
@@ -1767,13 +1793,6 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask, BOOL called_from_parent
                                         // update search string only on successful match
                                         mSearchTimer.reset();
 
-                                        // highlight current search on matching item
-                                        LLScrollListCell* cellp = getFirstSelected()->getColumn(mSearchColumn);
-                                        if (cellp)
-                                        {
-                                                cellp->highlightText(mSearchString.size());
-                                        }
-
                                         if (mCommitOnKeyboardMovement
                                                 && !mCommitOnSelectionChange) 
                                         {
@@ -1813,13 +1832,6 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_
                 mSearchString += uni_char;
                 mSearchTimer.reset();
 
-                // highlight current search on matching item
-                LLScrollListCell* cellp = getFirstSelected()->getColumn(mSearchColumn);
-                if (cellp)
-                {
-                        cellp->highlightText(mSearchString.size());
-                }
-
                 if (mCommitOnKeyboardMovement
                         && !mCommitOnSelectionChange) 
                 {
@@ -1862,7 +1874,7 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_
                                 if (item->getEnabled() && LLStringOps::toLower(item_label[0]) == uni_char)
                                 {
                                         selectItem(item);
-                                        cellp->highlightText(1);
+                                        cellp->highlightText(0, 1);
                                         mSearchTimer.reset();
 
                                         if (mCommitOnKeyboardMovement
@@ -1925,7 +1937,7 @@ void LLScrollListCtrl::selectItem(LLScrollListItem* itemp, BOOL select_single_it
                         LLScrollListCell* cellp = mLastSelected->getColumn(mSearchColumn);
                         if (cellp)
                         {
-                                cellp->highlightText(0);
+                                cellp->highlightText(0, 0);
                         }
                 }
                 if (select_single_item)
@@ -1953,7 +1965,7 @@ void LLScrollListCtrl::deselectItem(LLScrollListItem* itemp)
                 LLScrollListCell* cellp = itemp->getColumn(mSearchColumn);
                 if (cellp)
                 {
-                        cellp->highlightText(0);
+                        cellp->highlightText(0, 0);
                 }
                 mSelectionChanged = TRUE;
         }
@@ -2195,7 +2207,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                 NULL,
                 multi_select,
                 draw_border);
-        
+
         scroll_list->setDisplayHeading(draw_heading);
         if (node->hasAttribute("heading_height"))
         {
@@ -2250,6 +2262,8 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                         F32 columnrelwidth = 0.f;
                         child->getAttributeF32("relwidth", columnrelwidth);
 
+                        LLFontGL::HAlign h_align = LLFontGL::LEFT;
+                        h_align = LLView::selectFontHAlign(child);
 
                         columns[index]["name"] = columnname;
                         columns[index]["sort"] = sortname;
@@ -2258,6 +2272,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                         columns[index]["width"] = columnwidth;
                         columns[index]["relwidth"] = columnrelwidth;
                         columns[index]["dynamicwidth"] = columndynamicwidth;
+                        columns[index]["halign"] = (S32)h_align;
                         index++;
                 }
         }
@@ -2604,6 +2619,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 
                 S32 index = column_itor->second.mIndex;
                 S32 width = column_itor->second.mWidth;
+                LLFontGL::HAlign font_alignment = column_itor->second.mFontAlignment;
 
                 LLSD value = (*itor)["value"];
                 LLString fontname = (*itor)["font"].asString();
@@ -2631,7 +2647,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 }
                 else
                 {
-                        new_item->setColumn(index, new LLScrollListText(value.asString(), font, width, font_style));
+                        new_item->setColumn(index, new LLScrollListText(value.asString(), font, width, font_style, font_alignment));
                 }
         }
 
@@ -2724,7 +2740,7 @@ void LLScrollListCtrl::setFocus(BOOL b)
         if (!getFirstSelected())
         {
                 selectFirstItem();
-                onCommit();
+                //onCommit(); // SJB: selectFirstItem() will call onCommit() if appropriate
         }
         LLUICtrl::setFocus(b);
 }
@@ -2739,3 +2755,4 @@ void LLScrollListCtrl::onFocusLost()
                 }
         }
 }
+
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index d097cb5..a1c4853 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -57,7 +57,7 @@ public:
         virtual const LLString& getTextLower() const { return LLString::null; }
         virtual const BOOL              getVisible() const { return TRUE; }
         virtual void                    setWidth(S32 width) = 0;
-        virtual void                    highlightText(S32 num_chars) {}
+        virtual void                    highlightText(S32 offset, S32 num_chars) {}
 
         virtual BOOL    handleClick() { return FALSE; }
         virtual void    setEnabled(BOOL enable) { }
@@ -65,9 +65,8 @@ public:
 
 class LLScrollListText : public LLScrollListCell
 {
-        static U32 sCount;
 public:
-        LLScrollListText( const LLString& text, const LLFontGL* font, S32 width = 0, U8 font_style = LLFontGL::NORMAL, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
+        LLScrollListText( const LLString& text, const LLFontGL* font, S32 width = 0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
         /*virtual*/ ~LLScrollListText();
 
         virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
@@ -76,7 +75,7 @@ public:
         virtual S32             getHeight() const                       { return llround(mFont->getLineHeight()); }
         virtual const LLString&         getText() const         { return mText.getString(); }
         virtual const BOOL                      getVisible() const  { return mVisible; }
-        virtual void    highlightText(S32 num_chars) {mHighlightChars = num_chars;}
+        virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
         void                    setText(const LLString& text);
 
 private:
@@ -84,12 +83,15 @@ private:
         const LLFontGL* mFont;
         LLColor4*               mColor;
         const U8                mFontStyle;
+        LLFontGL::HAlign mFontAlignment;
         S32                             mWidth;
-        S32                             mEllipsisWidth; // in pixels, of "..."
         BOOL                    mVisible;
-        S32                             mHighlightChars;
+        S32                             mHighlightCount;
+        S32                             mHighlightOffset;
 
         LLPointer<LLImageGL> mRoundedRectImage;
+
+        static U32 sCount;
 };
 
 class LLScrollListIcon : public LLScrollListCell
@@ -134,9 +136,10 @@ class LLScrollListColumn
 {
 public:
         // Default constructor
-        LLScrollListColumn() : mName(""), mSortingColumn(""), mLabel(""), mWidth(-1), mRelWidth(-1.0), mDynamicWidth(FALSE), mIndex(-1), mParentCtrl(NULL), mButton(NULL) { }
+        LLScrollListColumn() : mName(""), mSortingColumn(""), mLabel(""), mWidth(-1), mRelWidth(-1.0), mDynamicWidth(FALSE), mIndex(-1), mParentCtrl(NULL), mButton(NULL), mFontAlignment(LLFontGL::LEFT) 
+        { }
 
-        LLScrollListColumn(LLString name, LLString label, S32 width, F32 relwidth)
+        LLScrollListColumn(LLString name, LLString label, S32 width, F32 relwidth) 
                 : mName(name), mSortingColumn(name), mLabel(label), mWidth(width), mRelWidth(relwidth), mDynamicWidth(FALSE), mIndex(-1), mParentCtrl(NULL), mButton(NULL) { }
 
         LLScrollListColumn(const LLSD &sd)
@@ -168,20 +171,27 @@ public:
                         mDynamicWidth = FALSE;
                         mRelWidth = -1;
                 }
+
+                if (sd.has("halign"))
+                {
+                        mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
+                }
+
                 mIndex = -1;
                 mParentCtrl = NULL;
                 mButton = NULL;
         }
 
-        LLString mName;
-        LLString mSortingColumn;
-        LLString mLabel;
-        S32 mWidth;
-        F32 mRelWidth;
-        BOOL mDynamicWidth;
-        S32 mIndex;
-        LLScrollListCtrl *mParentCtrl;
-        LLButton *mButton;
+        LLString                        mName;
+        LLString                        mSortingColumn;
+        LLString                        mLabel;
+        S32                                     mWidth;
+        F32                                     mRelWidth;
+        BOOL                            mDynamicWidth;
+        S32                                     mIndex;
+        LLScrollListCtrl*       mParentCtrl;
+        LLButton*                       mButton;
+        LLFontGL::HAlign        mFontAlignment;
 };
 
 class LLScrollListItem
@@ -208,8 +218,8 @@ public:
 
         // If width = 0, just use the width of the text.  Otherwise override with
         // specified width in pixels.
-        void    addColumn( const LLString& text, const LLFontGL* font, S32 width = 0 , U8 font_style = LLFontGL::NORMAL, BOOL visible = TRUE)
-                                { mColumns.push_back( new LLScrollListText(text, font, width, font_style, LLColor4::black, FALSE, visible) ); }
+        void    addColumn( const LLString& text, const LLFontGL* font, S32 width = 0 , U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, BOOL visible = TRUE)
+                                { mColumns.push_back( new LLScrollListText(text, font, width, font_style, font_alignment, LLColor4::black, FALSE, visible) ); }
 
         void    addColumn( LLImageGL* icon, S32 width = 0 )
                                 { mColumns.push_back( new LLScrollListIcon(icon, width) ); }
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index ca8f3ad..c62ec9a 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -215,7 +215,7 @@ void LLSliderCtrl::updateText()
                 LLLocale locale(LLLocale::USER_LOCALE);
 
                 // Don't display very small negative values as -0.000
-                F32 displayed_value = (F32)(floor(getValueF32() * pow(10, mPrecision) + 0.5) / pow(10, mPrecision));
+                F32 displayed_value = (F32)(floor(getValueF32() * pow(10.0, (F64)mPrecision) + 0.5) / pow(10.0, (F64)mPrecision));
 
                 LLString format = llformat("%%.%df", mPrecision);
                 LLString text = llformat(format.c_str(), displayed_value);
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index b93ed02..1f33279 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -248,7 +248,7 @@ void LLSpinCtrl::updateEditor()
         LLLocale locale(LLLocale::USER_LOCALE);
 
         // Don't display very small negative values as -0.000
-        F32 displayed_value = (F32)floor(getValue().asReal() * pow(10, mPrecision) + 0.5) / (F32)pow(10, mPrecision);
+        F32 displayed_value = (F32)floor(getValue().asReal() * pow(10.0, (F64)mPrecision) + 0.5) / (F32)pow(10.0, (F64)mPrecision);
 
 //      if( S32( displayed_value * pow( 10, mPrecision ) ) == 0 )
 //      {
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index b0f8b5a..8f22545 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3782,7 +3782,7 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer )
         //                      <text without \0> (text may contain ext_char_values)
         //              }\n
 
-        char tbuf[MAX_STRING];
+        char tbuf[MAX_STRING];  /* Flawfinder: ignore */
         
         S32 version = 0;
         instream.getline(tbuf, MAX_STRING);
@@ -3822,11 +3822,16 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer )
         BOOL success = TRUE;
 
         char* text = new char[ text_len + 1];
+        if (text == NULL)
+        {
+                llerrs << "Memory allocation failure." << llendl;                       
+                return FALSE;
+        }
         instream.get(text, text_len + 1, '\0');
         text[text_len] = '\0';
-        if( text_len != (S32)strlen(text) )
+        if( text_len != (S32)strlen(text) )/* Flawfinder: ignore */
         {
-                llwarns << llformat("Invalid text length: %d != %d ",strlen(text),text_len) << llendl;
+                llwarns << llformat("Invalid text length: %d != %d ",strlen(text),text_len) << llendl;/* Flawfinder: ignore */
                 success = FALSE;
         }
 
@@ -3948,6 +3953,8 @@ LLXMLNodePtr LLTextEditor::getXML(bool save_children) const
 
         node->createChild("word_wrap", TRUE)->setBoolValue(mWordWrap);
 
+        node->createChild("hide_scrollbar", TRUE)->setBoolValue(mHideScrollbarForShortDocs);
+
         addColorXML(node, mCursorColor, "cursor_color", "TextCursorColor");
         addColorXML(node, mFgColor, "text_color", "TextFgColor");
         addColorXML(node, mReadOnlyFgColor, "text_readonly_color", "TextFgReadOnlyColor");
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index c62f353..61dede2 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -1497,7 +1497,7 @@ void load_tr(const LLString& lang)
         LLString filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, inname.c_str());
 
         llifstream file;
-        file.open(filename.c_str(), std::ios_base::binary);
+        file.open(filename.c_str(), std::ios_base::binary);     /* Flawfinder: ignore */
         if (!file)
         {
                 llinfos << "No translation dictionary for: " << filename << llendl;
@@ -1510,7 +1510,7 @@ void load_tr(const LLString& lang)
         gUntranslated.clear();
 
         const S32 MAX_LINE_LEN = 1024;
-        char buffer[MAX_LINE_LEN];
+        char buffer[MAX_LINE_LEN];      /* Flawfinder: ignore */
         while (!file.eof())
         {
                 file.getline(buffer, MAX_LINE_LEN);
@@ -1550,7 +1550,7 @@ void cleanup_tr()
                 LLString outname = "untranslated_" + gLanguage + ".txt";
                 LLString outfilename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, outname.c_str());
                 llofstream outfile;
-                outfile.open(outfilename.c_str());
+                outfile.open(outfilename.c_str());      /* Flawfinder: ignore */
                 if (!outfile)
                 {
                         return;
diff --git a/linden/indra/llui/llui_vc8.vcproj b/linden/indra/llui/llui_vc8.vcproj
new file mode 100644
index 0000000..a78c71c
--- /dev/null
+++ b/linden/indra/llui/llui_vc8.vcproj
@@ -0,0 +1,588 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llui"

+        ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llui.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llui.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llui.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llalertdialog.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbutton.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcheckboxctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclipboard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcombobox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llctrlselectioninterface.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldraghandle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleditmenuhandler.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloater.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfocusmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliconctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeywords.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllineeditor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmenugl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmodaldialog.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanel.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llradiogroup.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizebar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizehandle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrootview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollbar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollcontainer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollingpanellist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrolllistctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llslider.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsliderctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llspinctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstyle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainervertical.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextbox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexteditor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llui.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrlfactory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluistring.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llundo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewborder.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewquery.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llalertdialog.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbutton.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallbackmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcheckboxctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclipboard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcombobox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llctrlselectioninterface.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldraghandle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleditmenuhandler.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloater.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfocusmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliconctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeywords.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllineeditor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemberlistener.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmenugl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmodaldialog.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanel.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llradiogroup.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizebar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizehandle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrootview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollbar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollcontainer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollingpanellist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrolllistctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llslider.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsliderctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llspinctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstyle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainervertical.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextbox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexteditor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llui.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluiconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrlfactory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluistring.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluixmltags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llundo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewborder.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewquery.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index 7f48378..47b5d66 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -36,7 +36,6 @@
 //
 // Classes
 //
-class LLViewerImage;
 class LLFontGL;
 class LLButton;
 class LLTextBox;
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 5a35783..77ef749 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -210,12 +210,18 @@ LLUICtrlFactory::LLUICtrlFactory()
         LLUICtrlCreator<LLMenuBarGL>::registerCreator(LL_MENU_BAR_GL_TAG, this);
         LLUICtrlCreator<LLScrollingPanelList>::registerCreator(LL_SCROLLING_PANEL_LIST_TAG, this);
 
+        setupPaths();
 
+}
+
+void LLUICtrlFactory::setupPaths()
+{
         LLString filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
 
         LLXMLNodePtr root;
         BOOL success  = LLXMLNode::parseFile(filename, root, NULL);
-
+        mXUIPaths.clear();
+        
         if (!success)
         {
                 LLString slash = gDirUtilp->getDirDelimiter();
@@ -239,7 +245,7 @@ LLUICtrlFactory::LLUICtrlFactory()
                         path_val_ui.setArg("[Language]", language);
                         LLString fullpath = app_dir + path_val_ui.getString();
 
-                        if (mXUIPaths.empty() || (find(mXUIPaths.begin(), mXUIPaths.end(), fullpath) == mXUIPaths.end()) )
+                        if (std::find(mXUIPaths.begin(), mXUIPaths.end(), fullpath) == mXUIPaths.end())
                         {
                                 mXUIPaths.push_back(app_dir + path_val_ui.getString());
                         }
@@ -297,7 +303,7 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
 // buildFloater()
 //-----------------------------------------------------------------------------
 void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const LLString &filename, 
-                                                                        const LLCallbackMap::map_t* factory_map, BOOL open)
+                                                                        const LLCallbackMap::map_t* factory_map, BOOL open) /* Flawfinder: ignore */
 {
         LLXMLNodePtr root;
 
@@ -318,7 +324,7 @@ void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const LLString &filename
                 mFactoryStack.push_front(factory_map);
         }
 
-        floaterp->initFloaterXML(root, NULL, this, open);
+        floaterp->initFloaterXML(root, NULL, this, open);       /* Flawfinder: ignore */
 
         if (LLUI::sShowXUINames)
         {
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index ed2a396..b96dc5d 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -74,6 +74,8 @@ public:
         // do not call!  needs to be public so run-time can clean up the singleton
         virtual ~LLUICtrlFactory();
 
+        void setupPaths();
+        
         void buildFloater(LLFloater* floaterp, const LLString &filename, 
                                                 const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index ab06c0f..13f1ddc 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -51,7 +51,6 @@
 BOOL    LLView::sDebugRects = FALSE;
 BOOL    LLView::sDebugKeys = FALSE;
 S32             LLView::sDepth = 0;
-LLView* LLView::sFastFrameView = NULL;
 BOOL    LLView::sDebugMouseHandling = FALSE;
 LLString LLView::sMouseHandlerMessage;
 S32     LLView::sSelectID = GL_NAME_UI_RESERVED;
@@ -112,7 +111,6 @@ LLView::LLView() :
         mSaveToXML(TRUE),
         mIsFocusRoot(FALSE),
         mLastVisible(TRUE),
-        mRenderInFastFrame(TRUE),
         mSpanChildren(FALSE),
         mVisible(TRUE),
         mHidden(FALSE),
@@ -133,7 +131,6 @@ LLView::LLView(const LLString& name, BOOL mouse_opaque) :
         mSaveToXML(TRUE),
         mIsFocusRoot(FALSE),
         mLastVisible(TRUE),
-        mRenderInFastFrame(TRUE),
         mSpanChildren(FALSE),
         mVisible(TRUE),
         mHidden(FALSE),
@@ -157,7 +154,6 @@ LLView::LLView(
         mSaveToXML(TRUE),
         mIsFocusRoot(FALSE),
         mLastVisible(TRUE),
-        mRenderInFastFrame(TRUE),
         mSpanChildren(FALSE),
         mVisible(TRUE),
         mHidden(FALSE),
@@ -199,11 +195,6 @@ LLView::~LLView()
                 mParentView->removeChild(this);
         }
 
-        if(LLView::sFastFrameView == this)
-        {
-                LLView::sFastFrameView = NULL;
-        }
-
         dispatch_list_t::iterator itor;
         for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
         {
@@ -1789,26 +1780,6 @@ void LLView::localRectToScreen(const LLRect& local, LLRect* screen) const
         }
 }
 
-LLView* LLView::getRootMostFastFrameView()
-{
-        if (gFocusMgr.getTopView() == this)
-        {
-                return this;
-        }
-
-        if (getParent())
-        {
-                LLView* rootmost_view = getParent()->getRootMostFastFrameView();
-                if (rootmost_view)
-                {
-                        return rootmost_view;
-                }
-        }
-
-        return mRenderInFastFrame ? this : NULL;
-}
-
-
 LLView* LLView::getRootView()
 {
         LLView* view = this;
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 268f157..3885789 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -164,7 +164,6 @@ protected:
 public:
         LLViewHandle mViewHandle;
         BOOL            mLastVisible;
-        BOOL            mRenderInFastFrame;
         BOOL            mSpanChildren;
 
 private:
@@ -180,7 +179,6 @@ public:
         static BOOL     sDebugRects;    // Draw debug rects behind everything.
         static BOOL sDebugKeys;
         static S32      sDepth;
-        static LLView* sFastFrameView;
         static BOOL sDebugMouseHandling;
         static LLString sMouseHandlerMessage;
         static S32      sSelectID;
@@ -338,8 +336,8 @@ public:
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
         virtual void    translate( S32 x, S32 y );
+        virtual void    setOrigin( S32 x, S32 y )       { mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
         BOOL                    translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside );
-        void                    setOrigin( S32 x, S32 y )       { mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); }
         LLView*                 findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
         LLView*                 findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
 
@@ -437,8 +435,6 @@ public:
         virtual void    localRectToScreen( const LLRect& local, LLRect* screen ) const;
         virtual BOOL    localRectToOtherView( const LLRect& local, LLRect* other, LLView* other_view ) const;
 
-        void                    setRenderInFastFrame(BOOL render) { mRenderInFastFrame = render; }
-        virtual LLView* getRootMostFastFrameView();
 
         static LLWindow*        getWindow(void);
 
diff --git a/linden/indra/llui/llviewquery.cpp b/linden/indra/llui/llviewquery.cpp
index 4867116..89b2192 100644
--- a/linden/indra/llui/llviewquery.cpp
+++ b/linden/indra/llui/llviewquery.cpp
@@ -1,8 +1,8 @@
-/** 

- * @file llviewquery.cpp

- * @brief Implementation of view query class.

- *

- * Copyright (c) 2001-2007, Linden Research, Inc.

+/** 
+ * @file llviewquery.cpp
+ * @brief Implementation of view query class.
+ *
+ * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,124 +22,124 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#include "llview.h"

-#include "lluictrl.h"

-#include "llviewquery.h"

-

-void LLQuerySorter::operator() (LLView * parent, viewList_t &children) const {}

-

-filterResult_t LLNoLeavesFilter::operator() (const LLView* const view, const viewList_t & children) const 

-{

-        return filterResult_t(!(view->getChildList()->size() == 0), TRUE);

-}

-

-filterResult_t LLVisibleFilter::operator() (const LLView* const view, const viewList_t & children) const 

-{

-        return filterResult_t(view->getVisible(), view->getVisible());

-}

-filterResult_t LLEnabledFilter::operator() (const LLView* const view, const viewList_t & children) const 

-{

-        return filterResult_t(view->getEnabled(), view->getEnabled());

-}

-filterResult_t LLTabStopFilter::operator() (const LLView* const view, const viewList_t & children) const 

-{

-        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl* const>(view)->hasTabStop(),

-                                                view->canFocusChildren());

-}

-

-// LLViewQuery

-

-LLViewQuery::LLViewQuery(): mPreFilters(), mPostFilters(), mSorterp() 

-{

-}

-

-void LLViewQuery::addPreFilter(const LLQueryFilter* prefilter) { mPreFilters.push_back(prefilter); }

-

-void LLViewQuery::addPostFilter(const LLQueryFilter* postfilter) {      mPostFilters.push_back(postfilter); }

-

-const LLViewQuery::filterList_t & LLViewQuery::getPreFilters() const { return mPreFilters; }

-

-const LLViewQuery::filterList_t & LLViewQuery::getPostFilters() const { return mPostFilters; }

-

-void LLViewQuery::setSorter(const LLQuerySorter* sorterp) { mSorterp = sorterp; }

-const LLQuerySorter* LLViewQuery::getSorter() const { return mSorterp; }

-

-viewList_t LLViewQuery::run(LLView * view) const

-{

-        viewList_t result;

-

-        filterResult_t pre = runFilters(view, viewList_t(), mPreFilters);

-        if(!pre.first && !pre.second)

-        {

-                // skip post filters completely if we're not including ourselves or the children

-                return result;

-        }

-        if(pre.second)

-        {

-                // run filters on children

-                viewList_t filtered_children;

-                filterChildren(view, filtered_children);

-                filterResult_t post = runFilters(view, filtered_children, mPostFilters);

-                if(pre.first && post.first)

-                {

-                        result.push_back(view);

-                }

-                if(post.second)

-                {

-                        result.insert(result.end(), filtered_children.begin(), filtered_children.end());

-                }

-        }

-        else 

-        {

-                if(pre.first) 

-                {

-                        result.push_back(view);

-                }

-        }

-        return result;

-}

-

-void LLViewQuery::filterChildren(LLView * view, viewList_t & filtered_children) const

-{

-        LLView::child_list_t views(*(view->getChildList()));

-        (*mSorterp)(view, views); // sort the children per the sorter

-        for(LLView::child_list_iter_t iter = views.begin();

-                        iter != views.end();

-                        iter++)

-                {

-                        viewList_t indiv_children = this->run(*iter);

-                        filtered_children.insert(filtered_children.end(), indiv_children.begin(), indiv_children.end());

-                }

-}

-

-filterResult_t LLViewQuery::runFilters(LLView * view, const viewList_t children, const filterList_t filters) const

-{

-        filterResult_t result = filterResult_t(TRUE, TRUE);

-        for(filterList_const_iter_t iter = filters.begin();

-                iter != filters.end();

-                iter++)

-        {

-                filterResult_t filtered = (**iter)(view, children);

-                result.first = result.first && filtered.first;

-                result.second = result.second && filtered.second;

-        }

-        return result;

-}

-

-class SortByTabOrder : public LLQuerySorter, public LLSingleton<SortByTabOrder>

-{

-        /*virtual*/ void operator() (LLView * parent, LLView::child_list_t &children) const 

-        {

-                children.sort(LLCompareByTabOrder(parent->getCtrlOrder()));

-        }

-};

-

-LLCtrlQuery::LLCtrlQuery() : 

-        LLViewQuery()

-{

-        setSorter(SortByTabOrder::getInstance());

-}

-

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include "llview.h"
+#include "lluictrl.h"
+#include "llviewquery.h"
+
+void LLQuerySorter::operator() (LLView * parent, viewList_t &children) const {}
+
+filterResult_t LLNoLeavesFilter::operator() (const LLView* const view, const viewList_t & children) const 
+{
+        return filterResult_t(!(view->getChildList()->size() == 0), TRUE);
+}
+
+filterResult_t LLVisibleFilter::operator() (const LLView* const view, const viewList_t & children) const 
+{
+        return filterResult_t(view->getVisible(), view->getVisible());
+}
+filterResult_t LLEnabledFilter::operator() (const LLView* const view, const viewList_t & children) const 
+{
+        return filterResult_t(view->getEnabled(), view->getEnabled());
+}
+filterResult_t LLTabStopFilter::operator() (const LLView* const view, const viewList_t & children) const 
+{
+        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl* const>(view)->hasTabStop(),
+                                                view->canFocusChildren());
+}
+
+// LLViewQuery
+
+LLViewQuery::LLViewQuery(): mPreFilters(), mPostFilters(), mSorterp() 
+{
+}
+
+void LLViewQuery::addPreFilter(const LLQueryFilter* prefilter) { mPreFilters.push_back(prefilter); }
+
+void LLViewQuery::addPostFilter(const LLQueryFilter* postfilter) {      mPostFilters.push_back(postfilter); }
+
+const LLViewQuery::filterList_t & LLViewQuery::getPreFilters() const { return mPreFilters; }
+
+const LLViewQuery::filterList_t & LLViewQuery::getPostFilters() const { return mPostFilters; }
+
+void LLViewQuery::setSorter(const LLQuerySorter* sorterp) { mSorterp = sorterp; }
+const LLQuerySorter* LLViewQuery::getSorter() const { return mSorterp; }
+
+viewList_t LLViewQuery::run(LLView * view) const
+{
+        viewList_t result;
+
+        filterResult_t pre = runFilters(view, viewList_t(), mPreFilters);
+        if(!pre.first && !pre.second)
+        {
+                // skip post filters completely if we're not including ourselves or the children
+                return result;
+        }
+        if(pre.second)
+        {
+                // run filters on children
+                viewList_t filtered_children;
+                filterChildren(view, filtered_children);
+                filterResult_t post = runFilters(view, filtered_children, mPostFilters);
+                if(pre.first && post.first)
+                {
+                        result.push_back(view);
+                }
+                if(post.second)
+                {
+                        result.insert(result.end(), filtered_children.begin(), filtered_children.end());
+                }
+        }
+        else 
+        {
+                if(pre.first) 
+                {
+                        result.push_back(view);
+                }
+        }
+        return result;
+}
+
+void LLViewQuery::filterChildren(LLView * view, viewList_t & filtered_children) const
+{
+        LLView::child_list_t views(*(view->getChildList()));
+        (*mSorterp)(view, views); // sort the children per the sorter
+        for(LLView::child_list_iter_t iter = views.begin();
+                        iter != views.end();
+                        iter++)
+                {
+                        viewList_t indiv_children = this->run(*iter);
+                        filtered_children.insert(filtered_children.end(), indiv_children.begin(), indiv_children.end());
+                }
+}
+
+filterResult_t LLViewQuery::runFilters(LLView * view, const viewList_t children, const filterList_t filters) const
+{
+        filterResult_t result = filterResult_t(TRUE, TRUE);
+        for(filterList_const_iter_t iter = filters.begin();
+                iter != filters.end();
+                iter++)
+        {
+                filterResult_t filtered = (**iter)(view, children);
+                result.first = result.first && filtered.first;
+                result.second = result.second && filtered.second;
+        }
+        return result;
+}
+
+class SortByTabOrder : public LLQuerySorter, public LLSingleton<SortByTabOrder>
+{
+        /*virtual*/ void operator() (LLView * parent, LLView::child_list_t &children) const 
+        {
+                children.sort(LLCompareByTabOrder(parent->getCtrlOrder()));
+        }
+};
+
+LLCtrlQuery::LLCtrlQuery() : 
+        LLViewQuery()
+{
+        setSorter(SortByTabOrder::getInstance());
+}
+
diff --git a/linden/indra/llui/llviewquery.h b/linden/indra/llui/llviewquery.h
index 3dc2861..7ab401a 100644
--- a/linden/indra/llui/llviewquery.h
+++ b/linden/indra/llui/llviewquery.h
@@ -1,8 +1,8 @@
-/** 

- * @file llviewquery.h

- * @brief Query algorithm for flattening and filtering the view hierarchy.

- *

- * Copyright (c) 2001-2007, Linden Research, Inc.

+/** 
+ * @file llviewquery.h
+ * @brief Query algorithm for flattening and filtering the view hierarchy.
+ *
+ * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,87 +22,87 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#ifndef LL_LLVIEWQUERY_H

-#define LL_LLVIEWQUERY_H

-

-#include <list> 

-

-#include "llmemory.h"

-

-class LLView;

-

-typedef std::list<LLView *>                     viewList_t;

-typedef std::pair<BOOL, BOOL>           filterResult_t;

-

-// Abstract base class for all filters.

-class LLQueryFilter : public LLRefCount

-{

-public:

-        virtual filterResult_t operator() (const LLView* const view, const viewList_t & children) const =0;

-};

-

-class LLQuerySorter : public LLRefCount

-{

-public:

-        virtual void operator() (LLView * parent, viewList_t &children) const;

-};

-

-class LLNoLeavesFilter : public LLQueryFilter, public LLSingleton<LLNoLeavesFilter>

-{

-        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;

-};

-class LLVisibleFilter : public LLQueryFilter, public LLSingleton<LLVisibleFilter>

-{

-        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;

-};

-class LLEnabledFilter : public LLQueryFilter, public LLSingleton<LLEnabledFilter>

-{

-        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;

-};

-class LLTabStopFilter : public LLQueryFilter, public LLSingleton<LLTabStopFilter>

-{

-        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;

-};

-

-// Algorithm for flattening

-class LLViewQuery

-{

-public:

-        typedef std::list<const LLQueryFilter*>         filterList_t;

-        typedef filterList_t::iterator                          filterList_iter_t;

-        typedef filterList_t::const_iterator            filterList_const_iter_t;

-

-        LLViewQuery();

-        virtual ~LLViewQuery() {}

-

-        void addPreFilter(const LLQueryFilter* prefilter);

-        void addPostFilter(const LLQueryFilter* postfilter);

-        const filterList_t & getPreFilters() const;

-        const filterList_t & getPostFilters() const;

-

-        void setSorter(const LLQuerySorter* sorter);

-        const LLQuerySorter* getSorter() const;

-

-        viewList_t run(LLView * view) const;

-        // syntactic sugar

-        viewList_t operator () (LLView * view) const { return run(view); }

-protected:

-        // override this method to provide iteration over other types of children

-        virtual void filterChildren(LLView * view, viewList_t & filtered_children) const;

-        filterResult_t runFilters(LLView * view, const viewList_t children, const filterList_t filters) const;

-protected:

-        filterList_t mPreFilters;

-        filterList_t mPostFilters;

-        const LLQuerySorter* mSorterp;

-};

-

-class LLCtrlQuery : public LLViewQuery

-{

-public:

-        LLCtrlQuery();

-};

-

-#endif

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#ifndef LL_LLVIEWQUERY_H
+#define LL_LLVIEWQUERY_H
+
+#include <list> 
+
+#include "llmemory.h"
+
+class LLView;
+
+typedef std::list<LLView *>                     viewList_t;
+typedef std::pair<BOOL, BOOL>           filterResult_t;
+
+// Abstract base class for all filters.
+class LLQueryFilter : public LLRefCount
+{
+public:
+        virtual filterResult_t operator() (const LLView* const view, const viewList_t & children) const =0;
+};
+
+class LLQuerySorter : public LLRefCount
+{
+public:
+        virtual void operator() (LLView * parent, viewList_t &children) const;
+};
+
+class LLNoLeavesFilter : public LLQueryFilter, public LLSingleton<LLNoLeavesFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+class LLVisibleFilter : public LLQueryFilter, public LLSingleton<LLVisibleFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+class LLEnabledFilter : public LLQueryFilter, public LLSingleton<LLEnabledFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+class LLTabStopFilter : public LLQueryFilter, public LLSingleton<LLTabStopFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+
+// Algorithm for flattening
+class LLViewQuery
+{
+public:
+        typedef std::list<const LLQueryFilter*>         filterList_t;
+        typedef filterList_t::iterator                          filterList_iter_t;
+        typedef filterList_t::const_iterator            filterList_const_iter_t;
+
+        LLViewQuery();
+        virtual ~LLViewQuery() {}
+
+        void addPreFilter(const LLQueryFilter* prefilter);
+        void addPostFilter(const LLQueryFilter* postfilter);
+        const filterList_t & getPreFilters() const;
+        const filterList_t & getPostFilters() const;
+
+        void setSorter(const LLQuerySorter* sorter);
+        const LLQuerySorter* getSorter() const;
+
+        viewList_t run(LLView * view) const;
+        // syntactic sugar
+        viewList_t operator () (LLView * view) const { return run(view); }
+protected:
+        // override this method to provide iteration over other types of children
+        virtual void filterChildren(LLView * view, viewList_t & filtered_children) const;
+        filterResult_t runFilters(LLView * view, const viewList_t children, const filterList_t filters) const;
+protected:
+        filterList_t mPreFilters;
+        filterList_t mPostFilters;
+        const LLQuerySorter* mSorterp;
+};
+
+class LLCtrlQuery : public LLViewQuery
+{
+public:
+        LLCtrlQuery();
+};
+
+#endif
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index b0d9d92..6d0e956 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -202,6 +202,27 @@ const std::string &LLDir::getTempDir() const
         return mTempDir;
 }
 
+const std::string  LLDir::getCacheDir(bool get_default) const
+{
+        if (mCacheDir.empty() || get_default)
+        {
+                std::string res;
+                if (getOSUserAppDir().empty())
+                {
+                        res = "data";
+                }
+                else
+                {
+                        res = getOSUserAppDir() + mDirDelimiter + "cache";
+                }
+                return res;
+        }
+        else
+        {
+                return mCacheDir;
+        }
+}
+
 const std::string &LLDir::getCAFile() const
 {
         return mCAFile;
@@ -217,7 +238,12 @@ const std::string &LLDir::getSkinDir() const
         return mSkinDir;
 }
 
-std::string LLDir::getExpandedFilename(ELLPath location, const std::string &filename) const
+std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const
+{
+        return getExpandedFilename(location, "", filename);
+}
+
+std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subdir, const std::string& in_filename) const
 {
         std::string prefix;
         switch (location)
@@ -249,16 +275,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
                 break;
                 
         case LL_PATH_CACHE:
-                if (getOSUserAppDir().empty())
-                {
-                        prefix = "data";
-                }
-                else
-                {
-                        prefix = getOSUserAppDir();
-                        prefix += mDirDelimiter;
-                        prefix += "cache";
-                }
+            prefix = getCacheDir();
                 break;
                 
         case LL_PATH_USER_SETTINGS:
@@ -309,6 +326,16 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
                 llassert(0);
         }
 
+        std::string filename = in_filename;
+        if (!subdir.empty())
+        {
+                filename = subdir + mDirDelimiter + in_filename;
+        }
+        else
+        {
+                filename = in_filename;
+        }
+        
         std::string expanded_filename;
         if (!filename.empty())
         {
@@ -323,8 +350,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
                         expanded_filename = filename;
                 }
         }
-        else
-        if (!prefix.empty())
+        else if (!prefix.empty())
         {
                 // Directory only, no file name.
                 expanded_filename = prefix;
@@ -342,7 +368,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
 std::string LLDir::getTempFilename() const
 {
         LLUUID random_uuid;
-        char uuid_str[64];
+        char uuid_str[64];      /* Flawfinder: ignore */ 
 
         random_uuid.generate();
         random_uuid.toString(uuid_str);
@@ -424,6 +450,30 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
         mSkinDir += skin_folder;
 }
 
+bool LLDir::setCacheDir(const std::string &path)
+{
+        if (path.empty() )
+        {
+                // reset to default
+                mCacheDir = "";
+                return true;
+        }
+        else
+        {
+                LLFile::mkdir(path.c_str());
+                std::string tempname = path + mDirDelimiter + "temp";
+                LLFILE* file = LLFile::fopen(tempname.c_str(),"wt");
+                if (file)
+                {
+                        fclose(file);
+                        LLFile::remove(tempname.c_str());
+                        mCacheDir = path;
+                        return true;
+                }
+                return false;
+        }
+}
+
 void LLDir::dumpCurrentDirectories()
 {
         llinfos << "Current Directories:" << llendl;
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 2012f1b..60188f3 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -79,12 +79,14 @@ class LLDir
         const std::string &getChatLogsDir() const;      // Location of the chat logs dir.
         const std::string &getPerAccountChatLogsDir() const;    // Location of the per account chat logs dir.
         const std::string &getTempDir() const;                  // Common temporary directory
+        const std::string  getCacheDir(bool get_default = false) const; // Location of the cache.
         const std::string &getCAFile() const;                   // File containing TLS certificate authorities
         const std::string &getDirDelimiter() const;     // directory separator for platform (ie. '\' or '/' or ':')
         const std::string &getSkinDir() const;          // User-specified skin folder.
 
         // Expanded filename
         std::string getExpandedFilename(ELLPath location, const std::string &filename) const;
+        std::string getExpandedFilename(ELLPath location, const std::string &subdir, const std::string &filename) const;
 
         // random filename in common temporary directory
         std::string getTempFilename() const;
@@ -93,6 +95,7 @@ class LLDir
         virtual void setPerAccountChatLogsDir(const std::string &first, const std::string &last);               // Set the per user chat log directory.
         virtual void setLindenUserDir(const std::string &first, const std::string &last);               // Set the linden user dir to this user's dir
         virtual void setSkinFolder(const std::string &skin_folder);
+        virtual bool setCacheDir(const std::string &path);
 
         virtual void dumpCurrentDirectories();
         
@@ -110,6 +113,7 @@ protected:
         std::string mChatLogsDir;                // Location for chat logs.
         std::string mCAFile;                             // Location of the TLS certificate authority PEM file.
         std::string mTempDir;
+        std::string mCacheDir;
         std::string mDirDelimiter;
         std::string mSkinDir;                   // Location for u ser-specified skin info.
 };
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index 780fbdb..f46ccf2 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -51,7 +51,7 @@ static std::string getCurrentUserHome(char* fallback)
         else
         {
                 llinfos << "Couldn't detect home directory from passwd - trying $HOME" << llendl;
-                const char *const home_env = getenv("HOME");
+                const char *const home_env = getenv("HOME");    /* Flawfinder: ignore */ 
                 if (home_env)
                 {
                         result_cstr = (char*) home_env;
@@ -73,7 +73,7 @@ LLDir_Linux::LLDir_Linux()
         mCurrentDirCount = -1;
         mDirp = NULL;
 
-        char tmp_str[LL_MAX_PATH];
+        char tmp_str[LL_MAX_PATH];      /* Flawfinder: ignore */ 
         getcwd(tmp_str, LL_MAX_PATH);
 
         mExecutableFilename = "";
@@ -85,13 +85,13 @@ LLDir_Linux::LLDir_Linux()
         mOSUserAppDir = "";
         mLindenUserDir = tmp_str;
 
-        char path [32];
+        char path [32]; /* Flawfinder: ignore */ 
 
         // *NOTE: /proc/%d/exe doesn't work on FreeBSD. But that's ok,
         // because this is the linux implementation.
 
-        sprintf (path, "/proc/%d/exe", (int) getpid ());
-        int rc = readlink (path, tmp_str, sizeof (tmp_str)-1);
+        snprintf (path, sizeof(path), "/proc/%d/exe", (int) getpid ()); /* Flawfinder: ignore */
+        int rc = readlink (path, tmp_str, sizeof (tmp_str)-1);  /* Flawfinder: ignore */ 
         if ( (rc != -1) && (rc <= ((int) sizeof (tmp_str)-1)) )
         {
                 tmp_str[rc] = '\0'; //readlink() doesn't 0-terminate the buffer
@@ -128,7 +128,7 @@ void LLDir_Linux::initAppDirs(const std::string &app_name)
         LLString upper_app_name(app_name);
         LLString::toUpper(upper_app_name);
 
-        char* app_home_env = getenv((upper_app_name + "_USER_DIR").c_str());
+        char* app_home_env = getenv((upper_app_name + "_USER_DIR").c_str());    /* Flawfinder: ignore */ 
         if (app_home_env)
         {
                 // user has specified own userappdir i.e. $SECONDLIFE_USER_DIR
@@ -326,7 +326,7 @@ void LLDir_Linux::getRandomFileInDir(const std::string &dirname, const std::stri
 
 std::string LLDir_Linux::getCurPath()
 {
-        char tmp_str[LL_MAX_PATH];
+        char tmp_str[LL_MAX_PATH];      /* Flawfinder: ignore */ 
         getcwd(tmp_str, LL_MAX_PATH);
         return tmp_str;
 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 7f1d2ce..7ed7697 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -354,7 +354,7 @@ S32 LLDir_Mac::deleteFilesInDir(const std::string &dirname, const std::string &m
 
 std::string LLDir_Mac::getCurPath()
 {
-        char tmp_str[LL_MAX_PATH];
+        char tmp_str[LL_MAX_PATH];      /* Flawfinder: ignore */ 
         getcwd(tmp_str, LL_MAX_PATH);
         return tmp_str;
 }
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index ad72752..fd264a7 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -64,9 +64,9 @@ LLDir_Win32::LLDir_Win32()
 
         if (GetTempPath(MAX_PATH, w_str))
         {
-                if (wcslen(w_str))
+                if (wcslen(w_str))      /* Flawfinder: ignore */ 
                 {
-                        w_str[wcslen(w_str)-1] = '\0'; // remove trailing slash
+                        w_str[wcslen(w_str)-1] = '\0'; /* Flawfinder: ignore */ // remove trailing slash
                 }
                 mTempDir = utf16str_to_utf8str(llutf16string(w_str));
         }
@@ -361,7 +361,7 @@ DWORD GetDllVersion(LPCTSTR lpszDllName)
     HINSTANCE hinstDll;
     DWORD dwVersion = 0;
 
-    hinstDll = LoadLibrary(lpszDllName);
+    hinstDll = LoadLibrary(lpszDllName);        /* Flawfinder: ignore */ 
         
     if(hinstDll)
     {
diff --git a/linden/indra/llvfs/lllfsthread.cpp b/linden/indra/llvfs/lllfsthread.cpp
index b7335e2..25edb52 100644
--- a/linden/indra/llvfs/lllfsthread.cpp
+++ b/linden/indra/llvfs/lllfsthread.cpp
@@ -38,10 +38,10 @@
 //============================================================================
 // Run on MAIN thread
 //static
-void LLLFSThread::initClass(bool local_is_threaded, bool local_run_always)
+void LLLFSThread::initClass(bool local_is_threaded)
 {
         llassert(sLocal == NULL);
-        sLocal = new LLLFSThread(local_is_threaded, local_run_always);
+        sLocal = new LLLFSThread(local_is_threaded);
 }
 
 //static
@@ -65,8 +65,9 @@ void LLLFSThread::cleanupClass()
 
 //----------------------------------------------------------------------------
 
-LLLFSThread::LLLFSThread(bool threaded, bool runalways) :
-        LLQueuedThread("LFS", threaded, runalways)
+LLLFSThread::LLLFSThread(bool threaded) :
+        LLQueuedThread("LFS", threaded),
+        mPriorityCounter(PRIORITY_LOWBITS)
 {
 }
 
@@ -77,251 +78,165 @@ LLLFSThread::~LLLFSThread()
 
 //----------------------------------------------------------------------------
 
-LLLFSThread::handle_t LLLFSThread::read(const LLString& filename,
-                                                                                U8* buffer, S32 offset, S32 numbytes, U32 priority, U32 flags)
+LLLFSThread::handle_t LLLFSThread::read(const LLString& filename,       /* Flawfinder: ignore */ 
+                                                                                U8* buffer, S32 offset, S32 numbytes,
+                                                                                Responder* responder, U32 priority)
 {
         handle_t handle = generateHandle();
 
-        priority = llmax(priority, (U32)PRIORITY_LOW); // All reads are at least PRIORITY_LOW
-        Request* req = new Request(handle, priority, flags,
+        if (priority == 0) priority = PRIORITY_NORMAL | priorityCounter();
+        else if (priority < PRIORITY_LOW) priority |= PRIORITY_LOW; // All reads are at least PRIORITY_LOW
+
+        Request* req = new Request(this, handle, priority,
                                                            FILE_READ, filename,
-                                                           buffer, offset, numbytes);
+                                                           buffer, offset, numbytes,
+                                                           responder);
 
         bool res = addRequest(req);
         if (!res)
         {
                 llerrs << "LLLFSThread::read called after LLLFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-                handle = nullHandle();
         }
 
         return handle;
 }
 
-S32 LLLFSThread::readImmediate(const LLString& filename,
-                                                           U8* buffer, S32 offset, S32 numbytes)
-{
-        handle_t handle = generateHandle();
-
-        Request* req = new Request(handle, PRIORITY_IMMEDIATE, 0,
-                                                           FILE_READ, filename,
-                                                           buffer, offset, numbytes);
-        
-        S32 res = addRequest(req) ? 1 : 0;
-        if (res == 0)
-        {
-                llerrs << "LLLFSThread::read called after LLLFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-        }
-        else
-        {
-                llverify(waitForResult(handle, false) == true);
-                res = req->getBytesRead();
-                completeRequest(handle);
-        }
-        return res;
-}
-
 LLLFSThread::handle_t LLLFSThread::write(const LLString& filename,
-                                                                                 U8* buffer, S32 offset, S32 numbytes, U32 flags)
+                                                                                 U8* buffer, S32 offset, S32 numbytes,
+                                                                                 Responder* responder, U32 priority)
 {
         handle_t handle = generateHandle();
 
-        Request* req = new Request(handle, 0, flags,
-                                                           FILE_WRITE, filename,
-                                                           buffer, offset, numbytes);
-
-        bool res = addRequest(req);
-        if (!res)
-        {
-                llerrs << "LLLFSThread::read called after LLLFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-                handle = nullHandle();
-        }
+        if (priority == 0) priority = PRIORITY_LOW | priorityCounter();
         
-        return handle;
-}
-
-S32 LLLFSThread::writeImmediate(const LLString& filename,
-                                                                 U8* buffer, S32 offset, S32 numbytes)
-{
-        handle_t handle = generateHandle();
-
-        Request* req = new Request(handle, PRIORITY_IMMEDIATE, 0,
+        Request* req = new Request(this, handle, priority,
                                                            FILE_WRITE, filename,
-                                                           buffer, offset, numbytes);
-
-        S32 res = addRequest(req) ? 1 : 0;
-        if (res == 0)
-        {
-                llerrs << "LLLFSThread::write called after LLLFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-        }
-        else
-        {
-                llverify(waitForResult(handle, false) == true);
-                res = req->getBytesRead();
-                completeRequest(handle);
-        }
-        return res;
-}
-
-
-LLLFSThread::handle_t LLLFSThread::rename(const LLString& filename, const LLString& newname, U32 flags)
-{
-        handle_t handle = generateHandle();
-
-        LLString* new_name_str = new LLString(newname); // deleted with Request
-        Request* req = new Request(handle, 0, flags,
-                                                           FILE_RENAME, filename,
-                                                           (U8*)new_name_str, 0, 0);
-
-        bool res = addRequest(req);
-        if (!res)
-        {
-                llerrs << "LLLFSThread::rename called after LLLFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-                handle = nullHandle();
-        }
-        
-        return handle;
-}
-
-LLLFSThread::handle_t LLLFSThread::remove(const LLString& filename, U32 flags)
-{
-        handle_t handle = generateHandle();
-
-        Request* req = new Request(handle, 0, flags,
-                                                           FILE_RENAME, filename,
-                                                           NULL, 0, 0);
+                                                           buffer, offset, numbytes,
+                                                           responder);
 
         bool res = addRequest(req);
         if (!res)
         {
-                llerrs << "LLLFSThread::remove called after LLLFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-                handle = nullHandle();
+                llerrs << "LLLFSThread::read called after LLLFSThread::cleanupClass()" << llendl;
         }
         
         return handle;
 }
 
 //============================================================================
-// Runs on its OWN thread
-
-bool LLLFSThread::processRequest(QueuedRequest* qreq)
-{
-        Request *req = (Request*)qreq;
-
-        bool complete = req->processIO();
-
-        return complete;
-}
-
-//============================================================================
 
-LLLFSThread::Request::Request(handle_t handle, U32 priority, U32 flags,
+LLLFSThread::Request::Request(LLLFSThread* thread,
+                                                          handle_t handle, U32 priority,
                                                           operation_t op, const LLString& filename,
-                                                          U8* buffer, S32 offset, S32 numbytes) :
-        QueuedRequest(handle, priority, flags),
+                                                          U8* buffer, S32 offset, S32 numbytes,
+                                                          Responder* responder) :
+        QueuedRequest(handle, priority, FLAG_AUTO_COMPLETE),
+        mThread(thread),
         mOperation(op),
         mFileName(filename),
         mBuffer(buffer),
         mOffset(offset),
         mBytes(numbytes),
-        mBytesRead(0)
+        mBytesRead(0),
+        mResponder(responder)
 {
-        llassert(mBuffer);
-
-        if (numbytes <= 0 && mOperation != FILE_RENAME && mOperation != FILE_REMOVE)
+        if (numbytes <= 0)
         {
                 llwarns << "LLLFSThread: Request with numbytes = " << numbytes << llendl;
         }
 }
 
-void LLLFSThread::Request::finishRequest()
+LLLFSThread::Request::~Request()
 {
 }
 
+// virtual, called from own thread
+void LLLFSThread::Request::finishRequest(bool completed)
+{
+        if (mResponder.notNull())
+        {
+                mResponder->completed(completed ? mBytesRead : 0);
+                mResponder = NULL;
+        }
+}
+
 void LLLFSThread::Request::deleteRequest()
 {
-        if (getStatus() == STATUS_QUEUED || getStatus() == STATUS_ABORT)
+        if (getStatus() == STATUS_QUEUED)
         {
                 llerrs << "Attempt to delete a queued LLLFSThread::Request!" << llendl;
         }       
-        if (mOperation == FILE_WRITE)
-        {
-                if (mFlags & AUTO_DELETE)
-                {
-                        delete mBuffer;
-                }
-        }
-        else if (mOperation == FILE_RENAME)
+        if (mResponder.notNull())
         {
-                LLString* new_name = (LLString*)mBuffer;
-                delete new_name;
+                mResponder->completed(0);
+                mResponder = NULL;
         }
         LLQueuedThread::QueuedRequest::deleteRequest();
 }
 
-bool LLLFSThread::Request::processIO()
+bool LLLFSThread::Request::processRequest()
 {
         bool complete = false;
         if (mOperation ==  FILE_READ)
         {
                 llassert(mOffset >= 0);
-                apr_file_t* filep = ll_apr_file_open(mFileName, LL_APR_RB);
+                apr_file_t* filep = ll_apr_file_open(mFileName, LL_APR_RB, mThread->mAPRPoolp);
                 if (!filep)
                 {
                         llwarns << "LLLFS: Unable to read file: " << mFileName << llendl;
                         mBytesRead = 0; // fail
                         return true;
                 }
+                S32 off;
                 if (mOffset < 0)
-                        ll_apr_file_seek(filep, APR_END, 0);
+                        off = ll_apr_file_seek(filep, APR_END, 0);
                 else
-                        ll_apr_file_seek(filep, APR_SET, mOffset);
+                        off = ll_apr_file_seek(filep, APR_SET, mOffset);
+                llassert_always(off >= 0);
                 mBytesRead = ll_apr_file_read(filep, mBuffer, mBytes );
                 apr_file_close(filep);
                 complete = true;
-                //llinfos << llformat("LLLFSThread::READ '%s': %d bytes",mFileName.c_str(),mBytesRead) << llendl;
+//              llinfos << "LLLFSThread::READ:" << mFileName << " Bytes: " << mBytesRead << llendl;
         }
         else if (mOperation ==  FILE_WRITE)
         {
-                apr_file_t* filep = ll_apr_file_open(mFileName, LL_APR_WB);
+                apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
+                if (mOffset < 0)
+                        flags |= APR_APPEND;
+                apr_file_t* filep = ll_apr_file_open(mFileName, flags, mThread->mAPRPoolp);
                 if (!filep)
                 {
                         llwarns << "LLLFS: Unable to write file: " << mFileName << llendl;
                         mBytesRead = 0; // fail
                         return true;
                 }
-                if (mOffset < 0)
-                        ll_apr_file_seek(filep, APR_END, 0);
-                else
-                        ll_apr_file_seek(filep, APR_SET, mOffset);
+                if (mOffset >= 0)
+                {
+                        S32 seek = ll_apr_file_seek(filep, APR_SET, mOffset);
+                        if (seek < 0)
+                        {
+                                apr_file_close(filep);
+                                llwarns << "LLLFS: Unable to write file (seek failed): " << mFileName << llendl;
+                                mBytesRead = 0; // fail
+                                return true;
+                        }
+                }
                 mBytesRead = ll_apr_file_write(filep, mBuffer, mBytes );
                 complete = true;
                 apr_file_close(filep);
-                //llinfos << llformat("LLLFSThread::WRITE '%s': %d bytes",mFileName.c_str(),mBytesRead) << llendl;
-        }
-        else if (mOperation ==  FILE_RENAME)
-        {
-                LLString* new_name = (LLString*)mBuffer;
-                ll_apr_file_rename(mFileName, *new_name);
-                complete = true;
-                //llinfos << llformat("LLLFSThread::RENAME '%s': '%s'",mFileName.c_str(),new_name->c_str()) << llendl;
-        }
-        else if (mOperation ==  FILE_REMOVE)
-        {
-                ll_apr_file_remove(mFileName);
-                complete = true;
-                //llinfos << llformat("LLLFSThread::REMOVE '%s'",mFileName.c_str()) << llendl;
+//              llinfos << "LLLFSThread::WRITE:" << mFileName << " Bytes: " << mBytesRead << "/" << mBytes << " Offset:" << mOffset << llendl;
         }
         else
         {
-                llerrs << llformat("LLLFSThread::unknown operation: %d", mOperation) << llendl;
+                llerrs << "LLLFSThread::unknown operation: " << (S32)mOperation << llendl;
         }
         return complete;
 }
 
 //============================================================================
+
+LLLFSThread::Responder::~Responder()
+{
+}
+
+//============================================================================
diff --git a/linden/indra/llvfs/lllfsthread.h b/linden/indra/llvfs/lllfsthread.h
index 8af66b1..06c53aa 100644
--- a/linden/indra/llvfs/lllfsthread.h
+++ b/linden/indra/llvfs/lllfsthread.h
@@ -55,15 +55,24 @@ public:
         //------------------------------------------------------------------------
 public:
 
+        class Responder : public LLThreadSafeRefCount
+        {
+        public:
+                virtual ~Responder();
+                virtual void completed(S32 bytes) = 0;
+        };
+
         class Request : public QueuedRequest
         {
         protected:
-                ~Request() {}; // use deleteRequest()
+                virtual ~Request(); // use deleteRequest()
                 
         public:
-                Request(handle_t handle, U32 priority, U32 flags,
+                Request(LLLFSThread* thread,
+                                handle_t handle, U32 priority, 
                                 operation_t op, const LLString& filename,
-                                U8* buffer, S32 offset, S32 numbytes);
+                                U8* buffer, S32 offset, S32 numbytes,
+                                Responder* responder);
 
                 S32 getBytes()
                 {
@@ -86,12 +95,12 @@ public:
                         return mFileName;
                 }
                 
-                /*virtual*/ void finishRequest();
+                /*virtual*/ bool processRequest();
+                /*virtual*/ void finishRequest(bool completed);
                 /*virtual*/ void deleteRequest();
-
-                bool processIO();
                 
         private:
+                LLLFSThread* mThread;
                 operation_t mOperation;
                 
                 LLString mFileName;
@@ -99,35 +108,36 @@ public:
                 U8* mBuffer;    // dest for reads, source for writes, new UUID for rename
                 S32 mOffset;    // offset into file, -1 = append (WRITE only)
                 S32 mBytes;             // bytes to read from file, -1 = all
-                S32     mBytesRead;     // bytes read from file
+                S32 mBytesRead; // bytes read from file
+
+                LLPointer<Responder> mResponder;
         };
 
         //------------------------------------------------------------------------
 public:
-        LLLFSThread(bool threaded = TRUE, bool runalways = TRUE);
+        LLLFSThread(bool threaded = TRUE);
         ~LLLFSThread(); 
 
         // Return a Request handle
-        handle_t read(const LLString& filename,
-                                  U8* buffer, S32 offset, S32 numbytes, U32 pri=PRIORITY_NORMAL, U32 flags = 0);
+        handle_t read(const LLString& filename, /* Flawfinder: ignore */ 
+                                  U8* buffer, S32 offset, S32 numbytes,
+                                  Responder* responder, U32 pri=0);
         handle_t write(const LLString& filename,
-                                   U8* buffer, S32 offset, S32 numbytes, U32 flags = 0);
-        handle_t rename(const LLString& filename, const LLString& newname, U32 flags = 0);
-        handle_t remove(const LLString& filename, U32 flags = 0);
+                                   U8* buffer, S32 offset, S32 numbytes,
+                                   Responder* responder, U32 pri=0);
         
-        // Return number of bytes read
-        S32 readImmediate(const LLString& filename,
-                                          U8* buffer, S32 offset, S32 numbytes);
-        S32 writeImmediate(const LLString& filename,
-                                           U8* buffer, S32 offset, S32 numbytes);
-
-        static void initClass(bool local_is_threaded = TRUE, bool run_always = TRUE); // Setup sLocal
+        // Misc
+        U32 priorityCounter() { return mPriorityCounter-- & PRIORITY_LOWBITS; } // Use to order IO operations
+        
+        // static initializers
+        static void initClass(bool local_is_threaded = TRUE); // Setup sLocal
         static S32 updateClass(U32 ms_elapsed);
         static void cleanupClass();             // Delete sLocal
 
-protected:
-        /*virtual*/ bool processRequest(QueuedRequest* req);
-
+        
+private:
+        U32 mPriorityCounter;
+        
 public:
         static LLLFSThread* sLocal;             // Default local file thread
 };
diff --git a/linden/indra/llvfs/llvfile.cpp b/linden/indra/llvfs/llvfile.cpp
index 2faa5c3..e958b33 100644
--- a/linden/indra/llvfs/llvfile.cpp
+++ b/linden/indra/llvfs/llvfile.cpp
@@ -70,12 +70,12 @@ LLVFile::~LLVFile()
                 {
                         if (!(mMode & LLVFile::WRITE))
                         {
-                                //                      llwarns << "Destroying LLVFile with pending async read/write, aborting..." << llendl;
-                                sVFSThread->abortRequest(mHandle, LLVFSThread::AUTO_COMPLETE);
+                                //llwarns << "Destroying LLVFile with pending async read/write, aborting..." << llendl;
+                                sVFSThread->setFlags(mHandle, LLVFSThread::FLAG_AUTO_COMPLETE | LLVFSThread::FLAG_ABORT);
                         }
                         else // WRITE
                         {
-                                sVFSThread->setFlags(mHandle, LLVFSThread::AUTO_COMPLETE);
+                                sVFSThread->setFlags(mHandle, LLVFSThread::FLAG_AUTO_COMPLETE);
                         }
                 }
         }
@@ -135,7 +135,7 @@ U8* LLVFile::readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S
         else
         {
                 data = new U8[file_size];
-                file.read(data, file_size);
+                file.read(data, file_size);     /* Flawfinder: ignore */ 
                 
                 if (file.getLastBytesRead() != (S32)file_size)
                 {
@@ -213,8 +213,8 @@ BOOL LLVFile::write(const U8 *buffer, S32 bytes)
                 S32 offset = -1;
                 mHandle = sVFSThread->write(mVFS, mFileID, mFileType,
                                                                         writebuf, offset, bytes,
-                                                                        LLVFSThread::AUTO_COMPLETE | LLVFSThread::AUTO_DELETE);
-                mHandle = LLVFSThread::nullHandle(); // AUTO_COMPLETE means we don't track this
+                                                                        LLVFSThread::FLAG_AUTO_COMPLETE | LLVFSThread::FLAG_AUTO_DELETE);
+                mHandle = LLVFSThread::nullHandle(); // FLAG_AUTO_COMPLETE means we don't track this
         }
         else
         {
@@ -323,7 +323,7 @@ BOOL LLVFile::setMaxSize(S32 size)
                         }
                         if (sVFSThread->isPaused())
                         {
-                                sVFSThread->updateQueue(0);
+                                sVFSThread->update(0);
                         }
                         ms_sleep(10);
                 }
@@ -427,7 +427,7 @@ void LLVFile::waitForLock(EVFSLock lock)
         {
                 if (sVFSThread->isPaused())
                 {
-                        sVFSThread->updateQueue(0);
+                        sVFSThread->update(0);
                 }
                 ms_sleep(1);
         }
diff --git a/linden/indra/llvfs/llvfile.h b/linden/indra/llvfs/llvfile.h
index dcc3cb5..c574cbc 100644
--- a/linden/indra/llvfs/llvfile.h
+++ b/linden/indra/llvfs/llvfile.h
@@ -39,7 +39,7 @@ public:
         LLVFile(LLVFS *vfs, const LLUUID &file_id, const LLAssetType::EType file_type, S32 mode = LLVFile::READ);
         ~LLVFile();
 
-        BOOL read(U8 *buffer, S32 bytes, BOOL async = FALSE, F32 priority = 128.f);
+        BOOL read(U8 *buffer, S32 bytes, BOOL async = FALSE, F32 priority = 128.f);     /* Flawfinder: ignore */ 
         static U8* readFile(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, S32* bytes_read = 0);
         void setReadPriority(const F32 priority);
         BOOL isReadComplete();
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index bb211df..88476eb 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -63,12 +63,11 @@ public:
                 mLength = size;
         }
     
-        static BOOL insertFirstLL(LLVFSBlock *first, LLVFSBlock *second)
+        static bool locationSortPredicate(
+                const LLVFSBlock* lhs,
+                const LLVFSBlock* rhs)
         {
-                return first->mLocation != second->mLocation
-                        ? first->mLocation < second->mLocation
-                        : first->mLength < second->mLength;
-
+                return lhs->mLocation < rhs->mLocation;
         }
 
 public:
@@ -129,7 +128,7 @@ public:
         }
 
         #ifdef LL_LITTLE_ENDIAN
-        inline void swizzleCopy(void *dst, void *src, int size) { memcpy(dst, src, size); }
+        inline void swizzleCopy(void *dst, void *src, int size) { memcpy(dst, src, size); /* Flawfinder: ignore */}
 
         #else
         
@@ -156,7 +155,7 @@ public:
                 else
                 {
                         // Perhaps this should assert...
-                        memcpy(dst, src, size);
+                        memcpy(dst, src, size); /* Flawfinder: ignore */
                 }
         }
         
@@ -170,7 +169,7 @@ public:
                 buffer +=4;
                 swizzleCopy(buffer, &mAccessTime, 4);
                 buffer +=4;
-                memcpy(buffer, &mFileID.mData, 16);
+                memcpy(buffer, &mFileID.mData, 16); /* Flawfinder: ignore */    
                 buffer += 16;
                 S16 temp_type = mFileType;
                 swizzleCopy(buffer, &temp_type, 2);
@@ -239,10 +238,15 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
         }
         mValid = VFSVALID_OK;
         mReadOnly = read_only;
-        mIndexFilename = new char[strlen(index_filename) + 1];
-        mDataFilename = new char[strlen(data_filename) + 1];
-        strcpy(mIndexFilename, index_filename);
-        strcpy(mDataFilename, data_filename);
+        mIndexFilename = new char[strlen(index_filename) + 1];  /* Flawfinder: ignore */
+        mDataFilename = new char[strlen(data_filename) + 1];    /* Flawfinder: ignore */
+        if (mIndexFilename == NULL || mDataFilename  == NULL)
+        {
+                llerrs << "Memory Allocation Failure" << llendl;
+                return;
+        }
+        strcpy(mIndexFilename, index_filename); /* Flawfinder: ignore */
+        strcpy(mDataFilename, data_filename);   /* Flawfinder: ignore */
     
         const char *file_mode = mReadOnly ? "rb" : "r+b";
     
@@ -266,13 +270,23 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                 {
                         llwarns << "Can't open VFS data file " << mDataFilename << " attempting to use alternate" << llendl;
     
-                        char *temp_index = new char[strlen(mIndexFilename) + 10];
-                        char *temp_data = new char[strlen(mDataFilename) + 10];
+                        char *temp_index = new char[strlen(mIndexFilename) + 10];       /* Flawfinder: ignore */
+                        if (!temp_index)
+                        {
+                                llerrs << "Out of the memory in LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)" << llendl;
+                                return;
+                        }
+                        char *temp_data = new char[strlen(mDataFilename) + 10]; /* Flawfinder: ignore */
+                        if (!temp_data)
+                        {
+                                llerrs << "Out of the memory in LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)" << llendl;
+                                return;
+                        }
 
                         for (U32 count = 0; count < 256; count++)
                         {
-                                sprintf(temp_index, "%s.%u", mIndexFilename, count);
-                                sprintf(temp_data, "%s.%u", mDataFilename, count);
+                                sprintf(temp_index, "%s.%u", mIndexFilename, count);    /* Flawfinder: ignore */
+                                sprintf(temp_data, "%s.%u", mDataFilename, count);      /* Flawfinder: ignore */
     
                                 // try just opening, then creating, each alternate
                                 if ((mDataFP = openAndLock(temp_data, "r+b", FALSE)))
@@ -313,8 +327,13 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
         if (!mReadOnly && mRemoveAfterCrash)
         {
                 llstat marker_info;
-                char* marker = new char[strlen(mDataFilename) + strlen(".open") + 1];
-                sprintf(marker, "%s.open", mDataFilename);
+                char* marker = new char[strlen(mDataFilename) + strlen(".open") + 1];   /* Flawfinder: ignore */
+                if (!marker )
+                {
+                        llerrs << "Out of memory in LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)" << llendl;
+                        return;
+                }
+                sprintf(marker, "%s.open", mDataFilename);      /* Flawfinder: ignore */
                 if (!LLFile::stat(marker, &marker_info))
                 {
                         // marker exists, kill the lock and the VFS files
@@ -361,9 +380,8 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
     
                 U8 *tmp_ptr = buffer;
     
-                LLLinkedList<LLVFSBlock> files_by_loc;
-                files_by_loc.setInsertBefore(LLVFSBlock::insertFirstLL);
-
+                std::vector<LLVFSFileBlock*> files_by_loc;
+                
                 while (tmp_ptr < buffer + fbuf.st_size)
                 {
                         LLVFSFileBlock *block = new LLVFSFileBlock();
@@ -383,7 +401,7 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                                 block->mFileType < LLAssetType::AT_COUNT)
                         {
                                 mFileBlocks.insert(fileblock_map::value_type(*block, block));
-                                files_by_loc.addDataSorted(block);
+                                files_by_loc.push_back(block);
                         }
                         else
                         if (block->mLength && block->mSize > 0)
@@ -419,22 +437,40 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                         tmp_ptr += block->SERIAL_SIZE;
                 }
                 delete[] buffer;
-    
-                // discover all the free blocks
-                LLVFSFileBlock *last_file_block = (LLVFSFileBlock*)files_by_loc.getFirstData();
-    
-                if (last_file_block)
+
+                std::sort(
+                        files_by_loc.begin(),
+                        files_by_loc.end(),
+                        LLVFSFileBlock::locationSortPredicate);
+
+                // There are 3 cases that have to be considered.
+                // 1. No blocks
+                // 2. One block.
+                // 3. Two or more blocks.
+                if (!files_by_loc.empty())
                 {
-                        // check for empty space at the beginning
+                        // cur walks through the list.
+                        std::vector<LLVFSFileBlock*>::iterator cur = files_by_loc.begin();
+                        std::vector<LLVFSFileBlock*>::iterator end = files_by_loc.end();
+                        LLVFSFileBlock* last_file_block = *cur;
+                        
+                        // Check to see if there is an empty space before the first file.
                         if (last_file_block->mLocation > 0)
                         {
-                                LLVFSBlock *block = new LLVFSBlock(0, last_file_block->mLocation);
-                                addFreeBlock(block);
+                                // If so, create a free block.
+                                addFreeBlock(new LLVFSBlock(0, last_file_block->mLocation));
                         }
-    
-                        LLVFSFileBlock *cur_file_block;
-                        while ((cur_file_block = (LLVFSFileBlock*)files_by_loc.getNextData()))
+
+                        // Walk through the 2nd+ block.  If there is a free space
+                        // between cur_file_block and last_file_block, add it to
+                        // the free space collection.  This block will not need to
+                        // run in the case there is only one entry in the VFS.
+                        ++cur;
+                        while( cur != end )
                         {
+                                LLVFSFileBlock* cur_file_block = *cur;
+
+                                // Dupe check on the block
                                 if (cur_file_block->mLocation == last_file_block->mLocation
                                         && cur_file_block->mLength == last_file_block->mLength)
                                 {
@@ -451,21 +487,29 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                                         if (cur_file_block->mLength > 0)
                                         {
                                                 // convert to hole
-                                                LLVFSBlock* block = new LLVFSBlock(cur_file_block->mLocation,
-                                                                                                                   cur_file_block->mLength);
-                                                addFreeBlock(block);
+                                                addFreeBlock(
+                                                        new LLVFSBlock(
+                                                                cur_file_block->mLocation,
+                                                                cur_file_block->mLength));
                                         }
                                         lockData();                                             // needed for sync()
                                         sync(cur_file_block, TRUE);             // remove first on disk
                                         sync(last_file_block, TRUE);    // remove last on disk
                                         unlockData();                                   // needed for sync()
                                         last_file_block = cur_file_block;
+                                        ++cur;
                                         continue;
                                 }
 
-                                U32 loc = last_file_block->mLocation + last_file_block->mLength;
+                                // Figure out where the last block ended.
+                                U32 loc = last_file_block->mLocation+last_file_block->mLength;
+
+                                // Figure out how much space there is between where
+                                // the last block ended and this block begins.
                                 S32 length = cur_file_block->mLocation - loc;
     
+                                // Check for more errors...  Seeing if the current
+                                // entry and the last entry make sense together.
                                 if (length < 0 || loc < 0 || loc > data_size)
                                 {
                                         // Invalid VFS
@@ -487,27 +531,25 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                                         return;
                                 }
 
+                                // we don't want to add empty blocks to the list...
                                 if (length > 0)
                                 {
-                                        LLVFSBlock *block = new LLVFSBlock(loc, length);
-                                        addFreeBlock(block);
+                                        addFreeBlock(new LLVFSBlock(loc, length));
                                 }
-    
                                 last_file_block = cur_file_block;
+                                ++cur;
                         }
     
                         // also note any empty space at the end
                         U32 loc = last_file_block->mLocation + last_file_block->mLength;
                         if (loc < data_size)
                         {
-                                LLVFSBlock *block = new LLVFSBlock(loc, data_size - loc);
-                                addFreeBlock(block);
+                                addFreeBlock(new LLVFSBlock(loc, data_size - loc));
                         }
                 }
-                else
+                else // There where no blocks in the file.
                 {
-                        LLVFSBlock *first_block = new LLVFSBlock(0, data_size);
-                        addFreeBlock(first_block);
+                        addFreeBlock(new LLVFSBlock(0, data_size));
                 }
         }
         else
@@ -542,8 +584,13 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
         if (!mReadOnly && mRemoveAfterCrash)
         {
                 char* marker = new char[strlen(mDataFilename) + strlen(".open") + 1];
-                sprintf(marker, "%s.open", mDataFilename);
-                FILE* marker_fp = LLFile::fopen(marker, "w");
+                if (!marker)
+                {
+                        llerrs << "Out of memory in LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash)" << llendl;
+                        return;
+                }
+                sprintf(marker, "%s.open", mDataFilename);      /* Flawfinder: ignore */
+                FILE* marker_fp = LLFile::fopen(marker, "w");   /* Flawfinder: ignore */
                 if (marker_fp)
                 {
                         fclose(marker_fp);
@@ -586,7 +633,12 @@ LLVFS::~LLVFS()
         if (!mReadOnly && mRemoveAfterCrash)
         {
                 char* marker_file = new char[strlen(mDataFilename) + strlen(".open") + 1];
-                sprintf(marker_file, "%s.open", mDataFilename);
+                if (marker_file == NULL)
+                {
+                        llerrs << "Memory Allocation Failure" << llendl;
+                        return;
+                }
+                sprintf(marker_file, "%s.open", mDataFilename); /* Flawfinder: ignore */
                 LLFile::remove(marker_file);
                 delete [] marker_file;
                 marker_file = NULL;
@@ -738,12 +790,17 @@ BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type
         }
     
         // round all sizes upward to KB increments
-        if (max_size & FILE_BLOCK_MASK)
+        // SJB: Need to not round for the new texture-pipeline code so we know the correct
+        //      max file size. Need to investigate the potential problems with this...
+        if (file_type != LLAssetType::AT_TEXTURE)
         {
-                max_size += FILE_BLOCK_MASK;
-                max_size &= ~FILE_BLOCK_MASK;
-        }
-    
+                if (max_size & FILE_BLOCK_MASK)
+                {
+                        max_size += FILE_BLOCK_MASK;
+                        max_size &= ~FILE_BLOCK_MASK;
+                }
+    }
+        
         if (block && block->mLength > 0)
         {    
                 block->mAccessTime = (U32)time(NULL);
@@ -1230,6 +1287,7 @@ void LLVFS::eraseBlockLength(LLVFSBlock *block)
         S32 length = block->mLength;
         blocks_length_map_t::iterator iter = mFreeBlocksByLength.lower_bound(length);
         blocks_length_map_t::iterator end = mFreeBlocksByLength.end();
+        bool found_block = false;
         while(iter != end)
         {
                 LLVFSBlock *tblock = iter->second;
@@ -1237,13 +1295,14 @@ void LLVFS::eraseBlockLength(LLVFSBlock *block)
                 if (tblock == block)
                 {
                         mFreeBlocksByLength.erase(iter);
+                        found_block = true;
                         break;
                 }
                 ++iter;
         }
-        if (iter == end)
+        if(!found_block)
         {
-                llerrs << "eraseBlock could not find block" << llendl;
+                llwarns << "eraseBlock could not find block" << llendl;
         }
 }
 
@@ -1963,7 +2022,7 @@ LLString get_extension(LLAssetType::EType type)
         switch(type)
         {
           case LLAssetType::AT_TEXTURE:
-                extension = ".jp2"; // ".j2c"; // IrfanView recognizes .jp2 -sjb
+                extension = ".j2c";
                 break;
           case LLAssetType::AT_SOUND:
                 extension = ".ogg";
@@ -2033,7 +2092,7 @@ void LLVFS::dumpFiles()
                         lockData();
                         
                         LLString extension = get_extension(type);
-                        LLString filename = id.getString() + extension;
+                        LLString filename = id.asString() + extension;
                         llinfos << " Writing " << filename << llendl;
                         apr_file_t* file = ll_apr_file_open(filename, LL_APR_WB);
                         ll_apr_file_write(file, buffer, size);
@@ -2064,7 +2123,7 @@ FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock)
         // first test the lock in a non-destructive way
         if (strstr(mode, "w"))
         {
-                fp = LLFile::fopen(filename, "rb");
+                fp = LLFile::fopen(filename, "rb");     /* Flawfinder: ignore */
                 if (fp)
                 {
                         fd = fileno(fp);
@@ -2079,7 +2138,7 @@ FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock)
         }
 
         // now actually open the file for use
-        fp = LLFile::fopen(filename, mode);
+        fp = LLFile::fopen(filename, mode);     /* Flawfinder: ignore */
         if (fp)
         {
                 fd = fileno(fp);
diff --git a/linden/indra/llvfs/llvfs_vc8.vcproj b/linden/indra/llvfs/llvfs_vc8.vcproj
new file mode 100644
index 0000000..7d4c0ae
--- /dev/null
+++ b/linden/indra/llvfs/llvfs_vc8.vcproj
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llvfs"

+        ProjectGUID="{D37774F4-253D-4760-BF64-372A943224A1}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llvfs.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llvfs.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\..\libraries\i686-win32\include;..\..\libraries\include\;..\llcommon;..\llmath"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llvfs.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\lldir.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldir_win32.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllfsthread.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvfile.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvfs.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvfsthread.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\lldir.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldir_win32.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllfsthread.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvfile.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvfs.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvfsthread.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llvfs/llvfsthread.cpp b/linden/indra/llvfs/llvfsthread.cpp
index be23bd5..9226230 100644
--- a/linden/indra/llvfs/llvfsthread.cpp
+++ b/linden/indra/llvfs/llvfsthread.cpp
@@ -39,10 +39,10 @@
 //============================================================================
 // Run on MAIN thread
 //static
-void LLVFSThread::initClass(bool local_is_threaded, bool local_run_always)
+void LLVFSThread::initClass(bool local_is_threaded)
 {
         llassert(sLocal == NULL);
-        sLocal = new LLVFSThread(local_is_threaded, local_run_always);
+        sLocal = new LLVFSThread(local_is_threaded);
 }
 
 //static
@@ -66,8 +66,8 @@ void LLVFSThread::cleanupClass()
 
 //----------------------------------------------------------------------------
 
-LLVFSThread::LLVFSThread(bool threaded, bool runalways) :
-        LLQueuedThread("VFS", threaded, runalways)
+LLVFSThread::LLVFSThread(bool threaded) :
+        LLQueuedThread("VFS", threaded)
 {
 }
 
@@ -164,38 +164,26 @@ S32 LLVFSThread::writeImmediate(LLVFS* vfs, const LLUUID &file_id, const LLAsset
 }
 
 
-LLVFSThread::handle_t LLVFSThread::rename(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
-                                                                                  const LLUUID &new_id, const LLAssetType::EType new_type, U32 flags)
-{
-        handle_t handle = generateHandle();
+// LLVFSThread::handle_t LLVFSThread::rename(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
+//                                                                                const LLUUID &new_id, const LLAssetType::EType new_type, U32 flags)
+// {
+//      handle_t handle = generateHandle();
 
-        LLUUID* new_idp = new LLUUID(new_id); // deleted with Request
-        // new_type is passed as "numbytes"
-        Request* req = new Request(handle, 0, flags, FILE_RENAME, vfs, file_id, file_type,
-                                                           (U8*)new_idp, 0, (S32)new_type);
+//      LLUUID* new_idp = new LLUUID(new_id); // deleted with Request
+//      // new_type is passed as "numbytes"
+//      Request* req = new Request(handle, 0, flags, FILE_RENAME, vfs, file_id, file_type,
+//                                                         (U8*)new_idp, 0, (S32)new_type);
 
-        bool res = addRequest(req);
-        if (!res)
-        {
-                llerrs << "LLVFSThread::read called after LLVFSThread::cleanupClass()" << llendl;
-                req->deleteRequest();
-                handle = nullHandle();
-        }
+//      bool res = addRequest(req);
+//      if (!res)
+//      {
+//              llerrs << "LLVFSThread::read called after LLVFSThread::cleanupClass()" << llendl;
+//              req->deleteRequest();
+//              handle = nullHandle();
+//      }
         
-        return handle;
-}
-
-//============================================================================
-// Runs on its OWN thread
-
-bool LLVFSThread::processRequest(QueuedRequest* qreq)
-{
-        Request *req = (Request*)qreq;
-
-        bool complete = req->processIO();
-
-        return complete;
-}
+//      return handle;
+// }
 
 //============================================================================
 
@@ -242,7 +230,7 @@ LLVFSThread::Request::Request(handle_t handle, U32 priority, U32 flags,
 }
 
 // dec locks as soon as a request finishes
-void LLVFSThread::Request::finishRequest()
+void LLVFSThread::Request::finishRequest(bool completed)
 {
         if (mOperation == FILE_WRITE)
         {
@@ -260,13 +248,13 @@ void LLVFSThread::Request::finishRequest()
 
 void LLVFSThread::Request::deleteRequest()
 {
-        if (getStatus() == STATUS_QUEUED || getStatus() == STATUS_ABORT)
+        if (getStatus() == STATUS_QUEUED)
         {
                 llerrs << "Attempt to delete a queued LLVFSThread::Request!" << llendl;
         }       
         if (mOperation == FILE_WRITE)
         {
-                if (mFlags & AUTO_DELETE)
+                if (mFlags & FLAG_AUTO_DELETE)
                 {
                         delete [] mBuffer;
                 }
@@ -279,7 +267,7 @@ void LLVFSThread::Request::deleteRequest()
         LLQueuedThread::QueuedRequest::deleteRequest();
 }
 
-bool LLVFSThread::Request::processIO()
+bool LLVFSThread::Request::processRequest()
 {
         bool complete = false;
         if (mOperation ==  FILE_READ)
@@ -302,7 +290,7 @@ bool LLVFSThread::Request::processIO()
                 mVFS->renameFile(mFileID, mFileType, *new_idp, new_type);
                 mFileID = *new_idp;
                 complete = true;
-                //llinfos << llformat("LLVFSThread::WRITE '%s': %d bytes arg:%d",getFilename(),mBytesRead) << llendl;
+                //llinfos << llformat("LLVFSThread::RENAME '%s': %d bytes arg:%d",getFilename(),mBytesRead) << llendl;
         }
         else
         {
diff --git a/linden/indra/llvfs/llvfsthread.h b/linden/indra/llvfs/llvfsthread.h
index c3a5a55..3c90808 100644
--- a/linden/indra/llvfs/llvfsthread.h
+++ b/linden/indra/llvfs/llvfsthread.h
@@ -83,15 +83,14 @@ public:
                 }
                 std::string getFilename()
                 {
-                        char tbuf[40];
+                        char tbuf[40];  /* Flawfinder: ignore */
                         mFileID.toString(tbuf);
                         return std::string(tbuf);
                 }
                 
-                /*virtual*/ void finishRequest();
+                /*virtual*/ bool processRequest();
+                /*virtual*/ void finishRequest(bool completed);
                 /*virtual*/ void deleteRequest();
-
-                bool processIO();
                 
         private:
                 operation_t mOperation;
@@ -109,19 +108,20 @@ public:
         //------------------------------------------------------------------------
 public:
         static std::string sDataPath;
-        static void setDataPath(const std::string& path) { sDataPath = path; }
+        static LLVFSThread* sLocal;             // Default worker thread
         
 public:
-        LLVFSThread(bool threaded = TRUE, bool runalways = TRUE);
+        LLVFSThread(bool threaded = TRUE);
         ~LLVFSThread(); 
 
         // Return a Request handle
-        handle_t read(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
+        handle_t read(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,    /* Flawfinder: ignore */
                                   U8* buffer, S32 offset, S32 numbytes, U32 pri=PRIORITY_NORMAL, U32 flags = 0);
         handle_t write(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
                                    U8* buffer, S32 offset, S32 numbytes, U32 flags);
-        handle_t rename(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
-                                        const LLUUID &new_id, const LLAssetType::EType new_type, U32 flags);
+        // SJB: rename seems to have issues, especially when threaded
+//      handle_t rename(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
+//                                      const LLUUID &new_id, const LLAssetType::EType new_type, U32 flags);
         // Return number of bytes read
         S32 readImmediate(LLVFS* vfs, const LLUUID &file_id, const LLAssetType::EType file_type,
                                           U8* buffer, S32 offset, S32 numbytes);
@@ -130,12 +130,11 @@ public:
 
         /*virtual*/ bool processRequest(QueuedRequest* req);
 
-        static void initClass(bool local_is_threaded = TRUE, bool run_always = TRUE); // Setup sLocal
+public:
+        static void initClass(bool local_is_threaded = TRUE); // Setup sLocal
         static S32 updateClass(U32 ms_elapsed);
         static void cleanupClass();             // Delete sLocal
-
-public:
-        static LLVFSThread* sLocal;             // Default worker thread
+        static void setDataPath(const std::string& path) { sDataPath = path; }
 };
 
 //============================================================================
diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index 5dd632b..b2e1b04 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -66,16 +66,16 @@ std::string get_string(IDxDiagContainer *containerp, WCHAR *wszPropName)
                 switch( var.vt )
                 {
                         case VT_UI4:
-                                swprintf( wszPropValue, L"%d", var.ulVal );
+                                swprintf( wszPropValue, L"%d", var.ulVal );     /* Flawfinder: ignore */
                                 break;
                         case VT_I4:
-                                swprintf( wszPropValue, L"%d", var.lVal );
+                                swprintf( wszPropValue, L"%d", var.lVal );      /* Flawfinder: ignore */
                                 break;
                         case VT_BOOL:
-                                wcscpy( wszPropValue, (var.boolVal) ? L"true" : L"false" );
+                                wcscpy( wszPropValue, (var.boolVal) ? L"true" : L"false" );     /* Flawfinder: ignore */
                                 break;
                         case VT_BSTR:
-                                wcsncpy( wszPropValue, var.bstrVal, 255 );
+                                wcsncpy( wszPropValue, var.bstrVal, 255 );      /* Flawfinder: ignore */
                                 wszPropValue[255] = 0;
                                 break;
                 }
diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index ec22907..aabe9da 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -44,6 +44,7 @@
 
 #include "llglheaders.h"
 
+#define LL_DEBUG_GL 1
 
 #if LL_LINUX && !LL_MESA_HEADLESS
 // The __APPLE__ hack is to make glh_extensions.h not symbol-clash horribly
@@ -118,6 +119,10 @@ PFNGLGETQUERYIVARBPROC glGetQueryivARB = NULL;
 PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB = NULL;
 PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB = NULL;
 
+// GL_ARB_point_parameters
+PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB = NULL;
+PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB = NULL;
+
 //shader object prototypes
 PFNGLDELETEOBJECTARBPROC glDeleteObjectARB = NULL;
 PFNGLGETHANDLEARBPROC glGetHandleARB = NULL;
@@ -267,6 +272,7 @@ LLGLManager::LLGLManager()
         mHasVertexShader = FALSE;
         mHasFragmentShader = FALSE;
         mHasShaderObjects = FALSE;
+        mHasPointParameters = FALSE;
 
 #if LL_WINDOWS
         mHasWGLARBPixelFormat = FALSE;
@@ -290,7 +296,6 @@ LLGLManager::LLGLManager()
         mVRAM = 0;
         mGLMaxVertexRange = 0;
         mGLMaxIndexRange = 0;
-        mSoftwareBlendSSE = TRUE;
 }
 
 //---------------------------------------------------------------------
@@ -506,8 +511,6 @@ extern LLCPUInfo gSysCPU;
 
 void LLGLManager::initExtensions()
 {
-        mSoftwareBlendSSE = gSysCPU.hasSSE();
-
 #if LL_MESA_HEADLESS
 # if GL_ARB_multitexture
         mHasMultitexture = TRUE;
@@ -538,6 +541,7 @@ void LLGLManager::initExtensions()
         mHasCubeMap = FALSE;
         mHasATIVAO = FALSE;
         mHasOcclusionQuery = FALSE;
+        mHasPointParameters = FALSE;
         mHasShaderObjects = FALSE;
         mHasVertexShader = FALSE;
         mHasFragmentShader = FALSE;
@@ -553,9 +557,12 @@ void LLGLManager::initExtensions()
         mHasCubeMap = ExtensionExists("GL_ARB_texture_cube_map", gGLHExts.mSysExts);
         mHasARBEnvCombine = ExtensionExists("GL_ARB_texture_env_combine", gGLHExts.mSysExts);
         mHasCompressedTextures = glh_init_extensions("GL_ARB_texture_compression");
-        mHasVertexBufferObject = ExtensionExists("GL_ARB_vertex_buffer_object", gGLHExts.mSysExts);
         mHasATIVAO = ExtensionExists("GL_ATI_vertex_array_object", gGLHExts.mSysExts);
         mHasOcclusionQuery = ExtensionExists("GL_ARB_occlusion_query", gGLHExts.mSysExts);
+        mHasVertexBufferObject = ExtensionExists("GL_ARB_vertex_buffer_object", gGLHExts.mSysExts);
+#if !LL_DARWIN
+        mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
+#endif
         mHasShaderObjects = ExtensionExists("GL_ARB_shader_objects", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
         mHasVertexShader = ExtensionExists("GL_ARB_vertex_program", gGLHExts.mSysExts) && ExtensionExists("GL_ARB_vertex_shader", gGLHExts.mSysExts)
                                                 && ExtensionExists("GL_ARB_shading_language_100", gGLHExts.mSysExts);
@@ -565,7 +572,7 @@ void LLGLManager::initExtensions()
 #if LL_LINUX
         // Our extension support for the Linux Client is very young with some
         // potential driver gotchas, so offer a semi-secret way to turn it off.
-        if (getenv("LL_GL_NOEXT"))
+        if (getenv("LL_GL_NOEXT"))      /* Flawfinder: ignore */
         {
                 //mHasMultitexture = FALSE; // NEEDED!
                 mHasARBEnvCombine = FALSE;
@@ -580,13 +587,14 @@ void LLGLManager::initExtensions()
                 mHasCubeMap = FALSE;
                 mHasATIVAO = FALSE;
                 mHasOcclusionQuery = FALSE;
+                mHasPointParameters = FALSE;
                 mHasShaderObjects = FALSE;
                 mHasVertexShader = FALSE;
                 mHasFragmentShader = FALSE;
                 llwarns << "GL extension support DISABLED via LL_GL_NOEXT" <<
                         llendl;
         }
-        else if (getenv("LL_GL_BASICEXT"))
+        else if (getenv("LL_GL_BASICEXT"))      /* Flawfinder: ignore */
         {
                 // This switch attempts to turn off all support for exotic
                 // extensions which I believe correspond to fatal driver
@@ -597,6 +605,7 @@ void LLGLManager::initExtensions()
                 mHasNVVertexArrayRange = FALSE;
                 mHasNVFence = FALSE;
                 mHasAnisotropic = FALSE;
+                mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
                 mHasATIVAO = FALSE;
                 mHasOcclusionQuery = FALSE; // source of many ATI system hangs
                 mHasShaderObjects = FALSE;
@@ -605,12 +614,12 @@ void LLGLManager::initExtensions()
                 llwarns << "GL extension support forced to SIMPLE level via LL_GL_BASICEXT" <<
                         llendl;
         }
-        if (getenv("LL_GL_BLACKLIST"))
+        if (getenv("LL_GL_BLACKLIST"))  /* Flawfinder: ignore */
         {
                 // This lets advanced troubleshooters disable specific
                 // GL extensions to isolate problems with their hardware.
                 // SL-28126
-                const char *const blacklist = getenv("LL_GL_BLACKLIST");
+                const char *const blacklist = getenv("LL_GL_BLACKLIST");        /* Flawfinder: ignore */
                 llwarns << "GL extension support partially disabled via LL_GL_BLACKLIST: " << blacklist << llendl;
                 if (strchr(blacklist,'a')) mHasARBEnvCombine = FALSE;
                 if (strchr(blacklist,'b')) mHasCompressedTextures = FALSE;
@@ -621,12 +630,13 @@ void LLGLManager::initExtensions()
                 if (strchr(blacklist,'g')) mHasNVFence = FALSE;//S
                 if (strchr(blacklist,'h')) mHasSeparateSpecularColor = FALSE;
                 if (strchr(blacklist,'i')) mHasAnisotropic = FALSE;//S
-                if (strchr(blacklist,'j')) mHasCubeMap = FALSE;
+                if (strchr(blacklist,'j')) mHasCubeMap = FALSE;//S
                 if (strchr(blacklist,'k')) mHasATIVAO = FALSE;//S
                 if (strchr(blacklist,'l')) mHasOcclusionQuery = FALSE;
                 if (strchr(blacklist,'m')) mHasShaderObjects = FALSE;//S
                 if (strchr(blacklist,'n')) mHasVertexShader = FALSE;//S
                 if (strchr(blacklist,'o')) mHasFragmentShader = FALSE;//S
+                if (strchr(blacklist,'p')) mHasPointParameters = FALSE;//S
         }
 #endif // LL_LINUX
 
@@ -677,6 +687,10 @@ void LLGLManager::initExtensions()
         {
                 llinfos << "Couldn't initialize GL_ARB_occlusion_query" << llendl;
         }
+        if (!mHasPointParameters)
+        {
+                llinfos << "Couldn't initialize GL_ARB_point_parameters" << llendl;
+        }
         if (!mHasShaderObjects)
         {
                 llinfos << "Couldn't initialize GL_ARB_shader_objects" << llendl;
@@ -741,16 +755,23 @@ void LLGLManager::initExtensions()
         if (mHasVertexBufferObject)
         {
                 glBindBufferARB = (PFNGLBINDBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBindBufferARB");
-                glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteBuffersARB");
-                glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenBuffersARB");
-                glIsBufferARB = (PFNGLISBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsBufferARB");
-                glBufferDataARB = (PFNGLBUFFERDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferDataARB");
-                glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferSubDataARB");
-                glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferSubDataARB");
-                glMapBufferARB = (PFNGLMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMapBufferARB");
-                glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glUnmapBufferARB");
-                glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferParameterivARB");
-                glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferPointervARB");
+                if (glBindBufferARB)
+                {
+                        glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glDeleteBuffersARB");
+                        glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenBuffersARB");
+                        glIsBufferARB = (PFNGLISBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glIsBufferARB");
+                        glBufferDataARB = (PFNGLBUFFERDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferDataARB");
+                        glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glBufferSubDataARB");
+                        glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferSubDataARB");
+                        glMapBufferARB = (PFNGLMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glMapBufferARB");
+                        glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)GLH_EXT_GET_PROC_ADDRESS("glUnmapBufferARB");
+                        glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferParameterivARB");
+                        glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetBufferPointervARB");
+                }
+                else
+                {
+                        mHasVertexBufferObject = FALSE;
+                }
         }
         if (mHasATIVAO)
         {
@@ -797,6 +818,11 @@ void LLGLManager::initExtensions()
                 glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryObjectivARB");
                 glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGetQueryObjectuivARB");
         }
+        if (mHasPointParameters)
+        {
+                glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfARB");
+                glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)GLH_EXT_GET_PROC_ADDRESS("glPointParameterfvARB");
+        }
         if (mHasShaderObjects)
         {
                 glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC) GLH_EXT_GET_PROC_ADDRESS("glDeleteObjectARB");
@@ -991,6 +1017,7 @@ void LLGLState::dumpStates()
 
 void LLGLState::checkStates()  
 {
+#if LL_DEBUG_GL
         stop_glerror();
 
         GLint activeTexture;
@@ -1025,10 +1052,12 @@ void LLGLState::checkStates()
         }
         
         stop_glerror();
+#endif
 }
 
 void LLGLState::checkTextureChannels()
 {
+#if LL_DEBUG_GL
         GLint activeTexture;
         glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &activeTexture);
         
@@ -1109,42 +1138,103 @@ void LLGLState::checkTextureChannels()
         {
                 LL_GL_ERRS << "GL texture state corruption detected." << llendl;
         }
+#endif
 }
 
-void LLGLState::checkClientArrays()
+void LLGLState::checkClientArrays(U32 data_mask)
 {
+#if LL_DEBUG_GL
+        stop_glerror();
         BOOL error = FALSE;
         static const char* label[] =
         {
-                //"GL_INDEX_ARRAY",
+                "GL_VERTEX_ARRAY",
                 "GL_NORMAL_ARRAY",
-                //"GL_VERTEX_ARRAY",
                 "GL_COLOR_ARRAY",
                 "GL_TEXTURE_COORD_ARRAY"
         };
 
         static GLint value[] =
         {
-                //GL_INDEX_ARRAY,
+                GL_VERTEX_ARRAY,
                 GL_NORMAL_ARRAY,
-                //GL_VERTEX_ARRAY,
                 GL_COLOR_ARRAY,
-                GL_TEXTURE_COORD_ARRAY  
+                GL_TEXTURE_COORD_ARRAY
+        };
+
+         U32 mask[] = 
+        { //copied from llvertexbuffer.h
+                0x0001, //MAP_VERTEX,
+                0x0002, //MAP_NORMAL,
+                0x0010, //MAP_COLOR,
+                0x0004, //MAP_TEXCOORD
         };
 
-        for (S32 j = 0; j < 3; j++)
+
+        for (S32 j = 0; j < 4; j++)
         {
                 if (glIsEnabled(value[j]))
                 {
+                        if (!(mask[j] & data_mask))
+                        {
+                                error = TRUE;
+                                llwarns << "GL still has " << label[j] << " enabled." << llendl;
+                        }
+                }
+                else
+                {
+                        if (mask[j] & data_mask)
+                        {
+                                error = TRUE;
+                                llwarns << "GL does not have " << label[j] << " enabled." << llendl;
+                        }
+                }
+        }
+
+        glClientActiveTextureARB(GL_TEXTURE1_ARB);
+        glActiveTextureARB(GL_TEXTURE1_ARB);
+        if (glIsEnabled(GL_TEXTURE_COORD_ARRAY))
+        {
+                if (!(data_mask & 0x0008))
+                {
+                        error = TRUE;
+                        llwarns << "GL still has GL_TEXTURE_COORD_ARRAY enabled on channel 1." << llendl;
+                }
+        }
+        else
+        {
+                if (data_mask & 0x0008)
+                {
                         error = TRUE;
-                        llwarns << "GL still has " << label[j] << " enabled." << llendl;
+                        llwarns << "GL does not have GL_TEXTURE_COORD_ARRAY enabled on channel 1." << llendl;
                 }
         }
 
+        if (glIsEnabled(GL_TEXTURE_2D))
+        {
+                if (!(data_mask & 0x0008))
+                {
+                        error = TRUE;
+                        llwarns << "GL still has GL_TEXTURE_2D enabled on channel 1." << llendl;
+                }
+        }
+        else
+        {
+                if (data_mask & 0x0008)
+                {
+                        error = TRUE;
+                        llwarns << "GL does not have GL_TEXTURE_2D enabled on channel 1." << llendl;
+                }
+        }
+
+        glClientActiveTextureARB(GL_TEXTURE0_ARB);
+        glActiveTextureARB(GL_TEXTURE0_ARB);
+
         if (error)
         {
                 LL_GL_ERRS << "GL client array corruption detected." << llendl;
         }
+#endif
 }
 
 //============================================================================
@@ -1190,9 +1280,8 @@ LLGLState::~LLGLState()
         stop_glerror();
         if (mState)
         {
-#if LL_DEBUG
-                LLGLboolean cur_state = sStateMap[mState];
-                llassert(cur_state == glIsEnabled(mState));
+#if LL_DEBUG_GL
+                llassert(sStateMap[mState] == glIsEnabled(mState));
 #endif
                 if (mIsEnabled != mWasEnabled)
                 {
@@ -1270,10 +1359,10 @@ void disable_cloth_weights(const S32 index)
 #endif
 }
 
-void set_vertex_weights(const S32 index, const F32 *weights)
+void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights)
 {
 #if GL_ARB_vertex_program
-        if (index > 0) glVertexAttribPointerARB(index, 1, GL_FLOAT, FALSE, 0, weights);
+        if (index > 0) glVertexAttribPointerARB(index, 1, GL_FLOAT, FALSE, stride, weights);
         stop_glerror();
 #endif
 }
@@ -1321,7 +1410,7 @@ void parse_gl_version( S32* major, S32* minor, S32* release, LLString* vendor_sp
         }
 
         LLString ver_copy( version );
-        S32 len = (S32)strlen( version );
+        S32 len = (S32)strlen( version );       /* Flawfinder: ignore */
         S32 i = 0;
         S32 start;
         // Find the major version
diff --git a/linden/indra/llwindow/llgl.h b/linden/indra/llwindow/llgl.h
index c0668ca..34bf400 100644
--- a/linden/indra/llwindow/llgl.h
+++ b/linden/indra/llwindow/llgl.h
@@ -73,6 +73,7 @@ public:
         BOOL mHasVertexShader;
         BOOL mHasFragmentShader;
         BOOL mHasOcclusionQuery;
+        BOOL mHasPointParameters;
 
         // nVidia extensions.
         BOOL mHasAnisotropic;
@@ -117,7 +118,6 @@ public:
         S32 mVRAM; // VRAM in MB
         S32 mGLMaxVertexRange;
         S32 mGLMaxIndexRange;
-        BOOL mSoftwareBlendSSE;
         
         void getPixelFormat(); // Get the best pixel format
 
@@ -223,7 +223,7 @@ public:
         static void dumpStates();
         static void checkStates();
         static void checkTextureChannels();
-        static void checkClientArrays();
+        static void checkClientArrays(U32 data_mask = 0x0001);
         
 protected:
         static std::map<LLGLenum, LLGLboolean> sStateMap;
@@ -262,7 +262,7 @@ void enable_binormals(const S32 index);
 void disable_binormals(const S32 index);
 void enable_cloth_weights(const S32 index);
 void disable_cloth_weights(const S32 index);
-void set_vertex_weights(const S32 index, const F32 *weights);
+void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights);
 void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights);
 void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals);
 void set_palette(U8* palette_data);
diff --git a/linden/indra/llwindow/llglheaders.h b/linden/indra/llwindow/llglheaders.h
index e67b6c7..7c4d8fd 100644
--- a/linden/indra/llwindow/llglheaders.h
+++ b/linden/indra/llwindow/llglheaders.h
@@ -92,6 +92,10 @@ extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
 extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
 extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
 
+// GL_ARB_point_parameters
+extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
+extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;
+
 // GL_ARB_shader_objects
 extern PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
 extern PFNGLGETHANDLEARBPROC glGetHandleARB;
@@ -255,6 +259,10 @@ extern PFNGLGETQUERYIVARBPROC glGetQueryivARB;
 extern PFNGLGETQUERYOBJECTIVARBPROC glGetQueryObjectivARB;
 extern PFNGLGETQUERYOBJECTUIVARBPROC glGetQueryObjectuivARB;
 
+// GL_ARB_point_parameters
+extern PFNGLPOINTPARAMETERFARBPROC glPointParameterfARB;
+extern PFNGLPOINTPARAMETERFVARBPROC glPointParameterfvARB;
+
 // GL_ARB_shader_objects
 extern PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
 extern PFNGLGETHANDLEARBPROC glGetHandleARB;
@@ -435,7 +443,7 @@ typedef GLboolean (* glIsBufferARBProcPtr) (GLuint buffer);
 typedef void (* glBufferDataARBProcPtr) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
 typedef void (* glBufferSubDataARBProcPtr) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
 typedef void (* glGetBufferSubDataARBProcPtr) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (* glMapBufferARBProcPtr) (GLenum target, GLenum access);
+typedef GLvoid* (* glMapBufferARBProcPtr) (GLenum target, GLenum access);       /* Flawfinder: ignore */
 typedef GLboolean (* glUnmapBufferARBProcPtr) (GLenum target);
 typedef void (* glGetBufferParameterivARBProcPtr) (GLenum target, GLenum pname, GLint *params);
 typedef void (* glGetBufferPointervARBProcPtr) (GLenum target, GLenum pname, GLvoid* *params);
diff --git a/linden/indra/llwindow/llgltypes.h b/linden/indra/llwindow/llgltypes.h
index 52a58b5..fffa979 100644
--- a/linden/indra/llwindow/llgltypes.h
+++ b/linden/indra/llwindow/llgltypes.h
@@ -1,8 +1,8 @@
-/** 

- * @file llgltypes.h

- * @brief LLGL definition

- *

- * Copyright (c) 2006-2007, Linden Research, Inc.

+/** 
+ * @file llgltypes.h
+ * @brief LLGL definition
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,19 +22,19 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#ifndef LLGLTYPES_H

-#define LLGLTYPES_H

-

-#define MAX_GL_TEXTURE_UNITS 16

-

-typedef U32 LLGLenum;

-typedef U32 LLGLuint;

-typedef S32 LLGLint;

-typedef F32 LLGLfloat;

-typedef F64 LLGLdouble;

-typedef U8 LLGLboolean;

-

-#endif

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#ifndef LLGLTYPES_H
+#define LLGLTYPES_H
+
+#define MAX_GL_TEXTURE_UNITS 16
+
+typedef U32 LLGLenum;
+typedef U32 LLGLuint;
+typedef S32 LLGLint;
+typedef F32 LLGLfloat;
+typedef F64 LLGLdouble;
+typedef U8 LLGLboolean;
+
+#endif
diff --git a/linden/indra/llwindow/llkeyboard.cpp b/linden/indra/llwindow/llkeyboard.cpp
index 409bb13..0da1644 100644
--- a/linden/indra/llwindow/llkeyboard.cpp
+++ b/linden/indra/llwindow/llkeyboard.cpp
@@ -330,7 +330,7 @@ LLString LLKeyboard::stringFromKey(KEY key)
         LLString res = get_if_there(sKeysToNames, key, LLString::null);
         if (res.empty())
         {
-                char buffer[2];
+                char buffer[2];         /* Flawfinder: ignore */
                 buffer[0] = key;
                 buffer[1] = '\0';
                 res = LLString(buffer);
diff --git a/linden/indra/llwindow/llkeyboardwin32.cpp b/linden/indra/llwindow/llkeyboardwin32.cpp
index e166ec2..33664b9 100644
--- a/linden/indra/llwindow/llkeyboardwin32.cpp
+++ b/linden/indra/llwindow/llkeyboardwin32.cpp
@@ -187,10 +187,7 @@ MASK LLKeyboardWin32::updateModifiers()
 
         // Scan the modifier keys as of the last Windows key message
         // (keydown encoded in high order bit of short)
-        //setModifierKeyLevel( KEY_SHIFT, GetKeyState(VK_SHIFT) & 0x8000 );
-        //setModifierKeyLevel( KEY_CONTROL, GetKeyState(VK_CONTROL) & 0x8000 );
-        //setModifierKeyLevel( KEY_ALT, GetKeyState(VK_MENU) & 0x8000 );
-        //setModifierKeyLevel( KEY_CAPSLOCK, GetKeyState(VK_CAPITAL) & 0x0001); // Low order bit carries the toggle state.
+        mKeyLevel[KEY_CAPSLOCK] = (GetKeyState(VK_CAPITAL) & 0x0001) != 0; // Low order bit carries the toggle state.
         // Get mask for keyboard events
         MASK mask = currentMask(FALSE);
         return mask;
@@ -214,7 +211,6 @@ BOOL LLKeyboardWin32::handleKeyDown(const U16 key, MASK mask)
         return handled;
 }
 
-
 // mask is ignored, except for extended flag -- we poll the modifier keys for the other flags
 BOOL LLKeyboardWin32::handleKeyUp(const U16 key, MASK mask)
 {
@@ -248,10 +244,14 @@ MASK LLKeyboardWin32::currentMask(BOOL)
 void LLKeyboardWin32::scanKeyboard()
 {
         S32 key;
+        MSG     msg;
+        BOOL pending_key_events = PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_NOREMOVE | PM_NOYIELD);
         for (key = 0; key < KEY_COUNT; key++)
         {
                 // On Windows, verify key down state. JC
-                if (mKeyLevel[key])
+                // RN: only do this if we don't have further key events in the queue
+                // as otherwise there might be key repeat events still waiting for this key we are now dumping
+                if (!pending_key_events && mKeyLevel[key])
                 {
                         // *TODO: I KNOW there must be a better way of
                         // interrogating the key state than this, using async key
@@ -262,9 +262,9 @@ void LLKeyboardWin32::scanKeyboard()
                                 // ...translate back to windows key
                                 U16 virtual_key = inverseTranslateExtendedKey(key);
                                 // keydown in highest bit
-                                if (!(GetAsyncKeyState(virtual_key) & 0x8000))
+                                if (!pending_key_events && !(GetAsyncKeyState(virtual_key) & 0x8000))
                                 {
-                                        //llinfos << "Key up event missed, resetting" << llendl;
+                                        //llinfos << "Key up event missed, resetting" << llendl;
                                         mKeyLevel[key] = FALSE;
                                 }
                         }
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index b907b55..4e9b882 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -28,10 +28,14 @@
 #ifndef LL_MOUSEHANDLER_H
 #define LL_MOUSEHANDLER_H
 
+#include "llstring.h"
+
 // Abstract interface.
 // Intended for use via multiple inheritance. 
 // A class may have as many interfaces as it likes, but never needs to inherit one more than once.
 
+#include "llstring.h"
+
 class LLMouseHandler
 {
 public:
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index ac427f1..f4bb147 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -317,6 +317,7 @@ public:
 //
 // helper funcs
 //
+extern BOOL gDebugWindowProc;
 
 // Protocols, like "http" and "https" we support in URLs
 extern const S32 gURLProtocolWhitelistCount;
diff --git a/linden/indra/llwindow/llwindow_vc8.vcproj b/linden/indra/llwindow/llwindow_vc8.vcproj
new file mode 100644
index 0000000..b04477f
--- /dev/null
+++ b/linden/indra/llwindow/llwindow_vc8.vcproj
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llwindow"

+        ProjectGUID="{B5B53617-416F-404A-BF10-22EBCCA0E4FB}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llwindow.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llwindow.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="DebugMesaHeadless|Win32"

+                        OutputDirectory="../lib_debug/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\GLMESA;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;LL_MESA;LL_MESA_HEADLESS"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llwindow_mesaheadless.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llxml;..\llvfs;..\llmessage;..\llscene;..\llimage;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llwindow.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\lldxhardware.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyboard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyboardwin32.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindow.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindowheadless.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindowmesaheadless.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindowwin32.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\lldxhardware.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llglheaders.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llglstates.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgltypes.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyboard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeyboardwin32.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmousehandler.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindow.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindowheadless.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindowmesaheadless.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindowwin32.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index d990bb5..7313fd3 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -30,6 +30,7 @@
 #include "linden_common.h"
 
 #include <Carbon/Carbon.h>
+#include <OpenGL/OpenGL.h>
 
 #include "llwindowmacosx.h"
 #include "llkeyboardmacosx.h"
@@ -89,8 +90,8 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
 {
         if (!strnicmp(RENDERER, bad_card, strlen(bad_card)))
         {
-                char buffer[1024];
-                sprintf(buffer,
+                char buffer[1024];/* Flawfinder: ignore */
+                snprintf(buffer, sizeof(buffer), /* Flawfinder: ignore */
                         "Your video card appears to be a %s, which Second Life does not support.\n"
                         "\n"
                         "Second Life requires a video card with 32 Mb of memory or more, as well as\n"
@@ -246,8 +247,8 @@ LLWindowMacOSX::LLWindowMacOSX(char *title, char *name, S32 x, S32 y, S32 width,
         mOriginalAspectRatio = (double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
 
         // Stash the window title
-        strcpy((char*)mWindowTitle + 1, title);
-        mWindowTitle[0] = strlen(title);
+        strcpy((char*)mWindowTitle + 1, title); /* Flawfinder: ignore */
+        mWindowTitle[0] = strlen(title);        /* Flawfinder: ignore */
 
         mEventHandlerUPP = NewEventHandlerUPP(staticEventHandler);
         mGlobalHandlerRef = NULL;
@@ -424,8 +425,8 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
                         mFullscreenBits    = -1;
                         mFullscreenRefresh = -1;
 
-                        char error[256];
-                        sprintf(error, "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);
+                        char error[256];        /* Flawfinder: ignore */
+                        snprintf(error, sizeof(error), "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);      /* Flawfinder: ignore */
                         OSMessageBox(error, "Error", OSMB_OK);
                 }
         }
@@ -738,6 +739,22 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
         }
         aglSetInteger(mContext, AGL_SWAP_INTERVAL, &frames_per_swap);  
 
+#if 0 // SJB: Got a compile error. Plus I don't want to test this along with everything else ; save it for later
+        //enable multi-threaded OpenGL
+        CGLError cgl_err;
+        CGLContextObj ctx = CGLGetCurrentContext();
+                        
+        cgl_err =  CGLEnable( ctx, kCGLCEMPEngine);
+                        
+        if (cgl_err != kCGLNoError )
+        {
+                 llinfos << "Multi-threaded OpenGL not available." << llendl;
+        }    
+        else
+        {
+                llinfos << "Multi-threaded OpenGL enabled." << llendl;
+        }
+#endif          
         // Don't need to get the current gamma, since there's a call that restores it to the system defaults.
         return TRUE;
 }
@@ -2738,7 +2755,7 @@ void spawn_web_browser(const char* escaped_url)
         S32 i;
         for (i = 0; i < gURLProtocolWhitelistCount; i++)
         {
-                S32 len = strlen(gURLProtocolWhitelist[i]);
+                S32 len = strlen(gURLProtocolWhitelist[i]);     /* Flawfinder: ignore */
                 if (!strncmp(escaped_url, gURLProtocolWhitelist[i], len)
                         && escaped_url[len] == ':')
                 {
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index a94284e..85836af 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -68,20 +68,12 @@ const S32	MAX_NUM_RESOLUTIONS = 32;
 
 #if LL_X11
 # include <X11/Xutil.h>
-// A global!  Well, SDL isn't really designed for communicating
-// with multiple physical X11 displays.  Heck, it's not really
-// designed for multiple X11 windows.
-// So, we need this for the SDL/X11 event filter callback (which
-// doesnt have a userdata parameter) and more.
-static Display *SDL_Display = NULL;
-static Window SDL_XWindowID = None;
 #endif //LL_X11
 
-// TOFU HACK -- (*exactly* the same hack as LLWindowMacOSX for the same reasons)
-// For SDL, to put up an OS dialog in full screen mode, we must first switch OUT of full screen mode.
-// The proper way to do this is to bracket the dialog with calls to beforeDialog() and afterDialog(), but these
-// require a pointer to the LLWindowMacSDL object.  Stash it here and maintain in the constructor and destructor.
-// This assumes that there will be only one object of this class at any time.  Hopefully this is true.
+// TOFU HACK -- (*exactly* the same hack as LLWindowMacOSX for a similar
+// set of reasons): Stash a pointer to the LLWindowSDL object here and
+// maintain in the constructor and destructor.  This assumes that there will
+// be only one object of this class at any time.  Hopefully this is true.
 static LLWindowSDL *gWindowImplementation = NULL;
 
 static BOOL was_fullscreen = FALSE;
@@ -113,14 +105,51 @@ void show_window_creation_error(const char* title)
 }
 
 
+void maybe_lock_display(void)
+{
+        if (gWindowImplementation) {
+                gWindowImplementation->Lock_Display();
+        }
+}
+
+
+void maybe_unlock_display(void)
+{
+        if (gWindowImplementation) {
+                gWindowImplementation->Unlock_Display();
+        }
+}
+
+
 #if LL_GTK
-// Check the runtime GTK version for goodness.
-static BOOL maybe_do_gtk_diagnostics(void)
+// Lazily initialize and check the runtime GTK version for goodness.
+BOOL ll_try_gtk_init(void)
 {
         static BOOL done_gtk_diag = FALSE;
-        static BOOL is_good = TRUE;
-        gtk_disable_setlocale();
-        if ((!done_gtk_diag) && gtk_init_check(NULL, NULL))
+        static BOOL gtk_is_good = FALSE;
+        static BOOL done_setlocale = FALSE;
+        static BOOL tried_gtk_init = FALSE;
+
+        if (!done_setlocale)
+        {
+                llinfos << "Starting GTK Initialization." << llendl;
+                maybe_lock_display();
+                gtk_disable_setlocale();
+                maybe_unlock_display();
+                done_setlocale = TRUE;
+        }
+        
+        if (!tried_gtk_init)
+        {
+                tried_gtk_init = TRUE;
+                maybe_lock_display();
+                gtk_is_good = gtk_init_check(NULL, NULL);
+                maybe_unlock_display();
+                if (!gtk_is_good)
+                        llwarns << "GTK Initialization failed." << llendl;
+        }
+
+        if (gtk_is_good && !done_gtk_diag)
         {
                 llinfos << "GTK Initialized." << llendl;
                 llinfos << "- Compiled against GTK version "
@@ -132,29 +161,51 @@ static BOOL maybe_do_gtk_diagnostics(void)
                         << gtk_minor_version << "."
                         << gtk_micro_version << llendl;
                 gchar *gtk_warning;
+                maybe_lock_display();
                 gtk_warning = gtk_check_version(GTK_MAJOR_VERSION,
                                                 GTK_MINOR_VERSION,
                                                 GTK_MICRO_VERSION);
+                maybe_unlock_display();
                 if (gtk_warning)
                 {
                         llwarns << "- GTK COMPATIBILITY WARNING: " <<
                                 gtk_warning << llendl;
-                        is_good = FALSE;
+                        gtk_is_good = FALSE;
                 }
 
                 done_gtk_diag = TRUE;
         }
-        return is_good;
+
+        return gtk_is_good;
 }
 #endif // LL_GTK
 
 
+#if LL_X11
+Window get_SDL_XWindowID(void)
+{
+        if (gWindowImplementation) {
+                return gWindowImplementation->mSDL_XWindowID;
+        }
+        return None;
+}
+
+Display* get_SDL_Display(void)
+{
+        if (gWindowImplementation) {
+                return gWindowImplementation->mSDL_Display;
+        }
+        return NULL;
+}
+#endif // LL_X11
+
+
 BOOL check_for_card(const char* RENDERER, const char* bad_card)
 {
         if (!strncasecmp(RENDERER, bad_card, strlen(bad_card)))
         {
-                char buffer[1024];
-                sprintf(buffer,
+                char buffer[1024];      /* Flawfinder: ignore */
+                snprintf(buffer, sizeof(buffer),        /* Flawfinder: ignore */
                         "Your video card appears to be a %s, which Second Life does not support.\n"
                         "\n"
                         "Second Life requires a video card with 32 Mb of memory or more, as well as\n"
@@ -209,6 +260,19 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
         mHaveInputFocus = -1;
         mIsMinimized = -1;
 
+#if LL_X11
+        mSDL_XWindowID = None;
+        mSDL_Display = NULL;
+#endif // LL_X11
+
+#if LL_GTK
+        // We MUST be the first to initialize GTK, i.e. we have to beat
+        // our embedded Mozilla to the punch so that GTK doesn't get badly
+        // initialized with a non-C locale and cause lots of serious random
+        // weirdness.
+        ll_try_gtk_init();
+#endif // LL_GTK
+
         // Get the original aspect ratio of the main device.
         mOriginalAspectRatio = 1024.0 / 768.0;  // !!! FIXME //(double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
 
@@ -216,9 +280,14 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
                 title = "SDL Window";  // *FIX: (???)
 
         // Stash the window title
-        mWindowTitle = new char[strlen(title) + 1];
-        strcpy(mWindowTitle, title);
+        mWindowTitle = new char[strlen(title) + 1]; /* Flawfinder: ignore */
+        if(mWindowTitle == NULL)
+        {
+                llerrs << "Memory allocation failure" << llendl;
+                return;
+        }
 
+        strcpy(mWindowTitle, title); /* Flawfinder: ignore */
         // Create the GL context and set it up for windowed or fullscreen, as appropriate.
         if(createContext(x, y, width, height, 32, fullscreen, disable_vsync))
         {
@@ -242,10 +311,10 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
 static SDL_Surface *Load_BMP_Resource(const char *basename)
 {
         const int PATH_BUFFER_SIZE=1000;
-        char path_buffer[PATH_BUFFER_SIZE];
+        char path_buffer[PATH_BUFFER_SIZE];     /* Flawfinder: ignore */
         
         // Figure out where our BMP is living on the disk
-        snprintf(path_buffer, PATH_BUFFER_SIZE-1, "%s%sres-sdl%s%s",
+        snprintf(path_buffer, PATH_BUFFER_SIZE-1, "%s%sres-sdl%s%s",    /* Flawfinder: ignore */
                  gDirUtilp->getAppRODataDir().c_str(),
                  gDirUtilp->getDirDelimiter().c_str(),
                  gDirUtilp->getDirDelimiter().c_str(),
@@ -271,7 +340,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
         {
                 llinfos << "sdl_init() failed! " << SDL_GetError() << llendl;
                 setupFailure("window creation error", "error", OSMB_OK);
-            return false;
+                return false;
         }
 
         SDL_version c_sdl_version;
@@ -415,8 +484,8 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
                         mFullscreenBits    = -1;
                         mFullscreenRefresh = -1;
 
-                        char error[256];
-                        sprintf(error, "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);
+                        char error[256];        /* Flawfinder: ignore */
+                        snprintf(error, sizeof(error), "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);      /* Flawfinder: ignore */
                         OSMessageBox(error, "Error", OSMB_OK);
                 }
         }
@@ -948,24 +1017,29 @@ void LLWindowSDL::beforeDialog()
         }
 
 #if LL_X11
-        if (SDL_Display)
+        if (mSDL_Display)
         {
                 // Everything that we/SDL asked for should happen before we
                 // potentially hand control over to GTK.
-                XSync(SDL_Display, False);
+                XSync(mSDL_Display, False);
         }
 #endif // LL_X11
 
 #if LL_GTK
         // this is a good time to grab some GTK version information for
-        // diagnostics
-        maybe_do_gtk_diagnostics();
+        // diagnostics, if not already done.
+        ll_try_gtk_init();
 #endif // LL_GTK
+
+        maybe_lock_display();
 }
 
 void LLWindowSDL::afterDialog()
 {
         llinfos << "LLWindowSDL::afterDialog()" << llendl;
+
+        maybe_unlock_display();
+
         if (old_fullscreen && !was_fullscreen)
         {
                 // *FIX: NOT YET WORKING (see below)
@@ -985,13 +1059,13 @@ S32 LLWindowSDL::stat(const char* file_name, struct stat* stat_info)
 // set/reset the XWMHints flag for 'urgency' that usually makes the icon flash
 void LLWindowSDL::x11_set_urgent(BOOL urgent)
 {
-        if (SDL_Display && !mFullscreen)
+        if (mSDL_Display && !mFullscreen)
         {
                 XWMHints *wm_hints;
                 
                 llinfos << "X11 hint for urgency, " << urgent << llendl;
 
-                wm_hints = XGetWMHints(SDL_Display, mSDL_XWindowID);
+                wm_hints = XGetWMHints(mSDL_Display, mSDL_XWindowID);
                 if (!wm_hints)
                         wm_hints = XAllocWMHints();
 
@@ -1000,9 +1074,9 @@ void LLWindowSDL::x11_set_urgent(BOOL urgent)
                 else
                         wm_hints->flags &= ~XUrgencyHint;
 
-                XSetWMHints(SDL_Display, mSDL_XWindowID, wm_hints);
+                XSetWMHints(mSDL_Display, mSDL_XWindowID, wm_hints);
                 XFree(wm_hints);
-                XSync(SDL_Display, False);
+                XSync(mSDL_Display, False);
         }
 }
 #endif // LL_X11
@@ -1035,6 +1109,8 @@ void LLWindowSDL::flashIcon(F32 seconds)
    right now it has the rare and desirable trait of being
    generally stable and working. */
 
+typedef Atom x11clipboard_type;
+
 /* PRIMARY and CLIPBOARD are the two main kinds of
    X11 clipboard.  A third are the CUT_BUFFERs which an
    obsolete holdover from X10 days and use a quite orthogonal
@@ -1047,26 +1123,52 @@ void LLWindowSDL::flashIcon(F32 seconds)
    we support (to as full an extent as the clipboard content type
    allows) CLIPBOARD, PRIMARY, and CUT_BUFFER0.
  */
-#define SL_READWRITE_XCLIPBOARD_TYPE XInternAtom(SDL_Display, "CLIPBOARD", False)
-#define SL_WRITE_XCLIPBOARD_TYPE XA_PRIMARY
+static x11clipboard_type get_x11_readwrite_clipboard_type(void)
+{
+        return XInternAtom(get_SDL_Display(), "CLIPBOARD", False);
+}
+
+static x11clipboard_type get_x11_write_clipboard_type(void)
+{
+        return XA_PRIMARY;
+}
 
 /* This is where our own private cutbuffer goes - we don't use
    a regular cutbuffer (XA_CUT_BUFFER0 etc) for intermediate
    storage because their use isn't really defined for holding UTF8. */
-#define SL_CUTBUFFER_TYPE XInternAtom(SDL_Display, "SECONDLIFE_CUTBUFFER", False)
+static x11clipboard_type get_x11_cutbuffer_clipboard_type(void)
+{
+        return XInternAtom(get_SDL_Display(), "SECONDLIFE_CUTBUFFER", False);
+}
+
+/* Some X11 atom-generators */
+static Atom get_x11_targets_atom(void)
+{
+        return XInternAtom(get_SDL_Display(), "TARGETS", False);
+}
+
+static Atom get_x11_text_atom(void)
+{
+        return XInternAtom(get_SDL_Display(), "TEXT", False);
+}
 
 /* These defines, and convert_data/convert_x11clipboard,
    mostly exist to support non-text or unusually-encoded
    clipboard data, which we don't really have a need for at
    the moment. */
-#define SDLCLIPTYPE(A, B, C, D) (int)((A<<24)|(B<<16)|(C<<8)|(D<<0))
+#define SDLCLIPTYPE(A, B, C, D) (int)(((A)<<24)|((B)<<16)|((C)<<8)|((D)<<0))
 #define FORMAT_PREFIX   "SECONDLIFE_x11clipboard_0x"
 
-typedef Atom x11clipboard_type;
-
 static
 x11clipboard_type convert_format(int type)
 {
+        if (!gWindowImplementation)
+        {
+                llwarns << "!gWindowImplementation in convert_format()"
+                        << llendl;
+                return XA_STRING;
+        }
+
         switch (type)
         {
         case SDLCLIPTYPE('T', 'E', 'X', 'T'):
@@ -1074,15 +1176,17 @@ x11clipboard_type convert_format(int type)
                 return XA_STRING;
         case SDLCLIPTYPE('U', 'T', 'F', '8'):
                 // newer de-facto UTF8 clipboard atom
-                return XInternAtom(SDL_Display, "UTF8_STRING", False);
+                return XInternAtom(gWindowImplementation->mSDL_Display,
+                                   "UTF8_STRING", False);
         default:
         {
                 /* completely arbitrary clipboard types... we don't actually use
                 these right now, and support is skeletal. */
-                char format[sizeof(FORMAT_PREFIX)+8+1];
+                char format[sizeof(FORMAT_PREFIX)+8+1]; /* Flawfinder: ignore */
 
-                sprintf(format, "%s%08lx", FORMAT_PREFIX, (unsigned long)type);
-                return XInternAtom(SDL_Display, format, False);
+                snprintf(format, sizeof(format), "%s%08lx", FORMAT_PREFIX, (unsigned long)type);        /* Flawfinder: ignore */
+                return XInternAtom(gWindowImplementation->mSDL_Display,
+                                   format, False);
         }
     }
 }
@@ -1099,14 +1203,18 @@ convert_data(int type, char *dst, const char *src, int srclen)
         {
         case SDLCLIPTYPE('T', 'E', 'X', 'T'):
         case SDLCLIPTYPE('U', 'T', 'F', '8'):
+                if (src == NULL)
+                {
+                        break;
+                }
                 if ( srclen == 0 )
-                        srclen = strlen(src);
+                        srclen = strlen(src);   /* Flawfinder: ignore */
                 
                 dstlen = srclen + 1;
                 
                 if ( dst ) // assume caller made it big enough by asking us
                 {
-                        memcpy(dst, src, srclen);
+                        memcpy(dst, src, srclen);       /* Flawfinder: ignore */
                         dst[srclen] = '\0';
                 }
                 break;
@@ -1131,14 +1239,18 @@ convert_x11clipboard(int type, char *dst, const char *src, int srclen)
         {
         case SDLCLIPTYPE('U', 'T', 'F', '8'):
         case SDLCLIPTYPE('T', 'E', 'X', 'T'):
+                if (src == NULL)
+                {
+                        break;
+                }
                 if ( srclen == 0 )
-                        srclen = strlen(src);
+                        srclen = strlen(src);   /* Flawfinder: ignore */
                 
                 dstlen = srclen + 1;
                 
                 if ( dst ) // assume caller made it big enough by asking us
                 {
-                        memcpy(dst, src, srclen);
+                        memcpy(dst, src, srclen);       /* Flawfinder: ignore */
                         dst[srclen] = '\0';
                 }
                 break;
@@ -1155,9 +1267,9 @@ LLWindowSDL::is_empty_x11clipboard(void)
 {
         int retval;
 
-        Lock_Display();
-        retval = ( XGetSelectionOwner(SDL_Display, SL_READWRITE_XCLIPBOARD_TYPE) == None );
-        Unlock_Display();
+        maybe_lock_display();
+        retval = ( XGetSelectionOwner(mSDL_Display, get_x11_readwrite_clipboard_type()) == None );
+        maybe_unlock_display();
 
         return(retval);
 }
@@ -1175,8 +1287,8 @@ LLWindowSDL::put_x11clipboard(int type, int srclen, const char *src)
         dst = (char *)malloc(dstlen);
         if ( dst != NULL )
         {
-                Window root = DefaultRootWindow(SDL_Display);
-                Lock_Display();
+                maybe_lock_display();
+                Window root = DefaultRootWindow(mSDL_Display);
                 convert_data(type, dst, src, srclen);
                 // Cutbuffers are only allowed to have STRING atom types,
                 // but Emacs puts UTF8 inside them anyway.  We cautiously
@@ -1185,7 +1297,7 @@ LLWindowSDL::put_x11clipboard(int type, int srclen, const char *src)
                 {
                         // dstlen-1 so we don't include the trailing \0
                         llinfos << "X11: Populating cutbuffer." <<llendl;
-                        XChangeProperty(SDL_Display, root,
+                        XChangeProperty(mSDL_Display, root,
                                         XA_CUT_BUFFER0, XA_STRING, 8, PropModeReplace,
                                         (unsigned char*)dst, dstlen-1);
                 } else {
@@ -1194,18 +1306,18 @@ LLWindowSDL::put_x11clipboard(int type, int srclen, const char *src)
                         //XDeleteProperty(SDL_Display, root, XA_CUT_BUFFER0);
                 }
                 // Private cutbuffer of an appropriate type.
-                XChangeProperty(SDL_Display, root,
-                                SL_CUTBUFFER_TYPE, format, 8, PropModeReplace,
+                XChangeProperty(mSDL_Display, root,
+                                get_x11_cutbuffer_clipboard_type(), format, 8, PropModeReplace,
                                 (unsigned char*)dst, dstlen-1);
                 free(dst);
                 
                 /* Claim ownership of both PRIMARY and CLIPBOARD */
-                XSetSelectionOwner(SDL_Display, SL_READWRITE_XCLIPBOARD_TYPE,
+                XSetSelectionOwner(mSDL_Display, get_x11_readwrite_clipboard_type(),
                                    mSDL_XWindowID, CurrentTime);
-                XSetSelectionOwner(SDL_Display, SL_WRITE_XCLIPBOARD_TYPE,
+                XSetSelectionOwner(mSDL_Display, get_x11_write_clipboard_type(),
                                    mSDL_XWindowID, CurrentTime);
                 
-                Unlock_Display();
+                maybe_unlock_display();
         }
 }
 
@@ -1225,19 +1337,19 @@ LLWindowSDL::get_x11clipboard(int type, int *dstlen, char **dst)
         unsigned long overflow;
         char *src;
         
-        Lock_Display();
-        owner = XGetSelectionOwner(SDL_Display, SL_READWRITE_XCLIPBOARD_TYPE);
-        Unlock_Display();
+        maybe_lock_display();
+        owner = XGetSelectionOwner(mSDL_Display, get_x11_readwrite_clipboard_type());
+        maybe_unlock_display();
         if (owner == None)
         {
                 // Fall right back to ancient X10 cut-buffers
-                owner = DefaultRootWindow(SDL_Display);
+                owner = DefaultRootWindow(mSDL_Display);
                 selection = XA_CUT_BUFFER0;
         } else if (owner == mSDL_XWindowID)
         {
                 // Use our own uncooked opaque string property
-                owner = DefaultRootWindow(SDL_Display);
-                selection = SL_CUTBUFFER_TYPE;
+                owner = DefaultRootWindow(mSDL_Display);
+                selection = get_x11_cutbuffer_clipboard_type();
         }
         else
         {
@@ -1246,11 +1358,11 @@ LLWindowSDL::get_x11clipboard(int type, int *dstlen, char **dst)
                 SDL_Event event;
                 
                 owner = mSDL_XWindowID;
-                Lock_Display();
-                selection = XInternAtom(SDL_Display, "SDL_SELECTION", False);
-                XConvertSelection(SDL_Display, SL_READWRITE_XCLIPBOARD_TYPE, format,
+                maybe_lock_display();
+                selection = XInternAtom(mSDL_Display, "SDL_SELECTION", False);
+                XConvertSelection(mSDL_Display, get_x11_readwrite_clipboard_type(), format,
                                   selection, owner, CurrentTime);
-                Unlock_Display();
+                maybe_unlock_display();
                 llinfos << "X11: Waiting for clipboard to arrive." <<llendl;
                 while ( ! selection_response )
                 {
@@ -1276,8 +1388,8 @@ LLWindowSDL::get_x11clipboard(int type, int *dstlen, char **dst)
                 llinfos << "X11: Clipboard arrived." <<llendl;
         }
 
-        Lock_Display();
-        if ( XGetWindowProperty(SDL_Display, owner, selection, 0, INT_MAX/4,
+        maybe_lock_display();
+        if ( XGetWindowProperty(mSDL_Display, owner, selection, 0, INT_MAX/4,
                                 False, format, &seln_type, &seln_format,
                                 &nbytes, &overflow, (unsigned char **)&src) == Success )
         {
@@ -1292,8 +1404,7 @@ LLWindowSDL::get_x11clipboard(int type, int *dstlen, char **dst)
                 }
                 XFree(src);
         }
-        
-        Unlock_Display();
+        maybe_unlock_display();
 }
 
 int clipboard_filter_callback(const SDL_Event *event)
@@ -1306,7 +1417,7 @@ int clipboard_filter_callback(const SDL_Event *event)
 
         /* Handle window-manager specific clipboard events */
         switch (event->syswm.msg->event.xevent.type) {
-        /* Copy the selection from SL_CUTBUFFER_TYPE to the requested property */
+        /* Copy the selection from SECONDLIFE_CUTBUFFER to the requested property */
         case SelectionRequest: {
                 XSelectionRequestEvent *req;
                 XEvent sevent;
@@ -1323,8 +1434,8 @@ int clipboard_filter_callback(const SDL_Event *event)
                 sevent.xselection.property = None;
                 sevent.xselection.requestor = req->requestor;
                 sevent.xselection.time = req->time;
-                if ( XGetWindowProperty(SDL_Display, DefaultRootWindow(SDL_Display),
-                                        SL_CUTBUFFER_TYPE, 0, INT_MAX/4, False, req->target,
+                if ( XGetWindowProperty(get_SDL_Display(), DefaultRootWindow(get_SDL_Display()),
+                                        get_x11_cutbuffer_clipboard_type(), 0, INT_MAX/4, False, req->target,
                                         &sevent.xselection.target, &seln_format,
                                         &nbytes, &overflow, &seln_data) == Success )
                 {
@@ -1337,21 +1448,20 @@ int clipboard_filter_callback(const SDL_Event *event)
                                         if ( seln_data[nbytes-1] == '\0' )
                                                 --nbytes;
                                 }
-                                XChangeProperty(SDL_Display, req->requestor, req->property,
+                                XChangeProperty(get_SDL_Display(), req->requestor, req->property,
                                                 req->target, seln_format, PropModeReplace,
                                                 seln_data, nbytes);
                                 sevent.xselection.property = req->property;
-#define XA_TARGETS XInternAtom(SDL_Display, "TARGETS", False)
-                        } else if (XA_TARGETS == req->target) {
+                        } else if (get_x11_targets_atom() == req->target) {
                                 /* only advertise what we currently support */
                                 const int num_supported = 3;
                                 Atom supported[num_supported] = {
                                         XA_STRING, // will be over-written below
-                                        XInternAtom(SDL_Display, "TEXT",False),
-                                        XA_TARGETS
+                                        get_x11_text_atom(),
+                                        get_x11_targets_atom()
                                 };
                                 supported[0] = sevent.xselection.target;
-                                XChangeProperty(SDL_Display, req->requestor,
+                                XChangeProperty(get_SDL_Display(), req->requestor,
                                                 req->property, XA_ATOM, 32, PropModeReplace,
                                                 (unsigned char*)supported,
                                                 num_supported);
@@ -1364,10 +1474,10 @@ int clipboard_filter_callback(const SDL_Event *event)
                         XFree(seln_data);
                 }
                 int sendret =
-                        XSendEvent(SDL_Display,req->requestor,False,0,&sevent);
+                        XSendEvent(get_SDL_Display(),req->requestor,False,0,&sevent);
                 if ((sendret==BadValue) || (sendret==BadWindow))
                         llwarns << "Clipboard SendEvent failed" << llendl;
-                XSync(SDL_Display, False);
+                XSync(get_SDL_Display(), False);
         }
                 break;
         }
@@ -1392,8 +1502,7 @@ LLWindowSDL::init_x11clipboard(void)
                 /* Save the information for later use */
                 if ( info.subsystem == SDL_SYSWM_X11 )
                 {
-                        SDL_Display = info.info.x11.display;
-                        SDL_XWindowID = info.info.x11.wmwindow;
+                        mSDL_Display = info.info.x11.display;
                         mSDL_XWindowID = info.info.x11.wmwindow;
                         Lock_Display = info.info.x11.lock_func;
                         Unlock_Display = info.info.x11.unlock_func;
@@ -1415,8 +1524,7 @@ LLWindowSDL::init_x11clipboard(void)
 void
 LLWindowSDL::quit_x11clipboard(void)
 {
-        SDL_Display = NULL;
-        SDL_XWindowID = None;
+        mSDL_Display = NULL;
         mSDL_XWindowID = None;
         Lock_Display = NULL;
         Unlock_Display = NULL;
@@ -1470,7 +1578,11 @@ BOOL LLWindowSDL::copyTextToClipboard(const LLWString &s)
 {
         std::string utf8text = wstring_to_utf8str(s);
         const char* cstr = utf8text.c_str();
-        int cstrlen = strlen(cstr);
+        if (cstr == NULL)
+        {
+                return FALSE;
+        }
+        int cstrlen = strlen(cstr);     /* Flawfinder: ignore */
         int i;
         for (i=0; i<cstrlen; ++i)
         {
@@ -1653,7 +1765,7 @@ BOOL LLWindowSDL::SDLReallyCaptureInput(BOOL capture)
         if (!mFullscreen) /* only bother if we're windowed anyway */
         {
 #if LL_X11
-                if (SDL_Display)
+                if (mSDL_Display)
                 {
                         /* we dirtily mix raw X11 with SDL so that our pointer
                            isn't (as often) constrained to the limits of the
@@ -1669,7 +1781,7 @@ BOOL LLWindowSDL::SDLReallyCaptureInput(BOOL capture)
                         {
                                 //llinfos << "X11 POINTER GRABBY" << llendl;
                                 //newmode = SDL_WM_GrabInput(wantmode);
-                                result = XGrabPointer(SDL_Display, mSDL_XWindowID,
+                                result = XGrabPointer(mSDL_Display, mSDL_XWindowID,
                                                       True, 0, GrabModeAsync,
                                                       GrabModeAsync,
                                                       None, None, CurrentTime);
@@ -1683,9 +1795,9 @@ BOOL LLWindowSDL::SDLReallyCaptureInput(BOOL capture)
                                 newmode = SDL_GRAB_OFF;
                                 //newmode = SDL_WM_GrabInput(SDL_GRAB_OFF);
 
-                                XUngrabPointer(SDL_Display, CurrentTime);
+                                XUngrabPointer(mSDL_Display, CurrentTime);
                                 // Make sure the ungrab happens RIGHT NOW.
-                                XSync(SDL_Display, False);
+                                XSync(mSDL_Display, False);
                         } else
                         {
                                 newmode = SDL_GRAB_QUERY; // neutral
@@ -1751,6 +1863,29 @@ void LLWindowSDL::gatherInput()
     static Uint32 lastRightDown = 0;
     SDL_Event event;
 
+#if LL_GTK && LL_LIBXUL_ENABLED
+    // Pump GTK events so embedded Gecko doesn't starve.
+    if (ll_try_gtk_init())
+    {
+            // Yuck, Mozilla's GTK callbacks play with the locale - push/pop
+            // the locale to protect it, as exotic/non-C locales
+            // causes our code lots of general critical weirdness
+            // and crashness. (SL-35450)
+            char *saved_locale = setlocale(LC_ALL, NULL);
+
+            // Do a limited number of pumps so SL doesn't starve!
+            // FIXME - this should ideally be time-limited, not count-limited.
+            gtk_main_iteration_do(0); // Always do one non-blocking pump
+            for (int iter=0; iter<10; ++iter)
+                    if (gtk_events_pending())
+                            gtk_main_iteration();
+
+            if (saved_locale)
+                    setlocale(LC_ALL, saved_locale);
+    }
+#endif // LL_GTK && LL_LIBXUL_ENABLED
+
+    // Handle all outstanding SDL events
     while (SDL_PollEvent(&event))
     {
         switch (event.type)
@@ -2237,15 +2372,12 @@ S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type)
 {
         S32 rtn = OSBTN_CANCEL;
 
-#if LL_GTK
-        maybe_do_gtk_diagnostics();
-#endif // LL_GTK
+        ll_try_gtk_init();
 
         if(gWindowImplementation != NULL)
                 gWindowImplementation->beforeDialog();
 
-        gtk_disable_setlocale();
-        if (gtk_init_check(NULL, NULL)
+        if (ll_try_gtk_init()
             // We can NOT expect to combine GTK and SDL's aggressive fullscreen
             && ((NULL==gWindowImplementation) || (!was_fullscreen))
             )
@@ -2281,10 +2413,11 @@ S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type)
                 // Make GTK tell the window manager to associate this
                 // dialog with our non-GTK SDL window, which should try
                 // to keep it on top etc.
-                if (SDL_XWindowID != None)
+                if (gWindowImplementation &&
+                    gWindowImplementation->mSDL_XWindowID != None)
                 {
                         gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin
-                        GdkWindow *gdkwin = gdk_window_foreign_new(SDL_XWindowID);
+                        GdkWindow *gdkwin = gdk_window_foreign_new(gWindowImplementation->mSDL_XWindowID);
                         gdk_window_set_transient_for(GTK_WIDGET(win)->window,
                                                      gdkwin);
                 }
@@ -2353,8 +2486,7 @@ BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
 
         beforeDialog();
 
-        gtk_disable_setlocale();
-        if (gtk_init_check(NULL, NULL)
+        if (ll_try_gtk_init()
             // We can NOT expect to combine GTK and SDL's aggressive fullscreen
             && !was_fullscreen
             )
@@ -2367,10 +2499,10 @@ BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
                 // Get GTK to tell the window manager to associate this
                 // dialog with our non-GTK SDL window, which should try
                 // to keep it on top etc.
-                if (SDL_XWindowID != None)
+                if (mSDL_XWindowID != None)
                 {
                         gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin
-                        GdkWindow *gdkwin = gdk_window_foreign_new(SDL_XWindowID);
+                        GdkWindow *gdkwin = gdk_window_foreign_new(mSDL_XWindowID);
                         gdk_window_set_transient_for(GTK_WIDGET(win)->window,
                                                      gdkwin);
                 }
@@ -2442,8 +2574,9 @@ void spawn_web_browser(const char* escaped_url)
         
 #if LL_LINUX
 #  if LL_X11
-        if (SDL_Display) // Just in case - before forking.
-                XSync(SDL_Display, False);
+        if (gWindowImplementation &&
+         gWindowImplementation->mSDL_Display) // Just in case - before forking.
+                XSync(gWindowImplementation->mSDL_Display, False);
 #  endif // LL_X11
 
         std::string cmd;
@@ -2461,7 +2594,7 @@ void spawn_web_browser(const char* escaped_url)
                 close(1);
                 close(2);
                 // end ourself by running the command
-                execv(cmd.c_str(), argv);
+                execv(cmd.c_str(), argv);       /* Flawfinder: ignore */
                 // if execv returns at all, there was a problem.
                 llwarns << "execv failure when trying to start " << cmd << llendl;
                 _exit(1); // _exit because we don't want atexit() clean-up!
@@ -2488,13 +2621,26 @@ void shell_open( const char* file_path )
 
 void *LLWindowSDL::getPlatformWindow()
 {
-#if LL_X11
-        // pointer to our static raw X window
-        return (void*)&SDL_XWindowID;
-#else
-        // doubt we really want to return a high-level SDL structure here.
+#if LL_GTK && LL_LIBXUL_ENABLED
+        if (ll_try_gtk_init())
+        {
+                GtkWidget *win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+                // These hacks were attempts to get Gecko to see the keyboard,
+                // but I think they're doomed to fail.
+                //GdkWindow *gdkwin = gdk_window_foreign_new(SDL_XWindowID);
+                //GTK_WIDGET(win)->window = gdkwin;
+                //gtk_widget_set_parent_window(win, gdkwin);
+
+                // show the hidden-widget while debugging (needs mozlib change)
+                //gtk_widget_show_all(GTK_WIDGET(win));
+
+                gtk_widget_realize(GTK_WIDGET(win));
+                return win;
+        }
+#endif // LL_GTK && LL_LIBXUL_ENABLED
+        // Unixoid mozilla really needs GTK.
         return NULL;
-#endif
 }
 
 void LLWindowSDL::bringToFront()
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 0528b84..ed529a2 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -112,7 +112,17 @@ public:
 
         /*virtual*/ void *getPlatformWindow();
         /*virtual*/ void bringToFront();
-        
+
+        // Not great that these are public, but they have to be accessible
+        // by non-class code and it's better than making them global.
+#if LL_X11
+        // These are set up by the X11 clipboard initialization code
+        Window mSDL_XWindowID;
+        Display *mSDL_Display;
+#endif
+        void (*Lock_Display)(void);
+        void (*Unlock_Display)(void);
+
 protected:
         LLWindowSDL(
                 char *title, int x, int y, int width, int height, U32 flags,
@@ -179,10 +189,6 @@ protected:
 
 #if LL_X11
 private:
-        // These are set up by the X11 clipboard initialization code
-        Window mSDL_XWindowID;
-        void (*Lock_Display)(void);
-        void (*Unlock_Display)(void);
         // more X11 clipboard stuff
         int init_x11clipboard(void);
         void quit_x11clipboard(void);
@@ -214,4 +220,14 @@ S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type);
 void load_url_external(const char* url);
 void shell_open( const char* file_path );
 
+#if LL_GTK
+// Lazily initialize and check the runtime GTK version for goodness.
+BOOL ll_try_gtk_init(void);
+#endif // LL_GTK
+
+#if LL_X11
+Window get_SDL_XWindowID(void);
+Display* get_SDL_Display(void);
+#endif // LL_X11
+
 #endif //LL_LLWINDOWSDL_H
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 5929fb5..1d084d2 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -74,57 +74,6 @@ void show_window_creation_error(const char* title)
 {
         llwarns << title << llendl;
         shell_open( "help/window_creation_error.html");
-        /*
-        OSMessageBox(
-        "Second Life is unable to run because it can't set up your display.\n"
-        "We need to be able to make a 32-bit color window at 1024x768, with\n"
-        "an 8 bit alpha channel.\n"
-        "\n"
-        "First, be sure your monitor is set to True Color (32-bit) in\n"
-        "Start -> Control Panels -> Display -> Settings.\n"
-        "\n"
-        "Otherwise, this may be due to video card driver issues.\n"
-        "Please make sure you have the latest video card drivers installed.\n"
-        "ATI drivers are available at http://www.ati.com/\n"
-        "nVidia drivers are available at http://www.nvidia.com/\n"
-        "\n"
-        "If you continue to receive this message, contact customer service.",
-        title,
-        OSMB_OK);
-        */
-}
-
-BOOL check_for_card(const char* RENDERER, const char* bad_card)
-{
-        if (!strnicmp(RENDERER, bad_card, strlen(bad_card)))
-        {
-                char buffer[1024];
-                sprintf(buffer,
-                        "Your video card appears to be a %s, which Second Life does not support.\n"
-                        "\n"
-                        "Second Life requires a video card with 32 Mb of memory or more, as well as\n"
-                        "multitexture support.  We explicitly support nVidia GeForce 2 or better, \n"
-                        "and ATI Radeon 8500 or better.\n"
-                        "\n"
-                        "If you own a supported card and continue to receive this message, try \n"
-                        "updating to the latest video card drivers. Otherwise look in the\n"
-                        "secondlife.com support section or e-mail technical support\n"
-                        "\n"
-                        "You can try to run Second Life, but it will probably crash or run\n"
-                        "very slowly.  Try anyway?",
-                        bad_card);
-                S32 button = OSMessageBox(buffer, "Unsupported video card", OSMB_YESNO);
-                if (OSBTN_YES == button)
-                {
-                        return FALSE;
-                }
-                else
-                {
-                        return TRUE;
-                }
-        }
-
-        return FALSE;
 }
 
 //static
@@ -147,6 +96,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
                                                          BOOL ignore_pixel_depth)
         : LLWindow(fullscreen, flags)
 {
+        S32 i = 0;
         mIconResource = gIconResource;
         mOverrideAspectRatio = 0.f;
         mNativeAspectRatio = 0.f;
@@ -348,8 +298,8 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
                         mFullscreenBits    = -1;
                         mFullscreenRefresh = -1;
 
-                        char error[256];
-                        sprintf(error, "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);
+                        char error[256];        /* Flawfinder: ignore */
+                        snprintf(error, sizeof(error), "Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);      /* Flawfinder: ignore */
                         OSMessageBox(error, "Error", OSMB_OK);
                 }
         }
@@ -515,37 +465,6 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
                         return;
                 }
 
-                // Check for some explicitly unsupported cards.
-                const char* RENDERER = (const char*) glGetString(GL_RENDERER);
-
-                const char* CARD_LIST[] = 
-                {       "RAGE 128",
-                "RIVA TNT2",
-                "Intel 810",
-                "3Dfx/Voodoo3",
-                "Radeon 7000",
-                "Radeon 7200",
-                "Radeon 7500",
-                "Radeon DDR",
-                "Radeon VE",
-                "GDI Generic" };
-                const S32 CARD_COUNT = sizeof(CARD_LIST)/sizeof(char*);
-
-                // Future candidates:
-                // ProSavage/Twister
-                // SuperSavage
-
-                S32 i;
-                for (i = 0; i < CARD_COUNT; i++)
-                {
-                        if (check_for_card(RENDERER, CARD_LIST[i]))
-                        {
-                                close();
-                                shell_open( "help/unsupported_card.html" );
-                                return;
-                        }
-                }
-
                 gGLManager.initWGL();
 
                 if (gGLManager.mHasWGLARBPixelFormat && (wglChoosePixelFormatARB != NULL))
@@ -1976,20 +1895,6 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                                 << " key " << S32(w_param) 
                                                 << llendl;
                                 }
-                                // lower 15 bits hold key repeat count
-                                S32 key_repeat_count = l_param & 0x7fff;
-                                if (key_repeat_count > 1)
-                                {
-                                        KEY translated_key;
-                                        gKeyboard->translateKey(w_param, &translated_key);
-                                        if (!gKeyboard->getKeyDown(translated_key))
-                                        {
-                                                //RN: hack for handling key repeats when we no longer recognize the key as being down
-                                                //This is necessary because we sometimes ignore the message queue and use getAsyncKeyState
-                                                // to clear key level flags before we've processed all key repeat messages
-                                                return 0;
-                                        }
-                                }
                                 if(gKeyboard->handleKeyDown(w_param, mask) && eat_keystroke)
                                 {
                                         return 0;
@@ -2469,7 +2374,7 @@ BOOL LLWindowWin32::copyTextToClipboard(const LLWString& wstr)
                         WCHAR* copy_utf16 = (WCHAR*) GlobalLock(hglobal_copy_utf16);
                         if (copy_utf16)
                         {
-                                memcpy(copy_utf16, out_utf16.c_str(), size_utf16);
+                                memcpy(copy_utf16, out_utf16.c_str(), size_utf16);      /* Flawfinder: ignore */
                                 GlobalUnlock(hglobal_copy_utf16);
 
                                 if (SetClipboardData(CF_UNICODETEXT, hglobal_copy_utf16))
@@ -2493,7 +2398,7 @@ BOOL LLWindowWin32::copyTextToClipboard(const LLWString& wstr)
                         char* copy = (char*) GlobalLock(hglobal_copy);
                         if( copy )
                         {
-                                memcpy(copy, out_s.c_str(), size);
+                                memcpy(copy, out_s.c_str(), size);      /* Flawfinder: ignore */
                                 GlobalUnlock(hglobal_copy);
 
                                 if (SetClipboardData(CF_TEXT, hglobal_copy))
@@ -2594,7 +2499,7 @@ BOOL LLWindowWin32::sendEmail(const char* address, const char* subject, const ch
         }
         else
         {
-                HINSTANCE hMAPIInst = LoadLibrary(L"MAPI32.DLL");
+                HINSTANCE hMAPIInst = LoadLibrary(L"MAPI32.DLL");       /* Flawfinder: ignore */
                 if(!hMAPIInst)
                 {
                         result =  LL_EMAIL_MAPILOAD_FAILED;
@@ -3112,7 +3017,7 @@ void spawn_web_browser(const char* escaped_url )
         S32 i;
         for (i = 0; i < gURLProtocolWhitelistCount; i++)
         {
-                S32 len = strlen(gURLProtocolWhitelist[i]);
+                S32 len = strlen(gURLProtocolWhitelist[i]);     /* Flawfinder: ignore */
                 if (!strncmp(escaped_url, gURLProtocolWhitelist[i], len)
                         && escaped_url[len] == ':')
                 {
@@ -3131,8 +3036,8 @@ void spawn_web_browser(const char* escaped_url )
 
         // Figure out the user's default web browser
         // HKEY_CLASSES_ROOT\http\shell\open\command
-        char reg_path_str[256];
-        sprintf(reg_path_str, "%s\\shell\\open\\command", gURLProtocolWhitelistHandler[i]);
+        char reg_path_str[256]; /* Flawfinder: ignore */
+        snprintf(reg_path_str, sizeof(reg_path_str), "%s\\shell\\open\\command", gURLProtocolWhitelistHandler[i]);      /* Flawfinder: ignore */
         WCHAR reg_path_wstr[256];
         mbstowcs(reg_path_wstr, reg_path_str, 1024);
 
@@ -3183,7 +3088,7 @@ void spawn_web_browser(const char* escaped_url )
         // MS docs say to cast to int and compare to 32.
         HWND our_window = NULL;
         LPCWSTR directory_wstr = NULL;
-        int retval = (int) ShellExecute(our_window, 
+        int retval = (int) ShellExecute(our_window,     /* Flawfinder: ignore */
                                                                         L"open", 
                                                                         browser_exec_utf16.c_str(), 
                                                                         url_utf16.c_str(), 
@@ -3207,7 +3112,7 @@ void shell_open( const char* file_path )
         mbstowcs(wstr, file_path, 1024);
 
         HWND our_window = NULL;
-        int retval = (int) ShellExecute(our_window, L"open", wstr, NULL, NULL, SW_SHOWNORMAL);
+        int retval = (int) ShellExecute(our_window, L"open", wstr, NULL, NULL, SW_SHOWNORMAL);  /* Flawfinder: ignore */
         if (retval > 32)
         {
                 llinfos << "ShellExecute success with " << retval << llendl;
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 77696e6..f6300f6 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -201,6 +201,7 @@ private:
 };
 
 extern LLW32MsgCallback gAsyncMsgCallback;
+extern LPWSTR gIconResource;
 
 static void     handleMessage( const MSG& msg );
 
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index 79fd522..c365aed 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -132,7 +132,8 @@ void LLControlGroup::cleanup()
 
 LLControlBase*  LLControlGroup::getControl(const LLString& name)
 {
-        return mNameTable[name];
+        ctrl_name_table_t::iterator iter = mNameTable.find(name);
+        return iter == mNameTable.end() ? NULL : (LLControlBase*)iter->second;
 }
 
 BOOL LLControlGroup::declareControl(const LLString& name, eControlType type, const LLSD initial_val, const LLString& comment, BOOL persist)
@@ -143,9 +144,11 @@ BOOL LLControlGroup::declareControl(const LLString& name, eControlType type, con
                 LLControl* control = new LLControl(name, type, initial_val, comment, persist);
                 mNameTable[name] = control;
                 return TRUE;
-        } else
+        }
+        else
         {
                 llwarns << "LLControlGroup::declareControl: Control named " << name << " already exists." << llendl;
+                mNameTable.erase(name);
                 return FALSE;
         }
 }
@@ -207,7 +210,7 @@ BOOL LLControlGroup::declareColor3(const LLString& name, const LLColor3 &initial
 
 LLSD LLControlGroup::registerListener(const LLString& name, LLSimpleListenerObservable *listener)
 {
-        LLControlBase *control = mNameTable[name];
+        LLControlBase *control = getControl(name);
         if (control)
         {
                 return control->registerListener(listener);
@@ -217,7 +220,7 @@ LLSD LLControlGroup::registerListener(const LLString& name, LLSimpleListenerObse
 
 BOOL LLControlGroup::getBOOL(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_BOOLEAN))
                 return control->get().asBoolean();
@@ -230,7 +233,7 @@ BOOL LLControlGroup::getBOOL(const LLString& name)
 
 S32 LLControlGroup::getS32(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_S32))
                 return control->get().asInteger();
@@ -243,7 +246,7 @@ S32 LLControlGroup::getS32(const LLString& name)
 
 U32 LLControlGroup::getU32(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_U32))               
                 return control->get().asInteger();
@@ -256,7 +259,7 @@ U32 LLControlGroup::getU32(const LLString& name)
 
 F32 LLControlGroup::getF32(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_F32))
                 return (F32) control->get().asReal();
@@ -269,7 +272,7 @@ F32 LLControlGroup::getF32(const LLString& name)
 
 LLString LLControlGroup::findString(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_STRING))
                 return control->get().asString();
@@ -278,7 +281,7 @@ LLString LLControlGroup::findString(const LLString& name)
 
 LLString LLControlGroup::getString(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_STRING))
                 return control->get().asString();
@@ -304,7 +307,7 @@ LLString LLControlGroup::getText(const LLString& name)
 
 LLVector3 LLControlGroup::getVector3(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_VEC3))
                 return control->get();
@@ -317,7 +320,7 @@ LLVector3 LLControlGroup::getVector3(const LLString& name)
 
 LLVector3d LLControlGroup::getVector3d(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_VEC3D))
                 return control->get();
@@ -330,7 +333,7 @@ LLVector3d LLControlGroup::getVector3d(const LLString& name)
 
 LLRect LLControlGroup::getRect(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_RECT))
                 return control->get();
@@ -376,7 +379,7 @@ LLColor4 LLControlGroup::getColor(const LLString& name)
 
 LLColor4U LLControlGroup::getColor4U(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_COL4U))
                 return control->get();
@@ -389,7 +392,7 @@ LLColor4U LLControlGroup::getColor4U(const LLString& name)
 
 LLColor4 LLControlGroup::getColor4(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_COL4))
                 return control->get();
@@ -402,7 +405,7 @@ LLColor4 LLControlGroup::getColor4(const LLString& name)
 
 LLColor3 LLControlGroup::getColor3(const LLString& name)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_COL3))
                 return control->get();
@@ -415,9 +418,8 @@ LLColor3 LLControlGroup::getColor3(const LLString& name)
 
 BOOL LLControlGroup::controlExists(const LLString& name)
 {
-        void *control = mNameTable[name];
-
-        return (control != 0);
+        ctrl_name_table_t::iterator iter = mNameTable.find(name);
+        return iter != mNameTable.end();
 }
 
 //-------------------------------------------------------------------
@@ -426,7 +428,7 @@ BOOL LLControlGroup::controlExists(const LLString& name)
 
 void LLControlGroup::setBOOL(const LLString& name, BOOL val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_BOOLEAN))
         {
@@ -441,7 +443,7 @@ void LLControlGroup::setBOOL(const LLString& name, BOOL val)
 
 void LLControlGroup::setS32(const LLString& name, S32 val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_S32))
         {
@@ -456,7 +458,7 @@ void LLControlGroup::setS32(const LLString& name, S32 val)
 
 void LLControlGroup::setF32(const LLString& name, F32 val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_F32))
         {
@@ -471,7 +473,7 @@ void LLControlGroup::setF32(const LLString& name, F32 val)
 
 void LLControlGroup::setU32(const LLString& name, U32 val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_U32))
         {
@@ -486,7 +488,7 @@ void LLControlGroup::setU32(const LLString& name, U32 val)
 
 void LLControlGroup::setString(const LLString& name, const LLString &val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_STRING))
         {
@@ -501,7 +503,7 @@ void LLControlGroup::setString(const LLString& name, const LLString &val)
 
 void LLControlGroup::setVector3(const LLString& name, const LLVector3 &val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_VEC3))
         {
@@ -515,7 +517,7 @@ void LLControlGroup::setVector3(const LLString& name, const LLVector3 &val)
 
 void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_VEC3D))
         {
@@ -529,7 +531,7 @@ void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
 
 void LLControlGroup::setRect(const LLString& name, const LLRect &val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_RECT))
         {
@@ -543,7 +545,7 @@ void LLControlGroup::setRect(const LLString& name, const LLRect &val)
 
 void LLControlGroup::setColor4U(const LLString& name, const LLColor4U &val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_COL4U))
         {
@@ -557,7 +559,7 @@ void LLControlGroup::setColor4U(const LLString& name, const LLColor4U &val)
 
 void LLControlGroup::setColor4(const LLString& name, const LLColor4 &val)
 {
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control && control->isType(TYPE_COL4))
         {
@@ -576,7 +578,7 @@ void LLControlGroup::setValue(const LLString& name, const LLSD& val)
                 return;
         }
 
-        LLControlBase* control = mNameTable[name];
+        LLControlBase* control = getControl(name);
         
         if (control)
         {
@@ -599,7 +601,7 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
         llifstream file;
         S32 version;
         
-        file.open(filename.c_str()); 
+        file.open(filename.c_str());            /*Flawfinder: ignore*/ 
 
         if (!file)
         {
@@ -629,7 +631,7 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
                 if (name.substr(0,2) == "//")
                 {
                         // This is a comment.
-                        char buffer[MAX_STRING];
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                         file.getline(buffer, MAX_STRING);
                         continue;
                 }
@@ -643,7 +645,7 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
                         if (!name.empty())
                         {
                                 //read in to end of line
-                                char buffer[MAX_STRING];
+                                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                                 file.getline(buffer, MAX_STRING);
                                 llwarns << "LLControlGroup::loadFromFile() : Trying to set \"" << name << "\", setting doesn't exist." << llendl;
                         }
@@ -709,7 +711,7 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de
                         break;
                 case TYPE_BOOLEAN:
                         {
-                                char boolstring[256];
+                                char boolstring[256];           /*Flawfinder: ignore*/
                                 BOOL valid = FALSE;
                                 BOOL initial = FALSE;
 
@@ -858,7 +860,7 @@ U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declarat
         {
                 name = child_nodep->getName();          
                 
-                BOOL declared = (mNameTable[name].notNull());
+                BOOL declared = controlExists(name);
 
                 if (require_declaration && !declared)
                 {
@@ -1045,8 +1047,7 @@ U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
                         break;
                 }
 
-                LLControlBase* control = (LLControlBase *)mNameTable[name];
-
+                LLControlBase* control = (LLControlBase *)iter->second;
                 if (!control)
                 {
                         llwarns << "Tried to save invalid control: " << name << llendl;
@@ -1067,7 +1068,7 @@ U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
         }
 
         llofstream file;
-        file.open(filename.c_str());
+        file.open(filename.c_str());            /*Flawfinder: ignore*/
 
         if (!file.is_open())
         {
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index 846a3b5..ca5f711 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -67,6 +67,7 @@ protected:
         BOOL                    mHasRange;
         BOOL                    mPersist;
         BOOL            mIsDefault;
+
         static  std::set<LLControlBase*>        mChangedControls;
         static  std::list<S32>                          mFreeIDs;//These lists are used to store the ID's of registered event listeners.
         static  std::list<S32>                          mUsedIDs;
@@ -171,7 +172,10 @@ public:
                 }
         }
 
-        /*virtual*/ void resetToDefault() { mCurrent = mDefault; mIsDefault = TRUE;}
+        /*virtual*/ void resetToDefault() 
+        { 
+                setValue(mDefault);
+        }
 
         virtual ~LLControl()
         {
diff --git a/linden/indra/llxml/llxml_vc8.vcproj b/linden/indra/llxml/llxml_vc8.vcproj
new file mode 100644
index 0000000..0b2a2b1
--- /dev/null
+++ b/linden/indra/llxml/llxml_vc8.vcproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="llxml"

+        ProjectGUID="{A5470DA6-0C3A-4602-B930-43DB25511A59}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llxml.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llxml.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\..\libraries\i686-win32\include;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llxml.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llcontrol.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmlnode.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmlparser.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmltree.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llcontrol.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmlnode.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmlparser.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmltree.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index 6366519..50a08be 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -561,7 +561,7 @@ bool LLXMLNode::parseFile(
         LLXMLNode* defaults_tree)
 {
         // Read file
-        FILE* fp = LLFile::fopen(filename.c_str(), "rb");
+        FILE* fp = LLFile::fopen(filename.c_str(), "rb");               /* Flawfinder: ignore */
         if (fp == NULL)
         {
                 node = new LLXMLNode();
@@ -1865,12 +1865,12 @@ U32 LLXMLNode::getUUIDValue(U32 expected_length, LLUUID *array)
                 LLUUID uuid_value;
                 value_string = skipWhitespace(value_string);
 
-                if (strlen(value_string) < (UUID_STR_LENGTH-1))
+                if (strlen(value_string) < (UUID_STR_LENGTH-1))         /* Flawfinder: ignore */
                 {
                         break;
                 }
-                char uuid_string[UUID_STR_LENGTH];
-                memcpy(uuid_string, value_string, (UUID_STR_LENGTH-1));
+                char uuid_string[UUID_STR_LENGTH];              /* Flawfinder: ignore */
+                memcpy(uuid_string, value_string, (UUID_STR_LENGTH-1));         /* Flawfinder: ignore */
                 uuid_string[(UUID_STR_LENGTH-1)] = 0;
 
                 if (!LLUUID::parseUUID(uuid_string, &uuid_value))
@@ -2155,18 +2155,18 @@ void LLXMLNode::setFloatValue(U32 length, const F32 *array, Encoding encoding, U
         LLString new_value;
         if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
         {
-                char format_string[10];
+                char format_string[10];         /* Flawfinder: ignore */
                 if (precision > 0)
                 {
                         if (precision > 25)
                         {
                                 precision = 25;
                         }
-                        sprintf(format_string, "%%.%dg", precision);
+                        snprintf(format_string, sizeof(format_string), "%%.%dg", precision);            /* Flawfinder: ignore */
                 }
                 else
                 {
-                        sprintf(format_string, "%%g");
+                        snprintf(format_string, sizeof(format_string), "%%g");          /* Flawfinder: ignore */
                 }
 
                 for (U32 pos=0; pos<length; ++pos)
@@ -2206,18 +2206,18 @@ void LLXMLNode::setDoubleValue(U32 length, const F64 *array, Encoding encoding,
         LLString new_value;
         if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
         {
-                char format_string[10];
+                char format_string[10];         /* Flawfinder: ignore */
                 if (precision > 0)
                 {
                         if (precision > 25)
                         {
                                 precision = 25;
                         }
-                        sprintf(format_string, "%%.%dg", precision);
+                        snprintf(format_string, sizeof(format_string), "%%.%dg", precision);            /* Flawfinder: ignore */
                 }
                 else
                 {
-                        sprintf(format_string, "%%g");
+                        snprintf(format_string, sizeof(format_string), "%%g");          /* Flawfinder: ignore */
                 }
                 for (U32 pos=0; pos<length; ++pos)
                 {
@@ -2294,7 +2294,7 @@ void LLXMLNode::setUUIDValue(U32 length, const LLUUID *array)
         LLString new_value;
         for (U32 pos=0; pos<length; ++pos)
         {
-                new_value.append(array[pos].getString());
+                new_value.append(array[pos].asString());
                 if (pos < length-1) new_value.append(" ");
         }
 
@@ -2491,7 +2491,7 @@ LLXMLNode *get_rand_node(LLXMLNode *node)
 void LLXMLNode::createUnitTest(S32 max_num_children)
 {
         // Random ID
-        char rand_id[20];
+        char rand_id[20];               /* Flawfinder: ignore */
         U32 rand_id_len = get_rand(10)+5;
         U32 pos = 0;
         for (; pos<rand_id_len; ++pos)
@@ -2520,7 +2520,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
         for (U32 child_num=0; child_num<num_children; ++child_num)
         {
                 // Random Name
-                char child_name[20];
+                char child_name[20];            /* Flawfinder: ignore */
                 U32 child_name_len = get_rand(10)+5;
                 pos = 0;
                 for (; pos<child_name_len; ++pos)
@@ -2532,7 +2532,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
                 LLXMLNode *new_child = createChild(child_name, FALSE);
 
                 // Random ID
-                char child_id[20];
+                char child_id[20];              /* Flawfinder: ignore */
                 U32 child_id_len = get_rand(10)+5;
                 pos = 0;
                 for (; pos<child_id_len; ++pos)
@@ -2653,7 +2653,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
                                 {
                                         random_node_array[value] = get_rand_node(root);
                                         const char *node_name = random_node_array[value]->mName->mString;
-                                        for (U32 pos=0; pos<strlen(node_name); ++pos)
+                                        for (U32 pos=0; pos<strlen(node_name); ++pos)           /* Flawfinder: ignore */
                                         {
                                                 U32 hash_contrib = U32(node_name[pos]) << ((pos % 4) * 8);
                                                 noderef_checksum ^= hash_contrib;
@@ -2825,7 +2825,7 @@ BOOL LLXMLNode::performUnitTest(LLString &error_buffer)
                                 for (U32 pos=0; pos<node->mLength; ++pos)
                                 {
                                         const char *node_name = node_array[pos]->mName->mString;
-                                        for (U32 pos2=0; pos2<strlen(node_name); ++pos2)
+                                        for (U32 pos2=0; pos2<strlen(node_name); ++pos2)                /* Flawfinder: ignore */
                                         {
                                                 U32 hash_contrib = U32(node_name[pos2]) << ((pos2 % 4) * 8);
                                                 noderef_checksum ^= hash_contrib;
@@ -2896,7 +2896,7 @@ BOOL LLXMLNode::performUnitTest(LLString &error_buffer)
                 }
                 if (node_uuid_checksum != uuid_checksum)
                 {
-                        error_buffer.append(llformat("ERROR Node %s: UUID checksum mismatch: read %s / calc %s.\n", mName->mString, node_uuid_checksum.getString().c_str(), uuid_checksum.getString().c_str()));
+                        error_buffer.append(llformat("ERROR Node %s: UUID checksum mismatch: read %s / calc %s.\n", mName->mString, node_uuid_checksum.asString().c_str(), uuid_checksum.asString().c_str()));
                         return FALSE;
                 }
         }
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index 6ecd9ce..bfe0fbe 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -34,6 +34,7 @@
 
 #include "indra_constants.h"
 #include "llmemory.h"
+#include "llthread.h"
 #include "llstring.h"
 #include "llstringtable.h"
 
diff --git a/linden/indra/llxml/llxmlparser.cpp b/linden/indra/llxml/llxmlparser.cpp
index 57e6a30..056d850 100644
--- a/linden/indra/llxml/llxmlparser.cpp
+++ b/linden/indra/llxml/llxmlparser.cpp
@@ -41,7 +41,7 @@ LLXmlParser::LLXmlParser()
         mParser( NULL ),
         mDepth( 0 )
 {
-        strcpy( mAuxErrorString, "no error" );
+        strcpy( mAuxErrorString, "no error" );          /* Flawfinder: ignore */
 
         // Override the document's declared encoding.
         mParser = XML_ParserCreate(NULL);
@@ -73,10 +73,10 @@ BOOL LLXmlParser::parseFile(const std::string &path)
         
         BOOL success = TRUE;
 
-        FILE *file = LLFile::fopen(path.c_str(), "rb");
+        FILE* file = LLFile::fopen(path.c_str(), "rb");         /* Flawfinder: ignore */
         if( !file )
         {
-                sprintf( mAuxErrorString, "Couldn't open file %s", path.c_str());
+                snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Couldn't open file %s", path.c_str());             /* Flawfinder: ignore */
                 success = FALSE;
         }
         else
@@ -90,7 +90,7 @@ BOOL LLXmlParser::parseFile(const std::string &path)
                 void* buffer = XML_GetBuffer(mParser, buffer_size);
                 if( !buffer ) 
                 {
-                        sprintf( mAuxErrorString, "Unable to allocate XML buffer while reading file %s", path.c_str() );
+                        snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Unable to allocate XML buffer while reading file %s", path.c_str() );              /* Flawfinder: ignore */
                         success = FALSE;
                         goto exit_label;
                 }
@@ -98,14 +98,14 @@ BOOL LLXmlParser::parseFile(const std::string &path)
                 bytes_read = (S32)fread(buffer, 1, buffer_size, file);
                 if( bytes_read <= 0 )
                 {
-                        sprintf( mAuxErrorString, "Error while reading file  %s", path.c_str() );
+                        snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while reading file  %s", path.c_str() );             /* Flawfinder: ignore */
                         success = FALSE;
                         goto exit_label;
                 }
                 
                 if( !XML_ParseBuffer(mParser, bytes_read, TRUE ) )
                 {
-                        sprintf( mAuxErrorString, "Error while parsing file  %s", path.c_str() );
+                        snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while parsing file  %s", path.c_str() );             /* Flawfinder: ignore */
                         success = FALSE;
                 }
 
diff --git a/linden/indra/llxml/llxmlparser.h b/linden/indra/llxml/llxmlparser.h
index 27c137a..e1bd2e2 100644
--- a/linden/indra/llxml/llxmlparser.h
+++ b/linden/indra/llxml/llxmlparser.h
@@ -122,7 +122,7 @@ public:
 protected:
         XML_Parser              mParser;
         int                             mDepth;
-        char                    mAuxErrorString[1024];
+        char                    mAuxErrorString[1024];          /*Flawfinder: ignore*/
 };
 
 #endif  // LL_LLXMLPARSER_H
diff --git a/linden/indra/lscript/lscript_byteformat.h b/linden/indra/lscript/lscript_byteformat.h
index a69f1fe..8b8e487 100644
--- a/linden/indra/lscript/lscript_byteformat.h
+++ b/linden/indra/lscript/lscript_byteformat.h
@@ -70,7 +70,7 @@ typedef enum e_lscript_registers
         LREG_EOF
 } LSCRIPTRegisters;
 
-const S32 gLSCRIPTRegisterAddresses[LREG_EOF] =
+const S32 gLSCRIPTRegisterAddresses[LREG_EOF] = /* Flawfinder: ignore */
 {
         0,                      // LREG_INVALID
         4,                      // LREG_IP
@@ -468,7 +468,7 @@ const U8 LSCRIPTTypeHi4Bits[LST_EOF] =
         LST_LIST << 4,
 };
 
-const char * const LSCRIPTTypeNames[LST_EOF] =
+const char * const LSCRIPTTypeNames[LST_EOF] =  /*Flawfinder: ignore*/
 {
         "VOID",
         "integer",
@@ -511,7 +511,7 @@ typedef enum e_lscript_runtime_faults
         LSRF_EOF
 } LSCRIPTRunTimeFaults;
 
-extern char *LSCRIPTRunTimeFaultStrings[LSRF_EOF];
+extern char* LSCRIPTRunTimeFaultStrings[LSRF_EOF];      /*Flawfinder: ignore*/
 
 const S32 LSCRIPTRunTimeFaultBits[LSRF_EOF] =
 {
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 1290018..f4199df 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -4,7 +4,7 @@ L			[a-zA-Z_]
 H                       [a-fA-F0-9]
 E                       [Ee][+-]?{D}+
 FS                      (f|F)
-%e 8000
+%e 9000
 %n 4000
 %p 5000
 
@@ -559,6 +559,10 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PARCEL_DETAILS_GROUP"  { count(); yylval.ival = PARCEL_DETAILS_GROUP; return(INTEGER_CONSTANT); }
 "PARCEL_DETAILS_AREA"   { count(); yylval.ival = PARCEL_DETAILS_AREA; return(INTEGER_CONSTANT); }
 
+"STRING_TRIM_HEAD"      { count(); yylval.ival = STRING_TRIM_HEAD; return(INTEGER_CONSTANT); }
+"STRING_TRIM_TAIL"      { count(); yylval.ival = STRING_TRIM_TAIL; return(INTEGER_CONSTANT); }
+"STRING_TRIM"   { count(); yylval.ival = STRING_TRIM; return(INTEGER_CONSTANT); }
+
 {L}({L}|{N})*           { count(); yylval.sval = new char[strlen(yytext) + 1]; strcpy(yylval.sval, yytext); return(IDENTIFIER); }
 
 {D}+{E}                                 { count(); yylval.fval = (F32)atof(yytext); return(FP_CONSTANT); }
diff --git a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
index 6d18a1a..b696cc6 100644
--- a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
@@ -78,7 +78,7 @@ void LLScriptByteCodeChunk::addByte(U8 byte)
         if (mCodeChunk)
         {
                 U8 *temp = new U8[mCurrentOffset + 1];
-                memcpy(temp, mCodeChunk, mCurrentOffset);
+                memcpy(temp, mCodeChunk, mCurrentOffset);       /* Flawfinder: ignore */
                 delete [] mCodeChunk;
                 mCodeChunk = temp;
         }
@@ -102,7 +102,7 @@ void LLScriptByteCodeChunk::addBytes(U8 *bytes, S32 size)
         if (mCodeChunk)
         {
                 U8 *temp = new U8[mCurrentOffset + size];
-                memcpy(temp, mCodeChunk, mCurrentOffset);
+                memcpy(temp, mCodeChunk, mCurrentOffset);       /* Flawfinder: ignore */
                 delete [] mCodeChunk;
                 mCodeChunk = temp;
         }
@@ -110,7 +110,7 @@ void LLScriptByteCodeChunk::addBytes(U8 *bytes, S32 size)
         {
                 mCodeChunk = new U8[size];
         }
-        memcpy(mCodeChunk + mCurrentOffset, bytes, size);
+        memcpy(mCodeChunk + mCurrentOffset, bytes, size);/* Flawfinder: ignore */
         mCurrentOffset += size;
 }
 
@@ -119,7 +119,7 @@ void LLScriptByteCodeChunk::addBytes(char *bytes, S32 size)
         if (mCodeChunk)
         {
                 U8 *temp = new U8[mCurrentOffset + size];
-                memcpy(temp, mCodeChunk, mCurrentOffset);
+                memcpy(temp, mCodeChunk, mCurrentOffset);               /*Flawfinder: ignore*/
                 delete [] mCodeChunk;
                 mCodeChunk = temp;
         }
@@ -127,7 +127,7 @@ void LLScriptByteCodeChunk::addBytes(char *bytes, S32 size)
         {
                 mCodeChunk = new U8[size];
         }
-        memcpy(mCodeChunk + mCurrentOffset, bytes, size);
+        memcpy(mCodeChunk + mCurrentOffset, bytes, size);       /*Flawfinder: ignore*/
         mCurrentOffset += size;
 }
 
@@ -136,7 +136,7 @@ void LLScriptByteCodeChunk::addBytes(S32 size)
         if (mCodeChunk)
         {
                 U8 *temp = new U8[mCurrentOffset + size];
-                memcpy(temp, mCodeChunk, mCurrentOffset);
+                memcpy(temp, mCodeChunk, mCurrentOffset);       /*Flawfinder: ignore*/
                 delete [] mCodeChunk;
                 mCodeChunk = temp;
         }
@@ -153,7 +153,7 @@ void LLScriptByteCodeChunk::addBytesDontInc(S32 size)
         if (mCodeChunk)
         {
                 U8 *temp = new U8[mCurrentOffset + size];
-                memcpy(temp, mCodeChunk, mCurrentOffset);
+                memcpy(temp, mCodeChunk, mCurrentOffset);               /*Flawfinder: ignore*/
                 delete [] mCodeChunk;
                 mCodeChunk = temp;
         }
@@ -256,7 +256,7 @@ void LLScriptScriptCodeChunk::build(FILE *efp, FILE *bcfp)
                 mCompleteCode = new U8[mTotalSize];
                 memset(mCompleteCode, 0, mTotalSize);
                 
-                memcpy(mCompleteCode, mRegisters->mCodeChunk, mRegisters->mCurrentOffset);
+                memcpy(mCompleteCode, mRegisters->mCodeChunk, mRegisters->mCurrentOffset);      
                 offset += mRegisters->mCurrentOffset;
 
                 set_register(mCompleteCode, LREG_IP, 0);
@@ -267,12 +267,12 @@ void LLScriptScriptCodeChunk::build(FILE *efp, FILE *bcfp)
 
                 set_register(mCompleteCode, LREG_GVR, offset);
                 
-                memcpy(mCompleteCode + offset, mGlobalVariables->mCodeChunk, mGlobalVariables->mCurrentOffset);
+                memcpy(mCompleteCode + offset, mGlobalVariables->mCodeChunk, mGlobalVariables->mCurrentOffset);         /*Flawfinder: ignore*/
                 offset += mGlobalVariables->mCurrentOffset;
 
                 set_register(mCompleteCode, LREG_GFR, offset);
                 
-                memcpy(mCompleteCode + offset, mGlobalFunctions->mCodeChunk, mGlobalFunctions->mCurrentOffset);
+                memcpy(mCompleteCode + offset, mGlobalFunctions->mCodeChunk, mGlobalFunctions->mCurrentOffset); /*Flawfinder: ignore*/
                 offset += mGlobalFunctions->mCurrentOffset;
 
                 set_register(mCompleteCode, LREG_SR, offset);
@@ -291,12 +291,12 @@ void LLScriptScriptCodeChunk::build(FILE *efp, FILE *bcfp)
                 }
                 set_event_register(mCompleteCode, LREG_ER, bytestream2u64(mStates->mCodeChunk, default_state_offset), LSL2_CURRENT_MAJOR_VERSION);
                 
-                memcpy(mCompleteCode + offset, mStates->mCodeChunk, mStates->mCurrentOffset);
+                memcpy(mCompleteCode + offset, mStates->mCodeChunk, mStates->mCurrentOffset);           /*Flawfinder: ignore*/
                 offset += mStates->mCurrentOffset;
 
                 set_register(mCompleteCode, LREG_HR, offset);
                 
-                memcpy(mCompleteCode + offset, mHeap->mCodeChunk, mHeap->mCurrentOffset);
+                memcpy(mCompleteCode + offset, mHeap->mCodeChunk, mHeap->mCurrentOffset);               /*Flawfinder: ignore*/
                 offset += mHeap->mCurrentOffset;
                 
                 set_register(mCompleteCode, LREG_HP, offset);
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
new file mode 100644
index 0000000..c61e6ec
--- /dev/null
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_fb_vc8.vcproj
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="7.10"
+        Name="lscript_compile_fb"
+        ProjectGUID="{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
+        RootNamespace="lscript_compile_fb"
+        Keyword="MakeFileProj">
+        <Platforms>
+                <Platform
+                        Name="Win32"/>
+        </Platforms>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="."
+                        IntermediateDirectory="Debug_fb"
+                        ConfigurationType="10">
+                        <Tool
+                                Name="VCCustomBuildTool"/>
+                        <Tool
+                                Name="VCMIDLTool"/>
+                        <Tool
+                                Name="VCPostBuildEventTool"/>
+                        <Tool
+                                Name="VCPreBuildEventTool"/>
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="."
+                        IntermediateDirectory="Release_fb"
+                        ConfigurationType="10">
+                        <Tool
+                                Name="VCCustomBuildTool"/>
+                        <Tool
+                                Name="VCMIDLTool"/>
+                        <Tool
+                                Name="VCPostBuildEventTool"/>
+                        <Tool
+                                Name="VCPreBuildEventTool"/>
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <Filter
+                        Name="Source Files"
+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+                </Filter>
+                <Filter
+                        Name="Header Files"
+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+                </Filter>
+                <Filter
+                        Name="Resource Files"
+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+                </Filter>
+                <File
+                        RelativePath=".\indra.l">
+                        <FileConfiguration
+                                Name="Debug|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building lex_yy.cpp"
+                                        CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l
+"
+                                        Outputs="lex_yy.cpp"/>
+                        </FileConfiguration>
+                        <FileConfiguration
+                                Name="Release|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building lex_yy.cpp"
+                                        CommandLine="C:\cygwin\bin\flex.exe -olex_yy.cpp indra.l
+"
+                                        Outputs="lex_yy.cpp"/>
+                        </FileConfiguration>
+                </File>
+                <File
+                        RelativePath=".\indra.y">
+                        <FileConfiguration
+                                Name="Debug|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building ytab.cpp"
+                                        CommandLine="C:\cygwin\bin\bison.exe -o ytab.cpp -v -d indra.y
+"
+                                        Outputs="ytab.cpp;ytab.h"/>
+                        </FileConfiguration>
+                        <FileConfiguration
+                                Name="Release|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building ytab.cpp"
+                                        CommandLine="C:\cygwin\bin\bison.exe -y -d -v -o ytab.cpp indra.y
+C:\cygwin\bin\mv.exe ytab.hpp ytab.h"
+                                        Outputs="ytab.cpp;ytab.h"/>
+                        </FileConfiguration>
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj
new file mode 100644
index 0000000..c324ed9
--- /dev/null
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_ly.vcproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+        ProjectType="Visual C++"
+        Version="7.10"
+        Name="lscript_compile_ly"
+        ProjectGUID="{FF8ECB70-C788-47D4-91BF-F88448AE8940}"
+        RootNamespace="lscript_compile_ly"
+        Keyword="MakeFileProj">
+        <Platforms>
+                <Platform
+                        Name="Win32"/>
+        </Platforms>
+        <Configurations>
+                <Configuration
+                        Name="Debug|Win32"
+                        OutputDirectory="."
+                        IntermediateDirectory="Debug_ly"
+                        ConfigurationType="10">
+                        <Tool
+                                Name="VCCustomBuildTool"/>
+                        <Tool
+                                Name="VCMIDLTool"/>
+                        <Tool
+                                Name="VCPostBuildEventTool"/>
+                        <Tool
+                                Name="VCPreBuildEventTool"/>
+                </Configuration>
+                <Configuration
+                        Name="Release|Win32"
+                        OutputDirectory="."
+                        IntermediateDirectory="Release_ly"
+                        ConfigurationType="10">
+                        <Tool
+                                Name="VCCustomBuildTool"/>
+                        <Tool
+                                Name="VCMIDLTool"/>
+                        <Tool
+                                Name="VCPostBuildEventTool"/>
+                        <Tool
+                                Name="VCPreBuildEventTool"/>
+                </Configuration>
+        </Configurations>
+        <References>
+        </References>
+        <Files>
+                <Filter
+                        Name="Source Files"
+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+                </Filter>
+                <Filter
+                        Name="Header Files"
+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+                </Filter>
+                <Filter
+                        Name="Resource Files"
+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+                </Filter>
+                <File
+                        RelativePath=".\indra.l">
+                        <FileConfiguration
+                                Name="Debug|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building lex_yy.cpp"
+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
+..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l
+"
+                                        Outputs="lex_yy.cpp"/>
+                        </FileConfiguration>
+                        <FileConfiguration
+                                Name="Release|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building lex_yy.cpp"
+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
+..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l
+"
+                                        Outputs="lex_yy.cpp"/>
+                        </FileConfiguration>
+                </File>
+                <File
+                        RelativePath=".\indra.y">
+                        <FileConfiguration
+                                Name="Debug|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building ytab.cpp"
+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
+..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y
+"
+                                        Outputs="ytab.cpp;ytab.h"/>
+                        </FileConfiguration>
+                        <FileConfiguration
+                                Name="Release|Win32">
+                                <Tool
+                                        Name="VCCustomBuildTool"
+                                        Description="Building ytab.cpp"
+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks
+..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y
+"
+                                        Outputs="ytab.cpp;ytab.h"/>
+                        </FileConfiguration>
+                </File>
+        </Files>
+        <Globals>
+        </Globals>
+</VisualStudioProject>
diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj
new file mode 100644
index 0000000..baa202a
--- /dev/null
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_ly_vc8.vcproj
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="lscript_compile_ly"

+        ProjectGUID="{FF8ECB70-C788-47D4-91BF-F88448AE8940}"

+        RootNamespace="lscript_compile_ly"

+        Keyword="MakeFileProj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="."

+                        IntermediateDirectory="Debug_ly"

+                        ConfigurationType="10"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="."

+                        IntermediateDirectory="Release_ly"

+                        ConfigurationType="10"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+                <File

+                        RelativePath=".\indra.l"

+                        >

+                        <FileConfiguration

+                                Name="Debug|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Building lex_yy.cpp"

+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l&#x0D;&#x0A;"

+                                        Outputs="lex_yy.cpp"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="Release|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Building lex_yy.cpp"

+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\lex.exe -o lex_yy.cpp indra.l&#x0D;&#x0A;"

+                                        Outputs="lex_yy.cpp"

+                                />

+                        </FileConfiguration>

+                </File>

+                <File

+                        RelativePath=".\indra.y"

+                        >

+                        <FileConfiguration

+                                Name="Debug|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Building ytab.cpp"

+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y&#x0D;&#x0A;"

+                                        Outputs="ytab.cpp;ytab.h"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="Release|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Building ytab.cpp"

+                                        CommandLine="set ROOTDIR=..\..\..\libraries\i686-win32\mks&#x0D;&#x0A;..\..\..\libraries\i686-win32\mks\yacc.exe -o ytab.cpp -v -d indra.y&#x0D;&#x0A;"

+                                        Outputs="ytab.cpp;ytab.h"

+                                />

+                        </FileConfiguration>

+                </File>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj b/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
new file mode 100644
index 0000000..1427015
--- /dev/null
+++ b/linden/indra/lscript/lscript_compile/lscript_compile_vc8.vcproj
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="lscript_compile"

+        ProjectGUID="{44CE6D82-7320-4609-8FC3-5965C19F4808}"

+        RootNamespace="lscript_compile"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_compile.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_compile.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;..\..\llvfs;..\..\llmessage;..\..\llinventory;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_compile.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\lex_yy.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_alloc.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_bytecode.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_error.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_heap.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_resource.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_scope.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_tree.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_typecheck.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\ytab.cpp"

+                                >

+                                <FileConfiguration

+                                        Name="Release|Win32"

+                                        >

+                                        <Tool

+                                                Name="VCCLCompilerTool"

+                                                CompileAs="2"

+                                        />

+                                </FileConfiguration>

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\generated_lex_yy.hpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\generated_ytab.hpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_bytecode.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_error.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_heap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_resource.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_scope.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_tree.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_typecheck.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/lscript/lscript_compile/lscript_error.cpp b/linden/indra/lscript/lscript_compile/lscript_error.cpp
index d9f4d49..5ec50d3 100644
--- a/linden/indra/lscript/lscript_compile/lscript_error.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_error.cpp
@@ -45,13 +45,13 @@ void LLScriptFilePosition::fdotabs(FILE *fp, S32 tabs, S32 tabsize)
         }
 }
 
-char *gWarningText[LSWARN_EOF] = 
+char* gWarningText[LSWARN_EOF] =                /*Flawfinder: ignore*/
 {
         "INVALID",
         "Dead code found beyond return statement"
 };
 
-char *gErrorText[LSERROR_EOF] = 
+char* gErrorText[LSERROR_EOF] =         /*Flawfinder: ignore*/
 {
         "INVALID",
         "Syntax error",
diff --git a/linden/indra/lscript/lscript_compile/lscript_heap.cpp b/linden/indra/lscript/lscript_compile/lscript_heap.cpp
index 4adf84a..2cbd6bb 100644
--- a/linden/indra/lscript/lscript_compile/lscript_heap.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_heap.cpp
@@ -53,9 +53,9 @@ LLScriptHeapEntry::~LLScriptHeapEntry()
 
 void LLScriptHeapEntry::addString(char *string)
 {
-        S32 size = strlen(string) + 1;
+        S32 size = strlen(string) + 1;          /*Flawfinder: ignore*/
         S32 offset = 0;
-        memcpy(mData, string, size);
+        memcpy(mData, string, size);            /*Flawfinder: ignore*/
         mNext += size;
         integer2bytestream(mEntry, offset, mNext);
         mRefCount++;
diff --git a/linden/indra/lscript/lscript_compile/lscript_scope.h b/linden/indra/lscript/lscript_compile/lscript_scope.h
index ff20ad3..62fef88 100644
--- a/linden/indra/lscript/lscript_compile/lscript_scope.h
+++ b/linden/indra/lscript/lscript_compile/lscript_scope.h
@@ -45,7 +45,7 @@ typedef enum e_lscript_identifier_type
         LIT_EOF
 } LSCRIPTIdentifierType;
 
-const char LSCRIPTFunctionTypeStrings[LST_EOF] =
+const char LSCRIPTFunctionTypeStrings[LST_EOF] =                /*Flawfinder: ignore*/
 {
         '0',
         'i',
@@ -58,7 +58,7 @@ const char LSCRIPTFunctionTypeStrings[LST_EOF] =
         '0'
 };
 
-const char * const LSCRIPTListDescription[LST_EOF] =
+const char * const LSCRIPTListDescription[LST_EOF] =    /*Flawfinder: ignore*/
 {
    "PUSHARGB 0",
    "PUSHARGB 1",
@@ -71,7 +71,7 @@ const char * const LSCRIPTListDescription[LST_EOF] =
    "PUSHARGB 0"
 };
 
-const char * const LSCRIPTTypePush[LST_EOF] = 
+const char * const LSCRIPTTypePush[LST_EOF] =   /*Flawfinder: ignore*/
 {
         "INVALID",
         "PUSHE",
@@ -84,7 +84,7 @@ const char * const LSCRIPTTypePush[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeReturn[LST_EOF] = 
+const char * const LSCRIPTTypeReturn[LST_EOF] =         /*Flawfinder: ignore*/
 {
         "INVALID",
         "LOADP -12",
@@ -97,7 +97,7 @@ const char * const LSCRIPTTypeReturn[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypePop[LST_EOF] = 
+const char * const LSCRIPTTypePop[LST_EOF] =    /*Flawfinder: ignore*/
 {
         "INVALID",
         "POP",
@@ -110,7 +110,7 @@ const char * const LSCRIPTTypePop[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeDuplicate[LST_EOF] = 
+const char * const LSCRIPTTypeDuplicate[LST_EOF] =              /*Flawfinder: ignore*/
 {
         "INVALID",
         "DUP",
@@ -123,7 +123,7 @@ const char * const LSCRIPTTypeDuplicate[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeLocalStore[LST_EOF] = 
+const char * const LSCRIPTTypeLocalStore[LST_EOF] =     /*Flawfinder: ignore*/
 {
         "INVALID",
         "STORE ",
@@ -136,7 +136,7 @@ const char * const LSCRIPTTypeLocalStore[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeLocalDeclaration[LST_EOF] = 
+const char * const LSCRIPTTypeLocalDeclaration[LST_EOF] =               /*Flawfinder: ignore*/
 {
         "INVALID",
         "STOREP ",
@@ -149,7 +149,7 @@ const char * const LSCRIPTTypeLocalDeclaration[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeGlobalStore[LST_EOF] = 
+const char * const LSCRIPTTypeGlobalStore[LST_EOF] =    /*Flawfinder: ignore*/
 {
         "INVALID",
         "STOREG ",
@@ -162,7 +162,7 @@ const char * const LSCRIPTTypeGlobalStore[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeLocalPush[LST_EOF] = 
+const char * const LSCRIPTTypeLocalPush[LST_EOF] =              /*Flawfinder: ignore*/
 {
         "INVALID",
         "PUSH ",
@@ -175,7 +175,7 @@ const char * const LSCRIPTTypeLocalPush[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeLocalPush1[LST_EOF] = 
+const char * const LSCRIPTTypeLocalPush1[LST_EOF] =             /*Flawfinder: ignore*/
 {
         "INVALID",
         "PUSHARGI 1",
@@ -188,7 +188,7 @@ const char * const LSCRIPTTypeLocalPush1[LST_EOF] =
         "undefined"
 };
 
-const char * const LSCRIPTTypeGlobalPush[LST_EOF] = 
+const char * const LSCRIPTTypeGlobalPush[LST_EOF] =     /*Flawfinder: ignore*/
 {
         "INVALID",
         "PUSHG ",
@@ -213,7 +213,7 @@ public:
         {
                 if (!mString)
                         return LST_NULL;
-                S32 length = (S32)strlen(mString);
+                S32 length = (S32)strlen(mString);              /*Flawfinder: ignore*/
                 if (count >= length)
                 {
                         return LST_NULL;
@@ -244,9 +244,9 @@ public:
                 S32 count = 0;
                 if (mString)
                 {
-                        count = (S32)strlen(mString);
+                        count = (S32)strlen(mString);           /*Flawfinder: ignore*/
                         char *temp = new char[count + 2];
-                        memcpy(temp, mString, count);
+                        memcpy(temp, mString, count);           /*Flawfinder: ignore*/
                         delete [] mString;
                         mString = temp;
                         mString[count + 1] = 0;
@@ -262,7 +262,7 @@ public:
         S32 getNumber()
         {
                 if (mString)
-                        return (S32)strlen(mString);
+                        return (S32)strlen(mString);            /*Flawfinder: ignore*/
                 else
                         return 0;
         }
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index bda09dd..0812ed5 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -270,7 +270,7 @@ void LLScriptConstantString::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 break;
         case LSCP_EMIT_ASSEMBLY:
                 fprintf(fp, "PUSHARGS \"%s\"\n", mValue);
-                fprintf(fp, "STACKTOS %lu\n", strlen(mValue) + 1);
+                fprintf(fp, "STACKTOS %lu\n", strlen(mValue) + 1);      /*Flawfinder: ignore*/
                 break;
         case LSCP_TYPE:
                 type = mType;
@@ -290,7 +290,7 @@ void LLScriptConstantString::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
         case LSCP_TO_STACK:
                 {
                         chunk->addByte(LSCRIPTOpCodes[LOPC_PUSHARGS]);
-                        chunk->addBytes(mValue, (S32)strlen(mValue) + 1);
+                        chunk->addBytes(mValue, (S32)strlen(mValue) + 1);               /*Flawfinder: ignore*/
                         type = mType;
                 }
                 break;
@@ -310,7 +310,7 @@ void LLScriptConstantString::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 
 S32 LLScriptConstantString::getSize()
 {
-        return (S32)strlen(mValue) + 1;
+        return (S32)strlen(mValue) + 1;         /*Flawfinder: ignore*/
 }
 
 
@@ -1161,7 +1161,7 @@ void LLScriptGlobalVariable::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                         // it also includes the name of the variable as well as the type
                         // plus 4 bytes of offset from it's apparent address to the actual data
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        count += strlen(mIdentifier->mName) + 1 + 1 + 4;
+                        count += strlen(mIdentifier->mName) + 1 + 1 + 4;        /*Flawfinder: ignore*/
 #else
                         count += 1 + 1 + 4;
 #endif
@@ -1184,7 +1184,7 @@ void LLScriptGlobalVariable::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                         chunk->addBytes(&vtype, 1);
                         // null terminated name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
+                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);    /*Flawfinder: ignore*/
 #else
                         chunk->addBytes(1);
 #endif
@@ -1315,7 +1315,7 @@ void LLScriptStateEntryEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "state_entry";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1351,7 +1351,7 @@ void LLScriptStateExitEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "state_exit";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1409,8 +1409,8 @@ void LLScriptTouchStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "touch_start";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1467,8 +1467,8 @@ void LLScriptTouchEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "touch";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1525,8 +1525,8 @@ void LLScriptTouchEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "touch_end";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1583,8 +1583,8 @@ void LLScriptCollisionStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRI
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "collision_start";
-                        chunk->addBytes(name, (S32)strlen(name) + 1);
-                        chunk->addBytes(mCount->mName, (S32)strlen(mCount->mName) + 1);
+                        chunk->addBytes(name, (S32)strlen(name) + 1);           /*Flawfinder: ignore*/
+                        chunk->addBytes(mCount->mName, (S32)strlen(mCount->mName) + 1);         /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1641,8 +1641,8 @@ void LLScriptCollisionEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "collision";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1699,8 +1699,8 @@ void LLScriptCollisionEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPT
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "collision_end";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mCount->mName, strlen(mCount->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1756,8 +1756,8 @@ void LLScriptLandCollisionStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, L
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "land_collision_start";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1815,8 +1815,8 @@ void LLScriptLandCollisionEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIP
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "land_collision";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1872,9 +1872,9 @@ void LLScriptLandCollisionEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSC
         case LSCP_EMIT_BYTE_CODE:
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        char name[] = "land_collision_end";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);
+                        char name[] = "land_collision_end";     /*Flawfinder: ignore*/
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mPosition->mName, strlen(mPosition->mName) + 1);        /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1931,8 +1931,8 @@ void LLScriptInventoryEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "changed";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mChange->mName, strlen(mChange->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mChange->mName, strlen(mChange->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -1988,8 +1988,8 @@ void LLScriptAttachEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "attach";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mAttach->mName, strlen(mAttach->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mAttach->mName, strlen(mAttach->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2058,9 +2058,9 @@ void LLScriptDataserverEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "dataserver";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
-                        chunk->addBytes(mData->mName, strlen(mData->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mData->mName, strlen(mData->mName) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2096,7 +2096,7 @@ void LLScriptTimerEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "timer";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2127,7 +2127,7 @@ void LLScriptMovingStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "moving_start";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2158,7 +2158,7 @@ void LLScriptMovingEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "moving_end";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2212,8 +2212,8 @@ void LLScriptRTPEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "chat";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mRTPermissions->mName, strlen(mRTPermissions->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mRTPermissions->mName, strlen(mRTPermissions->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2308,11 +2308,11 @@ void LLScriptChatEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "chat";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);
-                        chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
-                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
-                        chunk->addBytes(mMessage->mName, strlen(mMessage->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);          /*Flawfinder: ignore*/
+                        chunk->addBytes(mName->mName, strlen(mName->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mMessage->mName, strlen(mMessage->mName) + 1);          /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2371,8 +2371,8 @@ void LLScriptSensorEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "sensor";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2428,8 +2428,8 @@ void LLScriptObjectRezEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "sensor";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2511,10 +2511,10 @@ void LLScriptControlEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "control";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
-                        chunk->addBytes(mLevels->mName, strlen(mLevels->mName) + 1);
-                        chunk->addBytes(mEdges->mName, strlen(mEdges->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mName->mName, strlen(mName->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mLevels->mName, strlen(mLevels->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mEdges->mName, strlen(mEdges->mName) + 1);              /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2611,11 +2611,11 @@ void LLScriptLinkMessageEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTC
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "link_message";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);
-                        chunk->addBytes(mNum->mName, strlen(mNum->mName) + 1);
-                        chunk->addBytes(mStr->mName, strlen(mStr->mName) + 1);
-                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mNum->mName, strlen(mNum->mName) + 1);          /*Flawfinder: ignore*/
+                        chunk->addBytes(mStr->mName, strlen(mStr->mName) + 1);          /*Flawfinder: ignore*/
+                        chunk->addBytes(mID->mName, strlen(mID->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2739,13 +2739,13 @@ void LLScriptRemoteEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "remote_event";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mType->mName, strlen(mType->mName) + 1);
-                        chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);
-                        chunk->addBytes(mMessageID->mName, strlen(mMessageID->mName) + 1);
-                        chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);
-                        chunk->addBytes(mIntVal->mName, strlen(mIntVal->mName) + 1);
-                        chunk->addBytes(mStrVal->mName, strlen(mStrVal->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mType->mName, strlen(mType->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mChannel->mName, strlen(mChannel->mName) + 1);          /*Flawfinder: ignore*/
+                        chunk->addBytes(mMessageID->mName, strlen(mMessageID->mName) + 1);              /*Flawfinder: ignore*/
+                        chunk->addBytes(mSender->mName, strlen(mSender->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mIntVal->mName, strlen(mIntVal->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mStrVal->mName, strlen(mStrVal->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2854,11 +2854,11 @@ void LLScriptHTTPResponseEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPT
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "http_response";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1);
-                        chunk->addBytes(mStatus->mName, strlen(mStatus->mName) + 1);
-                        chunk->addBytes(mMetadata->mName, strlen(mMetadata->mName) + 1);
-                        chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mRequestId->mName, strlen(mRequestId->mName) + 1);              /*Flawfinder: ignore*/
+                        chunk->addBytes(mStatus->mName, strlen(mStatus->mName) + 1);            /*Flawfinder: ignore*/
+                        chunk->addBytes(mMetadata->mName, strlen(mMetadata->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -2932,9 +2932,9 @@ void LLScriptMoneyEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "money";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mName->mName, strlen(mName->mName) + 1);
-                        chunk->addBytes(mAmount->mName, strlen(mAmount->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mName->mName, strlen(mName->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mAmount->mName, strlen(mAmount->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3043,12 +3043,12 @@ void LLScriptEmailEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompile
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "email";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mTime->mName, strlen(mTime->mName) + 1);
-                        chunk->addBytes(mAddress->mName, strlen(mAddress->mName) + 1);
-                        chunk->addBytes(mSubject->mName, strlen(mSubject->mName) + 1);
-                        chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);
-                        chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mTime->mName, strlen(mTime->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mAddress->mName, strlen(mAddress->mName) + 1);          /*Flawfinder: ignore*/
+                        chunk->addBytes(mSubject->mName, strlen(mSubject->mName) + 1);          /*Flawfinder: ignore*/
+                        chunk->addBytes(mBody->mName, strlen(mBody->mName) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mNumber->mName, strlen(mNumber->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3108,8 +3108,8 @@ void LLScriptRezEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "rez";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mStartParam->mName, strlen(mStartParam->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
+                        chunk->addBytes(mStartParam->mName, strlen(mStartParam->mName) + 1);            /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3144,7 +3144,7 @@ void LLScriptNoSensorEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "no_sensor";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3223,11 +3223,11 @@ void LLScriptAtTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa
         case LSCP_EMIT_BYTE_CODE:
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        char name[] = "at_target";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);
-                        chunk->addBytes(mTargetPosition->mName, strlen(mTargetPosition->mName) + 1);
-                        chunk->addBytes(mOurPosition->mName, strlen(mOurPosition->mName) + 1);
+                        char name[] = "at_target";      /*Flawfinder: ignore*/
+                        chunk->addBytes(name, strlen(name) + 1);        /*Flawfinder: ignore*/
+                        chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);        /*Flawfinder: ignore*/
+                        chunk->addBytes(mTargetPosition->mName, strlen(mTargetPosition->mName) + 1);    /*Flawfinder: ignore*/
+                        chunk->addBytes(mOurPosition->mName, strlen(mOurPosition->mName) + 1);                  /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3265,8 +3265,8 @@ void LLScriptNotAtTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
         case LSCP_EMIT_BYTE_CODE:
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        char name[] = "not_at_target";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        char name[] = "not_at_target";  /*Flawfinder: ignore*/
+                        chunk->addBytes(name, strlen(name) + 1);        /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3346,10 +3346,10 @@ void LLScriptAtRotTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "at_rot_target";
-                        chunk->addBytes(name, strlen(name) + 1);
-                        chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);
-                        chunk->addBytes(mTargetRotation->mName, strlen(mTargetRotation->mName) + 1);
-                        chunk->addBytes(mOurRotation->mName, strlen(mOurRotation->mName) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);        /*Flawfinder: ignore*/
+                        chunk->addBytes(mTargetNumber->mName, strlen(mTargetNumber->mName) + 1);        /*Flawfinder: ignore*/
+                        chunk->addBytes(mTargetRotation->mName, strlen(mTargetRotation->mName) + 1);    /*Flawfinder: ignore*/
+                        chunk->addBytes(mOurRotation->mName, strlen(mOurRotation->mName) + 1);  /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -3388,7 +3388,7 @@ void LLScriptNotAtRotTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
                 {
 #ifdef LSL_INCLUDE_DEBUG_INFO
                         char name[] = "not_at_rot_target";
-                        chunk->addBytes(name, strlen(name) + 1);
+                        chunk->addBytes(name, strlen(name) + 1);                /*Flawfinder: ignore*/
 #endif
                 }
                 break;
@@ -7143,7 +7143,7 @@ void LLScriptFunctionCall::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
                                         gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
                                 }
                         }
-                        else if (argcount != strlen(mIdentifier->mScopeEntry->mFunctionArgs.mString))
+                        else if (argcount != strlen(mIdentifier->mScopeEntry->mFunctionArgs.mString))           /*Flawfinder: ignore*/
                         {
                                 gErrorToText.writeError(fp, this, LSERROR_FUNCTION_TYPE_ERROR);
                         }
@@ -7459,7 +7459,7 @@ void add_exit_pops(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry)
 
         if (entry->mLocals.mString)
         {
-                number = (S32)strlen(entry->mLocals.mString);
+                number = (S32)strlen(entry->mLocals.mString);   /*Flawfinder: ignore*/
                 for (i = number - 1; i >= 0; i--)
                 {
                         switch(entry->mLocals.getType(i))
@@ -7492,7 +7492,7 @@ void add_exit_pops(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry)
 
         if (entry->mFunctionArgs.mString)
         {
-                number = (S32)strlen(entry->mFunctionArgs.mString);
+                number = (S32)strlen(entry->mFunctionArgs.mString);     /*Flawfinder: ignore*/
                 for (i = number - 1; i >= 0; i--)
                 {
                         switch(entry->mFunctionArgs.getType(i))
@@ -7531,7 +7531,7 @@ void print_exit_pops(FILE *fp, LLScriptScopeEntry *entry)
 
         if (entry->mLocals.mString)
         {
-                number = (S32)strlen(entry->mLocals.mString);
+                number = (S32)strlen(entry->mLocals.mString);   /*Flawfinder: ignore*/
                 for (i = number - 1; i >= 0; i--)
                 {
                         fprintf(fp, "%s", LSCRIPTTypePop[entry->mLocals.getType(i)]);
@@ -7540,7 +7540,7 @@ void print_exit_pops(FILE *fp, LLScriptScopeEntry *entry)
 
         if (entry->mFunctionArgs.mString)
         {
-                number = (S32)strlen(entry->mFunctionArgs.mString);
+                number = (S32)strlen(entry->mFunctionArgs.mString);     /*Flawfinder: ignore*/
                 for (i = number - 1; i >= 0; i--)
                 {
                         fprintf(fp, "%s", LSCRIPTTypePop[entry->mFunctionArgs.getType(i)]);
@@ -7985,8 +7985,8 @@ void LLScriptIf::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pas
                 break;
         case LSCP_EMIT_BYTE_CODE:
                 {
-                        char jumpname[32];
-                        sprintf(jumpname, "##Temp Jump %d##", gTempJumpCount++);
+                        char jumpname[32];              /*Flawfinder: ignore*/
+                        snprintf(jumpname, sizeof(jumpname),"##Temp Jump %d##", gTempJumpCount++);      /*Flawfinder: ignore*/
 
                         mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
                         chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]);
@@ -8066,10 +8066,10 @@ void LLScriptIfElse::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
                 break;
         case LSCP_EMIT_BYTE_CODE:
                 {
-                        char jumpname1[32];
-                        sprintf(jumpname1, "##Temp Jump %d##", gTempJumpCount++);
-                        char jumpname2[32];
-                        sprintf(jumpname2, "##Temp Jump %d##", gTempJumpCount++);
+                        char jumpname1[32];                             /*Flawfinder: ignore*/
+                        snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++);   /*Flawfinder: ignore*/
+                        char jumpname2[32];                             /*Flawfinder: ignore*/
+                        snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++);    /*Flawfinder: ignore*/
 
                         mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
                         chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]);
@@ -8169,10 +8169,10 @@ void LLScriptFor::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pa
                 break;
         case LSCP_EMIT_BYTE_CODE:
                 {
-                        char jumpname1[32];
-                        sprintf(jumpname1, "##Temp Jump %d##", gTempJumpCount++);
-                        char jumpname2[32];
-                        sprintf(jumpname2, "##Temp Jump %d##", gTempJumpCount++);
+                        char jumpname1[32];                     /*Flawfinder: ignore*/
+                        snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++);   /*Flawfinder: ignore*/
+                        char jumpname2[32];                             /*Flawfinder: ignore*/
+                        snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++);           /*Flawfinder: ignore*/
 
                         if(mSequence)
                                 mSequence->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8266,8 +8266,8 @@ void LLScriptDoWhile::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas
                 break;
         case LSCP_EMIT_BYTE_CODE:
                 {
-                        char jumpname1[32];
-                        sprintf(jumpname1, "##Temp Jump %d##", gTempJumpCount++);
+                        char jumpname1[32];             /*Flawfinder: ignore*/
+                        snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++);           /*Flawfinder: ignore*/
 
                         chunk->addLabel(jumpname1);
                         mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -8340,10 +8340,10 @@ void LLScriptWhile::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
                 break;
         case LSCP_EMIT_BYTE_CODE:
                 {
-                        char jumpname1[32];
-                        sprintf(jumpname1, "##Temp Jump %d##", gTempJumpCount++);
-                        char jumpname2[32];
-                        sprintf(jumpname2, "##Temp Jump %d##", gTempJumpCount++);
+                        char jumpname1[32];     /*Flawfinder: ignore*/
+                        snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++);   /*Flawfinder: ignore*/
+                        char jumpname2[32];     /*Flawfinder: ignore*/
+                        snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++);   /*Flawfinder: ignore*/
 
                         chunk->addLabel(jumpname1);
                         mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -9018,7 +9018,7 @@ void LLScriptEventHandler::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompi
                 fprintf(fp, ".method public hidebysig instance default void ");
 
                 // Mangle event handler name by prefixing it with state name. Allows state changing by finding handlers prefixed with new state name.
-                fprintf(fp, entry->mIdentifier);
+                fprintf(fp, entry->mIdentifier);                /*Flawfinder: ignore*/
 
                 // Handler name and arguments.
                 mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -9154,7 +9154,7 @@ void LLScriptFunctionDec::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompil
                         chunk->addBytes(&typereturn, 1);
                         // name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
+                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);            /*Flawfinder: ignore*/
 #else
                         chunk->addBytes(1);
 #endif
@@ -9391,7 +9391,7 @@ void LLScriptGlobalFunctions::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCo
 
                         // null terminated function name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
+                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);            /*Flawfinder: ignore*/
 #else
                         chunk->addBytes(1);
 #endif
@@ -9642,7 +9642,7 @@ void LLScriptState::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 
                         // null terminated state name
 #ifdef LSL_INCLUDE_DEBUG_INFO
-                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);
+                        chunk->addBytes(mIdentifier->mName, strlen(mIdentifier->mName) + 1);            /*Flawfinder: ignore*/
 #else
                         chunk->addBytes(1);
 #endif
@@ -9697,8 +9697,8 @@ LLScriptScript::LLScriptScript(LLScritpGlobalStorage *globals,
         mStates(states), mGlobalScope(NULL), mGlobals(NULL), mGlobalFunctions(NULL), mGodLike(FALSE)
 {
         const char DEFAULT_BYTECODE_FILENAME[] = "lscript.lso";
-        strcpy(mBytecodeDest, DEFAULT_BYTECODE_FILENAME);
-
+        strncpy(mBytecodeDest, DEFAULT_BYTECODE_FILENAME, sizeof(mBytecodeDest) -1);    /*Flawfinder: ignore*/
+        mBytecodeDest[MAX_STRING-1] = '\0';
         LLScriptGlobalVariable  *tvar;
         LLScriptGlobalFunctions *tfunc;
         LLScritpGlobalStorage *temp;
@@ -9744,7 +9744,7 @@ LLScriptScript::LLScriptScript(LLScritpGlobalStorage *globals,
 
 void LLScriptScript::setBytecodeDest(const char* dst_filename)
 {
-        strncpy(mBytecodeDest, dst_filename, MAX_STRING);
+        strncpy(mBytecodeDest, dst_filename, MAX_STRING);       /*Flawfinder: ignore*/
         mBytecodeDest[MAX_STRING-1] = '\0';
 }
 
@@ -9753,7 +9753,7 @@ void print_cil_globals(FILE* fp, LLScriptGlobalVariable* global)
         fprintf(fp, ".field private ");
         print_cil_type(fp, global->mType->mType);
         fprintf(fp, " ");
-        fprintf(fp, global->mIdentifier->mName);
+        fprintf(fp, global->mIdentifier->mName);                /*Flawfinder: ignore*/
         fprintf(fp, "\n");
         if(NULL != global->mNextp)
         {
@@ -9932,7 +9932,7 @@ void LLScriptScript::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass
 
                         // now, put it all together and spit it out
                         // we need 
-                        FILE *bcfp = LLFile::fopen(mBytecodeDest, "wb");
+                        FILE* bcfp = LLFile::fopen(mBytecodeDest, "wb");                /*Flawfinder: ignore*/
                         
                         code->build(fp, bcfp);
                         fclose(bcfp);
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.h b/linden/indra/lscript/lscript_compile/lscript_tree.h
index a535e76..11be92d 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.h
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.h
@@ -2267,7 +2267,7 @@ public:
         BOOL                                    mGodLike;
 
 private:
-        char mBytecodeDest[MAX_STRING];
+        char mBytecodeDest[MAX_STRING];         /*Flawfinder: ignore*/
 };
 
 class LLScriptAllocationManager
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
index a81d706..b5d395e 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -39,7 +39,7 @@
 void (*binary_operations[LST_EOF][LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 void (*unary_operations[LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 
-char *LSCRIPTRunTimeFaultStrings[LSRF_EOF] =
+char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =            /*Flawfinder: ignore*/
 {
         "invalid",                              //      LSRF_INVALID,
         "Math Error",                   //      LSRF_MATH,
@@ -2596,6 +2596,7 @@ BOOL run_jump(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
         offset += arg;
         return FALSE;
 }
+
 BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
         if (b_print)
@@ -2648,8 +2649,10 @@ BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
         else if (type == LST_STRING)
         {
                 S32 base_address = lscript_pop_int(buffer);
-        // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
-        // and function clean up of ref counts isn't based on scope (a mistake, I know)
+                // this bit of nastiness is to get around that code paths to
+                // local variables can result in lack of initialization and
+                // function clean up of ref counts isn't based on scope (a
+                // mistake, I know)
                 S32 address = base_address + get_register(buffer, LREG_HR) - 1;
                 if (address)
                 {
@@ -2662,7 +2665,7 @@ BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                 S32 size = toffset - string;
                                 char *sdata = new char[size];
                                 bytestream2char(sdata, buffer, string);
-                                if (strlen(sdata))
+                                if (strlen(sdata))              /*Flawfinder: ignore*/
                                 {
                                         offset += arg;
                                 }
@@ -2674,8 +2677,10 @@ BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
         else if (type == LST_KEY)
         {
                 S32 base_address = lscript_pop_int(buffer);
-        // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
-        // and function clean up of ref counts isn't based on scope (a mistake, I know)
+                // this bit of nastiness is to get around that code paths to
+                // local variables can result in lack of initialization and
+                // function clean up of ref counts isn't based on scope (a
+                // mistake, I know)
                 S32 address = base_address + get_register(buffer, LREG_HR) - 1;
                 if (address)
                 {
@@ -2688,29 +2693,37 @@ BOOL run_jumpif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                 S32 size = toffset - string;
                                 char *sdata = new char[size];
                                 bytestream2char(sdata, buffer, string);
-                                if (strlen(sdata))
+                                if (strlen(sdata))              /*Flawfinder: ignore*/
                                 {
                                         LLUUID id;
-                                        id.set(sdata);
-                                        if (id != LLUUID::null)
+                                        if (id.set(sdata) && id.notNull())
                                                 offset += arg;
                                 }
                                 delete [] sdata;
                         }
                         lsa_decrease_ref_count(buffer, base_address);
                 }
-                else if (type == LST_LIST)
+        }
+        else if (type == LST_LIST)
+        {
+                S32 base_address = lscript_pop_int(buffer);
+                S32 address = base_address + get_register(buffer, LREG_HR) - 1;
+                if (address)
                 {
-                        S32 address = lscript_pop_int(buffer);
-                        LLScriptLibData *list = lsa_get_data(buffer, address, TRUE);
-                        if (list->getListLength())
+                        if (safe_heap_check_address(buffer, address + SIZEOF_SCRIPT_ALLOC_ENTRY, 1))
                         {
-                                offset += arg;
+                                LLScriptLibData *list = lsa_get_list_ptr(buffer, base_address, TRUE);
+                                if (list && list->getListLength())
+                                {
+                                        offset += arg;
+                                }
+                                delete list;
                         }
                 }
         }
         return FALSE;
 }
+
 BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
         if (b_print)
@@ -2763,8 +2776,10 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
         else if (type == LST_STRING)
         {
                 S32 base_address = lscript_pop_int(buffer);
-        // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
-        // and function clean up of ref counts isn't based on scope (a mistake, I know)
+                // this bit of nastiness is to get around that code paths to
+                // local variables can result in lack of initialization and
+                // function clean up of ref counts isn't based on scope (a
+                // mistake, I know)
                 S32 address = base_address + get_register(buffer, LREG_HR) - 1;
                 if (address)
                 {
@@ -2777,7 +2792,7 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                 S32 size = toffset - string;
                                 char *sdata = new char[size];
                                 bytestream2char(sdata, buffer, string);
-                                if (!strlen(sdata))
+                                if (!strlen(sdata))             /*Flawfinder: ignore*/
                                 {
                                         offset += arg;
                                 }
@@ -2789,8 +2804,10 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
         else if (type == LST_KEY)
         {
                 S32 base_address = lscript_pop_int(buffer);
-        // this bit of nastiness is to get around that code paths to local variables can result in lack of initialization
-        // and function clean up of ref counts isn't based on scope (a mistake, I know)
+                // this bit of nastiness is to get around that code paths to
+                // local variables can result in lack of initialization and
+                // function clean up of ref counts isn't based on scope (a
+                // mistake, I know)
                 S32 address = base_address + get_register(buffer, LREG_HR) - 1;
                 if (address)
                 {
@@ -2803,11 +2820,10 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                 S32 size = toffset - string;
                                 char *sdata = new char[size];
                                 bytestream2char(sdata, buffer, string);
-                                if (strlen(sdata))
+                                if (strlen(sdata))              /*Flawfinder: ignore*/
                                 {
                                         LLUUID id;
-                                        id.set(sdata);
-                                        if (id == LLUUID::null)
+                                        if (!id.set(sdata) || id.isNull())
                                                 offset += arg;
                                 }
                                 else
@@ -2818,13 +2834,25 @@ BOOL run_jumpnif(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                         }
                         lsa_decrease_ref_count(buffer, base_address);
                 }
-                else if (type == LST_LIST)
+        }
+        else if (type == LST_LIST)
+        {
+                S32 base_address = lscript_pop_int(buffer);
+                // this bit of nastiness is to get around that code paths to
+                // local variables can result in lack of initialization and
+                // function clean up of ref counts isn't based on scope (a
+                // mistake, I know)
+                S32 address = base_address + get_register(buffer, LREG_HR) - 1;
+                if (address)
                 {
-                        S32 address = lscript_pop_int(buffer);
-                        LLScriptLibData *list = lsa_get_data(buffer, address, TRUE);
-                        if (!list->getListLength())
+                        if (safe_heap_check_address(buffer, address + SIZEOF_SCRIPT_ALLOC_ENTRY, 1))
                         {
-                                offset += arg;
+                                LLScriptLibData *list = lsa_get_list_ptr(buffer, base_address, TRUE);
+                                if (!list || !list->getListLength())
+                                {
+                                        offset += arg;
+                                }
+                                delete list;
                         }
                 }
         }
@@ -2954,7 +2982,7 @@ S32 axtoi(char *hexStg)
 
 BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 {
-        char caststr[1024];
+        char caststr[1024];             /*Flawfinder: ignore*/
         if (b_print)
                 printf("[0x%X]\tCAST ", offset);
         offset++;
@@ -2987,7 +3015,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                         case LST_STRING:
                                 {
                                         S32 address, source = lscript_pop_int(buffer);
-                                        sprintf(caststr, "%d", source);
+                                        snprintf(caststr, sizeof(caststr), "%d", source);               /*Flawfinder: ignore*/
                                         address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
                                         lscript_push(buffer, address);
                                 }
@@ -3024,7 +3052,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                 {
                                         S32 address;
                                         F32 source = lscript_pop_float(buffer);
-                                        sprintf(caststr, "%f", source);
+                                        snprintf(caststr, sizeof(caststr), "%f", source);               /*Flawfinder: ignore*/
                                         address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
                                         lscript_push(buffer, address);
                                 }
@@ -3233,7 +3261,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                         S32 address;
                                         LLVector3 source;
                                         lscript_pop_vector(buffer, source);
-                                        sprintf(caststr, "<%5.5f, %5.5f, %5.5f>", source.mV[VX], source.mV[VY], source.mV[VZ]);
+                                        snprintf(caststr, sizeof(caststr), "<%5.5f, %5.5f, %5.5f>", source.mV[VX], source.mV[VY], source.mV[VZ]);               /*Flawfinder: ignore*/
                                         address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
                                         lscript_push(buffer, address);
                                 }
@@ -3266,7 +3294,7 @@ BOOL run_cast(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
                                         S32 address;
                                         LLQuaternion source;
                                         lscript_pop_quaternion(buffer, source);
-                                        sprintf(caststr, "<%5.5f, %5.5f, %5.5f, %5.5f>", source.mQ[VX], source.mQ[VY], source.mQ[VZ], source.mQ[VS]);
+                                        snprintf(caststr, sizeof(caststr), "<%5.5f, %5.5f, %5.5f, %5.5f>", source.mQ[VX], source.mQ[VY], source.mQ[VZ], source.mQ[VS]);         /*Flawfinder: ignore*/
                                         address = lsa_heap_add_data(buffer, new LLScriptLibData(caststr), get_max_heap_size(buffer), TRUE);
                                         lscript_push(buffer, address);
                                 }
@@ -3590,22 +3618,29 @@ void lscript_run(char *filename, BOOL b_debug)
         char *error;
         BOOL b_state;
         LLScriptExecute *execute = NULL;
-        FILE *file = LLFile::fopen(filename, "r");
+        if (filename == NULL)
+        {
+                llerrs << "filename is empty" << llendl;
+                // Just reporting error is likely not enough. Need
+                // to check how to abort or error out gracefully
+                // from this function. XXXTBD
+        }
+        FILE* file = LLFile::fopen(filename, "r");  /* Flawfinder: ignore */
         if (file)
         {
                 execute = new LLScriptExecute(file);
                 fclose(file);
         }
-        file = LLFile::fopen(filename, "r");
+        file = LLFile::fopen(filename, "r");  /* Flawfinder: ignore */
         if (file)
         {
-                FILE *fp = LLFile::fopen("lscript.parse", "w");
+                FILE* fp = LLFile::fopen("lscript.parse", "w");         /*Flawfinder: ignore*/
                 LLScriptLSOParse        *parse = new LLScriptLSOParse(file);
                 parse->printData(fp);
                 fclose(file);
                 fclose(fp);
         }
-        file = LLFile::fopen(filename, "r");
+        file = LLFile::fopen(filename, "r");    /*Flawfinder: ignore*/
         if (file && execute)
         {
                 timer.reset();
@@ -3814,7 +3849,7 @@ BOOL run_calllib(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &id)
 
         if (gScriptLibrary.mFunctions[arg]->mArgs)
         {
-                number = (S32)strlen(gScriptLibrary.mFunctions[arg]->mArgs);
+                number = (S32)strlen(gScriptLibrary.mFunctions[arg]->mArgs);            /*Flawfinder: ignore*/
                 arguments = new LLScriptLibData[number];
         }
         else
@@ -3885,7 +3920,7 @@ BOOL run_calllib_two_byte(U8 *buffer, S32 &offset, BOOL b_print, const LLUUID &i
 
         if (gScriptLibrary.mFunctions[arg]->mArgs)
         {
-                number = (S32)strlen(gScriptLibrary.mFunctions[arg]->mArgs);
+                number = (S32)strlen(gScriptLibrary.mFunctions[arg]->mArgs);            /*Flawfinder: ignore*/
                 arguments = new LLScriptLibData[number];
         }
         else
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
new file mode 100644
index 0000000..0a987c8
--- /dev/null
+++ b/linden/indra/lscript/lscript_execute/lscript_execute_vc8.vcproj
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="lscript_execute"

+        ProjectGUID="{F882263E-4F2A-43D9-A45A-FA4C8EC66552}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_execute.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_execute.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..;..\..\llcommon;..\..\llmath;&quot;..\..\..\libraries\i686-win32\include&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_execute.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\lscript_execute.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_heapruntime.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_readlso.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath="..\lscript_byteconvert.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\lscript_byteformat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\lscript_execute.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_heapruntime.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_readlso.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
index 6734d58..ea40892 100644
--- a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -122,7 +122,7 @@ void LLScriptLSOParse::printGlobals(FILE *fp)
         F32                             fpvalue;
         LLVector3               vvalue;
         LLQuaternion    qvalue;
-        char                    name[256];
+        char                    name[256];              /*Flawfinder: ignore*/
         U8                              type;
 
         S32 global_v_offset = get_register(mRawData, LREG_GVR);
@@ -190,7 +190,7 @@ void LLScriptLSOParse::printGlobalFunctions(FILE *fp)
         S32                             i, offset;
 //      LLVector3               vvalue;         unused
 //      LLQuaternion    qvalue;         unused
-        char                    name[256];
+        char                    name[256];              /*Flawfinder: ignore*/
         U8                              type;
 
         offset = get_register(mRawData, LREG_GFR);
@@ -280,7 +280,7 @@ void LLScriptLSOParse::printStates(FILE *fp)
         U32                     j, k;
 //      LLVector3               vvalue;         unused
 //      LLQuaternion    qvalue;         unused
-        char                    name[256];
+        char                    name[256];              /*Flawfinder: ignore*/
 
         S32 state_offset = get_register(mRawData, LREG_SR);
 
@@ -1196,7 +1196,7 @@ void print_pushargf(FILE *fp, U8 *buffer, S32 &offset, S32 tabs)
 
 void print_pushargs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs)
 {
-        char arg[1024];
+        char arg[1024];         /*Flawfinder: ignore*/
         lso_print_tabs(fp, tabs);
         fprintf(fp, "[0x%X]\tPUSHARGS ", offset++);
         bytestream2char(arg, buffer, offset);
diff --git a/linden/indra/lscript/lscript_library.h b/linden/indra/lscript/lscript_library.h
index 300cbb6..33fc9d6 100644
--- a/linden/indra/lscript/lscript_library.h
+++ b/linden/indra/lscript/lscript_library.h
@@ -182,10 +182,10 @@ public:
                         size += 4;
                         break;
                 case LST_KEY:
-                        size += (S32)strlen(mKey) + 1;
+                        size += (S32)strlen(mKey) + 1;  /*Flawfinder: ignore*/
                         break;
                 case LST_STRING:
-                        size += (S32)strlen(mString) + 1;
+                        size += (S32)strlen(mString) + 1;       /*Flawfinder: ignore*/
                         break;
                 case LST_LIST:
                         break;
@@ -241,19 +241,29 @@ public:
         {
                 if (data.mKey)
                 {
-                        mKey = new char[strlen(data.mKey) + 1];
-                        strcpy(mKey, data.mKey);
+                        mKey = new char[strlen(data.mKey) + 1]; /* Flawfinder: ignore */
+                        if (mKey == NULL)
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return;
+                        }
+                        strcpy(mKey, data.mKey);        /* Flawfinder: ignore */
                 }
                 if (data.mString)
                 {
-                        mString = new char[strlen(data.mString) + 1];
-                        strcpy(mString, data.mString);
+                        mString = new char[strlen(data.mString) + 1];   /* Flawfinder: ignore */
+                        if (mString == NULL)
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return;
+                        }
+                        strcpy(mString, data.mString);  /* Flawfinder: ignore */
                 }
         }
 
         LLScriptLibData(U8 *src, S32 &offset) : mListp(NULL)
         {
-                static char temp[TOP_OF_MEMORY];
+                static char temp[TOP_OF_MEMORY];        /* Flawfinder: ignore */
                 mType = (LSCRIPTType)bytestream2integer(src, offset);
                 switch(mType)
                 {
@@ -266,15 +276,25 @@ public:
                 case LST_KEY:
                         {
                                 bytestream2char(temp, src, offset);
-                                mKey = new char[strlen(temp) + 1];
-                                strcpy(mKey, temp);
+                                mKey = new char[strlen(temp) + 1];      /* Flawfinder: ignore */
+                                if (mKey == NULL)
+                                {
+                                        llerrs << "Memory Allocation Failed" << llendl;
+                                        return;
+                                }
+                                strcpy(mKey, temp);     /* Flawfinder: ignore */
                         }
                         break;
                 case LST_STRING:
                         {
                                 bytestream2char(temp, src, offset);
-                                mString = new char[strlen(temp) + 1];
-                                strcpy(mString, temp);
+                                mString = new char[strlen(temp) + 1];   /* Flawfinder: ignore */
+                                if (mString == NULL)
+                                {
+                                        llerrs << "Memory Allocation Failed" << llendl;
+                                        return;
+                                }
+                                strcpy(mString, temp);  /* Flawfinder: ignore */
                         }
                         break;
                 case LST_LIST:
@@ -292,7 +312,7 @@ public:
 
         void set(U8 *src, S32 &offset)
         {
-                static char temp[TOP_OF_MEMORY];
+                static char temp[TOP_OF_MEMORY];        /* Flawfinder: ignore */
                 mType = (LSCRIPTType)bytestream2integer(src, offset);
                 switch(mType)
                 {
@@ -305,15 +325,25 @@ public:
                 case LST_KEY:
                         {
                                 bytestream2char(temp, src, offset);
-                                mKey = new char[strlen(temp) + 1];
-                                strcpy(mKey, temp);
+                                mKey = new char[strlen(temp) + 1];      /* Flawfinder: ignore */
+                                if (mKey == NULL)
+                                {
+                                        llerrs << "Memory Allocation Failed" << llendl;
+                                        return;
+                                }
+                                strcpy(mKey, temp);     /* Flawfinder: ignore */
                         }
                         break;
                 case LST_STRING:
                         {
                                 bytestream2char(temp, src, offset);
-                                mString = new char[strlen(temp) + 1];
-                                strcpy(mString, temp);
+                                mString = new char[strlen(temp) + 1];   /* Flawfinder: ignore */
+                                if (mString == NULL)
+                                {
+                                        llerrs << "Memory Allocation Failed" << llendl;
+                                        return;
+                                }
+                                strcpy(mString, temp);  /* Flawfinder: ignore */
                         }
                         break;
                 case LST_LIST:
@@ -335,8 +365,13 @@ public:
         void setFromCSV(char *src)
         {
                 mType = LST_STRING;
-                mString = new char[strlen(src) + 1];
-                strcpy(mString, src);
+                mString = new char[strlen(src) + 1];    /* Flawfinder: ignore */
+                if (mString == NULL)
+                {
+                        llerrs << "Memory Allocation Failed" << llendl;
+                        return;
+                }
+                strcpy(mString, src);   /* Flawfinder: ignore */
         }
 
         LLScriptLibData(S32 integer) : mType(LST_INTEGER), mInteger(integer), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(), mListp(NULL)
@@ -362,8 +397,13 @@ public:
                 }
                 else
                 {
-                        mString = new char[strlen(string) + 1];
-                        strcpy(mString, string);
+                        mString = new char[strlen(string) + 1]; /* Flawfinder: ignore */
+                        if (mString == NULL)
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return;
+                        }
+                        strcpy(mString, string);        /* Flawfinder: ignore */
                 }
         }
 
@@ -376,8 +416,13 @@ public:
                 }
                 else
                 {
-                        mString = new char[strlen(string) + 1];
-                        strcpy(mString, string);
+                        mString = new char[strlen(string) + 1]; /* Flawfinder: ignore */
+                        if (mString == NULL)
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return;
+                        }
+                        strcpy(mString, string);        /* Flawfinder: ignore */
                 }
         }
 
diff --git a/linden/indra/lscript/lscript_library/lscript_alloc.cpp b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
index 4636c0b..b39cd1f 100644
--- a/linden/indra/lscript/lscript_library/lscript_alloc.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
@@ -127,10 +127,10 @@ S32 lsa_heap_add_data(U8 *buffer, LLScriptLibData *data, S32 heapsize, BOOL b_de
                 size = 4;
                 break;
         case LST_KEY:
-                size = (S32)strlen(data->mKey) + 1;
+                size = (S32)strlen(data->mKey) + 1;                     /*Flawfinder: ignore*/
                 break;
         case LST_STRING:
-                size = (S32)strlen(data->mString) + 1;
+                size = (S32)strlen(data->mString) + 1;          /*Flawfinder: ignore*/ 
                 break;
         case LST_LIST:
                 //      list data               4 bytes of number of entries followed by number of pointer
@@ -354,7 +354,7 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
                         {
                                 if (data->mString)
                                 {
-                                        size = (S32)strlen(data->mString) + 1;
+                                        size = (S32)strlen(data->mString) + 1;          /*Flawfinder: ignore*/
                                 }
                                 else
                                 {
@@ -365,7 +365,7 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
                         {
                                 if (data->mKey)
                                 {
-                                        size = (S32)strlen(data->mKey) + 1;
+                                        size = (S32)strlen(data->mKey) + 1;             /*Flawfinder: ignore*/
                                 }
                                 else
                                 {
@@ -432,8 +432,12 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
                         if (listsize)
                         {
                                 U8 *tbuff = new U8[size + listsize];
-                                memcpy(tbuff, *buffer, size);
-                                memcpy(tbuff + size, listbuf, listsize);
+                                if (tbuff == NULL)
+                                {
+                                        llerrs << "Memory Allocation Failed" << llendl;
+                                }
+                                memcpy(tbuff, *buffer, size);   /*Flawfinder: ignore*/
+                                memcpy(tbuff + size, listbuf, listsize);                /*Flawfinder: ignore*/
                                 size += listsize;
                                 delete [] *buffer;
                                 delete [] listbuf;
@@ -516,7 +520,7 @@ void lsa_decrease_ref_count(U8 *buffer, S32 offset)
         alloc_entry2bytestream(buffer, orig_offset, entry);
 }
 
-char gLSAStringRead[16384];
+char gLSAStringRead[16384];             /*Flawfinder: ignore*/
 
 
 LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref)
@@ -557,13 +561,13 @@ LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref)
                         break;
                 case LST_KEY:
                         bytestream2char(gLSAStringRead, buffer, offset);
-                        retval->mKey = new char[strlen(gLSAStringRead) + 1];
-                        strcpy(retval->mKey, gLSAStringRead);
+                        retval->mKey = new char[strlen(gLSAStringRead) + 1];            /*Flawfinder: ignore*/
+                        strcpy(retval->mKey, gLSAStringRead);                   /*Flawfinder: ignore*/
                         break;
                 case LST_STRING:
                         bytestream2char(gLSAStringRead, buffer, offset);
-                        retval->mString = new char[strlen(gLSAStringRead) + 1];
-                        strcpy(retval->mString, gLSAStringRead);
+                        retval->mString = new char[strlen(gLSAStringRead) + 1];         /*Flawfinder: ignore*/
+                        strcpy(retval->mString, gLSAStringRead);                        /*Flawfinder: ignore*/
                         break;
                 case LST_VECTOR:
                         bytestream2vector(retval->mVec, buffer, offset);
@@ -703,13 +707,13 @@ S32 lsa_cat_strings(U8 *buffer, S32 offset1, S32 offset2, S32 heapsize)
                 return 0;
         }
 
-        S32 size = (S32)strlen(test1) + (S32)strlen(test2) + 1;
+        S32 size = (S32)strlen(test1) + (S32)strlen(test2) + 1;                 /*Flawfinder: ignore*/
 
         LLScriptLibData *string3 = new LLScriptLibData;
         string3->mType = LST_STRING;
         string3->mString = new char[size];
-        strcpy(string3->mString, test1);
-        strcat(string3->mString, test2);
+        strcpy(string3->mString, test1);                        /*Flawfinder: ignore*/
+        strcat(string3->mString, test2);                        /*Flawfinder: ignore*/
 
         delete string1;
         delete string2;
@@ -779,7 +783,7 @@ void lsa_print_heap(U8 *buffer)
         F32                             fpvalue;
         LLVector3               vvalue;
         LLQuaternion    qvalue;
-        char                    string[4096];
+        char                    string[4096];           /*Flawfinder: ignore*/
 
         LLScriptAllocEntry entry;
 
@@ -849,7 +853,7 @@ void lsa_fprint_heap(U8 *buffer, FILE *fp)
         F32                             fpvalue;
         LLVector3               vvalue;
         LLQuaternion    qvalue;
-        char                    string[4096];
+        char                    string[4096];           /*Flawfinder: ignore*/
 
         LLScriptAllocEntry entry;
 
@@ -997,58 +1001,9 @@ S32 lsa_cmp_lists(U8 *buffer, S32 offset1, S32 offset2)
 
         S32 length1 = list1->getListLength();
         S32 length2 = list2->getListLength();
-
-        if (length1 != length2)
-        {
-                return length1 - length2;
-        }
-
-        LLScriptLibData *runner1 = list1;
-        LLScriptLibData *runner2 = list2;
-
-        S32 count = 0;
-
-        while (runner1)
-        {
-                if (runner1->mType != runner2->mType)
-                        return count;
-
-                switch(runner1->mType)
-                {
-                case LST_INTEGER:
-                        if (runner1->mInteger != runner2->mInteger)
-                                return count;
-                        break;
-                case LST_FLOATINGPOINT:
-                        if (runner1->mFP != runner2->mFP)
-                                return count;
-                        break;
-                case LST_KEY:
-                        if (strcmp(runner1->mKey, runner2->mKey))
-                                return count;
-                        break;
-                case LST_STRING:
-                        if (strcmp(runner1->mString, runner2->mString))
-                                return count;
-                        break;
-                case LST_VECTOR:
-                        if (runner1->mVec != runner2->mVec)
-                                return count;
-                case LST_QUATERNION:
-                        if (runner1->mQuat != runner2->mQuat)
-                                return count;
-                        break;
-                default:
-                        break;
-                }
-
-                runner1 = runner1->mListp;
-                runner2 = runner2->mListp;
-        }
-
         delete list1;
         delete list2;
-        return 0;
+        return length1 - length2;
 }
 
 
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 1b92608..7263ec3 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -119,7 +119,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetTexture", NULL, "si", "llSetTexture(string texture, integer face)\nsets the texture of face"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llScaleTexture", NULL, "ffi", "llScaleTexture(float scales, float scalet, integer face)\nsets the texture s, t scales for the chosen face"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llOffsetTexture", NULL, "ffi", "llOffsetTexture(float offsets, float offsett, integer face)\nsets the texture s, t offsets for the chosen face"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llRotateTexture", NULL, "fi", "llOffsetTexture(float rotation, integer face)\nsets the texture rotation for the chosen face"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llRotateTexture", NULL, "fi", "llRotateTexture(float rotation, integer face)\nsets the texture rotation for the chosen face"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetTexture", "s", "i", "string llGetTexture(integer face)\ngets the texture of face (if it's a texture in the object inventory, otherwise the key in a string)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetPos", NULL, "v", "llSetPos(vector pos)\nsets the position (if the script isn't physical)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetPos", "v", NULL, "vector llGetPos()\ngets the position (if the script isn't physical)"));
@@ -416,7 +416,14 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelPrimCount", "i", "vii","integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)\nGets the number of prims on the parcel of the given category.\nCategories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelMaxPrims", "i", "vi","integer llGetParcelMaxPrims(vector pos, integer sim_wide)\nGets the maximum number of prims allowed on the parcel at pos."));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelDetails", "l", "vl","list llGetParcelDetails(vector pos, list params)\nGets the parcel details specified in params for the parcel at pos.\nParams is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA"));
+
+
+        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."));
+
         // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
 
         // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST.
@@ -440,10 +447,6 @@ void LLScriptLibrary::init()
         //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPositionLocked",              NULL, "i", "llSetCamPositionLocked(TRUE or FALSE)\nLocks the camera position so it will not move"));
         //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocusLocked",                 NULL, "i", "llSetCamFocusLocked(TRUE or FALSE)\nLocks the camera focus so it will not move"));
 
-// These functions are being put on hold until we think through how we want them handled (security issues). DK 02/16/05
-        //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, "llSetForSale", "i", "ii", "integer llSetForSale(integer selltype, integer price)\nSets this object for sale in mode selltype for price.  Returns TRUE if successfully set for sale."));
 
 LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), char *name, char *ret_type, char *args, char *desc, BOOL god_only)
@@ -452,11 +455,17 @@ LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_fun
         mDesc = new char[512];
         if (mSleepTime)
         {
-                sprintf(mDesc,"%s\nSleeps script for %.1f seconds.",desc,mSleepTime);
+                snprintf(       /* Flawfinder: ignore */
+                        mDesc,
+                        512,
+                        "%s\nSleeps script for %.1f seconds.",
+                        desc,
+                        mSleepTime);
         }
         else
         {
-                strcpy(mDesc,desc);
+                strncpy(mDesc, desc, 512);      /* Flawfinder: ignore */
+                mDesc[511] = '\0'; // just in case.
         }
 }
 
@@ -470,7 +479,10 @@ void LLScriptLibrary::addFunction(LLScriptLibraryFunction *func)
         LLScriptLibraryFunction **temp = new LLScriptLibraryFunction*[mNextNumber + 1];
         if (mNextNumber)
         {
-                memcpy(temp, mFunctions, sizeof(LLScriptLibraryFunction *)*mNextNumber);
+                memcpy( /* Flawfinder: ignore */
+                        temp,
+                        mFunctions,
+                        sizeof(LLScriptLibraryFunction*)*mNextNumber);
                 delete [] mFunctions;
         }
         mFunctions = temp;
@@ -492,7 +504,7 @@ void LLScriptLibrary::assignExec(char *name, void (*exec_func)(LLScriptLibData *
 
 void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
 {
-        char tmp[1024];
+        char tmp[1024]; /*Flawfinder: ignore*/
         if (b_prepend_comma)
         {
                 s << ", ";
@@ -503,7 +515,7 @@ void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
              s << mInteger;
              break;
         case LST_FLOATINGPOINT:
-             snprintf(tmp, 1024, "%f", mFP);
+             snprintf(tmp, 1024, "%f", mFP);    /*Flawfinder: ignore*/
              s << tmp;
              break;
         case LST_KEY:
@@ -513,12 +525,12 @@ void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
              s << mString;
              break;
         case LST_VECTOR:
-             snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], 
+             snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], /* Flawfinder: ignore */
                       mVec.mV[VY], mVec.mV[VZ]);
              s << tmp;
              break;
         case LST_QUATERNION:
-             snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], 
+             snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], /* Flawfinder: ignore */
                       mQuat.mQ[VZ], mQuat.mQ[VS]);
              s << tmp;
              break;
@@ -536,7 +548,7 @@ void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, ch
         //print(ostr, FALSE);
         {
                 BOOL b_prepend_comma = FALSE;
-                char tmp[1024];
+                char tmp[1024]; /* Flawfinder: ignore */
                 if (b_prepend_comma)
                 {
                         ostr << ", ";
@@ -547,7 +559,7 @@ void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, ch
                      ostr << mInteger;
                      break;
                 case LST_FLOATINGPOINT:
-                     snprintf(tmp, 1024, "%f", mFP);
+                     snprintf(tmp, 1024, "%f", mFP);    /* Flawfinder: ignore */
                      ostr << tmp;
                      break;
                 case LST_KEY:
@@ -557,12 +569,12 @@ void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, ch
                      ostr << mString;
                      break;
                 case LST_VECTOR:
-                     snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], 
+                     snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], /* Flawfinder: ignore */
                               mVec.mV[VY], mVec.mV[VZ]);
                      ostr << tmp;
                      break;
                 case LST_QUATERNION:
-                     snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], 
+                     snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], /* Flawfinder: ignore */
                               mQuat.mQ[VZ], mQuat.mQ[VS]);
                      ostr << tmp;
                      break;
diff --git a/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
new file mode 100644
index 0000000..ee92752
--- /dev/null
+++ b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="lscript_library"

+        ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_library.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_library.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/lscript_library.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\lscript_alloc.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_export.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lscript_library.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath="..\lscript_alloc.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\lscript_export.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath="..\lscript_library.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/mac_crash_logger/mac_crash_logger.cpp b/linden/indra/mac_crash_logger/mac_crash_logger.cpp
index 372050d..4af95fe 100644
--- a/linden/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/linden/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -100,7 +100,7 @@ OSStatus dialogHandler(EventHandlerCallRef handler, EventRef event, void *userda
                         {
                                 case kHICommandOK:
                                 {
-                                        char buffer[65535];
+                                        char buffer[65535];             /* Flawfinder: ignore */
                                         Size size = sizeof(buffer) - 1;
                                         ControlRef textField = NULL;
                                         ControlID id;
@@ -334,9 +334,9 @@ int main(int argc, char **argv)
         // *NOTE: changing the size of either of these buffers will
         // require changing the sscanf() format string to correctly
         // account for it.
-        char tmp_sl_name[LL_MAX_PATH];
+        char tmp_sl_name[LL_MAX_PATH];  /* Flawfinder: ignore */
         tmp_sl_name[0] = '\0';
-        char tmp_space[MAX_STRING];
+        char tmp_space[MAX_STRING];             /* Flawfinder: ignore */
         tmp_space[0] = '\0';
 
         // Look for it in the debug_info.log file
@@ -395,7 +395,7 @@ int main(int argc, char **argv)
         // MBW -- This needs to go find "~/Library/Logs/CrashReporter/Second Life.crash.log" on 10.3
         // or "~/Library/Logs/Second Life.crash.log" on 10.2.
         {
-                char path[MAX_PATH];
+                char path[MAX_PATH];            /* Flawfinder: ignore */
                 FSRef folder;
                 
                 if(FSFindFolder(kUserDomain, kLogsFolderType, false, &folder) == noErr)
@@ -596,7 +596,7 @@ LLFileEncoder::LLFileEncoder(const char *form_name, const char *filename, bool i
         }
 
         S32 buf_size = stat_data.st_size;
-        FILE *fp = fopen(mFilename.c_str(), "rb");
+        FILE* fp = fopen(mFilename.c_str(), "rb");              /* Flawfinder: ignore */
         U8 *buf = new U8[buf_size + 1];
         fread(buf, 1, buf_size, fp);
         fclose(fp);
@@ -617,7 +617,7 @@ LLFileEncoder::LLFileEncoder(const char *form_name, const char *filename, bool i
                 while(temp != NULL)
                 {
                         // Skip past the marker we just found
-                        cur = temp + strlen(sep);
+                        cur = temp + strlen(sep);               /* Flawfinder: ignore */
                         
                         // and try to find another
                         temp = strstr(cur, sep);
@@ -657,11 +657,15 @@ LLString LLFileEncoder::encodeURL(const S32 max_length)
         S32 buf_size = mBuf.size();
         S32 url_buf_size = 3*mBuf.size() + 1;
         char *url_buf = new char[url_buf_size];
-
+        if (url_buf == NULL)
+        {
+                llerrs << "Memory Allocation Failed" << llendl;
+                return result;
+        }
         S32 cur_pos = 0;
         for (; i < buf_size; i++)
         {
-                sprintf(url_buf + cur_pos, "%%%02x", mBuf[i]);
+                sprintf(url_buf + cur_pos, "%%%02x", mBuf[i]);          /* Flawfinder: ignore */
                 cur_pos += 3;
         }
         url_buf[i*3] = 0;
@@ -680,12 +684,17 @@ LLString encode_string(const char *formname, const LLString &str)
         S32 buf_size = str.size();
         S32 url_buf_size = 3*str.size() + 1;
         char *url_buf = new char[url_buf_size];
+        if (url_buf == NULL)
+        {
+                llerrs << "Memory Allocation Failed" << llendl;
+            return result;
+        }
 
         S32 cur_pos = 0;
         S32 i;
         for (i = 0; i < buf_size; i++)
         {
-                sprintf(url_buf + cur_pos, "%%%02x", str[i]);
+                sprintf(url_buf + cur_pos, "%%%02x", str[i]);           /* Flawfinder: ignore */
                 cur_pos += 3;
         }
         url_buf[i*3] = 0;
diff --git a/linden/indra/mac_updater/FSCopyObject.c b/linden/indra/mac_updater/FSCopyObject.c
index b9210d2..f794358 100644
--- a/linden/indra/mac_updater/FSCopyObject.c
+++ b/linden/indra/mac_updater/FSCopyObject.c
@@ -913,7 +913,7 @@ static OSErr ProcessFolderList( FSCopyFolderGlobals *folderGlobals )
                 {
                         #if DEBUG && !TARGET_API_MAC_OS8
                         {
-                                char    path[1024];
+                                char    path[1024];             /* Flawfinder: ignore */
                                 myverify_noerr(FSRefMakePath( &(folderListData->sourceDirRef),  (unsigned char*)path, 1024 ));
                                 dwarning(("\n\n%s -- Copying contents of\n\t%s\n", __FUNCTION__, path));
                                 myverify_noerr(FSRefMakePath( &(folderListData->destDirRef),    (unsigned char*)path, 1024 ));
@@ -1451,7 +1451,7 @@ OSErr FSDeleteObjects( const FSRef *source )
         #if DEBUG && !TARGET_API_MAC_OS8
         if( err == noErr )
         {
-                char    path[1024];
+                char    path[1024];             /* Flawfinder: ignore */
                 myverify_noerr(FSRefMakePath( source,   (unsigned char*)path, 1024 ));
                 dwarning(("\n%s -- Deleting %s\n", __FUNCTION__, path));
         }       
@@ -1834,7 +1834,7 @@ static OSErr GetUniqueName(	const FSRef		*destDir,
 {
         HFSUniStr255    tmpName = *sourceName;
         FSRef                   tmpRef;
-        unsigned char   hexStr[17] = "123456789";       /* yeah, only 9...  I'm lazy, sosumi */
+        unsigned char   hexStr[17] = "123456789";               /* Flawfinder: ignore */                /* yeah, only 9...  I'm lazy, sosumi */
         long                    count = 0;
         int                             index;
         OSErr                   err;    
@@ -1983,4 +1983,4 @@ static pascal void MyCloseForkProc( void *pData )
                 myverify_noerr( FSCloseFork( refNum ) );        /* the fork was opened, so close it */
         
         DisposePtr( (char*) pData );    
-}
\ No newline at end of file
+}
diff --git a/linden/indra/mac_updater/MoreFilesX.c b/linden/indra/mac_updater/MoreFilesX.c
index 33d3424..283628d 100644
--- a/linden/indra/mac_updater/MoreFilesX.c
+++ b/linden/indra/mac_updater/MoreFilesX.c
@@ -1845,7 +1845,7 @@ GenerateUniqueHFSUniStr(
         long                    i;
         FSRefParam              pb;
         FSRef                   newRef;
-        unsigned char   hexStr[17] = "0123456789ABCDEF";
+        unsigned char   hexStr[17] = "0123456789ABCDEF";                /* Flawfinder: ignore */
         
         /* set up the parameter block */
         pb.name = uniqueName->unicode;
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 2061ab4..d05b73f 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -67,7 +67,7 @@ Boolean gCancelled = false;
 
 char *gUserServer;
 char *gProductName;
-char gUpdateURL[2048];
+char gUpdateURL[2048];          /* Flawfinder: ignore */
 
 void *updatethreadproc(void*);
 
@@ -381,7 +381,7 @@ int main(int argc, char **argv)
         llinfos << "Starting " << gProductName << " Updater" << llendl;
 
         // Build the URL to download the update
-        snprintf(gUpdateURL, sizeof(gUpdateURL), "http://secondlife.com/update-macos.php?userserver=%s", gUserServer);
+        snprintf(gUpdateURL, sizeof(gUpdateURL), "http://secondlife.com/update-macos.php?userserver=%s", gUserServer);          /* Flawfinder: ignore */
         
         // Real UI...
         OSStatus err;
@@ -389,8 +389,8 @@ int main(int argc, char **argv)
         
         err = CreateNibReference(CFSTR("AutoUpdater"), &nib);
 
-        char windowTitle[MAX_PATH];
-        snprintf(windowTitle, sizeof(windowTitle), "%s Updater", gProductName);
+        char windowTitle[MAX_PATH];             /* Flawfinder: ignore */
+        snprintf(windowTitle, sizeof(windowTitle), "%s Updater", gProductName);         /* Flawfinder: ignore */
         CFStringRef windowTitleRef = NULL;
         windowTitleRef = CFStringCreateWithCString(NULL, windowTitle, kCFStringEncodingUTF8);
         
@@ -507,7 +507,7 @@ bool isDirWritable(FSRef &dir)
         // This is kinda lame, but will pretty much always give the right answer.
         
         OSStatus err = noErr;
-        char temp[PATH_MAX];
+        char temp[PATH_MAX];            /* Flawfinder: ignore */
 
         err = FSRefMakePath(&dir, (UInt8*)temp, sizeof(temp));
 
@@ -557,15 +557,15 @@ static void utf8str_to_HFSUniStr255(HFSUniStr255 *dest, const char* src)
                 // Truncate to avoid stack smaching or other badness.
                 dest->length = 255;
         }
-        memcpy(dest->unicode, utf16str.data(), sizeof(UniChar)* dest->length);
+        memcpy(dest->unicode, utf16str.data(), sizeof(UniChar)* dest->length);          /* Flawfinder: ignore */
 }
 
 int restoreObject(const char* aside, const char* target, const char* path, const char* object)
 {
-        char source[PATH_MAX];
-        char dest[PATH_MAX];
-        snprintf(source, sizeof(source), "%s/%s/%s", aside, path, object);
-        snprintf(dest, sizeof(dest), "%s/%s", target, path);
+        char source[PATH_MAX];          /* Flawfinder: ignore */
+        char dest[PATH_MAX];            /* Flawfinder: ignore */
+        snprintf(source, sizeof(source), "%s/%s/%s", aside, path, object);              /* Flawfinder: ignore */
+        snprintf(dest, sizeof(dest), "%s/%s", target, path);            /* Flawfinder: ignore */
         FSRef sourceRef;
         FSRef destRef;
         OSStatus err;
@@ -597,28 +597,28 @@ int restoreObject(const char* aside, const char* target, const char* path, const
 // Replace any mention of "Second Life" with the product name.
 void filterFile(const char* filename)
 {
-        char temp[PATH_MAX];
+        char temp[PATH_MAX];            /* Flawfinder: ignore */
         // First copy the target's version, so we can run it through sed.
-        snprintf(temp, sizeof(temp), "cp '%s' '%s.tmp'", filename, filename);
-        system(temp);
+        snprintf(temp, sizeof(temp), "cp '%s' '%s.tmp'", filename, filename);           /* Flawfinder: ignore */
+        system(temp);           /* Flawfinder: ignore */
 
         // Now run it through sed.
-        snprintf(temp, sizeof(temp), 
+        snprintf(temp, sizeof(temp),            /* Flawfinder: ignore */
                         "sed 's/Second Life/%s/g' '%s.tmp' > '%s'", gProductName, filename, filename);
-        system(temp);
+        system(temp);           /* Flawfinder: ignore */
 }
 
 void *updatethreadproc(void*)
 {
-        char tempDir[PATH_MAX] = "";
+        char tempDir[PATH_MAX] = "";            /* Flawfinder: ignore */
         FSRef tempDirRef;
-        char temp[PATH_MAX];
+        char temp[PATH_MAX];    /* Flawfinder: ignore */
         // *NOTE: This buffer length is used in a scanf() below.
-        char deviceNode[1024] = "";
+        char deviceNode[1024] = "";     /* Flawfinder: ignore */
         FILE *downloadFile = NULL;
         OSStatus err;
         ProcessSerialNumber psn;
-        char target[PATH_MAX];
+        char target[PATH_MAX];          /* Flawfinder: ignore */
         FSRef targetRef;
         FSRef targetParentRef;
         FSVolumeRefNum targetVol;
@@ -759,7 +759,7 @@ void *updatethreadproc(void*)
                                         throw 0;
                                 }
                                 
-                                snprintf(target, sizeof(target), "/Applications/%s.app", gProductName);
+                                snprintf(target, sizeof(target), "/Applications/%s.app", gProductName);         /* Flawfinder: ignore */
 
                                 memset(&targetRef, 0, sizeof(targetRef));
                                 err = FSPathMakeRef((UInt8*)target, &targetRef, NULL);
@@ -844,7 +844,7 @@ void *updatethreadproc(void*)
                         throw 0;
                 }
                 
-                strcpy(tempDir, temp);
+                strcpy(tempDir, temp);          /* Flawfinder: ignore */
                 
                 llinfos << "tempDir is " << tempDir << llendl;
 
@@ -855,9 +855,9 @@ void *updatethreadproc(void*)
                                 
                 chdir(tempDir);
                 
-                snprintf(temp, sizeof(temp), "SecondLife.dmg");
+                snprintf(temp, sizeof(temp), "SecondLife.dmg");         /* Flawfinder: ignore */
                 
-                downloadFile = fopen(temp, "wb");
+                downloadFile = fopen(temp, "wb");               /* Flawfinder: ignore */
                 if(downloadFile == NULL)
                 {
                         throw 0;
@@ -902,7 +902,7 @@ void *updatethreadproc(void*)
                 // NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder,
                 //              but if our cleanup fails, this makes it much harder for the user to unmount the image.
                 LLString mountOutput;
-                FILE *mounter = popen("hdiutil attach SecondLife.dmg -mountpoint mnt", "r");
+                FILE* mounter = popen("hdiutil attach SecondLife.dmg -mountpoint mnt", "r");            /* Flawfinder: ignore */
                 
                 if(mounter == NULL)
                 {
@@ -937,8 +937,8 @@ void *updatethreadproc(void*)
                         
                         if(sub != NULL)
                         {
-                                sub += strlen(prefix);
-                                sscanf(sub, "%1023s", deviceNode);
+                                sub += strlen(prefix);  /* Flawfinder: ignore */
+                                sscanf(sub, "%1023s", deviceNode);      /* Flawfinder: ignore */
                         }
                 }
                 
@@ -953,7 +953,7 @@ void *updatethreadproc(void*)
                 
                 // Get an FSRef to the new application on the disk image
                 FSRef sourceRef;
-                snprintf(temp, sizeof(temp), "%s/mnt/Second Life.app", tempDir);
+                snprintf(temp, sizeof(temp), "%s/mnt/Second Life.app", tempDir);                /* Flawfinder: ignore */
 
                 llinfos << "Source application is: " << temp << llendl;
 
@@ -962,7 +962,7 @@ void *updatethreadproc(void*)
                         throw 0;
                 
                 FSRef asideRef;
-                char aside[MAX_PATH];
+                char aside[MAX_PATH];           /* Flawfinder: ignore */
                 
                 // this will hold the name of the destination target
                 HFSUniStr255 appNameUniStr;
@@ -985,8 +985,8 @@ void *updatethreadproc(void*)
                 else
                 {
                         // Construct the name of the target based on the product name
-                        char appName[MAX_PATH];
-                        snprintf(appName, sizeof(appName), "%s.app", gProductName);
+                        char appName[MAX_PATH];         /* Flawfinder: ignore */
+                        snprintf(appName, sizeof(appName), "%s.app", gProductName);             /* Flawfinder: ignore */
                         utf8str_to_HFSUniStr255( &appNameUniStr, appName );
                 }
                 
@@ -1034,8 +1034,8 @@ void *updatethreadproc(void*)
         
                         llinfos << "Clearing cache..." << llendl;
                         
-                        char mask[LL_MAX_PATH];
-                        sprintf(mask, "%s*.*", gDirUtilp->getDirDelimiter().c_str());
+                        char mask[LL_MAX_PATH];         /* Flawfinder: ignore */
+                        snprintf(mask, LL_MAX_PATH, "%s*.*", gDirUtilp->getDirDelimiter().c_str());             /* Flawfinder: ignore */
                         gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
                         
                         llinfos << "Clear complete." << llendl;
@@ -1067,8 +1067,8 @@ void *updatethreadproc(void*)
         {
                 llinfos << "Detaching disk image." << llendl;
 
-                snprintf(temp, sizeof(temp), "hdiutil detach '%s'", deviceNode);
-                system(temp);
+                snprintf(temp, sizeof(temp), "hdiutil detach '%s'", deviceNode);                /* Flawfinder: ignore */
+                system(temp);           /* Flawfinder: ignore */
         }
 
         sendProgress(2, 3);
@@ -1092,13 +1092,13 @@ void *updatethreadproc(void*)
         {
                 llinfos << "Touching application bundle." << llendl;
 
-                snprintf(temp, sizeof(temp), "touch '%s'", target);
-                system(temp);
+                snprintf(temp, sizeof(temp), "touch '%s'", target);             /* Flawfinder: ignore */
+                system(temp);           /* Flawfinder: ignore */
 
                 llinfos << "Launching updated application." << llendl;
 
-                snprintf(temp, sizeof(temp), "open '%s'", target);
-                system(temp);
+                snprintf(temp, sizeof(temp), "open '%s'", target);              /* Flawfinder: ignore */
+                system(temp);           /* Flawfinder: ignore */
         }
 
         sendDone();
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 6ef64e4..6efc60a 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.13.3.2";
-CFBundleGetInfoString = "Second Life version 1.13.3.2, Copyright 2004-2006 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.14.0.0";
+CFBundleGetInfoString = "Second Life version 1.14.0.0, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 6e1de8b..fbfd040 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.13.3.2</string>
+        <string>1.14.0.0</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 0545c38..bf49c2c 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -468,6 +468,10 @@ PARCEL_DETAILS_OWNER	Used with llGetParcelDetails to get the parcel owner id.
 PARCEL_DETAILS_GROUP    Used with llGetParcelDetails to get the parcel group id.
 PARCEL_DETAILS_AREA             Used with llGetParcelDetails to get the parcel area in square meters.
 
+STRING_TRIM_HEAD                Used with llStringTrim to trim leading spaces from a string.
+STRING_TRIM_TAIL                Used with llStringTrim to trim trailing spaces from a string.
+STRING_TRIM                             Used with llStringTrim to trim both leading and trailing spaces from a string.
+
 # string constants
 [word .1, .3, .5]
 NULL_KEY                        Indicates an empty key
diff --git a/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl b/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
index b2a6d67..c169fce 100644
--- a/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
@@ -5,7 +5,7 @@ uniform sampler2D diffuseMap;
 void default_lighting() 
 {
         vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
-        applyScatter(color.rgb);
+        //applyScatter(color.rgb);
         gl_FragColor = color;
 }
 
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
new file mode 100644
index 0000000..12c99a6
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
@@ -0,0 +1,13 @@
+void applyScatter(inout vec3 col);

+

+uniform samplerCube environmentMap;

+

+void main() 

+{

+        vec3 ref = textureCube(environmentMap, gl_TexCoord[0].xyz).rgb;

+                        

+        applyScatter(ref);

+                

+        gl_FragColor.rgb = ref;

+        gl_FragColor.a = gl_Color.a;

+}

diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
new file mode 100644
index 0000000..621ff6b
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
@@ -0,0 +1,27 @@
+void default_scatter(vec3 viewVec, vec3 lightDir);

+

+uniform vec4 origin;

+

+void main()

+{

+        //transform vertex

+        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;

+        

+        vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;

+        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);

+        

+        gl_FrontColor = gl_Color;

+        

+        vec3 ref = reflect(pos, norm);

+        

+        vec3 d = pos - origin.xyz;

+        float dist = dot(normalize(d), ref);

+        vec3 e = d + (ref * max(origin.w-dist, 0.0));

+        

+        ref = e - origin.xyz;

+        

+        gl_TexCoord[0] = gl_TextureMatrix[0]*vec4(ref,1.0);

+        

+        default_scatter(pos.xyz, gl_LightSource[0].position.xyz);

+}

+

diff --git a/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl b/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl
index 5f06aeb..25309fa 100644
--- a/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl
@@ -47,7 +47,7 @@ void main()
    gl_TexCoord[0].zw = littleWave1;
    gl_TexCoord[1].xy = littleWave2;
    gl_TexCoord[1].zw = bigWave;
-   gl_TexCoord[2] = oEyeVec;
+   gl_TexCoord[2].xyz = oEyeVec.xyz;
    gl_TexCoord[3].xyz = oRefCoord;
    gl_FrontColor = col;
 }
diff --git a/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl b/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl
index 0ef1129..6f732ed 100644
--- a/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl
@@ -5,7 +5,7 @@ uniform sampler2D diffuseMap;
 void default_lighting() 
 {
         vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
-        applyScatter(color.rgb);
+        //applyScatter(color.rgb);
         gl_FragColor = color;
 }
 
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/groundF.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/groundF.glsl
deleted file mode 100644
index 8618dad..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/groundF.glsl
+++ /dev/null
@@ -1,12 +0,0 @@
-vec4 getScatter(vec3 viewVec, vec3 lightDir);
-
-varying vec3 lightd;
-varying vec3 viewVec;
-
-void main() 
-{
-   vec4 color = gl_Color;
-   vec4 haze = getScatter(viewVec, lightd) * vec4(gl_Fog.color.rgb, 1.0);
-   color.rgb = haze.rgb + haze.a * color.rgb;
-   gl_FragColor = color;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/groundV.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/groundV.glsl
deleted file mode 100644
index a6f5270..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/groundV.glsl
+++ /dev/null
@@ -1,11 +0,0 @@
-varying vec3 lightd;
-varying vec3 viewVec;
-
-void main()
-{
-        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-        lightd = gl_LightSource[0].position.xyz;
-        viewVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
-        
-        gl_FrontColor = gl_Color;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/scatterF.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/scatterF.glsl
deleted file mode 100644
index 7a9245f..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/scatterF.glsl
+++ /dev/null
@@ -1,25 +0,0 @@
-uniform sampler2D scatterMap;
-
-//for per-pixel scatter
-vec4 getScatter(vec3 viewVec, vec3 lightDir)
-{
-   vec2 scatterCoord;
-   scatterCoord.x = length(viewVec);
-   vec3 normVec = viewVec / scatterCoord.x;
-   scatterCoord.y = dot(normVec, lightDir)*0.5 + 0.5;   
-   scatterCoord.x = scatterCoord.x / gl_Fog.end;
-   scatterCoord.x *= scatterCoord.x; // HACK!! Remove this when we can push the view distance farther out
-   return texture2D(scatterMap, scatterCoord) * vec4(gl_Fog.color.rgb, 1.0);
-}
-
-void applyScatter(inout vec3 color, vec4 haze)
-{
-        color.rgb = haze.rgb + haze.a * color.rgb;   
-}
-
-//for per-vertex scatter
-void applyScatter(inout vec3 color)
-{
-        vec4 haze = texture2D(scatterMap, gl_TexCoord[5].xy) * vec4(gl_Fog.color.rgb, 1.0);
-        color.rgb = haze.rgb + haze.a * color.rgb;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/scatterV.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/scatterV.glsl
deleted file mode 100644
index c9ebd9e..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/scatterV.glsl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-vec2 getScatterCoord(vec3 viewVec, vec3 lightDir)
-{
-   vec2 scatterCoord;
-   scatterCoord.x = length(viewVec);
-   vec3 normVec = normalize(viewVec);
-   scatterCoord.y = dot(normVec, lightDir)*0.5 + 0.5;   
-   scatterCoord.x = scatterCoord.x / gl_Fog.end;
-   scatterCoord.x *= scatterCoord.x; // HACK!! Remove this when we can push the view distance farther out
-   return scatterCoord;
-}
-
-void default_scatter(vec3 viewVec, vec3 lightDir)
-{
-        gl_TexCoord[5].xy = getScatterCoord(viewVec, lightDir);
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
new file mode 100644
index 0000000..3a117c5
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
@@ -0,0 +1,145 @@
+void applyScatter(inout vec3 color);

+

+uniform sampler2D diffuseMap;

+uniform sampler2D bumpMap;   

+uniform samplerCube environmentMap; //: TEXUNIT4,   // Environment map texture

+uniform sampler2D screenTex;   //   : TEXUNIT5

+

+uniform vec3 lightDir;

+uniform vec3 specular;

+uniform float lightExp;

+uniform vec2 fbScale;

+uniform float refScale;

+

+float msin(float x) {

+   float k = sin(x)+1.0;

+   k *= 0.5;

+   k *= k;

+   return 2.0 * k;

+}

+

+float mcos(float x) {

+   float k = cos(x)+1.0;

+   k *= 0.5;

+   k *= k;

+   return 2.0 * k;

+}

+

+float waveS(vec2 v, float t, float a, float f, vec2 d, float s, sampler1D sinMap) 

+{

+   return texture1D(sinMap, (dot(d, v)*f + t*s)*f).r*a;

+}

+

+float waveC(vec2 v, float t, float a, float f, vec2 d, float s, sampler1D sinMap) 

+{

+   return texture1D(sinMap, (dot(d, v)*f + t*s)*f).g*a*2.0-1.0;

+}

+

+float magnitude(vec3 vec) {

+   return sqrt(dot(vec,vec));

+}

+

+vec3 mreflect(vec3 i, vec3 n) {

+   return i + n * 2.0 * abs(dot(n,i))+vec3(0.0,0.0,0.5);

+}

+

+void main() 

+{

+   vec2 texCoord = gl_TexCoord[0].xy;   // Texture coordinates

+   vec2 littleWave1 = gl_TexCoord[0].zw;

+   vec2 littleWave2 = gl_TexCoord[1].xy;

+   vec2 bigWave = gl_TexCoord[1].zw;

+   vec3 viewVec = gl_TexCoord[2].xyz;

+   vec4 refCoord = gl_TexCoord[3];

+   vec4 col = gl_Color;

+   vec4 color;

+   

+   //get color from alpha map (alpha denotes water depth), rgb denotes water color

+   vec4 wcol = texture2D(diffuseMap, texCoord.xy);

+      

+   float dist = length(viewVec);

+   

+   //store texture alpha

+   float da = wcol.a;

+         

+   //modulate by incoming water color

+   //wcol.a *= refCoord.w;

+   

+   //scale wcol.a (water depth) for steep transition

+   wcol.a *= wcol.a;

+   

+   //normalize view vector

+   viewVec = normalize(viewVec);

+   

+   //get bigwave normal

+   vec3 wavef = texture2D(bumpMap, bigWave).xyz*2.0;

+      

+   vec3 view = vec3(viewVec.x, viewVec.y, viewVec.z);

+   

+   float dx = 1.0-(dot(wavef*2.0-vec3(1.0), view))*da;

+   dx *= 0.274;

+      

+   //get detail normals

+   vec3 dcol = texture2D(bumpMap, littleWave1+dx*view.xy).rgb*0.75;

+   dcol += texture2D(bumpMap, littleWave2+view.xy*dx*0.1).rgb*1.25;

+      

+   //interpolate between big waves and little waves (big waves in deep water)

+   wavef = wavef*wcol.a + dcol*(1.0-wcol.a);

+   

+   //crunch normal to range [-1,1]

+   wavef -= vec3(1,1,1);

+   wavef = normalize(wavef);

+   //wavef = vec3(0.0, 0.0, 1.0);

+   

+   //get base fresnel component

+   float df = dot(viewVec,wavef);

+   //translate and flip fresnel

+   df = 1.0-clamp(-df,0.0,1.0);

+   

+   //set output alpha based on fresnel

+   color.a = clamp((1.0-df+da)*0.5,0.0,1.0);

+         

+   //calculate reflection vector

+   vec3 refnorm = vec3(wavef.x*0.5, wavef.y*0.5, wavef.z*2.0);

+   

+   //ramp normal towards eye for far view stuff

+   float ramp = dist/256.0;

+   refnorm -= viewVec * ramp;

+   vec3 ref = reflect(viewVec.xyz, normalize(refnorm));

+   ref.z /= sqrt(dist);

+   

+   //get diffuse component

+   float diff = clamp(dot(ref, wavef),0.0,1.0)*0.9;

+      

+   //fudge diffuse for extra contrast and ambience

+   diff *= diff;

+   diff += 0.4;

+      

+   vec3 fog = gl_TexCoord[5].rgb*0.5;

+   

+   //read from reflection map

+   vec3 refcol = textureCube(environmentMap, ref).rgb;

+   //tint reflection by fresnal, bias by z component of view vec

+   color.rgb = refcol*(df*df*dcol.x*dcol.y);

+   

+   //add diffuse contribution (fake blue water, yay!)

+   vec3 blue = vec3(0.1, 0.3, 0.6);

+   color.rgb += (diff/(max(ramp, 1.0)))*vec3(fog.r*blue.r, fog.g*blue.g, fog.b*blue.b);

+      

+   //figure out distortion vector (ripply)   

+   vec2 distort = clamp(((refCoord.xy/refCoord.z) * 0.5 + 0.5 + wavef.xy*refScale),0.0,0.99);

+   

+   //read from framebuffer (offset)

+   vec4 fb = texture2D(screenTex, distort*fbScale);

+   

+   //tint by framebuffer

+   color.rgb = da*color.rgb + (1.0-da)*fb.rgb;

+   

+   //render as solid (previous pixel color already present)

+   color.a = 1.0;

+   

+   //apply fog

+   applyScatter(color.rgb);

+   

+   gl_FragColor = color;

+}

diff --git a/linden/indra/newview/app_settings/viewerart.ini b/linden/indra/newview/app_settings/viewerart.ini
deleted file mode 100644
index e3d7af4..0000000
--- a/linden/indra/newview/app_settings/viewerart.ini
+++ /dev/null
@@ -1,503 +0,0 @@
-version 101
-closebox.tga    47a8c844-cd2a-4b1a-be01-df8b1612fe5d
-close_in_blue.tga       e5821134-23c0-4bd0-af06-7fa95b9fb01a
-tearoffbox.tga  74e1a96f-4833-a24d-a1bb-1bce1468b0e7
-tearoff_pressed.tga     d2524c13-4ba6-af7c-e305-8ac6cc18d86a
-resize_handle_bottom_right_blue.tga     e3690e25-9690-4f6c-a745-e7dcd885285a
-scrollbutton_up_out_blue.tga    dad084d7-9a46-452a-b0ff-4b9f1cefdde9
-scrollbutton_up_in_blue.tga     a93abdf3-27b5-4e22-a8fa-c48216cd2e3a
-scrollbutton_down_out_blue.tga  b4ecdecf-5c8d-44e7-b882-17a77e88ed55
-scrollbutton_down_in_blue.tga   d2421bab-2eaf-4863-b8f6-5e4c52519247
-scrollbutton_left_out_blue.tga  43773e8d-49aa-48e0-80f3-a04715f4677a
-scrollbutton_left_in_blue.tga   ea137a32-6718-4d05-9c22-7d570d27b2cd
-scrollbutton_right_out_blue.tga 3d700d19-e708-465d-87f2-46c8c0ee7938
-scrollbutton_right_in_blue.tga  b749de64-e903-4c3c-ac0b-25fb6fa39cb5
-spin_up_out_blue.tga    56576e6e-6710-4e66-89f9-471b59122794
-spin_up_in_blue.tga     c8450082-96a0-4319-8090-d3ff900b4954
-spin_down_out_blue.tga  b6d240dd-5602-426f-b606-bbb49a30726d
-spin_down_in_blue.tga   a985ac71-052f-48e6-9c33-d931c813ac92
-radio_active_false.tga  7a1ba9b8-1047-4d1e-9cfc-bc478c80b63f
-radio_active_true.tga   52f09e07-5816-4052-953c-94c6c10479b7
-radio_inactive_false.tga        90688481-67ff-4af0-be69-4aa084bcad1e
-radio_inactive_true.tga 1975db39-aa29-4251-aea0-409ac09d414d
-checkbox_enabled_false.tga      05bb64ee-96fd-4243-b74e-f40a41bc53ba
-checkbox_enabled_true.tga       cf4a2ed7-1533-4686-9dde-df9a37ddca55
-checkbox_disabled_false.tga     7d94cb59-32a2-49bf-a516-9e5a2045f9d9
-checkbox_disabled_true.tga      c817c642-9abd-4236-9287-ae0513fe7d2b
-tab_top_blue.tga        1ed83f57-41cf-4052-a3b4-2e8bb78d8191
-tab_top_selected_blue.tga       16d032e8-817b-4368-8a4e-b7b947ae3889
-tab_bottom_blue.tga     bf0a8779-689b-48c3-bb9a-6af546366ef4
-tab_bottom_selected_blue.tga    c001d8fd-a869-4b6f-86a1-fdcb106df9c7
-tab_left.tga    1097dcb3-aef9-8152-f471-431d840ea89e
-tab_left_selected.tga   bea77041-5835-1661-f298-47e2d32b7a70
-crosshairs.tga  6e1a3980-bf2d-4274-8970-91e60d85fb52
-move_backward_in.tga    db11d956-5e7d-4aa5-b39d-7774d339fc5c
-move_backward_out.tga   3ae8bb18-ed97-4cd3-ae5c-d54bc8479fe7
-move_down_in.tga        b92a70b9-c841-4c94-b4b3-cee9eb460d48
-move_down_out.tga       b5abc9fa-9e62-4e03-bc33-82c4c1b6b689
-move_forward_in.tga     54197a61-f5d1-4c29-95d2-c071d08849cb
-move_forward_out.tga    a0eb4021-1b20-4a53-892d-8faa9265a6f5
-move_left_in.tga        724996f5-b956-46f6-9844-4fcfce1d5e83
-move_left_out.tga       82476321-0374-4c26-9567-521535ab4cd7
-move_right_in.tga       7eeb57d2-3f37-454d-a729-8b217b8be443
-move_right_out.tga      1fbe4e60-0607-44d1-a50a-032eff56ae75
-move_turn_left_in.tga   95463c78-aaa6-464d-892d-3a805b6bb7bf
-move_turn_left_out.tga  13a93910-6b44-45eb-ad3a-4d1324c59bac
-move_turn_right_in.tga  5e616d0d-4335-476f-9977-560bccd009da
-move_turn_right_out.tga 5a44fd04-f52b-4c30-8b00-4a31e27614bd
-move_up_out.tga f887146d-829f-4e39-9211-cf872b78f97c
-move_up_in.tga  49b4b357-e430-4b56-b9e0-05b8759c3c82
-cam_rotate_out.tga      88745b46-da05-11d5-8ac0-0003477c4611
-cam_rotate_in.tga       70bf2262-3eed-4996-88ac-076907e8921d
-cam_zoom_out.tga        bb02e941-cb3b-4dd3-892a-6841b5de6e45
-cam_zoom_plus_in.tga    c7aefd32-ce13-4242-82cc-2631d44ff9d3
-cam_zoom_minus_in.tga   deed3f4b-93e9-4183-a3b0-a5a98a6de1bb
-cam_tracking_out.tga    95c4ea0e-e3c2-4904-b847-7d7676139ebb
-cam_tracking_in.tga     fe2fc73b-5a64-4a8e-aacc-46fa81faf96a
-direction_arrow.tga     586383e8-4d9b-4fba-9196-2b5938e79c2c
-minimize.tga    34c9398d-bb78-4643-9633-46a2fa3e9637
-minimize_inactive.tga   6e72abba-1378-437f-bf7a-f0c15f3e99a3
-minimize_pressed.tga    39801651-26cb-4926-af57-7af9352c273c
-restore.tga     111b39de-8928-4690-b7b2-e17d5c960277
-restore_inactive.tga    0eafa471-70af-4882-b8c1-40a310929744
-restore_pressed.tga     90a0ed5c-2e7b-4845-9958-a64a1b30f312
-combobox_arrow.tga      b31c1335-0e9c-4927-bc90-53277777d9c1
-white.tga       5748decc-f629-461c-9a36-a35a221fe21f
-darkgray.tga    267e26d3-e0e1-41b8-91b1-3b337102928d
-lightgray.tga   c520bf46-cc5d-412b-a60b-9f1bd245189f
-eyes.tga        6522e74d-1660-4e7f-b601-6f48c1659a77
-hair.tga        7ca39b4c-bd19-4699-aff7-f93fd03d3e7b
-black.tga       e2244626-f22f-4839-8123-1e7baddeb659
-close_inactive_blue.tga 779e4fa3-9b13-f74a-fba9-3886fe9c86ba
-button_disabled_32x128.tga      f8124d60-2875-c358-7847-2acb63e5400c
-button_enabled_32x128.tga       d8faf8cb-ee6e-b0b5-abd9-bde873ad3461
-button_enabled_selected_32x128.tga      1eddba75-b682-110a-104e-6cdcce616a25
-button_anim_play_selected.tga   119c37bb-24af-45fe-ae11-3a6bc3c85138
-button_anim_pause_selected.tga  ad65d67a-777b-fbfa-693d-4bdcfca2acca
-button_anim_pause.tga   db2d9c2d-0bbd-21e2-e83a-103ea2def7a8
-button_anim_play.tga    2a7f6738-5d82-2ff3-d419-30ed09cbb72b
-button_anim_stop.tga    e10c9e36-d9f6-c8b4-de96-557dccce9205
-button_anim_stop_selected.tga   b8c0e0aa-2771-439e-c919-d2f5dad69a1c
-rounded_square.tga      38ce8b3c-fb30-5c59-9926-bd643613f606
-rounded_square_soft.tga 4c95e6bc-fe77-9cb4-b58a-909848042c1e
-badge_ok.tga    211035a7-c313-378d-478c-e80bbd0fde63
-badge_note.tga  13f6e639-b3f9-28da-a1e6-e990a43052b6
-badge_warn.tga  0992d4bc-7af8-4a1f-f2e6-e6c4083b066e
-badge_error.tga 00c50485-8491-ab70-2ea8-43f26fd028e2
-status_money.tga        5863eb7a-1546-6501-533a-6061f73a36b7
-status_health.tga       4330e8ce-b39b-1eb8-c2ec-a97c0b3947b5
-status_fly.tga  0e058115-5b8f-c3d7-dcaa-9623d92885d1
-status_build.tga        175a6b75-45c9-c2c2-4765-bf37a3909b53
-status_busy.tga beb0d821-6725-abdf-032d-1f70cdabde82
-status_scripts.tga      4cc1afcd-04dd-178f-e074-0f9dc730ab45
-status_buy_currency.tga f43a535a-59ac-26e3-84bc-c786735fabe4
-status_buy_currency_pressed.tga bfa5be70-37c7-8126-fecd-df55390954d5
-status_buy_land.tga     1a0edac5-3e50-fc9b-2752-70c1f69cb959
-status_buy_land_pressed.tga     257647b7-199f-99ff-8be9-f6753289a3aa
-terrain_dirt.tga        b8d3965a-ad78-bf43-699b-bff8eca6c975
-terrain_grass.tga       abb783e6-3e93-26c0-248a-247666855da3
-terrain_mountain.tga    179cdabd-398a-9b6b-1391-4dc333ba321f
-terrain_rock.tga        beb169c7-11ea-fff2-efe5-0f24dc881df2
-terrain_dirt_detail.tga 0bc58228-74a0-7e83-89bc-5c23464bcec5
-terrain_grass_detail.tga        63338ede-0037-c4fd-855b-015d77112fc8
-terrain_mountain_detail.tga     303cd381-8560-7579-23f1-f0a880799740
-terrain_rock_detail.tga 53a2f406-4895-1d13-d541-d2e3b86bc19c
-square_btn_32x128.tga   b28df901-6b8d-d31c-7903-4eb9676d4bfc
-square_btn_selected_32x128.tga  c48c9e95-191b-96d3-08b2-6e8ada58b651
-tree_pine_1.tga 0187babf-6c0d-5891-ebed-4ecab1426683
-tree_oak.tga    8a515889-eac9-fb55-8eba-d2dc09eb32c8
-tree_tropical_1.tga     5bc11cd6-2f40-071e-a8da-0903394204f9
-tree_palm_1.tga ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c
-tree_dogwood.tga        64367bd1-697e-b3e6-0b65-3f862a577366
-tree_tropical_2.tga     cdd9a9fc-6d0b-f90d-8416-c72b6019bca8
-tree_palm_2.tga 2d784476-d0db-9979-0cff-9408745a7cf3
-tree_cypress_1.tga      fb2ae204-3fd1-df33-594f-c9f882830e66
-tree_cypress_2.tga      30047cec-269d-408e-0c30-b2603b887268
-tree_pine_2.tga d691a01c-13b7-578d-57c0-5caef0b4e7e1
-tree_plumeria.tga       6de37e4e-7029-61f5-54b8-f5e63f983f58
-winter_tree_aspen.tga   7c0cf89b-44b1-1ce2-dd74-07102a98ac2a
-winter_tree_pine_1.tga  10d2a01a-0818-84b9-4b96-c2eb63256519
-winter_tree_pine_2.tga  67931331-0c02-4876-1255-28770896c6a2
-tree_eucalyptus.tga     a6162133-724b-54df-a12f-51cd070ad6f3
-tree_fern.tga   8872f2b8-31db-42d8-580a-b3e4a91262de
-tree_eelgrass.tga       96b4de31-f4fa-337d-ec78-451e3609769e
-tree_sea_sword.tga      5894e2e7-ab8d-edfa-e61c-18cf16854ba3
-tree_kelp_1.tga 2caf1179-7861-6ff3-4b7d-46e17780bdfa
-tree_kelp_2.tga 2a4880b6-b7a3-690a-2049-bfbe38eafb9f
-tree_beach_grass_1.tga  18fb888b-e8f1-dce7-7da7-321d651ea6b0
-tool_dozer.tga  d2a0d4d4-54eb-4d16-be4b-4eae43845c74
-tool_dozer_active.tga   d4afdbbe-1550-4b7d-91de-95731f47e8e3
-tool_land.tga   86fe4df4-0ecb-4382-b9ae-475925a92388
-tool_land_active.tga    34e60587-0791-4a07-8918-f5995fcc22a3
-tool_zoom.tga   27eb8829-fe65-45ed-a49a-73aac42f4b38
-tool_zoom_active.tga    69445f58-5c8e-44e0-9d2e-47408bb43b39
-tool_orbit.tga  06964fe4-033f-448a-95c9-30dc41d1be8b
-tool_orbit_active.tga   ee4e07db-3f72-4098-bd4c-aef34515a7bc
-tool_pan.tga    a32aa302-0a15-48d2-b2b1-4d69f1161173
-tool_pan_active.tga     24d9ad33-0b42-4eb5-99a3-659d838bc5c0
-inv_folder_texture.tga  743f035b-a049-43f4-16c7-7ec8daa2c481
-inv_folder_sound.tga    e10cb910-1e71-da47-bd12-8c53f7793714
-inv_folder_callingcard.tga      a3735971-e2b2-d78a-580d-d265cd8f2484
-inv_folder_landmark.tga 9f921155-7c8c-e276-d5ec-03ac9340584d
-inv_folder_script.tga   baa5c310-6a6d-cc48-51eb-65196ba31d77
-inv_folder_object.tga   113e5133-fd0d-ee51-4a59-9d67ca10e8a7
-inv_folder_notecard.tga a9e75d84-5073-9cb7-10a9-1ca68ef5c7ba
-inv_folder_clothing.tga f1427d3d-b2e8-97c4-69ab-1f36d4c0e8f0
-inv_folder_bodypart.tga 1fe05580-1d2f-0345-b28b-52b6e3a20e5d
-inv_folder_trash.tga    88ad072e-ea0b-aabd-5ac0-b37862a6eb66
-inv_folder_plain_closed.tga     86f00960-c3e9-9680-145d-3beffd743e9c
-inv_folder_plain_open.tga       d15dc243-2d0b-47af-0ce1-ec376464bdc8
-inv_folder_snapshot.tga 6efe85e7-800f-1843-296c-a5b7adffe091
-inv_folder_lostandfound.tga     9a371a04-297d-bacf-0d16-5f49753efe1d
-inv_folder_animation.tga        4d59b3ee-f29d-b912-2bcc-9bb1f8a07ec6
-inv_folder_gesture.tga  4de9129a-9fc1-d759-d739-364293906ba2
-inv_item_texture.tga    19f452d7-4eee-9f46-76cc-5497d17f1dd9
-inv_item_sound.tga      eb414d69-c77d-d4e7-66e6-6c2e6f6c1976
-inv_item_callingcard_online.tga 672cc53e-8dc0-ba91-2a4e-574104cf071c
-inv_item_callingcard_offline.tga        d0afe86b-2489-7600-55b7-6abb0a63d9f9
-inv_item_landmark.tga   bf25a2a0-85da-7fa0-0993-e461768d0221
-inv_item_landmark_visited.tga   229fac85-5428-4ab7-adeb-eb8389e91092
-inv_item_script.tga     59a3df81-ed76-06c9-7264-6dada535e7a3
-inv_item_clothing.tga   34dfe476-8e26-0e3a-11cf-76cc4a7126ce
-inv_item_object.tga     0f0780a0-89c4-742a-ef28-26405a41cf85
-inv_item_notecard.tga   23ce8a2c-9ea2-d863-6572-806f0645b0c7
-inv_item_bodypart.tga   d2a5362d-5c55-57dd-a9e9-5c814d1ddc16
-inv_item_attach.tga     5bcae41e-aa5d-02f8-edf1-605ebdd875ab
-inv_item_snapshot.tga   3810d584-b092-7caa-57e0-010f192b9659
-inv_item_eyes.tga       eaa5fd96-5c25-06ef-2280-7ef20203e167
-inv_item_gloves.tga     117b11cb-c04e-5081-13da-1a8846070fd0
-inv_item_hair.tga       6bca3bf4-ed6d-d438-63a0-2a7066d03a0b
-inv_item_jacket.tga     8df59386-56e0-c811-0443-840da3acb3a5
-inv_item_pants.tga      a87a58ca-f857-63b1-0acf-072711ed1bdb
-inv_item_shape.tga      4463e433-4db5-79ef-c1b0-4821b03ddb07
-inv_item_shirt.tga      e2ffb62b-6abc-22d6-952d-764759b4d636
-inv_item_shoes.tga      cf384fa5-1edd-c37c-2134-283dd4fe3396
-inv_item_skirt.tga      0b43f826-2abc-2944-7d72-10777a51d19b
-inv_item_socks.tga      22137c6d-6ec5-6eee-9a2e-2d7a9e6cbcd4
-inv_item_underpants.tga 2f15dc09-4385-526c-aa5d-d9d516ec7d99
-inv_item_undershirt.tga f72ab629-a3ab-de0c-35c0-5285e27478ce
-inv_item_animation.tga  b5cda0d6-d196-ce48-63db-d04323ef8931
-inv_item_gesture.tga    5579245d-d5bf-5f13-46b0-8624490de24c
-pixiesmall.tga  168e6813-096e-07ea-97ae-fd416826f627
-legend.tga      ca7609c6-6ec6-32d9-332e-0d8f437ef644
-propertyline.tga        e3548c46-8d5e-03da-fcab-4fc36ad818bb
-startup_logo.tga        66864f3c-e095-d9c8-058d-d6575e6ed1b8
-grass_texture_1.tga     79504bf5-c3ec-0763-6563-d843de66d0a1
-grass_texture_2.tga     6c4727b8-ac79-ba44-3b81-f9aa887b47eb
-grass_texture_3.tga     99bd60a2-3250-efc9-2e39-2fbcadefbecc
-grass_texture_4.tga     7a2b3a4a-53c2-53ac-5716-aac7d743c020
-undergrowth_1.tga       8f458549-173b-23ff-d4ff-bfaa5ea2371b
-silhouette.tga  da5d4079-7819-6b53-d2a4-dc9929381d7d
-avatar_thumb_bkgrnd.tga 3a7f4f0d-be14-ee78-29e3-fc8b0b2a68d3
-missing_asset.tga       32dfd1c8-7ff6-5909-d983-6d4adfb4255d
-alpha_gradient.tga      e97cf410-8e61-7005-ec06-629eba4cd1fb
-alpha_gradient_2d.tga   38b86f85-2575-52a9-a531-23108d8da837
-alpha_noise.tga b9e1cf8a-9660-c020-0c69-18f1ea27268a
-alpha_sizzle.tga        e121e2fc-7573-740f-edfd-0d45a9ba486e
-bump_woodgrain.tga      058c75c0-a0d5-f2f8-43f3-e9699a89c2fc
-bump_bark.tga   6c9fa78a-1c69-2168-325b-3e03ffa348ce
-bump_bricks.tga b8eed5f0-64b7-6e12-b67f-43fa8e773440
-bump_checker.tga        9deab416-9c63-78d6-d558-9a156f12044c
-bump_concrete.tga       db9d39ec-a896-c287-1ced-64566217021e
-bump_crustytile.tga     f2d7b6f6-4200-1e9a-fd5b-96459e950f94
-bump_cutstone.tga       d9258671-868f-7511-c321-7baef9e948a4
-bump_discs.tga  d21e44ca-ff1c-a96e-b2ef-c0753426b7d9
-bump_gravel.tga 4726f13e-bd07-f2fb-feb0-bfa2ac58ab61
-bump_petridish.tga      e569711a-27c2-aad4-9246-0c910239a179
-bump_siding.tga 073c9723-540c-5449-cdd4-0e87fdc159e3
-bump_stonetile.tga      ae874d1a-93ef-54fb-5fd3-eb0cb156afc0
-bump_stucco.tga 92e66e00-f56f-598a-7997-048aa64cde18
-bump_suction.tga        83b77fc6-10b4-63ec-4de7-f40629f238c5
-bump_weave.tga  735198cf-6ea0-2550-e222-21d3c6a341ae
-icon_avatar_online.tga  529ed15b-3d41-dcc1-79de-90bf21770b5b
-icon_avatar_offline.tga 34648c67-5bfb-5790-e05e-8bd6600fd087
-icon_event.tga  be235ae0-53cf-1d68-b3ae-cf375ed1fb58
-icon_event_mature.tga   cc090999-1b3e-2e97-7a38-c9f4afd10297
-icon_group.tga  04237108-a879-5a95-9b0c-b18fd09bc447
-icon_place.tga  ba0bac4e-815e-14e1-2895-5065b8c703b3
-icon_top_pick.tga       77ca91a2-4431-aeaf-6249-3dd99c7dd86d
-icon_popular.tga        bdd47da5-5b5b-c906-37ad-16aaa64f096f
-icon_for_sale.tga       f20728fd-1670-3771-2293-e0dd3f0bcaab
-icon_auction.tga        96abf5b1-335c-6b76-61e3-74ada07f3cb8
-icon_land_for_landless.tga      c421ddf2-b9d7-b373-503c-f4c423f37f1c
-icon_day_cycle.tga      5b30a285-f1e3-92b1-dcd3-0d07366ced3e
-icon_lock.tga   9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4
-noentrylines.tga        5d3e196b-fd4d-ada7-e4c1-99f8e9f1cfbf
-noentrypasslines.tga    ac8f8627-6a30-8da8-d4bd-958668eea7a0
-notify_tip_icon.tga     74ba3584-58ea-9984-5b76-62d37942ab77
-notify_box_icon.tga     b2ef2d31-9714-a07b-6ca7-31638166364b
-notify_next.tga 07d0ea4c-af0c-aad1-dbbf-c24020ff2b80
-map_avatar_you_8.tga    02fbdc40-5e07-a6e1-228b-58e10f8335b7
-map_avatar_8.tga        0be58a91-8065-c02b-7a12-2cc14dddbc37
-map_avatar_16.tga       db0dadd5-026a-88cf-f5c1-523a0a2daa3e
-map_telehub.tga bf1b2bb0-13b1-40ae-3354-b1b93761bdb4
-map_infohub.tga 85b1a79a-7f6c-9df3-4d6c-17b1a4efb55a
-map_home.tga    ae9b8f5f-03a1-2e71-db77-6eb27a1ba181
-map_event.tga   6008be5e-9267-2a3a-9798-e81b076c22ca
-map_event_mature.tga    f9cdba28-a227-d613-2f16-ce06209314ae
-map_track_8.tga bfdc7bf6-e2ee-1754-f4df-cc25887714ad
-map_track_16.tga        a3878395-ef00-a0e6-ee9a-f45ed6b9ce59
-object_cone.tga c2b8c90a-7dca-26e3-1a63-7aa4a0389cf9
-object_cone_active.tga  cf69c64b-f19e-e1f3-a586-42fef31a23be
-object_cube.tga 70c747ac-1de3-a8b9-514d-101753ca6ccb
-object_cube_active.tga  f9c5e213-1076-7a7d-7889-52388aad2c1a
-object_cylinder.tga     13e35d95-5f6c-9a91-1766-49dedf9b1267
-object_cylinder_active.tga      3f3e4932-8412-e2a7-cfe9-92caf5978b1b
-object_grass.tga        7ca8e672-920b-4653-3970-1abc91abef58
-object_grass_active.tga d0fc7cc9-646a-6860-cf7c-1d9e58cd6dab
-object_hemi_cone.tga    69d5e60c-739a-40b1-b526-84072121e394
-object_hemi_cone_active.tga     2e0c5435-95bb-1c0d-5da1-42336fb1cfc0
-object_hemi_cylinder.tga        f4be3e06-24a8-f86e-acc7-7daefc0572b7
-object_hemi_cylinder_active.tga 67279486-cfc1-3633-de42-85db65db373c
-object_hemi_sphere.tga  b67251ab-1716-b9fb-f911-967ba3fe027b
-object_hemi_sphere_active.tga   6c489466-3058-6475-6b1b-e5fc1d49f1f3
-object_pyramid.tga      9dde8b56-2cc4-a932-b63a-38c3a83221ad
-object_pyramid_active.tga       e7217b1a-e3d8-e339-d28a-d7714d0b5bee
-object_sphere.tga       7fa122c0-b994-460e-8636-cdc451d67268
-object_sphere_active.tga        f2c3bcbc-2904-41a5-1c22-688f176fd1ee
-object_tetrahedron.tga  e17db404-9fc5-9534-1038-777c82b2771f
-object_tetrahedron_active.tga   2792ea3b-c052-85fe-d168-a62b2f4e9d7c
-object_tree.tga 710d1bec-fb33-28f1-e77e-ddbb5b51f5ed
-object_tree_active.tga  da4835c7-b12a-41dd-11db-dae452f040c2
-object_prism.tga        02935f3a-dcda-3b42-1874-da89d4c12870
-object_prism_active.tga 223aac97-bd2f-ec2e-ad45-5641b77c78f9
-object_torus.tga        19e1f4c9-6aa6-4414-981d-59a1343a6472
-object_torus_active.tga ef2bca77-5004-4547-b00a-3b96e463f89f
-object_tube.tga 7ce81316-a478-480f-961c-435fcbdecaf0
-object_tube_active.tga  55c3e4d1-cfdc-48a8-af32-a34844b91832
-object_ring_active.tga  2c955a73-fa31-237b-a4a1-5c8ede3bae50
-object_ring.tga a7610e41-4647-16d8-0e0e-85a1211c1596
-container_animation.tga c4e657a1-4c86-0159-2da0-32ff948484e6
-container_bodypart.tga  770cb2df-758d-34d5-36c7-e3de06db5b5d
-container_clothing.tga  dd90406f-4c8f-a3f9-41df-d562f94f09e0
-container_gesture.tga   59cd31c0-2791-3c48-f740-f0a36c68653e
-container_landmark.tga  24c63386-04f7-ce6f-4ff2-dfb215d2e21f
-container_many_things.tga       849d3292-d9fa-7186-5465-dd7b5fc1ec48
-container_object.tga    ad887ae1-2bee-f2c9-6786-5599de3c95c4
-container_script.tga    b93bd494-c4bd-bcdf-4a59-35a9497d03f3
-container_sound.tga     5ddea031-cfa3-2776-43e3-c7146c1b4cd6
-container_texture.tga   b3f95caf-bd62-bef3-0ded-dea752920629
-avatar_aim_l_bow.bvh    46bb4359-de38-4ed8-6a22-f1f52fe8f506
-avatar_aim_r_bazooka.bvh        b5b4a67d-0aee-30d2-72cd-77b333e932ef
-avatar_aim_r_handgun.bvh        3147d815-6338-b932-f011-16b56d9ac18b
-avatar_aim_r_rifle.bvh  ea633413-8006-180a-c3ba-96dd1d756720
-avatar_angry_fingerwag.bvh      c1bc7f36-3ba0-d844-f93c-93be945d644f
-avatar_angry_tantrum.bvh        11000694-3f41-adc2-606b-eee1d66f3724
-avatar_away.bvh fd037134-85d4-f241-72c6-4f42164fedee
-avatar_backflip.bvh     c4ca6188-9127-4f31-0158-23c4e2f93304
-avatar_blowkiss.bvh     db84829b-462c-ee83-1e27-9bbee66bd624
-avatar_bow.bvh  82e99230-c906-1403-4d9c-3889dd98daba
-avatar_brush.bvh        349a3801-54f9-bf2c-3bd0-1ac89772af01
-avatar_clap.bvh 9b0c1c4e-8ac7-7969-1494-28c874c4f668
-avatar_courtbow.bvh     9ba1c942-08be-e43a-fb29-16ad440efc50
-avatar_crouch.bvh       201f3fdf-cb1f-dbec-201f-7333e328ae7c
-avatar_crouchwalk.bvh   47f5f6fb-22e5-ae44-f871-73aaaf4a6022
-avatar_dance1.bvh       b68a3d7c-de9e-fc87-eec8-543d787e5b0d
-avatar_dance2.bvh       928cae18-e31d-76fd-9cc9-2f55160ff818
-avatar_dance3.bvh       30047778-10ea-1af7-6881-4db7a3a5a114
-avatar_dance4.bvh       951469f4-c7b2-c818-9dee-ad7eea8c30b7
-avatar_dance5.bvh       4bd69a1d-1114-a0b4-625f-84e0a5237155
-avatar_dance6.bvh       cd28b69b-9c95-bb78-3f94-8d605ff1bb12
-avatar_dance7.bvh       a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6
-avatar_dance8.bvh       b0dc417c-1f11-af36-2e80-7e7489fa7cdc
-avatar_dead.bvh 57abaae6-1d17-7b1b-5f98-6d11a6411276
-avatar_drink.bvh        0f86e355-dd31-a61c-fdb0-3a96b9aad05f
-avatar_express_afraid.bvh       6b61c8e8-4747-0d75-12d7-e49ff207a4ca
-avatar_express_anger.bvh        5747a48e-073e-c331-f6f3-7c2149613d3e
-avatar_express_bored.bvh        b906c4ba-703b-1940-32a3-0c7f7d791510
-avatar_express_cry.bvh  92624d3e-1068-f1aa-a5ec-8244585193ed
-avatar_express_embarrased.bvh   514af488-9051-044a-b3fc-d4dbf76377c6
-avatar_express_laugh.bvh        18b3a4b5-b463-bd48-e4b6-71eaac76c515
-avatar_express_repulsed.bvh     36f81a92-f076-5893-dc4b-7c3795e487cf
-avatar_express_sad.bvh  0eb702e2-cc5a-9a88-56a5-661a55c0676a
-avatar_express_shrug.bvh        70ea714f-3a97-d742-1b01-590a8fcd1db5
-avatar_express_surprise.bvh     313b9881-4302-73c0-c7d0-0e7a36b6c224
-avatar_express_wink.bvh 869ecdad-a44b-671e-3266-56aef2e3ac2e
-avatar_express_worry.bvh        9f496bd2-589a-709f-16cc-69bf7df1d36c
-avatar_falldown.bvh     666307d9-a860-572d-6fd4-c3ab8865c094
-avatar_female_walk.bvh  f5fc7433-043d-e819-8298-f519a119b688
-avatar_fist_pump.bvh    7db00ccd-f380-f3ee-439d-61968ec69c8a
-avatar_fly.bvh  aec4610c-757f-bc4e-c092-c6e9caf18daf
-avatar_flyslow.bvh      2b5a38b2-5e00-3a97-a495-4c826bc443e6
-avatar_hello.bvh        9b29cd61-c45b-5689-ded2-91756b8d76a9
-avatar_hold_l_bow.bvh   8b102617-bcba-037b-86c1-b76219f90c88
-avatar_hold_r_bazooka.bvh       ef62d355-c815-4816-2474-b1acc21094a6
-avatar_hold_r_handgun.bvh       efdc1727-8b8a-c800-4077-975fc27ee2f2
-avatar_hold_r_rifle.bvh 3d94bad0-c55b-7dcc-8763-033c59405d33
-avatar_hover.bvh        4ae8016b-31b9-03bb-c401-b1ea941db41d
-avatar_hover_down.bvh   20f063ea-8306-2562-0b07-5c853b37b31e
-avatar_hover_up.bvh     62c5de58-cb33-5743-3d07-9e4cd4352864
-avatar_impatient.bvh    5ea3991f-c293-392e-6860-91dfa01278a3
-avatar_jump.bvh 2305bd75-1ca9-b03b-1faa-b176b8a8c49e
-avatar_jumpforjoy.bvh   709ea28e-1573-c023-8bf8-520c8bc637fa
-avatar_kick_roundhouse_r.bvh    49aea43b-5ac3-8a44-b595-96100af0beda
-avatar_kissmybutt.bvh   19999406-3a3a-d58c-a2ac-d72e555dcf51
-avatar_land.bvh 7a17b059-12b2-41b1-570a-186368b6aa6f
-avatar_laugh_short.bvh  ca5b3f14-3194-7a2b-c894-aa699b718d1f
-avatar_motorcycle_sit.bvh       08464f78-3a8e-2944-cba5-0c94aff3af29
-avatar_musclebeach.bvh  315c3a41-a5f3-0ba4-27da-f893f769e69b
-avatar_no_head.bvh      5a977ed9-7f72-44e9-4c4c-6e913df8ae74
-avatar_no_unhappy.bvh   d83fa0e5-97ed-7eb2-e798-7bd006215cb4
-avatar_nyanya.bvh       f061723d-0a18-754f-66ee-29a44795a32f
-avatar_peace.bvh        b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9
-avatar_point_me.bvh     17c024cc-eef2-f6a0-3527-9869876d7752
-avatar_point_you.bvh    ec952cca-61ef-aa3b-2789-4d1344f016de
-avatar_prejump.bvh      7a4e87fe-de39-6fcb-6223-024b00893244
-avatar_punch_l.bvh      f3300ad9-3462-1d07-2044-0fef80062da0
-avatar_punch_onetwo.bvh eefc79be-daae-a239-8c04-890f5d23654a
-avatar_punch_r.bvh      c8e42d32-7310-6906-c903-cab5d4a34656
-avatar_rps_countdown.bvh        35db4f7e-28c2-6679-cea9-3ee108f7fc7f
-avatar_rps_paper.bvh    0836b67f-7f7b-f37b-c00a-460dc1521f5a
-avatar_rps_rock.bvh     42dd95d5-0bc6-6392-f650-777304946c0f
-avatar_rps_scissors.bvh 16803a9f-5140-e042-4d7b-d28ba247c325
-avatar_run.bvh  05ddbff8-aaa9-92a1-2b74-8fe77a29b445
-avatar_salute.bvh       cd7668a6-7011-d7e2-ead8-fc69eff1a104
-avatar_shoot_l_bow.bvh  e04d450d-fdb5-0432-fd68-818aaf5935f8
-avatar_shout.bvh        6bd01860-4ebd-127a-bb3d-d1427e8e0c42
-avatar_sit.bvh  1a5fe8ac-a804-8a5d-7cbd-56bd83184568
-avatar_sit_female.bvh   b1709c8d-ecd3-54a1-4f28-d55ac0840782
-avatar_sit_generic.bvh  245f3c54-f1c0-bf2e-811f-46d8eeb386e7
-avatar_sit_ground.bvh   1c7600d6-661f-b87b-efe2-d7421eb93c86
-avatar_sit_ground_constrained.bvh       1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e
-avatar_sit_to_stand.bvh a8dee56f-2eae-9e7a-05a2-6fb92b97e21e
-avatar_sleep.bvh        f2bed5f9-9d44-39af-b0cd-257b2a17fe40
-avatar_smoke_idle.bvh   d2f2ee58-8ad1-06c9-d8d3-3827ba31567a
-avatar_smoke_inhale.bvh 6802d553-49da-0778-9f85-1599a2266526
-avatar_smoke_throw_down.bvh     0a9fb970-8b44-9114-d3a9-bf69cfe804d6
-avatar_snapshot.bvh     eae8905b-271a-99e2-4c0e-31106afd100c
-avatar_soft_land.bvh    f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57
-avatar_stand.bvh        2408fe9e-df1d-1d7d-f4ff-1384fa7b350f
-avatar_stand_1.bvh      15468e00-3400-bb66-cecc-646d7c14458e
-avatar_stand_2.bvh      370f3a20-6ca6-9971-848c-9a01bc42ae3c
-avatar_stand_3.bvh      42b46214-4b44-79ae-deb8-0df61424ff4b
-avatar_stand_4.bvh      f22fed8b-a5ed-2c93-64d5-bdd8b93c889f
-avatar_standup.bvh      3da1d753-028a-5446-24f3-9c9b856d9422
-avatar_stretch.bvh      80700431-74ec-a008-14f8-77575e73693f
-avatar_stride.bvh       1cb562b0-ba21-2202-efb3-30f82cdf9595
-avatar_surf.bvh 41426836-7437-7e89-025d-0aa4d10f1d69
-avatar_sword_strike_r.bvh       85428680-6bf9-3e64-b489-6f81087c24bd
-avatar_talk.bvh 5c682a95-6da4-a463-0bf6-0f5b7be129d1
-avatar_throw_r.bvh      aa134404-7dac-7aca-2cba-435f9db875ca
-avatar_tryon_shirt.bvh  83ff59fe-2346-f236-9009-4e3608af64c1
-avatar_turn_180.bvh     038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53
-avatar_turnback_180.bvh 6883a61a-b27b-5914-a61e-dda118a9ee2c
-avatar_turnleft.bvh     56e0ba0d-4a9f-7f27-6117-32f2ebbf6135
-avatar_turnright.bvh    2d6daa51-3192-6794-8e2e-a15f8338ec30
-avatar_type.bvh c541c47f-e0c0-058b-ad1a-d6ae3a4584d9
-avatar_walk.bvh 6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0
-avatar_whisper.bvh      7693f268-06c7-ea71-fa21-2b30d6533f8f
-avatar_whistle.bvh      b1ed7982-c68e-a982-7561-52a88a5298c0
-avatar_wink_hollywood.bvh       c0c4030f-c02b-49de-24ba-2331f43fe41c
-avatar_yes_happy.bvh    b8c8b2a3-9008-1771-3bfc-90924955ab2d
-avatar_yes_head.bvh     15dd911d-be82-2856-26db-27659b142875
-avatar_yoga_float.bvh   42ecd00b-9947-a97c-400a-bbc9174c7aeb
-fringe.tga      8ac54e9d-ec09-d804-60ab-47404a9b4a36
-foot_shadow.tga 14e8a47d-1055-0a68-5d55-eafd9ad3da5b
-img_smoke_poof.tga      c734da52-f2ba-f0ba-d59e-15ea49f3d5e9
-img_shot.tga    173b05c7-53a9-4cf8-ce6b-5eec21c5c63f
-folder_arrow.tga        09a324a8-acc1-d9cd-2cbd-7465d90d3a98
-color_swatch_alpha.tga  f13db22f-c55c-8bdf-7b1c-221e56fde253
-script_error.tga        e5a0ec29-f59e-d29e-2c59-ed66c187c26c
-status_script_debug.tga 7775b5cc-93a5-6efd-0d9b-4e079afac217
-water_normal.tga        822ded49-9a6c-f61c-cb89-6df54f42cdf4
-icon_groupnotice.tga    21579c81-a85e-f11c-2d80-33a4c007d88c
-icon_groupnoticeinventory.tga   8fcca699-08e7-3d58-2f05-86c9d52bbe82
-tab_background_lightgrey.tga    c769e547-c307-43ca-2b6a-51cad6d1c527
-tab_background_purple.tga       0ae8a2e9-aff4-249c-fc4a-0f41f89847dd
-tab_background_darkpurple.tga   38ff4f7e-3078-a749-8302-d6cc94b404c4
-smicon_warn.tga f47c17a3-8bfb-3c9f-22b8-77923de7eed9
-uv_test1.tga    f43b75f5-9aa5-18ec-d5d9-e6d1b8442613
-uv_test2.tga    300ce95f-3d3f-7c1a-3a22-3fc48f873fb9
-eye_button_active.tga   2b42b375-f9b4-788e-46c7-7ef38762d0ba
-eye_button_inactive.tga be1b7225-98b5-eb2a-2c86-ddaae3328a6e
-account_id_blue.tga     6ab9179a-7308-58db-6c9d-893d3b52bece
-account_id_orange.tga   fbe89371-1251-4e77-d2d8-8eeccffe3ca8
-account_id_green.tga    3bf64d5a-38d3-b752-cf52-3d9f8fca353a
-status_push.tga 07d1f523-e327-4d10-20d6-8bc22a6e8f56
-ff_visible_online.tga   d609a41f-34c0-7aae-b2c6-2fc3ab26d916
-ff_visible_map.tga      20b52706-c1ab-414a-9dea-1cb788ad5689
-ff_edit_mine.tga        1baee0b9-4b89-39eb-8815-866d82300ab5
-ff_edit_theirs.tga      32e981cd-4700-da5a-7fc7-d573ec3742f4
-inv_item_script_dangerous.tga   0b502db8-6fcd-c442-ecfe-483a0dce875e
-ff_visible_map_button.tga       c1079bef-5cf9-90f3-6dcd-48989851c252
-ff_visible_online_button.tga    36749b47-93d6-2c5e-7ebd-d38d30311163
-ff_edit_theirs_button.tga       ca229f65-d7e0-133e-1bc2-674abc33f3d5
-ff_edit_mine_button.tga 57f05b46-63d8-c3d5-66d6-8b915746b956
-ff_online_status_button.tga     3b1b6a53-9c8c-568a-22c5-2a8f3e5286f5
-oi_hud_cen_0_0.tga      3c650257-9caf-7cad-b26c-84c9eca560f1
-oi_hud_intro.tga        7611fb3d-9ff2-abd3-d98f-805c1c87e757
-oi_hud_underwater.tga   cde61aea-83c2-3001-d598-6b348f7a8e0b
-oi_hud_got_passport.tga 1271838d-d777-b811-7c4c-2a00308bd80a
-oi_hud_texture_off_edge.tga     852be205-b1ea-6356-58c8-8c5ee5a841a6
-oi_hud_texture_on_edge.tga      ab11e6ff-a732-be70-67df-c43131274562
-oi_hud_flyingabovewater.tga     c9d150d6-2739-5f8b-cce6-3cf98242920a
-oi_hud_walkingabovewater.tga    78284eeb-05f3-ff25-11a0-3cc9dbb30f0c
-oi_hud_landmark.tga     6cd9c221-9d42-a283-256b-09a113a87271
-oi_hud_cus_5_3.tga      7c12f4fb-f502-26d1-a2f3-cdb6aff61663
-oi_hud_cus_5_2.tga      c52c9c94-adc0-0f4e-6658-ed33d6ea8829
-oi_hud_cus_5_1.tga      9f6d5d11-6ca9-608c-e8a6-b77989350292
-oi_hud_cus_5_0.tga      2000cff1-119f-2023-66c0-ac5630d2f96e
-oi_hud_cus_4_5.tga      f302a935-ccd1-e2f5-3a38-e185cc262f3a
-oi_hud_cus_4_3.tga      af8d5b3c-b40f-cea5-b0b2-440fbd84a11a
-oi_hud_cus_4_2.tga      11b26901-8207-12bc-5224-10a12ac4c651
-oi_hud_cus_4_1.tga      41baadb7-1b94-907e-9443-54e92bba77cd
-oi_hud_cus_4_0.tga      9d627f8e-092c-5d32-6c12-ef76ab81cedc
-oi_hud_cus_3_4.tga      b196486e-d0d2-4fd7-529a-c84b4495fc74
-oi_hud_cus_3_2.tga      0b81c4bb-de33-e493-7bcb-e7221d97e5e7
-oi_hud_cus_3_1.tga      436dab74-25ae-8b60-c648-50663b7faa1d
-oi_hud_cus_3_0.tga      6c1594de-1e66-273c-a2ab-8f0ffa8b4633
-oi_hud_cus_2_4.tga      bb31fe48-8566-eec0-e96b-64025f832b63
-oi_hud_cus_2_2.tga      c946959a-26ae-eb66-efa0-20154057789d
-oi_hud_cus_2_1.tga      c946959a-26ae-eb66-efa0-20154057789d
-oi_hud_cus_2_0.tga      d7833106-b4a8-7666-bde1-64886de289f9
-oi_hud_cus_1_0.tga      811ded22-5940-940c-4821-6fbbfb6611d6
-oi_hud_cus_1_1.tga      eda8513b-a343-5109-1fd6-f1c7ad89b703
-oi_hud_cus_1_2.tga      7a4ce18c-e715-34d4-dfee-704c270a8ac8
-oi_hud_cus_1_4.tga      d3771c15-ac03-b762-b992-d9fd2fedf38a
-oi_hud_com_4_4.tga      d9e1e90d-3cc3-6269-128e-67f7a2b32d26
-oi_hud_com_4_2.tga      0f649a26-6fdb-c73b-ffac-e50fc311d5ce
-oi_hud_com_4_1.tga      ae5b1ce6-a2d2-22d2-f532-6280b3bc6adb
-oi_hud_com_4_0.tga      12cda3a0-58c7-dfa8-7f9b-380e5bb8baf9
-oi_hud_com_3_4.tga      ff326257-0530-356a-e0f8-be535044e540
-oi_hud_com_3_2.tga      66740ddb-1d56-89f9-f0c9-ae5eb7bb9537
-oi_hud_com_3_1.tga      55d662f4-6a28-6388-7c75-af1c9fd33055
-oi_hud_com_3_0.tga      de9d318f-b69e-82f9-0c61-43b868c5ca6b
-oi_hud_com_2_4.tga      01d47e68-400a-d0e1-afb7-d6806d1d477e
-oi_hud_com_2_0.tga      09c98850-27d4-6a12-abae-4af4bba23b6b
-oi_hud_com_1_3.tga      5c2049b9-f797-6608-ca71-758f3716aa90
-oi_hud_com_1_1.tga      1116ff68-cdc4-1cfc-e137-30f8426afeda
-oi_hud_com_1_0.tga      bd847d31-f5af-95f7-2b9c-af47d8ba53bd
-oi_hud_nav_4_5.tga      66194280-b087-db94-35d9-41e8f7518515
-oi_hud_nav_4_4.tga      180c4241-e309-4c05-13ee-9080ab69498d
-oi_hud_nav_4_3.tga      e98a6ba6-99c6-fa15-84b6-9afadea6c467
-oi_hud_nav_4_2.tga      2e19f352-1893-59a9-949b-4d2cfd3a8222
-oi_hud_nav_4_1.tga      13a1675b-fb5a-19b3-b5a3-74b0a6765f7d
-oi_hud_nav_4_0.tga      e7526e8d-b085-b26c-b0ae-2708ec231401
-oi_hud_nav_3_5.tga      5e67b0d0-29a2-6a08-c85e-b12d59e53d6e
-oi_hud_nav_3_4.tga      2ed8fbc2-5c4d-53c2-b289-88baffceab1a
-oi_hud_nav_3_3.tga      e0a72f1a-282e-1c1a-2cb7-6423feb41759
-oi_hud_nav_3_2.tga      4bcebb23-da5e-47d9-eac1-e4453f762c8c
-oi_hud_nav_3_1.tga      6ac87575-330e-3a2d-3b80-a34e7b277e50
-oi_hud_nav_3_0.tga      f1451e8e-7310-9152-47d5-5d037c28fef3
-oi_hud_nav_2_6.tga      c60b42ff-ee60-98e4-e603-ca2470141d4b
-oi_hud_nav_2_5.tga      a02b5a1a-bbdb-5556-ae5b-a2e68494755a
-oi_hud_nav_2_4.tga      625535ab-8abf-b3e7-48fb-43f728b77c79
-oi_hud_nav_2_3.tga      00a609c3-5750-3b5a-3ce3-458bdf632203
-oi_hud_nav_2_2.tga      94903387-d37f-092c-e4d2-c190f68577b8
-oi_hud_nav_2_1.tga      ee0cd82c-6ce8-8e73-307b-6d0dc77b19e8
-oi_hud_nav_2_0.tga      3e10b379-ed2c-7424-1fe7-bef3558c7536
-oi_hud_nav_1_4.tga      bf8d0be8-2012-1664-3ea5-e69a71c206e9
-oi_hud_nav_1_2.tga      72100f87-18a7-fc4a-4793-de281e8b02cc
-oi_hud_nav_1_1.tga      b048faf3-60ce-c3a2-d034-36613449d377
-oi_hud_nav_1_0.tga      0ad45106-3b26-6448-0b90-feae8bd46c38
-oi_hud_mov_4_5.tga      7c4a45c2-37dd-312c-c6ab-20896dd0a5a6
-oi_hud_mov_4_3.tga      8a88da1c-3735-c71e-d48a-016df0798de4
-oi_hud_mov_4_2.tga      f55ae4d3-7d6a-e6ac-4cf7-03014ce14390
-oi_hud_mov_4_1.tga      1cc3fcf1-35c0-e222-27d2-6905cf5c4cee
-oi_hud_mov_4_0.tga      1ae592dc-46f4-616e-b7c6-0dff3e6f40e5
-oi_hud_mov_3_4.tga      831b39be-99fc-45bd-ba85-708f9dc93bfd
-oi_hud_mov_3_2.tga      9f7e7373-92a9-d66a-ad5a-afb55ca6ac1f
-oi_hud_mov_3_1.tga      ab37ed0d-7e66-1f77-3acf-b0fe4b74dbe8
-oi_hud_mov_3_0.tga      f5ff1f08-4c92-8606-1854-cc5b9d3e445c
-oi_hud_mov_1_2.tga      1e3abeed-e893-c44e-1f9d-5ecc76d21e5d
-oi_hud_mov_1_0.tga      e300fc95-aa94-8e31-c501-ce903cac8b7c
diff --git a/linden/indra/newview/app_settings/viewerart.xml b/linden/indra/newview/app_settings/viewerart.xml
index dbd2227..d56efea 100644
--- a/linden/indra/newview/app_settings/viewerart.xml
+++ b/linden/indra/newview/app_settings/viewerart.xml
@@ -1,282 +1,4 @@
 <settings version = "101">
-        <closebox.tga value="47a8c844-cd2a-4b1a-be01-df8b1612fe5d"/>
-        <close_in_blue.tga value="e5821134-23c0-4bd0-af06-7fa95b9fb01a"/>
-        <tearoffbox.tga value="74e1a96f-4833-a24d-a1bb-1bce1468b0e7"/>
-        <tearoff_pressed.tga value="d2524c13-4ba6-af7c-e305-8ac6cc18d86a"/>
-        <resize_handle_bottom_right_blue.tga value="e3690e25-9690-4f6c-a745-e7dcd885285a"/>
-        <scrollbutton_up_out_blue.tga value="dad084d7-9a46-452a-b0ff-4b9f1cefdde9"/>
-        <scrollbutton_up_in_blue.tga value="a93abdf3-27b5-4e22-a8fa-c48216cd2e3a"/>
-        <scrollbutton_down_out_blue.tga value="b4ecdecf-5c8d-44e7-b882-17a77e88ed55"/>
-        <scrollbutton_down_in_blue.tga value="d2421bab-2eaf-4863-b8f6-5e4c52519247"/>
-        <scrollbutton_left_out_blue.tga value="43773e8d-49aa-48e0-80f3-a04715f4677a"/>
-        <scrollbutton_left_in_blue.tga value="ea137a32-6718-4d05-9c22-7d570d27b2cd"/>
-        <scrollbutton_right_out_blue.tga value="3d700d19-e708-465d-87f2-46c8c0ee7938"/>
-        <scrollbutton_right_in_blue.tga value="b749de64-e903-4c3c-ac0b-25fb6fa39cb5"/>
-        <spin_up_out_blue.tga value="56576e6e-6710-4e66-89f9-471b59122794"/>
-        <spin_up_in_blue.tga value="c8450082-96a0-4319-8090-d3ff900b4954"/>
-        <spin_down_out_blue.tga value="b6d240dd-5602-426f-b606-bbb49a30726d"/>
-        <spin_down_in_blue.tga value="a985ac71-052f-48e6-9c33-d931c813ac92"/>
-        <radio_active_false.tga value="7a1ba9b8-1047-4d1e-9cfc-bc478c80b63f"/>
-        <radio_active_true.tga value="52f09e07-5816-4052-953c-94c6c10479b7"/>
-        <radio_inactive_false.tga value="90688481-67ff-4af0-be69-4aa084bcad1e"/>
-        <radio_inactive_true.tga value="1975db39-aa29-4251-aea0-409ac09d414d"/>
-        <checkbox_enabled_false.tga value="05bb64ee-96fd-4243-b74e-f40a41bc53ba"/>
-        <checkbox_enabled_true.tga value="cf4a2ed7-1533-4686-9dde-df9a37ddca55"/>
-        <checkbox_disabled_false.tga value="7d94cb59-32a2-49bf-a516-9e5a2045f9d9"/>
-        <checkbox_disabled_true.tga value="c817c642-9abd-4236-9287-ae0513fe7d2b"/>
-        <tab_top_blue.tga value="1ed83f57-41cf-4052-a3b4-2e8bb78d8191"/>
-        <tab_top_selected_blue.tga value="16d032e8-817b-4368-8a4e-b7b947ae3889"/>
-        <tab_bottom_blue.tga value="bf0a8779-689b-48c3-bb9a-6af546366ef4"/>
-        <tab_bottom_selected_blue.tga value="c001d8fd-a869-4b6f-86a1-fdcb106df9c7"/>
-        <tab_left.tga value="1097dcb3-aef9-8152-f471-431d840ea89e"/>
-        <tab_left_selected.tga value="bea77041-5835-1661-f298-47e2d32b7a70"/>
-        <crosshairs.tga value="6e1a3980-bf2d-4274-8970-91e60d85fb52"/>
-        <move_backward_in.tga value="db11d956-5e7d-4aa5-b39d-7774d339fc5c"/>
-        <move_backward_out.tga value="3ae8bb18-ed97-4cd3-ae5c-d54bc8479fe7"/>
-        <move_down_in.tga value="b92a70b9-c841-4c94-b4b3-cee9eb460d48"/>
-        <move_down_out.tga value="b5abc9fa-9e62-4e03-bc33-82c4c1b6b689"/>
-        <move_forward_in.tga value="54197a61-f5d1-4c29-95d2-c071d08849cb"/>
-        <move_forward_out.tga value="a0eb4021-1b20-4a53-892d-8faa9265a6f5"/>
-        <move_left_in.tga value="724996f5-b956-46f6-9844-4fcfce1d5e83"/>
-        <move_left_out.tga value="82476321-0374-4c26-9567-521535ab4cd7"/>
-        <move_right_in.tga value="7eeb57d2-3f37-454d-a729-8b217b8be443"/>
-        <move_right_out.tga value="1fbe4e60-0607-44d1-a50a-032eff56ae75"/>
-        <move_turn_left_in.tga value="95463c78-aaa6-464d-892d-3a805b6bb7bf"/>
-        <move_turn_left_out.tga value="13a93910-6b44-45eb-ad3a-4d1324c59bac"/>
-        <move_turn_right_in.tga value="5e616d0d-4335-476f-9977-560bccd009da"/>
-        <move_turn_right_out.tga value="5a44fd04-f52b-4c30-8b00-4a31e27614bd"/>
-        <move_up_out.tga value="f887146d-829f-4e39-9211-cf872b78f97c"/>
-        <move_up_in.tga value="49b4b357-e430-4b56-b9e0-05b8759c3c82"/>
-        <cam_rotate_out.tga value="88745b46-da05-11d5-8ac0-0003477c4611"/>
-        <cam_rotate_in.tga value="70bf2262-3eed-4996-88ac-076907e8921d"/>
-        <cam_zoom_out.tga value="bb02e941-cb3b-4dd3-892a-6841b5de6e45"/>
-        <cam_zoom_plus_in.tga value="c7aefd32-ce13-4242-82cc-2631d44ff9d3"/>
-        <cam_zoom_minus_in.tga value="deed3f4b-93e9-4183-a3b0-a5a98a6de1bb"/>
-        <cam_tracking_out.tga value="95c4ea0e-e3c2-4904-b847-7d7676139ebb"/>
-        <cam_tracking_in.tga value="fe2fc73b-5a64-4a8e-aacc-46fa81faf96a"/>
-        <direction_arrow.tga value="586383e8-4d9b-4fba-9196-2b5938e79c2c"/>
-        <minimize.tga value="34c9398d-bb78-4643-9633-46a2fa3e9637"/>
-        <minimize_inactive.tga value="6e72abba-1378-437f-bf7a-f0c15f3e99a3"/>
-        <minimize_pressed.tga value="39801651-26cb-4926-af57-7af9352c273c"/>
-        <restore.tga value="111b39de-8928-4690-b7b2-e17d5c960277"/>
-        <restore_inactive.tga value="0eafa471-70af-4882-b8c1-40a310929744"/>
-        <restore_pressed.tga value="90a0ed5c-2e7b-4845-9958-a64a1b30f312"/>
-        <combobox_arrow.tga value="b31c1335-0e9c-4927-bc90-53277777d9c1"/>
-        <white.tga value="5748decc-f629-461c-9a36-a35a221fe21f"/>
-        <darkgray.tga value="267e26d3-e0e1-41b8-91b1-3b337102928d"/>
-        <lightgray.tga value="c520bf46-cc5d-412b-a60b-9f1bd245189f"/>
-        <eyes.tga value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
-        <hair.tga value="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"/>
-        <black.tga value="e2244626-f22f-4839-8123-1e7baddeb659"/>
-        <close_inactive_blue.tga value="779e4fa3-9b13-f74a-fba9-3886fe9c86ba"/>
-        <button_disabled_32x128.tga value="f8124d60-2875-c358-7847-2acb63e5400c"/>
-        <button_enabled_32x128.tga value="d8faf8cb-ee6e-b0b5-abd9-bde873ad3461"/>
-        <button_enabled_selected_32x128.tga value="1eddba75-b682-110a-104e-6cdcce616a25"/>
-        <button_anim_play_selected.tga value="119c37bb-24af-45fe-ae11-3a6bc3c85138"/>
-        <button_anim_pause_selected.tga value="ad65d67a-777b-fbfa-693d-4bdcfca2acca"/>
-        <button_anim_pause.tga value="db2d9c2d-0bbd-21e2-e83a-103ea2def7a8"/>
-        <button_anim_play.tga value="2a7f6738-5d82-2ff3-d419-30ed09cbb72b"/>
-        <button_anim_stop.tga value="e10c9e36-d9f6-c8b4-de96-557dccce9205"/>
-        <button_anim_stop_selected.tga value="b8c0e0aa-2771-439e-c919-d2f5dad69a1c"/>
-        <rounded_square.tga value="38ce8b3c-fb30-5c59-9926-bd643613f606"/>
-        <rounded_square_soft.tga value="4c95e6bc-fe77-9cb4-b58a-909848042c1e"/>
-        <badge_ok.tga value="211035a7-c313-378d-478c-e80bbd0fde63"/>
-        <badge_note.tga value="13f6e639-b3f9-28da-a1e6-e990a43052b6"/>
-        <badge_warn.tga value="0992d4bc-7af8-4a1f-f2e6-e6c4083b066e"/>
-        <badge_error.tga value="00c50485-8491-ab70-2ea8-43f26fd028e2"/>
-        <status_money.tga value="5863eb7a-1546-6501-533a-6061f73a36b7"/>
-        <status_health.tga value="4330e8ce-b39b-1eb8-c2ec-a97c0b3947b5"/>
-        <status_fly.tga value="0e058115-5b8f-c3d7-dcaa-9623d92885d1"/>
-        <status_build.tga value="175a6b75-45c9-c2c2-4765-bf37a3909b53"/>
-        <status_busy.tga value="beb0d821-6725-abdf-032d-1f70cdabde82"/>
-        <status_scripts.tga value="4cc1afcd-04dd-178f-e074-0f9dc730ab45"/>
-        <status_buy_currency.tga value="f43a535a-59ac-26e3-84bc-c786735fabe4"/>
-        <status_buy_currency_pressed.tga value="bfa5be70-37c7-8126-fecd-df55390954d5"/>
-        <status_buy_land.tga value="1a0edac5-3e50-fc9b-2752-70c1f69cb959"/>
-        <status_buy_land_pressed.tga value="257647b7-199f-99ff-8be9-f6753289a3aa"/>
-        <terrain_dirt.tga value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/>
-        <terrain_grass.tga value="abb783e6-3e93-26c0-248a-247666855da3"/>
-        <terrain_mountain.tga value="179cdabd-398a-9b6b-1391-4dc333ba321f"/>
-        <terrain_rock.tga value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/>
-        <terrain_dirt_detail.tga value="0bc58228-74a0-7e83-89bc-5c23464bcec5"/>
-        <terrain_grass_detail.tga value="63338ede-0037-c4fd-855b-015d77112fc8"/>
-        <terrain_mountain_detail.tga value="303cd381-8560-7579-23f1-f0a880799740"/>
-        <terrain_rock_detail.tga value="53a2f406-4895-1d13-d541-d2e3b86bc19c"/>
-        <square_btn_32x128.tga value="b28df901-6b8d-d31c-7903-4eb9676d4bfc"/>
-        <square_btn_selected_32x128.tga value="c48c9e95-191b-96d3-08b2-6e8ada58b651"/>
-        <tree_pine_1.tga value="0187babf-6c0d-5891-ebed-4ecab1426683"/>
-        <tree_oak.tga value="8a515889-eac9-fb55-8eba-d2dc09eb32c8"/>
-        <tree_tropical_1.tga value="5bc11cd6-2f40-071e-a8da-0903394204f9"/>
-        <tree_palm_1.tga value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c"/>
-        <tree_dogwood.tga value="64367bd1-697e-b3e6-0b65-3f862a577366"/>
-        <tree_tropical_2.tga value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8"/>
-        <tree_palm_2.tga value="2d784476-d0db-9979-0cff-9408745a7cf3"/>
-        <tree_cypress_1.tga value="fb2ae204-3fd1-df33-594f-c9f882830e66"/>
-        <tree_cypress_2.tga value="30047cec-269d-408e-0c30-b2603b887268"/>
-        <tree_pine_2.tga value="d691a01c-13b7-578d-57c0-5caef0b4e7e1"/>
-        <tree_plumeria.tga value="6de37e4e-7029-61f5-54b8-f5e63f983f58"/>
-        <winter_tree_aspen.tga value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a"/>
-        <winter_tree_pine_1.tga value="10d2a01a-0818-84b9-4b96-c2eb63256519"/>
-        <winter_tree_pine_2.tga value="67931331-0c02-4876-1255-28770896c6a2"/>
-        <tree_eucalyptus.tga value="a6162133-724b-54df-a12f-51cd070ad6f3"/>
-        <tree_fern.tga value="8872f2b8-31db-42d8-580a-b3e4a91262de"/>
-        <tree_eelgrass.tga value="96b4de31-f4fa-337d-ec78-451e3609769e"/>
-        <tree_sea_sword.tga value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3"/>
-        <tree_kelp_1.tga value="2caf1179-7861-6ff3-4b7d-46e17780bdfa"/>
-        <tree_kelp_2.tga value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f"/>
-        <tree_beach_grass_1.tga value="18fb888b-e8f1-dce7-7da7-321d651ea6b0"/>
-        <tool_dozer.tga value="d2a0d4d4-54eb-4d16-be4b-4eae43845c74"/>
-        <tool_dozer_active.tga value="d4afdbbe-1550-4b7d-91de-95731f47e8e3"/>
-        <tool_land.tga value="86fe4df4-0ecb-4382-b9ae-475925a92388"/>
-        <tool_land_active.tga value="34e60587-0791-4a07-8918-f5995fcc22a3"/>
-        <tool_zoom.tga value="27eb8829-fe65-45ed-a49a-73aac42f4b38"/>
-        <tool_zoom_active.tga value="69445f58-5c8e-44e0-9d2e-47408bb43b39"/>
-        <tool_orbit.tga value="06964fe4-033f-448a-95c9-30dc41d1be8b"/>
-        <tool_orbit_active.tga value="ee4e07db-3f72-4098-bd4c-aef34515a7bc"/>
-        <tool_pan.tga value="a32aa302-0a15-48d2-b2b1-4d69f1161173"/>
-        <tool_pan_active.tga value="24d9ad33-0b42-4eb5-99a3-659d838bc5c0"/>
-        <inv_folder_texture.tga value="743f035b-a049-43f4-16c7-7ec8daa2c481"/>
-        <inv_folder_sound.tga value="e10cb910-1e71-da47-bd12-8c53f7793714"/>
-        <inv_folder_callingcard.tga value="a3735971-e2b2-d78a-580d-d265cd8f2484"/>
-        <inv_folder_landmark.tga value="9f921155-7c8c-e276-d5ec-03ac9340584d"/>
-        <inv_folder_script.tga value="baa5c310-6a6d-cc48-51eb-65196ba31d77"/>
-        <inv_folder_object.tga value="113e5133-fd0d-ee51-4a59-9d67ca10e8a7"/>
-        <inv_folder_notecard.tga value="a9e75d84-5073-9cb7-10a9-1ca68ef5c7ba"/>
-        <inv_folder_clothing.tga value="f1427d3d-b2e8-97c4-69ab-1f36d4c0e8f0"/>
-        <inv_folder_bodypart.tga value="1fe05580-1d2f-0345-b28b-52b6e3a20e5d"/>
-        <inv_folder_trash.tga value="88ad072e-ea0b-aabd-5ac0-b37862a6eb66"/>
-        <inv_folder_plain_closed.tga value="86f00960-c3e9-9680-145d-3beffd743e9c"/>
-        <inv_folder_plain_open.tga value="d15dc243-2d0b-47af-0ce1-ec376464bdc8"/>
-        <inv_folder_snapshot.tga value="6efe85e7-800f-1843-296c-a5b7adffe091"/>
-        <inv_folder_lostandfound.tga value="9a371a04-297d-bacf-0d16-5f49753efe1d"/>
-        <inv_folder_animation.tga value="4d59b3ee-f29d-b912-2bcc-9bb1f8a07ec6"/>
-        <inv_folder_gesture.tga value="4de9129a-9fc1-d759-d739-364293906ba2"/>
-        <inv_item_texture.tga value="19f452d7-4eee-9f46-76cc-5497d17f1dd9"/>
-        <inv_item_sound.tga value="eb414d69-c77d-d4e7-66e6-6c2e6f6c1976"/>
-        <inv_item_callingcard_online.tga value="672cc53e-8dc0-ba91-2a4e-574104cf071c"/>
-        <inv_item_callingcard_offline.tga value="d0afe86b-2489-7600-55b7-6abb0a63d9f9"/>
-        <inv_item_landmark.tga value="bf25a2a0-85da-7fa0-0993-e461768d0221"/>
-        <inv_item_landmark_visited.tga value="229fac85-5428-4ab7-adeb-eb8389e91092"/>
-        <inv_item_script.tga value="59a3df81-ed76-06c9-7264-6dada535e7a3"/>
-        <inv_item_clothing.tga value="34dfe476-8e26-0e3a-11cf-76cc4a7126ce"/>
-        <inv_item_object.tga value="0f0780a0-89c4-742a-ef28-26405a41cf85"/>
-        <inv_item_notecard.tga value="23ce8a2c-9ea2-d863-6572-806f0645b0c7"/>
-        <inv_item_bodypart.tga value="d2a5362d-5c55-57dd-a9e9-5c814d1ddc16"/>
-        <inv_item_attach.tga value="5bcae41e-aa5d-02f8-edf1-605ebdd875ab"/>
-        <inv_item_snapshot.tga value="3810d584-b092-7caa-57e0-010f192b9659"/>
-        <inv_item_eyes.tga value="eaa5fd96-5c25-06ef-2280-7ef20203e167"/>
-        <inv_item_gloves.tga value="117b11cb-c04e-5081-13da-1a8846070fd0"/>
-        <inv_item_hair.tga value="6bca3bf4-ed6d-d438-63a0-2a7066d03a0b"/>
-        <inv_item_jacket.tga value="8df59386-56e0-c811-0443-840da3acb3a5"/>
-        <inv_item_pants.tga value="a87a58ca-f857-63b1-0acf-072711ed1bdb"/>
-        <inv_item_shape.tga value="4463e433-4db5-79ef-c1b0-4821b03ddb07"/>
-        <inv_item_shirt.tga value="e2ffb62b-6abc-22d6-952d-764759b4d636"/>
-        <inv_item_shoes.tga value="cf384fa5-1edd-c37c-2134-283dd4fe3396"/>
-        <inv_item_skirt.tga value="0b43f826-2abc-2944-7d72-10777a51d19b"/>
-        <inv_item_socks.tga value="22137c6d-6ec5-6eee-9a2e-2d7a9e6cbcd4"/>
-        <inv_item_underpants.tga value="2f15dc09-4385-526c-aa5d-d9d516ec7d99"/>
-        <inv_item_undershirt.tga value="f72ab629-a3ab-de0c-35c0-5285e27478ce"/>
-        <inv_item_animation.tga value="b5cda0d6-d196-ce48-63db-d04323ef8931"/>
-        <inv_item_gesture.tga value="5579245d-d5bf-5f13-46b0-8624490de24c"/>
-        <pixiesmall.tga value="168e6813-096e-07ea-97ae-fd416826f627"/>
-        <legend.tga value="ca7609c6-6ec6-32d9-332e-0d8f437ef644"/>
-        <propertyline.tga value="e3548c46-8d5e-03da-fcab-4fc36ad818bb"/>
-        <startup_logo.tga value="66864f3c-e095-d9c8-058d-d6575e6ed1b8"/>
-        <grass_texture_1.tga value="79504bf5-c3ec-0763-6563-d843de66d0a1"/>
-        <grass_texture_2.tga value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/>
-        <grass_texture_3.tga value="99bd60a2-3250-efc9-2e39-2fbcadefbecc"/>
-        <grass_texture_4.tga value="7a2b3a4a-53c2-53ac-5716-aac7d743c020"/>
-        <undergrowth_1.tga value="8f458549-173b-23ff-d4ff-bfaa5ea2371b"/>
-        <silhouette.tga value="da5d4079-7819-6b53-d2a4-dc9929381d7d"/>
-        <avatar_thumb_bkgrnd.tga value="3a7f4f0d-be14-ee78-29e3-fc8b0b2a68d3"/>
-        <missing_asset.tga value="32dfd1c8-7ff6-5909-d983-6d4adfb4255d"/>
-        <alpha_gradient.tga value="e97cf410-8e61-7005-ec06-629eba4cd1fb"/>
-        <alpha_gradient_2d.tga value="38b86f85-2575-52a9-a531-23108d8da837"/>
-        <alpha_noise.tga value="b9e1cf8a-9660-c020-0c69-18f1ea27268a"/>
-        <alpha_sizzle.tga value="e121e2fc-7573-740f-edfd-0d45a9ba486e"/>
-        <bump_woodgrain.tga value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc"/>
-        <bump_bark.tga value="6c9fa78a-1c69-2168-325b-3e03ffa348ce"/>
-        <bump_bricks.tga value="b8eed5f0-64b7-6e12-b67f-43fa8e773440"/>
-        <bump_checker.tga value="9deab416-9c63-78d6-d558-9a156f12044c"/>
-        <bump_concrete.tga value="db9d39ec-a896-c287-1ced-64566217021e"/>
-        <bump_crustytile.tga value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94"/>
-        <bump_cutstone.tga value="d9258671-868f-7511-c321-7baef9e948a4"/>
-        <bump_discs.tga value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9"/>
-        <bump_gravel.tga value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61"/>
-        <bump_petridish.tga value="e569711a-27c2-aad4-9246-0c910239a179"/>
-        <bump_siding.tga value="073c9723-540c-5449-cdd4-0e87fdc159e3"/>
-        <bump_stonetile.tga value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0"/>
-        <bump_stucco.tga value="92e66e00-f56f-598a-7997-048aa64cde18"/>
-        <bump_suction.tga value="83b77fc6-10b4-63ec-4de7-f40629f238c5"/>
-        <bump_weave.tga value="735198cf-6ea0-2550-e222-21d3c6a341ae"/>
-        <icon_avatar_online.tga value="529ed15b-3d41-dcc1-79de-90bf21770b5b"/>
-        <icon_avatar_offline.tga value="34648c67-5bfb-5790-e05e-8bd6600fd087"/>
-        <icon_event.tga value="be235ae0-53cf-1d68-b3ae-cf375ed1fb58"/>
-        <icon_event_mature.tga value="cc090999-1b3e-2e97-7a38-c9f4afd10297"/>
-        <icon_group.tga value="04237108-a879-5a95-9b0c-b18fd09bc447"/>
-        <icon_place.tga value="ba0bac4e-815e-14e1-2895-5065b8c703b3"/>
-        <icon_top_pick.tga value="77ca91a2-4431-aeaf-6249-3dd99c7dd86d"/>
-        <icon_popular.tga value="bdd47da5-5b5b-c906-37ad-16aaa64f096f"/>
-        <icon_for_sale.tga value="f20728fd-1670-3771-2293-e0dd3f0bcaab"/>
-        <icon_auction.tga value="96abf5b1-335c-6b76-61e3-74ada07f3cb8"/>
-        <icon_land_for_landless.tga value="c421ddf2-b9d7-b373-503c-f4c423f37f1c"/>
-        <icon_day_cycle.tga value="5b30a285-f1e3-92b1-dcd3-0d07366ced3e"/>
-        <icon_lock.tga value="9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4"/>
-        <noentrylines.tga value="5d3e196b-fd4d-ada7-e4c1-99f8e9f1cfbf"/>
-        <noentrypasslines.tga value="ac8f8627-6a30-8da8-d4bd-958668eea7a0"/>
-        <notify_tip_icon.tga value="74ba3584-58ea-9984-5b76-62d37942ab77"/>
-        <notify_box_icon.tga value="b2ef2d31-9714-a07b-6ca7-31638166364b"/>
-        <notify_next.tga value="07d0ea4c-af0c-aad1-dbbf-c24020ff2b80"/>
-        <map_avatar_you_8.tga value="02fbdc40-5e07-a6e1-228b-58e10f8335b7"/>
-        <map_avatar_8.tga value="0be58a91-8065-c02b-7a12-2cc14dddbc37"/>
-        <map_avatar_16.tga value="db0dadd5-026a-88cf-f5c1-523a0a2daa3e"/>
-        <map_telehub.tga value="bf1b2bb0-13b1-40ae-3354-b1b93761bdb4"/>
-        <map_infohub.tga value="85b1a79a-7f6c-9df3-4d6c-17b1a4efb55a"/>
-        <map_home.tga value="ae9b8f5f-03a1-2e71-db77-6eb27a1ba181"/>
-        <map_event.tga value="6008be5e-9267-2a3a-9798-e81b076c22ca"/>
-        <map_event_mature.tga value="f9cdba28-a227-d613-2f16-ce06209314ae"/>
-        <map_track_8.tga value="bfdc7bf6-e2ee-1754-f4df-cc25887714ad"/>
-        <map_track_16.tga value="a3878395-ef00-a0e6-ee9a-f45ed6b9ce59"/>
-        <object_cone.tga value="c2b8c90a-7dca-26e3-1a63-7aa4a0389cf9"/>
-        <object_cone_active.tga value="cf69c64b-f19e-e1f3-a586-42fef31a23be"/>
-        <object_cube.tga value="70c747ac-1de3-a8b9-514d-101753ca6ccb"/>
-        <object_cube_active.tga value="f9c5e213-1076-7a7d-7889-52388aad2c1a"/>
-        <object_cylinder.tga value="13e35d95-5f6c-9a91-1766-49dedf9b1267"/>
-        <object_cylinder_active.tga value="3f3e4932-8412-e2a7-cfe9-92caf5978b1b"/>
-        <object_grass.tga value="7ca8e672-920b-4653-3970-1abc91abef58"/>
-        <object_grass_active.tga value="d0fc7cc9-646a-6860-cf7c-1d9e58cd6dab"/>
-        <object_hemi_cone.tga value="69d5e60c-739a-40b1-b526-84072121e394"/>
-        <object_hemi_cone_active.tga value="2e0c5435-95bb-1c0d-5da1-42336fb1cfc0"/>
-        <object_hemi_cylinder.tga value="f4be3e06-24a8-f86e-acc7-7daefc0572b7"/>
-        <object_hemi_cylinder_active.tga value="67279486-cfc1-3633-de42-85db65db373c"/>
-        <object_hemi_sphere.tga value="b67251ab-1716-b9fb-f911-967ba3fe027b"/>
-        <object_hemi_sphere_active.tga value="6c489466-3058-6475-6b1b-e5fc1d49f1f3"/>
-        <object_pyramid.tga value="9dde8b56-2cc4-a932-b63a-38c3a83221ad"/>
-        <object_pyramid_active.tga value="e7217b1a-e3d8-e339-d28a-d7714d0b5bee"/>
-        <object_sphere.tga value="7fa122c0-b994-460e-8636-cdc451d67268"/>
-        <object_sphere_active.tga value="f2c3bcbc-2904-41a5-1c22-688f176fd1ee"/>
-        <object_tetrahedron.tga value="e17db404-9fc5-9534-1038-777c82b2771f"/>
-        <object_tetrahedron_active.tga value="2792ea3b-c052-85fe-d168-a62b2f4e9d7c"/>
-        <object_tree.tga value="710d1bec-fb33-28f1-e77e-ddbb5b51f5ed"/>
-        <object_tree_active.tga value="da4835c7-b12a-41dd-11db-dae452f040c2"/>
-        <object_prism.tga value="02935f3a-dcda-3b42-1874-da89d4c12870"/>
-        <object_prism_active.tga value="223aac97-bd2f-ec2e-ad45-5641b77c78f9"/>
-        <object_torus.tga value="19e1f4c9-6aa6-4414-981d-59a1343a6472"/>
-        <object_torus_active.tga value="ef2bca77-5004-4547-b00a-3b96e463f89f"/>
-        <object_tube.tga value="7ce81316-a478-480f-961c-435fcbdecaf0"/>
-        <object_tube_active.tga value="55c3e4d1-cfdc-48a8-af32-a34844b91832"/>
-        <object_ring_active.tga value="2c955a73-fa31-237b-a4a1-5c8ede3bae50"/>
-        <object_ring.tga value="a7610e41-4647-16d8-0e0e-85a1211c1596"/>
-        <container_animation.tga value="c4e657a1-4c86-0159-2da0-32ff948484e6"/>
-        <container_bodypart.tga value="770cb2df-758d-34d5-36c7-e3de06db5b5d"/>
-        <container_clothing.tga value="dd90406f-4c8f-a3f9-41df-d562f94f09e0"/>
-        <container_gesture.tga value="59cd31c0-2791-3c48-f740-f0a36c68653e"/>
-        <container_landmark.tga value="24c63386-04f7-ce6f-4ff2-dfb215d2e21f"/>
-        <container_many_things.tga value="849d3292-d9fa-7186-5465-dd7b5fc1ec48"/>
-        <container_object.tga value="ad887ae1-2bee-f2c9-6786-5599de3c95c4"/>
-        <container_script.tga value="b93bd494-c4bd-bcdf-4a59-35a9497d03f3"/>
-        <container_sound.tga value="5ddea031-cfa3-2776-43e3-c7146c1b4cd6"/>
-        <container_texture.tga value="b3f95caf-bd62-bef3-0ded-dea752920629"/>
         <avatar_aim_l_bow.bvh value="46bb4359-de38-4ed8-6a22-f1f52fe8f506"/>
         <avatar_aim_r_bazooka.bvh value="b5b4a67d-0aee-30d2-72cd-77b333e932ef"/>
         <avatar_aim_r_handgun.bvh value="3147d815-6338-b932-f011-16b56d9ac18b"/>
@@ -391,114 +113,4 @@
         <avatar_yes_happy.bvh value="b8c8b2a3-9008-1771-3bfc-90924955ab2d"/>
         <avatar_yes_head.bvh value="15dd911d-be82-2856-26db-27659b142875"/>
         <avatar_yoga_float.bvh value="42ecd00b-9947-a97c-400a-bbc9174c7aeb"/>
-        <fringe.tga value="8ac54e9d-ec09-d804-60ab-47404a9b4a36"/>
-        <foot_shadow.tga value="14e8a47d-1055-0a68-5d55-eafd9ad3da5b"/>
-        <img_smoke_poof.tga value="c734da52-f2ba-f0ba-d59e-15ea49f3d5e9"/>
-        <img_shot.tga value="173b05c7-53a9-4cf8-ce6b-5eec21c5c63f"/>
-        <folder_arrow.tga value="09a324a8-acc1-d9cd-2cbd-7465d90d3a98"/>
-        <color_swatch_alpha.tga value="f13db22f-c55c-8bdf-7b1c-221e56fde253"/>
-        <script_error.tga value="e5a0ec29-f59e-d29e-2c59-ed66c187c26c"/>
-        <status_script_debug.tga value="7775b5cc-93a5-6efd-0d9b-4e079afac217"/>
-        <water_normal.tga value="822ded49-9a6c-f61c-cb89-6df54f42cdf4"/>
-        <icon_groupnotice.tga value="21579c81-a85e-f11c-2d80-33a4c007d88c"/>
-        <icon_groupnoticeinventory.tga value="8fcca699-08e7-3d58-2f05-86c9d52bbe82"/>
-        <tab_background_lightgrey.tga value="c769e547-c307-43ca-2b6a-51cad6d1c527"/>
-        <tab_background_purple.tga value="0ae8a2e9-aff4-249c-fc4a-0f41f89847dd"/>
-        <tab_background_darkpurple.tga value="38ff4f7e-3078-a749-8302-d6cc94b404c4"/>
-        <smicon_warn.tga value="f47c17a3-8bfb-3c9f-22b8-77923de7eed9"/>
-        <uv_test1.tga value="f43b75f5-9aa5-18ec-d5d9-e6d1b8442613"/>
-        <uv_test2.tga value="300ce95f-3d3f-7c1a-3a22-3fc48f873fb9"/>
-        <eye_button_active.tga value="2b42b375-f9b4-788e-46c7-7ef38762d0ba"/>
-        <eye_button_inactive.tga value="be1b7225-98b5-eb2a-2c86-ddaae3328a6e"/>
-        <account_id_blue.tga value="6ab9179a-7308-58db-6c9d-893d3b52bece"/>
-        <account_id_orange.tga value="fbe89371-1251-4e77-d2d8-8eeccffe3ca8"/>
-        <account_id_green.tga value="3bf64d5a-38d3-b752-cf52-3d9f8fca353a"/>
-        <status_push.tga value="07d1f523-e327-4d10-20d6-8bc22a6e8f56"/>
-        <ff_visible_online.tga value="d609a41f-34c0-7aae-b2c6-2fc3ab26d916"/>
-        <ff_visible_map.tga value="20b52706-c1ab-414a-9dea-1cb788ad5689"/>
-        <ff_edit_mine.tga value="1baee0b9-4b89-39eb-8815-866d82300ab5"/>
-        <ff_edit_theirs.tga value="32e981cd-4700-da5a-7fc7-d573ec3742f4"/>
-        <inv_item_script_dangerous.tga value="0b502db8-6fcd-c442-ecfe-483a0dce875e"/>
-        <ff_visible_map_button.tga value="c1079bef-5cf9-90f3-6dcd-48989851c252"/>
-        <ff_visible_online_button.tga value="36749b47-93d6-2c5e-7ebd-d38d30311163"/>
-        <ff_edit_theirs_button.tga value="ca229f65-d7e0-133e-1bc2-674abc33f3d5"/>
-        <ff_edit_mine_button.tga value="57f05b46-63d8-c3d5-66d6-8b915746b956"/>
-        <ff_online_status_button.tga value="3b1b6a53-9c8c-568a-22c5-2a8f3e5286f5"/>
-        <oi_hud_cen_0_0.tga value="3c650257-9caf-7cad-b26c-84c9eca560f1"/>
-        <oi_hud_intro.tga value="7611fb3d-9ff2-abd3-d98f-805c1c87e757"/>
-        <oi_hud_underwater.tga value="cde61aea-83c2-3001-d598-6b348f7a8e0b"/>
-        <oi_hud_got_passport.tga value="1271838d-d777-b811-7c4c-2a00308bd80a"/>
-        <oi_hud_texture_off_edge.tga value="852be205-b1ea-6356-58c8-8c5ee5a841a6"/>
-        <oi_hud_texture_on_edge.tga value="ab11e6ff-a732-be70-67df-c43131274562"/>
-        <oi_hud_flyingabovewater.tga value="c9d150d6-2739-5f8b-cce6-3cf98242920a"/>
-        <oi_hud_walkingabovewater.tga value="78284eeb-05f3-ff25-11a0-3cc9dbb30f0c"/>
-        <oi_hud_landmark.tga value="6cd9c221-9d42-a283-256b-09a113a87271"/>
-        <oi_hud_cus_5_3.tga value="7c12f4fb-f502-26d1-a2f3-cdb6aff61663"/>
-        <oi_hud_cus_5_2.tga value="c52c9c94-adc0-0f4e-6658-ed33d6ea8829"/>
-        <oi_hud_cus_5_1.tga value="9f6d5d11-6ca9-608c-e8a6-b77989350292"/>
-        <oi_hud_cus_5_0.tga value="2000cff1-119f-2023-66c0-ac5630d2f96e"/>
-        <oi_hud_cus_4_5.tga value="f302a935-ccd1-e2f5-3a38-e185cc262f3a"/>
-        <oi_hud_cus_4_3.tga value="af8d5b3c-b40f-cea5-b0b2-440fbd84a11a"/>
-        <oi_hud_cus_4_2.tga value="11b26901-8207-12bc-5224-10a12ac4c651"/>
-        <oi_hud_cus_4_1.tga value="41baadb7-1b94-907e-9443-54e92bba77cd"/>
-        <oi_hud_cus_4_0.tga value="9d627f8e-092c-5d32-6c12-ef76ab81cedc"/>
-        <oi_hud_cus_3_4.tga value="b196486e-d0d2-4fd7-529a-c84b4495fc74"/>
-        <oi_hud_cus_3_2.tga value="0b81c4bb-de33-e493-7bcb-e7221d97e5e7"/>
-        <oi_hud_cus_3_1.tga value="436dab74-25ae-8b60-c648-50663b7faa1d"/>
-        <oi_hud_cus_3_0.tga value="6c1594de-1e66-273c-a2ab-8f0ffa8b4633"/>
-        <oi_hud_cus_2_4.tga value="bb31fe48-8566-eec0-e96b-64025f832b63"/>
-        <oi_hud_cus_2_2.tga value="c946959a-26ae-eb66-efa0-20154057789d"/>
-        <oi_hud_cus_2_1.tga value="c946959a-26ae-eb66-efa0-20154057789d"/>
-        <oi_hud_cus_2_0.tga value="d7833106-b4a8-7666-bde1-64886de289f9"/>
-        <oi_hud_cus_1_0.tga value="811ded22-5940-940c-4821-6fbbfb6611d6"/>
-        <oi_hud_cus_1_1.tga value="eda8513b-a343-5109-1fd6-f1c7ad89b703"/>
-        <oi_hud_cus_1_2.tga value="7a4ce18c-e715-34d4-dfee-704c270a8ac8"/>
-        <oi_hud_cus_1_4.tga value="d3771c15-ac03-b762-b992-d9fd2fedf38a"/>
-        <oi_hud_com_4_4.tga value="d9e1e90d-3cc3-6269-128e-67f7a2b32d26"/>
-        <oi_hud_com_4_2.tga value="0f649a26-6fdb-c73b-ffac-e50fc311d5ce"/>
-        <oi_hud_com_4_1.tga value="ae5b1ce6-a2d2-22d2-f532-6280b3bc6adb"/>
-        <oi_hud_com_4_0.tga value="12cda3a0-58c7-dfa8-7f9b-380e5bb8baf9"/>
-        <oi_hud_com_3_4.tga value="ff326257-0530-356a-e0f8-be535044e540"/>
-        <oi_hud_com_3_2.tga value="66740ddb-1d56-89f9-f0c9-ae5eb7bb9537"/>
-        <oi_hud_com_3_1.tga value="55d662f4-6a28-6388-7c75-af1c9fd33055"/>
-        <oi_hud_com_3_0.tga value="de9d318f-b69e-82f9-0c61-43b868c5ca6b"/>
-        <oi_hud_com_2_4.tga value="01d47e68-400a-d0e1-afb7-d6806d1d477e"/>
-        <oi_hud_com_2_0.tga value="09c98850-27d4-6a12-abae-4af4bba23b6b"/>
-        <oi_hud_com_1_3.tga value="5c2049b9-f797-6608-ca71-758f3716aa90"/>
-        <oi_hud_com_1_1.tga value="1116ff68-cdc4-1cfc-e137-30f8426afeda"/>
-        <oi_hud_com_1_0.tga value="bd847d31-f5af-95f7-2b9c-af47d8ba53bd"/>
-        <oi_hud_nav_4_5.tga value="66194280-b087-db94-35d9-41e8f7518515"/>
-        <oi_hud_nav_4_4.tga value="180c4241-e309-4c05-13ee-9080ab69498d"/>
-        <oi_hud_nav_4_3.tga value="e98a6ba6-99c6-fa15-84b6-9afadea6c467"/>
-        <oi_hud_nav_4_2.tga value="2e19f352-1893-59a9-949b-4d2cfd3a8222"/>
-        <oi_hud_nav_4_1.tga value="13a1675b-fb5a-19b3-b5a3-74b0a6765f7d"/>
-        <oi_hud_nav_4_0.tga value="e7526e8d-b085-b26c-b0ae-2708ec231401"/>
-        <oi_hud_nav_3_5.tga value="5e67b0d0-29a2-6a08-c85e-b12d59e53d6e"/>
-        <oi_hud_nav_3_4.tga value="2ed8fbc2-5c4d-53c2-b289-88baffceab1a"/>
-        <oi_hud_nav_3_3.tga value="e0a72f1a-282e-1c1a-2cb7-6423feb41759"/>
-        <oi_hud_nav_3_2.tga value="4bcebb23-da5e-47d9-eac1-e4453f762c8c"/>
-        <oi_hud_nav_3_1.tga value="6ac87575-330e-3a2d-3b80-a34e7b277e50"/>
-        <oi_hud_nav_3_0.tga value="f1451e8e-7310-9152-47d5-5d037c28fef3"/>
-        <oi_hud_nav_2_6.tga value="c60b42ff-ee60-98e4-e603-ca2470141d4b"/>
-        <oi_hud_nav_2_5.tga value="a02b5a1a-bbdb-5556-ae5b-a2e68494755a"/>
-        <oi_hud_nav_2_4.tga value="625535ab-8abf-b3e7-48fb-43f728b77c79"/>
-        <oi_hud_nav_2_3.tga value="00a609c3-5750-3b5a-3ce3-458bdf632203"/>
-        <oi_hud_nav_2_2.tga value="94903387-d37f-092c-e4d2-c190f68577b8"/>
-        <oi_hud_nav_2_1.tga value="ee0cd82c-6ce8-8e73-307b-6d0dc77b19e8"/>
-        <oi_hud_nav_2_0.tga value="3e10b379-ed2c-7424-1fe7-bef3558c7536"/>
-        <oi_hud_nav_1_4.tga value="bf8d0be8-2012-1664-3ea5-e69a71c206e9"/>
-        <oi_hud_nav_1_2.tga value="72100f87-18a7-fc4a-4793-de281e8b02cc"/>
-        <oi_hud_nav_1_1.tga value="b048faf3-60ce-c3a2-d034-36613449d377"/>
-        <oi_hud_nav_1_0.tga value="0ad45106-3b26-6448-0b90-feae8bd46c38"/>
-        <oi_hud_mov_4_5.tga value="7c4a45c2-37dd-312c-c6ab-20896dd0a5a6"/>
-        <oi_hud_mov_4_3.tga value="8a88da1c-3735-c71e-d48a-016df0798de4"/>
-        <oi_hud_mov_4_2.tga value="f55ae4d3-7d6a-e6ac-4cf7-03014ce14390"/>
-        <oi_hud_mov_4_1.tga value="1cc3fcf1-35c0-e222-27d2-6905cf5c4cee"/>
-        <oi_hud_mov_4_0.tga value="1ae592dc-46f4-616e-b7c6-0dff3e6f40e5"/>
-        <oi_hud_mov_3_4.tga value="831b39be-99fc-45bd-ba85-708f9dc93bfd"/>
-        <oi_hud_mov_3_2.tga value="9f7e7373-92a9-d66a-ad5a-afb55ca6ac1f"/>
-        <oi_hud_mov_3_1.tga value="ab37ed0d-7e66-1f77-3acf-b0fe4b74dbe8"/>
-        <oi_hud_mov_3_0.tga value="f5ff1f08-4c92-8606-1854-cc5b9d3e445c"/>
-        <oi_hud_mov_1_2.tga value="1e3abeed-e893-c44e-1f9d-5ecc76d21e5d"/>
-        <oi_hud_mov_1_0.tga value="e300fc95-aa94-8e31-c501-ce903cac8b7c"/>
 </settings>
\ No newline at end of file
diff --git a/linden/indra/newview/character/avatar_lad.xml b/linden/indra/newview/character/avatar_lad.xml
index 8038983..3b81fa2 100644
--- a/linden/indra/newview/character/avatar_lad.xml
+++ b/linden/indra/newview/character/avatar_lad.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
 <linden_avatar
  version="1.0"
- wearable_definition_version="22">
+ wearable_definition_version="22">  
+ <!-- The wearable_definition_version is checked during asset upload. -->
+ <!-- If you increment it, check indra/lib/python/indra/assetutil.py.  -->
    <skeleton
     file_name="avatar_skeleton.xml">
       <attachment_point
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index 3675fc3..59e816d 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 9
+version 10
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -23,7 +23,7 @@ version 9
 // NOTE: All settings are set to the MIN of applied values, including 'all'!
 //
 list all
-RenderAGP                               1       1
+RenderVBO                       1       1
 RenderAniso                     1       0
 RenderAvatarMode        1       2
 RenderAvatarVP          1       1
@@ -40,6 +40,7 @@ VertexShaderEnable	1	1
 //
 list Class0
 VertexShaderEnable      1       0
+RenderVBO                       1       1
 RenderDistance          1       64
 RenderAvatarVP          1       0
 RenderAvatarMode        1       0
@@ -52,6 +53,7 @@ RenderRippleWater	1	0
 //
 list Class1
 VertexShaderEnable      1       0
+RenderVBO                       1       1
 RenderDistance          1       96
 RenderAvatarVP          1       1
 RenderAvatarMode        1       0
@@ -99,7 +101,7 @@ RenderAvatarVP		0  0
 // "Default" setups for safe, low, medium, high
 //
 list safe
-RenderAGP                               1       0
+RenderVBO                       1       0
 RenderAniso                     1       0
 RenderAvatarVP          0       0
 RenderLighting          1       0
@@ -108,7 +110,7 @@ RenderTerrainDetail 1	0
 
 
 list low
-RenderAGP                               1       1
+RenderVBO                       1       0
 RenderAniso                     1       0
 RenderLighting          1       0
 
@@ -135,12 +137,17 @@ RenderObjectBump	0	0
 //
 // Graphics card based feature masks
 //
-list Brookdale
+list OpenGLPre15
+RenderVBO                       1       0
+
+list Intel
+RenderVBO                       1       0
 RenderAniso                     1       0
 RenderLighting          1       0
 RenderTerrainDetail     1       0
 
 list GeForce2
+RenderVBO                       1       1
 RenderAniso                     1       0
 RenderLighting          1       0
 RenderParticleCount     1       2048
@@ -150,10 +157,7 @@ list GeForce3
 
 list ATI
 
-// Hacked to be paranoid "safe"
-// Disable AGP entirely, in Catalyst 4.3 it's at least 50% slower
 list Radeon8500
-RenderAGP                               0       0
 RenderLighting          1       0
 RenderParticleCount     1       4096
 
@@ -162,9 +166,8 @@ list Radeon9700
 RenderParticleCount     1       4096
 
 // Hacked to be paranoid "safe"
-// Disable AGP entirely, in Catalyst 4.3 it's at least 50% slower
 list MobilityRadeon9000
-RenderLighting                  1       0
+RenderLighting          1       0
 RenderParticleCount     1       4096
 
 list GeForceFX
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index 25228fc..2685e3b 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 9
+version 10
 
 // NOTE: This is mostly identical to featuretable.txt with a few differences
 // Should be combined into one table
@@ -24,7 +24,7 @@ version 9
 //
 // Mac specific: RenderAvatarVP not enabled at all
 list all
-RenderAGP                               1       1
+RenderVBO                       1       0
 RenderAniso                     1       0
 RenderAvatarMode        1       2
 RenderAvatarVP          1       0
@@ -99,7 +99,7 @@ RenderAvatarVP		0  0
 // "Default" setups for safe, low, medium, high
 //
 list safe
-RenderAGP                               1       0
+RenderVBO                       1       0
 RenderAniso                     1       0
 RenderAvatarVP          0       0
 RenderDistance          1       64
@@ -109,7 +109,7 @@ RenderTerrainDetail 1	0
 
 
 list low
-RenderAGP                               1       1
+RenderVBO                       1       0
 RenderAniso                     1       0
 RenderDistance          1       96
 RenderLighting          1       0
@@ -135,6 +135,12 @@ list RAM256MB
 RenderDistance          1       96
 RenderObjectBump        0       0
 
+//
+// Graphics card based feature masks
+//
+list OpenGLPre15
+RenderVBO                       1       0
+
 // nVidia settings
 list NVIDIA
 
@@ -146,6 +152,6 @@ RenderParticleCount	1	2048
 RenderTerrainDetail     1       0
 
 //
-// ATI and AGP now work okay.
+// ATI settings
 //
 list ATI
diff --git a/linden/indra/newview/files.lst b/linden/indra/newview/files.lst
index 0439fff..000799d 100644
--- a/linden/indra/newview/files.lst
+++ b/linden/indra/newview/files.lst
@@ -32,19 +32,16 @@ newview/lldebugmessagebox.cpp
 newview/lldebugview.cpp
 newview/lldirpicker.cpp
 newview/lldrawable.cpp
+newview/lldrawpool.cpp
 newview/lldrawpoolalpha.cpp
 newview/lldrawpoolavatar.cpp
 newview/lldrawpoolbump.cpp
-newview/lldrawpoolclouds.cpp
-newview/lldrawpool.cpp
 newview/lldrawpoolground.cpp
-newview/lldrawpoolhud.cpp
 newview/lldrawpoolsimple.cpp
 newview/lldrawpoolsky.cpp
 newview/lldrawpoolstars.cpp
 newview/lldrawpoolterrain.cpp
 newview/lldrawpooltree.cpp
-newview/lldrawpooltreenew.cpp
 newview/lldrawpoolwater.cpp
 newview/lldriverparam.cpp
 newview/lldynamictexture.cpp
@@ -60,7 +57,6 @@ newview/llfilepicker.cpp
 newview/llfirstuse.cpp
 newview/llflexibleobject.cpp
 newview/llfloaterabout.cpp
-newview/llfloateraccounthistory.cpp
 newview/llfloateranimpreview.cpp
 newview/llfloaterauction.cpp
 newview/llfloateravatarinfo.cpp
@@ -197,7 +193,6 @@ newview/llpanelland.cpp
 newview/llpanellandobjects.cpp
 newview/llpanellandoptions.cpp
 newview/llpanellogin.cpp
-newview/llpanelmoney.cpp
 newview/llpanelmorph.cpp
 newview/llpanelmsgs.cpp
 newview/llpanelnetwork.cpp
@@ -237,7 +232,8 @@ newview/llstatview.cpp
 newview/llsurface.cpp
 newview/llsurfacepatch.cpp
 newview/lltexlayer.cpp
-newview/lltexturebar.cpp
+newview/lltexturecache.cpp
+newview/lltexturefetch.cpp
 newview/lltexturectrl.cpp
 newview/lltexturetable.cpp
 newview/lltextureview.cpp
@@ -310,14 +306,12 @@ newview/llvograss.cpp
 newview/llvoground.cpp
 newview/llvoinventorylistener.cpp
 newview/llvolumesliderctrl.cpp
-newview/llvopart.cpp
 newview/llvopartgroup.cpp
 newview/llvosky.cpp
 newview/llvostars.cpp
 newview/llvosurfacepatch.cpp
 newview/llvotextbubble.cpp
 newview/llvotree.cpp
-newview/llvotreenew.cpp
 newview/llvovolume.cpp
 newview/llvowater.cpp
 newview/llwaterpatch.cpp
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index fae0894..92f9b44 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -17,11 +17,14 @@
 3Dfx                                                    .*3Dfx.*                                                                0
 3Dlabs                                                  .*3Dlabs.*                                                              0
 ATI All-in-Wonder PCI-E                 .*ATI.*All-in-Wonder.*PCI-E.*                   1
+ATI All-in-Wonder X800                  .*ATI.*All-in-Wonder X8.*                               2
 ATI All-in-Wonder X1800                 .*ATI.*All-in-Wonder X18.*                              3
 ATI All-in-Wonder X1900                 .*ATI.*All-in-Wonder X19.*                              3
-ATI ASUS X1300                                  .*ATI.*ASUS X13.*                                               3
-ATI ASUS X1600                                  .*ATI.*ASUS X16.*                                               3
-ATI Diamond X1300                               .*ATI.*Diamond X13.*                                    3
+ATI ASUS X1xxx                                  .*ASUS X1.*                                                             3
+ATI Mobility Radeon X1xxx               .*ATI.*Mobility.*X1.*                                   2
+ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                                  3
+ATI Diamond X1xxx                               .*ATI.*Diamond.*X1.*                                    3
+ATI FireGL 5xxx                                 .*ATI.*FireGL V5.*                                              3
 ATI FireGL                                              .*ATI.*Fire.*GL.*                                               0
 ATI FireMV                                              .*ATI.*FireMV.*                                                 0
 ATI Generic                                             .*ATI.*Generic.*                                                0
@@ -35,14 +38,19 @@ ATI Radeon 9600					.*ATI.*Radeon 96.*						1
 ATI Radeon 9700                                 .*ATI.*Radeon 97.*                                              1
 ATI Radeon 9800                                 .*ATI.*Radeon 98.*                                              1
 ATI Radeon X1300                                .*ATI.*Radeon X13.*                                             3
+ATI Radeon X1400                                .*ATI.*Radeon X14.*                                             3
+ATI Radeon X1500                                .*ATI.*Radeon X15.*                                             3
 ATI Radeon X1600                                .*ATI.*Radeon X16.*                                             3
+ATI Radeon X1700                                .*ATI.*Radeon X17.*                                             3
 ATI Radeon X1800                                .*ATI.*Radeon X18.*                                             3
 ATI Radeon X1900                                .*ATI.*Radeon X19.*                                             3
 ATI Radeon X300                                 .*ATI.*Radeon X3.*                                              2
+ATI Radeon X400                                 .*ATI.*Radeon X4.*                                              2
 ATI Radeon X500                                 .*ATI.*Radeon X5.*                                              2
 ATI Radeon X600                                 .*ATI.*Radeon X6.*                                              2
 ATI Radeon X700                                 .*ATI.*Radeon X7.*                                              2
 ATI Radeon X800                                 .*ATI.*Radeon X8.*                                              2
+ATI Radeon X900                                 .*ATI.*Radeon X9.*                                              2
 ATI Radeon Xpress                               .*ATI.*Radeon Xpress.*                                  1
 ATI Rage 128                                    .*ATI.*Rage 128.*                                               0
 Intel 830M                                              .*Intel.*830M                                                   0
@@ -91,7 +99,6 @@ NVIDIA GeForce FX Go5600		.*NVIDIA.*GeForce FX Go56.*				1
 NVIDIA GeForce FX Go5700                .*NVIDIA.*GeForce FX Go57.*                             1
 NVIDIA GeForce FX Go5800                .*NVIDIA.*GeForce FX Go58.*                             1
 NVIDIA GeForce FX Go5900                .*NVIDIA.*GeForce FX Go59.*                             1
-NVIDIA GeForce Go 6                             .*GeForce Go 6.*                                                2
 NVIDIA GeForce Go 6100                  .*NVIDIA.*GeForce Go 61.*                               2
 NVIDIA GeForce Go 6200                  .*NVIDIA.*GeForce Go 62.*                               2
 NVIDIA GeForce Go 6500                  .*NVIDIA.*GeForce Go 65.*                               2
@@ -103,6 +110,7 @@ NVIDIA GeForce Go 7400			.*NVIDIA.*GeForce Go 74.*				3
 NVIDIA GeForce Go 7600                  .*NVIDIA.*GeForce Go 76.*                               3
 NVIDIA GeForce Go 7800                  .*NVIDIA.*GeForce Go 78.*                               3
 NVIDIA GeForce Go 7900                  .*NVIDIA.*GeForce Go 79.*                               3
+NVIDIA GeForce Go 6                             .*GeForce Go 6.*                                                2
 NVIDIA GeForce PCX                              .*GeForce PCX.*                                                 1
 NVIDIA Generic                                  .*NVIDIA.*NV.*                                                  0
 NVIDIA Generic                                  .*NVIDIA.*Unknown.*                                             0
diff --git a/linden/indra/newview/help/Advanced/Advanced_Second_Life_Skills.html b/linden/indra/newview/help/Advanced/Advanced_Second_Life_Skills.html
deleted file mode 100644
index 16c192d..0000000
--- a/linden/indra/newview/help/Advanced/Advanced_Second_Life_Skills.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-        <title>Advanced Second Life Skills</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">You've learned the basics and spent a little time exploring Second Life.</font>
-<p>
-<font color="#000000">To get the most out of this world, you'll want to learn a few more simple things and have a few more new experiences.</font>
-<p>
-<font color="#000000">The different topics below are arranged to be easiest if you follow them in order, first to last. But it's your life. Do what you want. However you choose to proceed, take your time and play along the way.</font>
-<p>
-<a href="The_Lay_of_the_Land.html">The Lay of the Land</a> -- Get an overview of the world where you live your Second Life, and find out where to go for a good time.
-<p>
-<a href="Getting_Around.html">Getting Around: Navigation and Landmarks</a> -- Learn some tricks for navigation around the world.
-<p>
-<a href="Nesting.html">Nesting</a> -- Find a place to call home and buy some land.
-<p>
-<a href="Home_Time.html">Home Time</a> -- Buy a house, then decorate it.
-<p>
-<a href="Personalize_Your_Home.html">Personalize Your Home</a> -- A little paint and wallpaper goes a long way.
-<p>
-<a href="The_Second_Life_Economy.html">The Second Life Economy</a> -- A little more information about how the money system works in Second Life.
-<p>
-<a href="Shopping_201.html">Shopping 201</a> -- Pick up some furnishings for your new home.
-<p>
-<a href="People.html">People</a> -- Find people you know and people and groups you may want to meet.
-<p>
-<a href="More_Ways_to_Communicate.html">More Ways to Communicate</a> -- Gestures, sounds and shortcuts will spruce up and speed up your conversations.
-<p>
-<a href="Clothing_Makes_the_Avatar.html">Clothing Makes the Avatar</a> -- Go deeper into Avatar customization and create your own look.
-<p>
-<a href="Party_Time.html">Party Time</a> -- Time to go dancing and meet some new people.
-<p>
-<a href="Dangerous_Time.html">Dangerous Time</a> -- Jessie is where you can play the deadliest game.
-<p>
-<a href="Creation_101.html">Creation 101</a> -- Some basics on creating and building new things in Second Life.
-<p>
-<a href="Graduation.html">Graduation</a> -- Congrats on a job well done, and where to go if you want to learn even more.
-<p>
-[ <a href="The_Lay_of_the_Land.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Building_the_Lamp_Base.html b/linden/indra/newview/help/Advanced/Building_the_Lamp_Base.html
deleted file mode 100644
index 07edd57..0000000
--- a/linden/indra/newview/help/Advanced/Building_the_Lamp_Base.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-<html>
-<head>
-        <title>Creation 101: Building the Lamp Base</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Let's start by building the lamp's base.</font>
-<p>
-<font color="#000080">1. You should be at your home, or a nice, flat area, with the model lamp nearby.</font>
-<p>
-<font color="#000080">2. Click on the ground near the model lamp.</font>
-<p>
-<font color="#000080">3. When the pie menu opens, select <font color="#B00000">Create</font>.</font>
-<p>
-<font color="#000000">A few things happen: the view focuses on the ground where you clicked, the cursor changes to the creation wand, and the Tool palette opens.</font>
-<p>
-<font color="#000000">On the Tool palette are a number of shapes you can create. We want the box shape on the far left.</font>
-<p>
-<font color="#000080">4. Click on the box shape in the tool palette.</font>
-<p>
-<font color="#000080">5. Click on the ground to create a box.</font>
-<p>
-<font color="#000000">The default box has been created. We'll want to change it. </font>
-<p>
-<font color="#000080">6. Click on the box you just created to make sure it's selected.</font>
-<p>
-<font color="#000080">7. Click on the <font color="#B00000">More</font> button in the Tool Palette.</font>
-<p>
-<font color="#000000">The Tool Palette expands.</font>
-<p>
-<font color="#000080">8. Click on the <font color="#B00000">Object tab</font> in the Tool Palette.</font>
-<p>
-<font color="#000000">The Tool Palette now shows a lot of controls for changing the box. It looks complicated, but we'll only deal with a few of the controls at a time.</font>
-<p>
-<font color="#000080">9. Find the <font color="#B00000">Size (meters)</font> controls.</font>
-<p>
-<font color="#000080">10. Change the number in the Z Size control to <font color="#B00000">0.100</font>.</font>
-<p>
-<font color="#000000">You can do this with the arrows, or highlight the number that's there and type in a new one.</font>
-<p>
-<font color="#000000">Now let's change the material that the box is made of.</font>
-<p>
-<font color="#000080">11. Find the <font color="#B00000">Material</font> drop-down menu at the bottom of the Tool Palette. </font>
-<p>
-<font color="#000080">12. Click on the Material menu and select <font color="#B00000">Metal</font>.</font>
-<p>
-<font color="#000000">It looks like nothing has happened. That's OK. You've changed the material of the box, so it will act like metal, but it still has the wood texture. In Second Life, you can put any texture on any material. This gives you as much flexibility as possible.</font>
-<p>
-<font color="#000000">So, let's make the metal box look like metal.</font>
-<p>
-<font color="#000080">13. Click on the <font color="#B00000">Texture tab</font> in the Tool Palette.</font>
-<p>
-<font color="#000080">14. Click on the picture of the wooden texture.</font>
-<p>
-<font color="#000000">The Pick: Texture dialog opens.</font>
-<p>
-<font color="#000080">15. Click on the drop-down menu (it should say Default), and choose  <font color="#B00000">Steel Plate</font>, then click OK.</font>
-<p>
-<font color="#000000">The look of the box now changes </font>
-<p>
-<font color="#000000">Steel Plate is the texture used in the model lamp, but you can pick any other texture that you prefer. Take some time if you like and try out a few different textures. Once you pick one that you like, move on to the next step.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Building_the_Lamp_Pole.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Building_the_Lamp_Bulb.html b/linden/indra/newview/help/Advanced/Building_the_Lamp_Bulb.html
deleted file mode 100644
index 11e3537..0000000
--- a/linden/indra/newview/help/Advanced/Building_the_Lamp_Bulb.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-<html>
-<head>
-        <title>Creation 101: Building the Lamp Bulb</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now let's build the bulb.</font>
-<p>
-<font color="#000080">1. Click on the <font color="#B00000">Create</font> icon in the Tool Palette.</font>
-<p>
-<font color="#000080">2. Click on the <font color="#B00000">half-sphere</font> icon (top row, far right).</font>
-<p>
-<font color="#000080">3. Click on the ground near your lamp base and pole.</font>
-<p>
-<font color="#000000">The default size will work just fine, so we won't have to change that, but we'll want to 
-change the material.</font>
-<p>
-<font color="#000080">4. Click on the <font color="#B00000">Edit</font> icon in the Tool Palette, then make sure the new half-sphere is selected.</font>
-<p>
-<font color="#000080">5. Click on the <font color="#B00000">Object tab</font>,then click on the <font color="#B00000">Material drop-down</font>, and then select Light.</font>
-<p>
-<font color="#000000">Now you've got what looks like a glowing piece of wood. Let's change the texture to get something that looks more like a light bulb.</font>
-<p>
-<font color="#000080">6. Click on the <font color="#B00000">Texture tab</font>, then click on the <font color="#B00000">wood texture</font> to open the Pick: Texture dialog.</font>
-<p>
-<font color="#000080">7. Click on the <font color="#B00000">White</font> button, then click <font color="#B00000">OK</font>.</font>
-<p>
-<font color="#000000">You now have a white, glowing bulb.</font>
-<p>
-<font color="#000000">Now, let's move the bulb into place on top of the pole.</font>
-<p>
-<font color="#000080">8. Click on the Edit icon, then on the bulb, then drag the three arrows and place the half-sphere on top of the pole.</font>
-<p>
-<font color="#000000">Again, moving things around in 3-D is tricky. Be patient and don't be afraid to use the Focus tool and move the camera around so you can see things at different angles.</font>
-<p>
-<font color="#000000">After futzing with placing the bulb for a while, it may occur to you that there has to be a more exact way to do this. There is: by using the Position controls in the Object tab.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Building_the_Lamp_Pole.html">Previous</a> | <a href="Positioning_with_Numbers.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Building_the_Lamp_Pole.html b/linden/indra/newview/help/Advanced/Building_the_Lamp_Pole.html
deleted file mode 100644
index 80c600c..0000000
--- a/linden/indra/newview/help/Advanced/Building_the_Lamp_Pole.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-<html>
-<head>
-        <title>Creation 101: Building the Lamp Pole</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now we'll build the lamp's pole.</font>
-<p>
-<font color="#000080">1. Click on the <font color="#B00000">Create</font> button in the Tool Palette.</font>
-<p>
-<font color="#000080">2. Click on the <font color="#B00000">Cylinder</font> button (top row, 5th from the left).</font>
-<p>
-<font color="#000080">3. Click on the ground near the lamp base you made.</font>
-<p>
-<font color="#000080">4. Click on the <font color="#B00000">Object tab</font> in the Tool Palette.</font>
-<p>
-<font color="#000080">5. Change the X Size to 0.100, change the Y Size to 0.100, and change the Z Size to 2.000.</font>
-<p>
-<font color="#000080">6. Change the pole's Material to <font color="#B00000">Metal</font>.</font>
-<p>
-<font color="#000080">7. Change the pole's texture to match the base.</font>
-<p>
-<font color="#000000">Now we need to move the pole to the center of the base. Moving things in 3-D is tricky, so be patient.</font>
-<p>
-<font color="#000000">You may find that you'll need to change your view at times. To change your view at any time, click on the Focus icon, and move the camera around until you can see what you want. (We learned how to do this earlier--it works just like using the Focus On feature from the pie menu.)</font>
-<p>
-<font color="#000080">8. Click on the <font color="#B00000">Edit</font> icon in the Tool Palette.</font>
-<p>
-<font color="#000080">9. Click on the pole.</font>
-<p>
-<font color="#000000">Now you'll see red, green and blue arrows. These are axes (plural of axis). You can move things around be dragging these arrows.</font>
-<p>
-<font color="#000080">10. Drag the up-pointing blue arrow until the pole is just resting on the ground (not half-buried).</font>
-<p>
-<font color="#000080">11. Drag the red and green arrows to place the pole right in the middle of the base.</font>
-<p>
-
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Building_the_Lamp_Base.html">Previous</a> | <a href="Building_the_Lamp_Bulb.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Clothing_Makes_the_Avatar.html b/linden/indra/newview/help/Advanced/Clothing_Makes_the_Avatar.html
deleted file mode 100644
index d370e01..0000000
--- a/linden/indra/newview/help/Advanced/Clothing_Makes_the_Avatar.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-        <title>Clothing Makes the Avatar</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Soon, we'll be going out for a party. We need a new outfit for the occasion.</font>
-<p>
-<font color="#000080">1. Click on your avatar, then click on Appearance....</font>
-<p>
-<font color="#000080">2. Click on the Make Outfit button at the bottom of the Appearance dialog.</font>
-<p>
-<font color="#000000">Another dialog opens.</font>
-<p>
-<font color="#000080">3. Under Folder name: type in Everyday Clothes.</font>
-<p>
-<font color="#000000">You'll notice that you can choose to include your avatar's Shape, Skin, Hair and Eyes in the new outfit as well as clothes. This lets you not only instantly change clothes, but also change the entire look of your avatar any time you want.</font>
-<p>
-<font color="#000000">For now, let's only include Hair, Eyes, Shirt, Pants, Shoes, Socks and Jacket. You can always modify other things later.</font>
-<p>
-<font color="#000080">4. Check the boxes next to Hair, Eyes, Shirt, Pants, Shoes, Socks and Jacket, then click Save.</font>
-<p>
-<font color="#000000">We have now saved the complete current outfit that we're wearing, so we can return to it instantly at any time.</font>
-<p>
-<font color="#000080">5. Click on the Make Outfit button again.</font>
-<p>
-<font color="#000080">6. Under Folder name: type in Party Clothes and click Save.</font>
-<p>
-<font color="#000000">Now, we have a duplicate set of clothes that we can modify. Let's create our new party outfit, starting with the jacket.</font>
-<p>
-<font color="#000080">7. Click on the Shirt button on the left side of the Appearance dialog.</font>
-<p>
-<font color="#000080">8. Click on the Upper Fabric square.</font>
-<p>
-<font color="#000000">A small dialog opens, displaying a swatch of the current jacket fabric.</font>
-<p>
-<font color="#000080">9. Click on the pop-up menu just below the swatch, and choose a new fabric for your jacket, then click OK.</font>
-<p>
-<font color="#000080">10. Try on a few fabrics, then choose one to keep.</font>
-<p>
-<font color="#000080">11. Choose a Fabric for the jacket's Lower Fabric.</font>
-<p>
-<font color="#000000">It can be the same as the Upper Fabric, or different, depending on your personal preference.</font>
-<p>
-<font color="#000080">12. Now play with the sliders to adjust the look and fit of the jacket.</font>
-<p>
-<font color="#000080">13. Change your shirt, pants, shoes and socks in the same way.</font>
-<p>
-<font color="#000080">14. Now, give yourself a new hairdo and a custom eye color.</font>
-<p>
-<font color="#000080">15. When you're all done modifying your outfit, click on the Save All button.</font>
-<p>
-<font color="#000000">You have now saved all of the recent modifications into your Inventory.</font>
-<p>
-<font color="#000000">Let's see how easy it is to change.</font>
-<p>
-<font color="#000080">16. Open the Inventory and then open the Clothing folder.</font>
-<p>
-<font color="#000080">17. Drag the Everyday Clothes folder out of your Inventory and onto your avatar.</font>
-<p>
-<font color="#000000">Everything should change -- even the hairstyle and eye color.</font>
-<p>
-<font color="#000080">18. Drag the Party Clothes folder out of your Inventory and onto your avatar.</font>
-<p>
-<font color="Black">You've instantly changed back into your party clothes, and you're ready for a night on the town.</font>
-
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="More_Ways_to_Communicate.html">Previous</a> | <a href="Party_Time.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Creation_101.html b/linden/indra/newview/help/Advanced/Creation_101.html
deleted file mode 100644
index d2f26c7..0000000
--- a/linden/indra/newview/help/Advanced/Creation_101.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-        <title>Creation 101</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Pretty soon, you'll want or need something that you can't find. Or maybe you'll just have an urge to make your mark in this life. Either way, you'll reach a point where you'll want to learn how to build things in Second Life.</font>
-<p>
-<font color="#000000">In this, the last of the Advanced Second Life Skills, we'll create a simple floor lamp for your home. Then we'll use scripting to turn the light on and off in a couple of ways.</font>
-<p>
-<font color="#000000">To help guide you as you build the lamp, we've put a model in your Inventory.</font>
-<p>
-<font color="#000080">1. Go to your home, or find a nice, flat area to build your lamp.</font>
-<p>
-<font color="#000000">You can build on your own land, or on public land. You can only build on someone else's land if they give you permission.</font>
-<p>
-<font color="#000080">2. Open your Inventory.</font>
-<p>
-<font color="#000080">3. Open the Objects folder.</font>
-<p>
-<font color="#000080">4. Open the Household folder.</font>
-<p>
-<font color="#000080">5. Find the <font color="#B00000">Floor Lamp</font>, and drag it out of your Inventory and onto the ground near you.</font>
-<p>
-<font color="#000000">As you can see, the lamp is made of three parts, each of which is a different shape: a square base, a cylindrical pole, and a half-spherical globe (the part that lights up).</font>
-<p>
-<font color="#000000">You'll also notice that the lamp isn't very beautiful -- but it's nice and simple, so it makes a good first project.</font>
-<p>
-<font color="#000080">6. Click on the lamp's globe.</font>
-<p>
-<font color="#000000">The light turns off.</font>
-<p>
-<font color="#000080">7. Click on the lamp's globe again.</font>
-<p>
-<font color="#000000">The light turns on.</font>
-<p>
-<font color="#000080">8. Hit Enter (Return), type &quot;off&quot; then hit Enter again.</font>
-<p>
-<font color="#000000">The light turns off.</font>
-<p>
-<font color="#000080">9. Hit Enter (Return), type &quot;on&quot; then hit Enter again.</font>
-<p>
-<font color="#000000">The light turns on.</font>
-<p>
-<font color="#000000">As you can see, the lamp is reasonably functional.</font>
-
-<font color="#000000">Click next to begin building your own version of the lamp.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Dangerous_Time.html">Previous</a> | <a href="Building_the_Lamp_Base.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Dangerous_Time.html b/linden/indra/newview/help/Advanced/Dangerous_Time.html
deleted file mode 100644
index 7793d6c..0000000
--- a/linden/indra/newview/help/Advanced/Dangerous_Time.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<head>
-        <title>Dangerous Time</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now let's visit Jessie and see how much danger we can handle.</font>
-<p>
-<font color="#000080">1. Navigate your way to the Jessie Wall and cross over.</font>
-<p>
-<font color="#000000">Once you enter Jessie, you'll notice that your health rating appears in the lower-left corner of the screen. That means your avatar can be damaged or killed here. Be careful.</font>
-<p>
-<font color="#000000"It's good idea to be armed when travelling in Jessie, and you'll usually find a number of merchants there ready to help outfit you with weapons.</font>
-<p>
-<font color="#000080">2. Buy a gun or other weapon.</font>
-<p>
-<font color="#000080">3. The use of your weapon will very from type to type -- most come with an instructional Notecard detailing proper operation. 
-<p>
-<font color="#000000">The most efficient way to maneuver and fire weapons is in Mouselook.</font>
-<p>
-<font color="#000080">4. Press the M key on your keyboard to enter Mouselook mode.</font>
-<p>
-<font color="#000000">In general, you'll use the keyboard's W and S keys to move forward and backward, and use the mouse to steer. If you haven't moved around in Mouselook before, you may want to practice a little.</font>
-<p>
-<font color="#000000">One more thing you'll need to know: you also aim the gun with the mouse, and press the left mouse button to fire.</font>
-<p>
-<font color="#000080">5. Wander around in Mouselook and take some practice shots.</font>
-<p>
-<font color="#000080">6. Once you feel secure that you can move, aim, and shoot, head deep into Jessie.
-<p>
-<font color="#000000">You can stay and play if you want, otherwise click Next below to leap from destruction to creation and learn how to build things in Second Life.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Party_Time.html">Previous</a> | <a href="Creation_101.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Getting_Around.html b/linden/indra/newview/help/Advanced/Getting_Around.html
deleted file mode 100644
index b100cfd..0000000
--- a/linden/indra/newview/help/Advanced/Getting_Around.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-        <title>Getting Around: Navigation and Landmarks</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Open the World Map and double-click any place the looks interesting; your avatar will teleport to the Telehub closest to your chosen location.</font>
-<p>
-<font color="#000080">Fly down from the Telehub and choose a spot that you'd like to explore more in the future.
-<p>
-<font color="#000000">Now, let's make a landmark so that you can find your way back again later.</font>
-<p>
-<font color="#000080">12. Open the World menu and select Create Landmark Here.</font>
-<p>
-<font color="#000000">Your Inventory will open if (it's not already open), and a new landmark, called New Landmark, is there and highlighted.</font>
-<p>
-<font color="#000080">13. Right-click on the New Landmark, and select Rename.</font>
-<p>
-<font color="#000080">14. Type in a new name for the landmark, something the describes the place, and hit Enter (Return).</font>
-<p>
-<font color="#000000">Now you have a new landmark to use any time you want.</font>
-<p>
-<font color="#000000">When you use your landmark, you'll be teleported to the nearest Telehub location.  From there, turn your avatar until you see the red beacon and follow it to the final destination.</font>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="The_Lay_of_the_Land.html">Previous</a> | <a href="Nesting.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Graduation.html b/linden/indra/newview/help/Advanced/Graduation.html
deleted file mode 100644
index 15cd03f..0000000
--- a/linden/indra/newview/help/Advanced/Graduation.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-        <title>Graduation</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">You've now absorbed the Advanced Second Life Skills.</font>
-<p>
-<font color="#000000">For many, if not most, this is all you'll want or need to live our your Second Life. </font>
-<p>
-<font color="#000000">But more information is available for those of you who really want to learn how to build things and write scripts:</font>
-<p>
-<font color="#006000">Script Help ...</font> <font color="#000000">in the Help menu provides a complete reference to the Second Life Scripting Language.</font>
-<p>
-You can find even more scripting information in the <a href="https://secondlife.com/badgeo/wakka.php?wakka=HomePage">Scripting Wiki</a>, a document constantly updated and added to by Second Life resident scripters.
-<p>
-Even more information on various parts of the Second Life world can be found in the general Support Wiki at <a href="http://secondlife.com/help">http://secondlife.com/help</a>.
-<p>
-<font color="#006000">More documents in PDF format</font> <font color="#000000">are available on the Second Life Members website, under the Downloads menu.</font>
-<p>
-<font color="#000000">Possibly the best resources for learning are the </font><font color="#006000">Forums</font> <font color="#000000">at Secondlife.com, where you can ask questions and get answers. You can also see what others have been asking about.</font>
-<p>
-<font color="#000000">Have a nice life.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Previous</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Home_Time.html b/linden/indra/newview/help/Advanced/Home_Time.html
deleted file mode 100644
index feb44a9..0000000
--- a/linden/indra/newview/help/Advanced/Home_Time.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-        <title>Home Time</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now that you have some land, you need a house to put there.</font>
-<p>
-Fortunately, there's a cozy little basic cabin in your Inventory, ready to build. This cabin isn't very big or fancy. And you'll see a number of them around.
-<p>
-But you can do a lot of customizing to make it more original. And once you learn the ways of the world and as you participate more in the Second Life economy, you'll be able to afford to buy a much nicer house -- or design and build your own.
-<p>
-<font color="#000080">1. Open your Inventory and open the Objects folder.</font>
-<p>
-<font color="#000080">2. Find the object called "Cabin, Little," and drag it out of your Inventory and onto your land.
-<p>
-<font color="#000000">Technically -- and this is an important point to understand -- the cabin itself wasn't in your inventory -- just the design for the cabin. When you pull that design out of your inventory and place it on the ground, it is then built. We'll discuss this in a minute.</font>
-<p>
-<font color="#000080">3. Click on the cabin and select Edit from the pie menu.</font>
-<p>
-<font color="#000080">4. Drag the cabin around by the arrows to place it exactly where you want it. (Don't forget to adjust it up and down.)</font>
-<p>
-<font color="#000000">Once your new cabin is in place, click on next to take the next step  -- customizing and personalizing your new home.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Nesting.html">Previous</a> | <a href="Personalize_Your_Home.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Installing_a_Script.html b/linden/indra/newview/help/Advanced/Installing_a_Script.html
deleted file mode 100644
index 7e8bc14..0000000
--- a/linden/indra/newview/help/Advanced/Installing_a_Script.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-        <title>Creation 101: Installing a Script</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">The Second Life scripting language is very powerful. It lets you add more functionality and interactivity to everything you build.</font>
-<p>
-<font color="#000000">If you're a programmer or are familiar with other scripting languages, you'll have no trouble learning the Second Life scripting language. A complete reference to the scripting language can be found in the Help menu.</font>
-<p>
-<font color="#000000">Even if you're not a programmer and you have no interest in learning to write scripts, you can still make use of them in your creations.</font>
-<p>
-<font color="#000000">If you need something complex or special scriptwise, there will be people to write it for you -- for a certain amount of Linden Dollars.</font>
-<p>
-<font color="#000000">But for simple things -- especially common ones like turning lights on and off -- there are scripts available for the taking. A number of useful scripts can be found in your Inventory.</font>
-<p>
-<font color="#000000">A good way to get scripts is to copy them from objects that already have them. As you travel through your Second Life, you'll find things that you like, some of which have scripts that you can take.</font>
-<p>
-<font color="#000000">When someone creates something, with or without a script, they can set the permissions either so people can or can't copy any or all of it. You'll no doubt find cool things that you can't copy, but many of things can be copied and you'll have access to copy the scripts, as well.</font>
-<p>
-<font color="#000000">Obviously, the model lamp has exactly the script you need for your lamp. Let's take the script out, then add it to our new lamp.</font>
-<p>
-<font color="#000000">The script you want is actually attached to the bulb of the model lamp. To access that single part, we'll first have to Unlink the lamp's parts.</font>
-<p>
-<font color="#000080">1. Click on the model lamp to select it.</font>
-<p>
-<font color="#000080">2. Open the Tools menu (the Tools menu at the top of the screen, not the Tool Palette) and select <font color="#B00000">Unlink</font>.</font>
-<p>
-<font color="#000080">3. Click on the ground near the model lamp to unselect it, then click on the bulb.</font>
-<p>
-<font color="#000080">4. Click on the Content tab of the Tool Palette. </font>
-<p>
-<font color="#000000">You should see a couple of button sounds and a script called LightScript in the contents.</font>
-<p>
-<font color="#000080">5. Drag the script into the <font color="#B00000">Scripts</font> folder of your Inventory.</font>
-<p>
-<font color="#000080">6. Now, click on the bulb of your new lamp.</font>
-<p>
-<font color="#000000">You should see an empty Contents tab in the Tool Palette.</font>
-<p>
-<font color="#000080">7. Drag LightScript from the Scripts folder of your Inventory into the Contents folder in the Tool Palette.</font>
-<p>
-<font color="#000000">The script is installed. It's that simple.</font>
-<p>
-<font color="#000000">This script also plays sounds -- button clicks -- when the lamp turns on and off. So we'll also add those two sounds to the Contents folder (so the script can access them). We could have copied them from the other lamp, but since they're common sounds used by a number of things, they're already in your Inventory in the Sounds folder.</font>
-<p>
-<font color="#000080">8. In your Inventory, open the Sounds folder, and drag both Button_click_down and Button_click_up into the Contents folder.</font>
-<p>
-<font color="#000080">9. Close the Tool Palette to get out of Edit view.</font>
-<p>
-<font color="#000080">10. Click on the bulb of your new lamp.</font>
-<p>
-<font color="#000000">The bulb should turn off.</font>
-<p>
-<font color="#000080">11. Click on it again.</font>
-<p>
-<font color="#000000">The bulb turns on.</font>
-<p>
-<font color="#000080">12. Hit Enter (Return) and type &quot;off&quot;, and hit Enter again.</font>
-<p>
-<font color="#000000">Again, the light turns off.</font>
-<p>
-<font color="#000080">13. Hit Enter (Return) and type &quot;on&quot;, and hit Enter again.</font>
-<p>
-<font color="#000000">And again, the light turns on.</font>
-<p>
-<font color="#000000">Next, let's take a look at a script and learn how we can easily modify it.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Simple_on_off.html">Previous</a> | <a href="Modifying_a_Script.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Modifying_a_Script.html b/linden/indra/newview/help/Advanced/Modifying_a_Script.html
deleted file mode 100644
index 9ae2137..0000000
--- a/linden/indra/newview/help/Advanced/Modifying_a_Script.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<html>
-<head>
-        <title>Creation 101: Modifying a Script</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now, we'll open up LightScript, look through it and make a small customization.</font>
-<p>
-<font color="#000080">1. Right-click on your lamp's bulb, and select Edit from the pie menu.</font>
-<p>
-<font color="#000000">The reason you have to right-click to select the bulb is because it has a script that has taken over the left click to turn the light on and off.</font>
-<p>
-<font color="#000080">2. Look at the Content tab of the Tool Palette.</font>
-<p>
-<font color="#000080">3. Double-click on LightScript.</font>
-<p>
-<font color="#000000">A new window opens, showing the script. It may look complicated if you've never played with scripts before, but it's really not hard at all to understand enough to make a few useful changes.</font>
-<p>
-<font color="#000080">4. Read through the script and see if any of it makes sense to you.</font>
-<p>
-<font color="#000000">Lines of text that begin with // are comments. They aren't actually part of the code -- they're there to explain what's going on. A well-written script will have good, clear comments that explain how the script works.</font>
-<p>
-<font color="#000080">5. Look for the lines that start with <font color="#B00000">llListen</font>. </font>
-<p>
-<font color="#000000">Near the end of one, there's the word &quot;on&quot; and near the end of the other is the word &quot;off&quot;.</font>
-<p>
-<font color="#000000">These lines tell the light bulb to look for the words on and off to turn itself on and off.</font>
-<p>
-<font color="#000000">One simple modification that we can do without understand the script at all is to change the words that turn the lamp on and off.</font>
-<p>
-<font color="#000000">Why bother? For a light, there's not really much of a reason to change the activating words, but you could modify a script for a door in the same way, setting up a password for entry that only you and your friends will know. </font>
-<p>
-<font color="#000080">6. In the lines that begin with llListen, change the word &quot;<font color="#B00000">on</font>&quot; to &quot;<font color="#B00000">light</font>&quot;, and the word &quot;<font color="#B00000">off</font>&quot; to &quot;<font color="#B00000">dark</font>&quot;. (You can use any other code words you want.)</font>
-<p>
-<font color="#000000">There's one more place you have to modify:</font>
-<p>
-<font color="#000080">7. Scroll down the script to the line that says if (text = &quot;on&quot;), and change &quot;on&quot; to &quot;light&quot; (or whatever other code word you chose).</font>
-<p>
-<font color="#000080">8. Click the <font color="#B00000">Save</font> button.</font>
-<p>
-<font color="#000080">9. Close the Script window and the Tool Palette.</font>
-<p>
-<font color="#000080">10.Test your lamp with the new words for on and off.</font>
-<p>
-<font color="#000000">Now that you've created a masterpiece, it's time to link it together and save it to your Inventory.</font>
-<p>
-<font color="#000080">11. Right-click on one part of the lamp and select Edit from the pie menu.</font>
-<p>
-<font color="#000080">12. Hold down the Shift key and click on the other two parts of the lamp,so they're all highlighted.</font>
-<p>
-<font color="#000080">13. Open the Tools menu and select <font color="#B00000">Link</font>.</font>
-<p>
-<font color="#000000">The lamp is now all linked together, so you can move the whole thing around instead of having to move each piece separately.</font>
-<p>
-<font color="#000080">14. With the lamp still highlighted, open the Tools menu and select <font color="#B00000">Take Copy of Object</font>.</font>
-<p>
-<font color="#000000">A copy of the lamp will be placed in the Objects folder of your Inventory.</font>
-<p>
-<font color="#000080">15. Right-click on the new object (named Object) in your Inventory, and select <font color="#B00000">Rename</font>.</font>
-<p>
-<font color="#000080">16. Type in a new name, like &quot;My Floor Lamp&quot;.</font>
-<p>
-<font color="#000080">17. Drag the newly named lamp from the Objects folder into the Furniture folder.</font>
-<p>
-<font color="#000080">18. Now you can delete both the model lamp and the lamp you made. </font>
-<p>
-<font color="#000000">You can pull them out of your Inventory any time you need them.</font>
-<p>
-
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Installing_a_Script.html">Previous</a> | <a href="Graduation.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/More_Ways_to_Communicate.html b/linden/indra/newview/help/Advanced/More_Ways_to_Communicate.html
deleted file mode 100644
index 15c66c2..0000000
--- a/linden/indra/newview/help/Advanced/More_Ways_to_Communicate.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html>
-<head>
-        <title>More Ways to Communicate</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Chat is great. But it could be a little more flexible and a little more expressive. In Second life, it is.</font>
-<p>
-<font color="#000000">You can expand your chat capabilities through shortcuts, gestures, sounds and even words.</font>
-<p>
-<font color="#000080">1. Hold down the ALT key and click on your avatar to Focus on yourself.</font>
-<p>
-<font color="#000080">2. Move the camera around so you can see yourself from the front.</font>
-<p>
-<font color="#000080">3. Hit the F2 key.</font>
-<p>
-<font color="#000000">What happened?</font>
-<p>
-<font color="#000080">4. One at a time, hit the F3 through F12 keys.</font>
-<p>
-<font color="#000080">5. Now, one at a time, hit shift-F2 through shift-F12.</font>
-<p>
-<font color="#000080">6. And now hit ctrl-F2 through ctrl-F12.</font>
-<p>
-<font color="#000000">All of these motions, expressions, sounds and chat are preset -- but they can easily be changed in any way you want.</font>
-<p>
-<font color="#000000">You can delete the ones you don't want, to free up F-keys for ones you do want. You can set up your shortcuts to chat any text you want. You can even upload your own sounds -- even your own voice -- and have your avatar say anything you want. The Gesture Starter menu on the chat bar is another way to activate gestures.</font>
-<p>
-<font color="#000000">Let's look behind the curtain and see how this works and how to change it.</font>
-<p>
-<font color="#000080">7. Press CTRL-G to open the Gestures window</font>
-<p>
-<font color="#000000">As you've seen, you can activate gestures (and sounds and text) either through the F-Keys or by typing things into Chat.</font>
-<p>
-<font color="#000000">The left column is where you enter the Chat Input -- whatever you want to use as the trigger to set off the gesture. You can put your Chat Input shortcut in the middle of a regular chat sentence, or use it by itself.</font>
-<p>
-<font color="#000000">Chat Input is case-sensitive. That means if you set &quot;Hi&quot; as the Chat Input for, &quot;Hello there! I'm pleased to meet you,&quot; this message will not be sent if you type in &quot;hi&quot; or &quot;HI.&quot; </font>
-<p>
-<font color="#000000">Notice that some of the Chat Inputs begin with a forward slash (/). This stops your avatar from performing the Chat typing animation while you're typing in your message. When you're chatting, this animation lets others know that you're busily typing away. But there are times when you might not want to play the animation -- like while dancing. </font>
-<p>
-<font color="#000000">You don't need to have a Chat Input if you have a Shortcut Key, but it doesn't hurt to have both.</font>
-<p>
-<font color="#000000">Speaking of Shortcut Keys, the next two columns are for choosing them. Your choices are all the F-keys -- except F1, which is for Help -- by themselves, and with the shift keys and the control keys.</font>
-<p>
-<font color="#000000">That's a total of 33 possible shortcut key combinations you can use. But with the Chat Input, you have an almost unlimited amount of shortcuts for animations, sounds and Chat Output.</font>
-<p>
-<font color="#000000">You choose the sound you want to play with the Sound pop-up menu. All the sounds in your Inventory are listed here. If you record your own sounds and upload them, they'll automatically appear here. You can upload an unlimited number of sounds, but they need to be less than 10 seconds long.</font>
-<p>
-<font color="#000000">Animations are also chosen with a drop-down menu. Many animations are supplied, and more will find their way into your Inventory over time, so check the list every so often to see if any new ones have appeared.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="People.html">Previous</a> | <a href="Clothing_Makes_the_Avatar.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Nesting.html b/linden/indra/newview/help/Advanced/Nesting.html
deleted file mode 100644
index a2ab004..0000000
--- a/linden/indra/newview/help/Advanced/Nesting.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<html>
-<head>
-        <title>Nesting</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">It's time to find yourself a home.</font>
-<p>
-<font color="#000000">You've flown all over the world and seen some of the sights. Think about all the places you've been. It makes sense to make your home near your favorite activities. That way, you'll spend less time commuting, and less money if you teleport.</font>
-<p>
-<font color="#000000">You can always change your home later if you decide to move.</font>
-<p>
-<font color="#000080">Look at the map and decide on a general area you'd like to call home. Using the "Land You Can Buy" selection from the Background pull down menu in the World Map window will help you find areas with available land. Premium Access members can own up to 512 square meters of land before incurring additional land fees; Basic Access users will be advised that they need to pay additional fees in order to own land.</font>
-<p>
-<font color="#000000">Once you've found a likely area, find out what land is available.</font>
-<p>
-<font color="#000080">Open the View menu at the top of your screen and activate the view Land Owners function.</font>
-<p>
-<font color="#000000">Land that's owned by others will be marked with a brightly colored overlay. Land that isn't colored is open to you.</font>
-<p>
-<font color="#000080">Wander around and pick a nice little spot that you like.</font>
-<p>
-<font color="#000000">Land costs money to buy, so don't overextend yourself. Just pick out a nice little plot.</font>
-<p>
-<font color="#000080">Click on the land you want to buy.</font>
-<p>
-<font color="#000000">A pie menu will open.</font>
-<p>
-<font color="#000080">Choose Edit Land ...</font>
-<p>
-<font color="#000000">A small parcel of land -- 4 by 4 meters by default -- will be marked off, and a tool panel will open.</font>
-<p>
-<font color="#000000">We'll want a little more land than what's marked, so:</font>
-<p>
-<font color="#000080">Click and drag on the land to mark out a rectangle that's at least 12 by 12 meters.</font>
-<p>
-<font color="#000000">Land is parceled out in 4 by 4 meter chunks, so if you make a rectangle that's 3 by 3 chunks, that'll be 12 by 12 meters. 12 by 12 is the minimum size you'll want to have room to place a small house and have a little room for a yard or garden.</font>
-<p>
-<font color="#000080">Click on the Claim Land ... button in the tool panel to buy the land.</font>
-<p>
-<font color="#000000">A dialog will open, giving details of the sale, including the cost to claim and any changes to your billing required to claim the land.</font>
-<p>
-<font color="#000080">Click on the Claim button.</font>
-<p>
-<font color="#000000">Your account will be deducted for the sale. If claiming the land changes your billing, you'll need to approve the transaction in a confirmation email before the land is added to your account.</font>
-<p>
-<font color="#000000">YOu can locate your land at anytime using the My Land tool located in World menu at the top of your screen.</font>
-<p>
-<font color="#000000">Now let's mark this land as your Home.</font>
-<p>
-<font color="#000080">Hit Esc to close the tool panel, then move your avatar onto your land.</font>
-<p>
-<font color="#000080">Open the World menu and select Set Home to Here.</font>
-<p>
-<font color="#000000">Now your newly purchased land has been set as your home location.</font>
-<p>
-<font color="#000000">Because this is your &quot;official&quot; home (at least for now), whenever you enter Second Life, you have the option to enter here (or enter at the last place you were last time you were in-world).</font>
-<p>
-<font color="#000000">If the land isn't flat, let's flatten it to prepare it for a house. (If it is flat, skip to the next help screen.)</font>
-<p>
-<font color="#000080">Fly your avatar up and position it so you can see your whole parcel of land.</font>
-<p>
-<font color="#000080">Click on the land and select Edit Land ... in the pie menu.</font>
-<p>
-<font color="#000080">In the tool panel, click on Flatten Land.</font>
-<p>
-<font color="#000080">Slowly move the cursor over your land until it's fairly flat.</font>
-<p>
-<font color="#000000">It doesn't have to be perfect, just &quot;flattish,&quot; so you can plop down a house there.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Getting_Around.html">Previous</a> | <a href="Home_Time.html">Next</a> ]
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Party_Time.html b/linden/indra/newview/help/Advanced/Party_Time.html
deleted file mode 100644
index b7d5130..0000000
--- a/linden/indra/newview/help/Advanced/Party_Time.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-        <title>Party Time</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now it's time to find a party.</font>
-<p>
-<font color="#000080">1. Open the Events window by clicking the Events button at the bottom of your screen.</font>
-<p>
-<font color="#000000">2. Look at the events listed and find one that's happening now or is about to start. If there isn't an event going on right now, find one that you might want to attend later.</font>
-<p>
-<font color="#000080">3. Once you've selected an event, you can select Teleport to get there quickly or you can select Map to have the event location tracked in the World Map window.</font>
-<p>
-<font color="#000080">4. Depending on the type of event, you might need to find a seat and enjoy the show, or you could end up on stage performing!  Take your lead from other attendees, and don't be afraid to ask your host if you have any questions.</font>
-<p>
-<font color="#000000">Stay and enjoy the event until you're ready to move on, then click Next below to take a trip to Jessie.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Clothing_Makes_the_Avatar.html">Previous</a> | <a href="Dangerous_Time.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/People.html b/linden/indra/newview/help/Advanced/People.html
deleted file mode 100644
index 5808753..0000000
--- a/linden/indra/newview/help/Advanced/People.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-        <title>People</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Spending time with other people is one of the joys of life. And it's just as true in your Second Life.</font>
-<p>
-<font color="#000000">So how do you find people?</font>
-<p>
-<font color="#000000">People who you've met -- and exchanged calling cards with -- are easy to find, if they're in-world.</font>
-<p>
-<font color="#000080">1. Make sure the World Map window is open.</font>
-<p>
-<font color="#000080">2. Click on the Person Tracking pull-down menu (just above the Landmark pull-down) on the right side of the window.</font>
-<p>
-<font color="#000000">A list of people shows up. Names only show up here if they're on your Friends list, and only if that Resident is currently in-world. </font>
-<p>
-<font color="#000080">3. Choose a name on the list, then look at the Map.</font>
-<p>
-<font color="#000000">Your friend will be shown on the map as a red circle. </font>
-<p>
-<font color="#000080">4. Back in the main Second Life window, fly up a ways and turn around until you see a red beacon.</font>
-<p>
-<font color="#000000">This beacon works just like the landmark beacon. You can find it and follow it to your friend. You can also click on the Teleport or Fly button in the World Map window to get to your friend more quickly.</font>
-<p>
-<font color="#000000">Finding people you already know is easy. So, how do you find new friends? Use the Finder.</font>
-<p>
-<font color="#000080">5. Click the Find button at the top of your screen to open the Finder</font>
-<p>
-<font color="#000000">The Finder helps you to locate people in Second Life, and many other things as well.</font>
-<p>
-<font color="#000000">If only our first lives were this easy.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Shopping_201.html">Previous</a> | <a href="More_Ways_to_Communicate.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Personalize_Your_Home.html b/linden/indra/newview/help/Advanced/Personalize_Your_Home.html
deleted file mode 100644
index 24f2852..0000000
--- a/linden/indra/newview/help/Advanced/Personalize_Your_Home.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-        <title>Personalize Your Home</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Now let's personalize the cabin a little, by changing the flooring and painting the walls.</font>
-<p>
-<font color="#000080">1. Walk into your cabin and take a look around.</font>
-<p>
-It's nice and quaint. But we could upgrade that floor a little.
-<p>
-<font color="#000080">2. Make sure your Inventory is open, then open the Textures folder.</font>
-<p>
-<font color="#000080">3. Now, open the Building Materials folder, and find Spanish Tile.</font>
-<p>
-<font color="#000080">4. Drag Spanish Tile out of your Inventory and onto the floor of your cabin.</font>
-<p>
-The floor is instantly converted to tile.
-<p>
-Now, let's do something with the walls. We could change the textures of the walls in the same way as we changed the floor, but let's try something else.
-<p>
-Let's keep that rough stucco-like texture, but paint a bit of a tint over it.
-<p>
-<font color="#000080">5. Click on one of the walls of the house, and select Edit from the pie menu.</font>
-<p>
-Because the house is all linked so it can be easily moved around in a single piece, if you perform an editing function, like painting a wall, the whole house will be affected. So what we'll do is first select a single wall then paint it.
-<p>
-<font color="#000080">6. Click on Select Individual in the Tool Palette, then click on the wall you want to paint.</font>
-<p>
-<font color="#000080">7. Click on the More >> button on the tool palette to expand the palette, then click on the Texture tab in the Tool Palette, and then click on the Color box.</font>
-<p>
-The Color dialog opens.
-<p>
-<font color="#000080">8. Choose a nice, bold color -- click on an orange square on the left side of the Color dialog, then click OK.</font>
-<p>
-The wall keeps the stucco-like feel, but is now painted orange.
-<p>
-Before we continue, let's look at what we did. We changed two things: Texture and Color.
-<p>
-<font color="#000000">Changing texture is picking a graphic file to apply to the surface of an object. It's like applying wallpaper, but without the glue, mess or Laurel and Hardy hijinks.</font>
-<p>
-<font color="#000000">Color lets you modify the texture by tinting it almost any color. If you want a solid color, then first apply the White texture, then apply the color.</font>
-<p>
-<font color="#000000">There's no cost for painting or applying textures, so you can modify your home (or other possessions) all you want without charge. (There is, however, a small, one-time fee o fL$10 to upload your own textures into the system.)</font>
-<p>
-<font color="#000000">You can take your time now and continue to redecorate your home as much as you want by painting other walls (and the ceiling) or changing any or all of the textures.
-<p>
-Later, you'll be able to gather up some furniture and customize your house in other ways.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Home_Time.html">Previous</a> | <a href="The_Second_Life_Economy.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Positioning_with_Numbers.html b/linden/indra/newview/help/Advanced/Positioning_with_Numbers.html
deleted file mode 100644
index 8af704a..0000000
--- a/linden/indra/newview/help/Advanced/Positioning_with_Numbers.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<html>
-<head>
-        <title>Creation 101: Positioning with Numbers</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Let's use Position to perfectly align our three parts. What we'll do is copy the X and Y Position values from the base, and paste them into the X and Y position values of both the pole and the bulb.</font>
-<p>
-<font color="#000080">1. Click on the Edit icon, then on the base, then on the Object tab.</font>
-<p>
-<font color="#000080">2. Highlight and copy the X Position value.</font>
-<p>
-<font color="#000080">3. Click on the pole, then highlight the X Position and paste in the value from the base.</font>
-<p>
-<font color="#000080">4. Click on the bulb, highlight the X Position and paste in the value from the base.</font>
-<p>
-<font color="#000080">5. Repeat the last four steps, but this time copy and paste the Y Position value from the base to both the pole and the bulb.</font>
-<p>
-<font color="#000000">Now the three parts are exactly lined up and centered. Of course, you don't want to copy and paste the Z Position value, because you want the three parts to be different heights.</font>
-<p>
-<font color="#000080">6. Adjust the heights of the three parts as needed.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Building_the_Lamp_Bulb.html">Previous</a> | <a href="Simple_on_off.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Shopping_201.html b/linden/indra/newview/help/Advanced/Shopping_201.html
deleted file mode 100644
index b45c396..0000000
--- a/linden/indra/newview/help/Advanced/Shopping_201.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-        <title>Shopping 201</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Let's get some furniture for your new home.</font>
-<p>
-<font color="#000000">You don't need much for now, just a place for guests to sit, and maybe a lamp or two. </font>
-<p>
-<font color="#000080">1. Use the World Map window to find your way to the shopping mall in Luna.</font>
-<p>
-<font color="#000080">2. Wander around the place and find a few things that you think will go well in your new home.</font>
-<p>
-<font color="#000080">3. Click on one of the things you want to buy, then select Buy.</font>
-<p>
-<font color="#000000">A confirmation dialog will open, giving the details of the transaction and the permissions involved. You'll notice that you are buying a copy, not the original. You'll also find out if you'll be able to modify or copy the thing you buy.</font>
-<p>
-<font color="#000080">4. Click Buy.</font>
-<p>
-<font color="#000000">A copy of the item will be put into your Inventory.</font>
-<p>
-<font color="#000080">5. Return to your home, and go inside.</font>
-<p>
-<font color="#000080">6. Open your inventory. Drag your new purchases out of inventory and into your home.</font>
-<p>
-<font color="#000080">7. Click on one of the items, and select Edit from the pie menu.</font>
-<p>
-<font color="#000080">8. Drag the item around by the arrows to place it where it belongs.</font>
-<p>
-<font color="#000000">Chances are, you'll also need to rotate it.</font>
-<p>
-<font color="#000080">9. In the tool panel, click on Rotate.</font>
-<p>
-<font color="#000000">The arrows turn into rounded axes surrounding the item.</font>
-<p>
-<font color="#000080">10. Drag the rounded axes to rotate the item to the proper position.</font>
-<p>
-<font color="#000080">11. Place the other items you bought where you want them.</font>
-<p>
-<font color="#000000">So, now you have a party pad. How do you find people to invite over?</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="The_Second_Life_Economy.html">Previous</a> | <a href="People.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/Simple_on_off.html b/linden/indra/newview/help/Advanced/Simple_on_off.html
deleted file mode 100644
index bfa3e7b..0000000
--- a/linden/indra/newview/help/Advanced/Simple_on_off.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<html>
-<head>
-        <title>Creation 101: Simple On/Off</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">So, we have a lamp, but how do we turn it off -- and then on again?</font>
-<p>
-<font color="#000000">The most basic way would be to change the bulb's texture from white to black. The black texture blocks the light's glow.</font>
-<p>
-<font color="#000080">1. Highlight the bulb, then click on the Edit icon, then the Texture tab.</font>
-<p>
-<font color="#000080">2. Find and click on the <font color="#B00000">Color</font> control.</font>
-<p>
-<font color="#000000">The Color dialog opens. You've seen this before.</font>
-<p>
-<font color="#000080">3. Select <font color="#B00000">black</font> in the Color dialog (lower-left corner of the basic colors) and click OK.</font>
-<p>
-<font color="#000000">The bulb is now black -- basically, off. If we wanted to turn it back on, all we have to do is change the color. What a pain.</font>
-<p>
-<font color="#000000">There has to be an easier -- and better -- way.</font>
-<p>
-<font color="#000000">There is: with a script.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Creation_101.html">Creation 101 Home</a> | <a href="Positioning_with_Numbers.html">Previous</a> | <a href="Installing_a_Script.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/The_Lay_of_the_Land.html b/linden/indra/newview/help/Advanced/The_Lay_of_the_Land.html
deleted file mode 100644
index 3db0d76..0000000
--- a/linden/indra/newview/help/Advanced/The_Lay_of_the_Land.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-        <title>The Lay of the Land</title>
-</head>
-
-<body>
-<br>
-<font color="#000000">Before going anywhere, let's get an overview of the Second Life world, and locate a few important places.</font>
-<p>
-<font color="#000080">1. If the World Map window isn't open, click the Mini Map or click the Map button at the bottom of the screen to open it.</font>
-<p>
-The World Map window isn't static -- it changes with the world, so every change to the land, every new building and every person within your avatar's sight is on the map.
-<p>
-In addition, the map in the Map window can be zoomed in and out. 
-<p>
-The Map window can be used to track people and find landmarks, but only the names of regions are labeled.
-<p>
-Let's see what the World Map window can do for us.
-<p>
-<font color="#000080">2. Find the Zoom slider at the bottom right of the World Map window.</font>
-<p>
-<font color="#000080">3. Move and enlarge the Map window so it fills most of the screen.</font>
-<p>
-<font color="#000080">4. Zoom the map so you can see the entire Second Life world. Left-clicking and holding on the map allows you slide the map and center in on places of interest.</font>
-<p>
-<font color="#000080">5. Examine the map and find the following places:</font>
-<p>
-- <font color="#006000">Welcome Area in Ahern</font><font color="#000000"> -- this is where new residents enter Second Life</font>.<br>
-- <font color="#006000">The Sandbox in Cordova</font><font color="#000000"> -- a place where any resident can freely build and experiment.  (Sandboxes are cleared twice daily; any object left behind is deleted.)<br>
-- <font color="#006000">Jessie</font><font color="#000000"> -- a damage-enable area for wargaming</font>.<br>
-- <font color="#006000">Busy Ben's Hoverboard Ranch in Oak Grove</font><font color="#000000"> -- A vehicle dealership with easy access to the Vehicle Recreation Area.</font>
-<p>
-<font color="#000000">You can freely build in the Sandbox areas.  If you want to build something (like a home) that will stay inworld permanently, you may want to own your own land.  Be sure to check out <a href="http://secondlife.com/land/">http://secondlife.com/land/</a> for all the details behind land ownership.</font>
-<p>
-<font color="#000000">As you travel across the world in the next steps, look over the areas you cross as potential homesites.  You can use the tabs at the top of the Map to display land that has recently been marked For Sale.</font>
-<p>
-<font color="#000080">6. Zoom the map smaller and shrink the Map window a bit, then close it.</font>
-<p>
-<font color="#000080">7. Click Next to continue.</font>
-<p>
-[ <a href="Advanced_Second_Life_Skills.html">Advanced Skills Home</a> | <a href="Getting_Around.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Advanced/The_Second_Life_Economy.html b/linden/indra/newview/help/Advanced/The_Second_Life_Economy.html
deleted file mode 100644
index 2f483a3..0000000
--- a/linden/indra/newview/help/Advanced/The_Second_Life_Economy.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-        <title>The Second Life Economy</title>
-</head>
-
-<body>
-<br>
-<font color="#000080">Earning Money</font>
-<font color="#000000">Second Life is an entrepreneurial world. You can create your own segment of the economy; create new goods and services that other inhabitants will be willing to pay for. Your creativity in simulated business can be as important -- and fun -- as your creativity in other aspects of Second Life.</font>
-<p>
-<font color="#000000">Every Second Life resident receives a basic weekly Linden Dollar grant. This will be enough to explore, have fun and participate in all sorts of events and practice building objects. If you need or want more money than your grant, you'll have to find a way to earn it.</font>
-<p>
-<font color="#000080">Developer Incentives</font>
-<font color="#000000">Second Life's best attractions, creations, and entertaining diversions are created by Second Life's Residents. Developer Incentives acknowledge these hard-working Residents with real-world cash. US Dollars are awarded monthly to the creators, designers, hosts, and bon-vivants who make Second Life more than the sum of its parts. We'll use a variety of measures and mechanisms to seek out those worthy of rewards - not just traffic. Stay tuned for additional details about this exciting development. </font>
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/3D_Terminology.html b/linden/indra/newview/help/Concepts/3D_Terminology.html
deleted file mode 100644
index b2771eb..0000000
--- a/linden/indra/newview/help/Concepts/3D_Terminology.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-        <title>3D Terminology</title>
-</head>
-
-<body>
-<br>
-There are some terms in 3D technology that you'll run across in Second Life and in this document. <p>
-<font color="#006000">OBJECTS</font><br>
-An object is something created in Second Life. Objects are made out of primitives (see below) and can be just about any shape, material or appearance. Objects can have physics and/or scripts assigned to them for added functionality.<p>
-<font color="#006000">PRIMITIVES</font><br>
-Primitives are basic 3D shapes, like cubes, cones and cylinders. Primitives can be resized, reshaped, hollowed out and otherwise modified, then combined and connected to make more complex shapes and objects. All building starts with primitives.<p>
-<font color="#006000">TEXTURES</font><br>
-Textures are the visual patterns applied to sides, or faces of primitives or objects. Textures in Second Life need to be in the form of a graphic file in either .TGA (Targa) or .BMP (Bitmap) format, set to 24-bit color-depth.<p>
-<font color="#006000">CAMERA</font><br>
-In 3D graphics, scenes are generated from a particular viewpoint or location, known as  the camera. Think of yourself as a movie director when building in Second Life, with the ability to move the camera around in the world to get the best shot.<p>
-<font color="#006000">AXIS (PLURAL: AXES)</font><br>
-Everything in a 3-D world-including the &quot;real&quot; world, can be located in space by three numbers, one on each of three axes.<p>
-Remember making graphs in math class? This is just like that, but with depth.<p>
-The x-axis goes from left to right on the computer screen.<br>
-The y-axis goes from bottom to top of the computer screen.<br>
-The z-axis goes from the screen straight back into the monitor, providing the illusion of depth.<p>
-Sounds simple. But there's a little more to it.<p>
-Since Second Life is full 3D, and you can look at anything from any angle, things get turned around. When a primitive is created, it is assigned X, Y and Z axes. These axes stay consistent with the primitive-not with the screen. If you rotate the primitive, its axes rotate along with it. <p>
-Axes come into play for more than just positioning, especially when you get into joints (moveable connections like wheels or hinges).<p>
-
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Building_in_3D.html">Previous</a> | <a href="Building_Tools.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Building_Tools.html b/linden/indra/newview/help/Concepts/Building_Tools.html
deleted file mode 100644
index 22eed3e..0000000
--- a/linden/indra/newview/help/Concepts/Building_Tools.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head>
-        <title>Building Tools</title>
-</head>
-
-<body>
-<br>
-The basic tools that you will use in Second Life to build things are:<p>
-- <font color="#006000">Focus</font> -- Take control of the camera to view objects from any angle.<br>
-- <font color="#006000">Move</font> -- move a primitive or object around.<br>
-- <font color="#006000">Edit</font> -- Move, resize, or rotate an object.<br>
-- <font color="#006000">Create</font> -- Make a new primitive.<br>
-- <font color="#006000">Land</font> -- Modify the land in Second Life, raising, lowering or flattening as needed to prepare it for building.<br>
-- <font color="#006000">Link</font> -- connect two or more primitives into a single object.<br>
-- <font color="#006000">Make Joints</font> -- connect two primitives with a moveable connection.
-<p>
-There are many variations and additions to these basic tools that we'll get to later on. But if you understand just these few simple tools, you've made a good start.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="3D_Terminology.html">Previous</a> | <a href="Scripting.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Building_in_3D.html b/linden/indra/newview/help/Concepts/Building_in_3D.html
deleted file mode 100644
index 5c2dfe1..0000000
--- a/linden/indra/newview/help/Concepts/Building_in_3D.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-        <title>Building in 3-D</title>
-</head>
-
-<body>
-<br>
-Moving around in 3D can be tricky. Building things in 3D is trickier.<p>
-When you first begin to build and move things around in 3D, it's not uncommon to accidentally bury things in the ground and lose them.<p>
-Yes, it's a bit more complicated than building in 2-D, but the extra flexibility and power is worth the steeper learning curve. Work through the tutorials in the Advanced Skills part of this help system and you'll catch on quickly.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Inventory.html">Previous</a> | <a href="3D_Terminology.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Different_Views.html b/linden/indra/newview/help/Concepts/Different_Views.html
deleted file mode 100644
index e586450..0000000
--- a/linden/indra/newview/help/Concepts/Different_Views.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-        <title>Different Views</title>
-</head>
-
-<body>
-<br>
-There are different ways to look at the world while exploring Second Life.<p>
-By default, you'll see the world in &quot;Third Person,&quot; looking over your avatar's shoulder as you control it and move it through the world. You can use the scroll wheel on your mouse to zoom closer to or farther away from your avatar. If you zoom all the way in, you'll be in Mouselook.<p>
-Mouselook lets you see through your avatar's eyes, and control where you look with the mouse. It's a good way to take a quick look up, down and around. It's also a great way to do some intricate flying if you move while in Mouselook.<p>
-There are times when you need more control over your view, such as when you want to closely inspect something from different angles, or when you're building something. For this kind of viewing, you can use the Focus tool to take complete control of the &quot;camera,&quot; and move it around and zoom it in and out as much as you want. 
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Getting_Around.html">Previous</a> | <a href="Inventory.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Getting_Around.html b/linden/indra/newview/help/Concepts/Getting_Around.html
deleted file mode 100644
index 3ebc2db..0000000
--- a/linden/indra/newview/help/Concepts/Getting_Around.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-        <title>Getting Around in 3D</title>
-</head>
-
-<body>
-<br>
-Second Life is a true 3D world. <p>
-This makes it much more flexible in many ways, but also makes it a little more of a challenge to move around than in a 2D world.<p>
-If you're not already familiar with 3D navigation, just be patient. It gets easy after a little practice.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Ownership_and_Permissions.html">Previous</a> | <a href="Different_Views.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Hours.html b/linden/indra/newview/help/Concepts/Hours.html
deleted file mode 100644
index df09237..0000000
--- a/linden/indra/newview/help/Concepts/Hours.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-        <title>Hours</title>
-</head>
-
-<body>
-<br>
-Second Life is available 24 hours a day, seven days a week.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Updates.html">Previous</a> | <a href="Things_to_do.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Inventory.html b/linden/indra/newview/help/Concepts/Inventory.html
deleted file mode 100644
index efcfb72..0000000
--- a/linden/indra/newview/help/Concepts/Inventory.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-        <title>Inventory</title>
-</head>
-
-<body>
-<br>
-As you spend time in Second Life, you'll gather many possessions. These may include objects, textures, sounds, items of clothing, scripts and other things. 
-<p>
-You can store, view and access your Inventory at any time.
-<p>
-By collecting and keeping things in your inventory, they'll always be handy when you need them -- and they'll be safe in case the original is deleted by accident. Also, regularly storing versions of things in your Inventory as you build is a good way to &quot;undo&quot; and go back to an earlier version of your project.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Different_Views.html">Previous</a> | <a href="Building_in_3D.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Many_Ways_to_Get_Help.html b/linden/indra/newview/help/Concepts/Many_Ways_to_Get_Help.html
deleted file mode 100644
index e421fe6..0000000
--- a/linden/indra/newview/help/Concepts/Many_Ways_to_Get_Help.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-        <title>Many Ways to Get Help</title>
-</head>
-
-<body>
-<br>
-There are several ways to learn more about Second Life:<p>
-- This online help system,<br>
-- The online Wiki at <a href="http://secondlife.com/help">http://secondlife.com/help</a>,<br>
-- Downloadable documentation in PDF format,<br>
-- The Second Life Forums<br>
-- In-world classes<p>
-To access the downloadable documentation, go to: http://www.secondlife.com/downloads and choose Guides and Tutorials<p>
-To access the message board, go to http://www.secondlife.com/forums
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Scripting.html">Previous</a> | <a href="Reporting_Errors.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Money.html b/linden/indra/newview/help/Concepts/Money.html
deleted file mode 100644
index 7153fc5..0000000
--- a/linden/indra/newview/help/Concepts/Money.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-        <title>Money</title>
-</head>
-
-<body>
-<br>
-The Second Life economy is based on Linden Dollars. The economy is evolving and will continue to evolve, depending on what Second Life residents want, and what they choose to do. 
-<p>
-Everyone is given a basic weekly grant of Linden Dollars to spend any way they want. Residents who receive high ratings from their fellow Resident get a weekly reward. (Be nice and you make more money.)
-<p>
-If you want or need more than your grant, you'll need to find a way to earn more. You might start a business or, if you're skilled at architecture, clothing design, scripting or art creation, you can charge others for your time and skills. You can build an attraction and charge admission. You can give tours. You can invent other ways to earn money. Use your strengths and carve out a niche for yourself.
-<p>
-
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Tips_For_Newbies.html">Previous</a> | <a href="Ownership_and_Permissions.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Other_People.html b/linden/indra/newview/help/Concepts/Other_People.html
deleted file mode 100644
index f31309a..0000000
--- a/linden/indra/newview/help/Concepts/Other_People.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-        <title>Other People: Meeting and Communicating</title>
-</head>
-
-<body>
-<br>
-A big part of the Second Life culture is communicating and sharing with others. 
-<p>
-There's an open chat system for communicating with others nearby, and a built-in instant messaging system for private and group conversations. 
-<p>
-You can also use sounds, animations and  gestures to add to your communications.<p>
-There's also a powerful search tool that lets you find other people or groups with similar interests.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Your_Avatar.html">Previous</a> | <a href="Tips_For_Newbies.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Ownership_and_Permissions.html b/linden/indra/newview/help/Concepts/Ownership_and_Permissions.html
deleted file mode 100644
index 7e32f14..0000000
--- a/linden/indra/newview/help/Concepts/Ownership_and_Permissions.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-        <title>Ownership and Permissions</title>
-</head>
-
-<body>
-<br>
-Objects can be public or owned by a particular person. When you build something, by default it is your personal property. You have the option to Deed it to a group you belong to if you want.
-<p>
-Ownership of personal property comes with rights, responsibilities, and costs. As the owner, you can set permissions to allow others to move, copy or delete your property -- if you wish. Otherwise nobody but you can mess with your stuff.
-<p>
-You can also set permissions for things you sell or give away.  You can determine whether the next owner can copy, modify, or give away your object.  Be careful when giving away original copies of your creations... once the object trades hands and the permissions are taken away, they're permanent!  You can't reset a no-modify object so you can modify it, even if you give it back to the creator.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Money.html">Previous</a> | <a href="Getting_Around.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Reporting_Errors.html b/linden/indra/newview/help/Concepts/Reporting_Errors.html
deleted file mode 100644
index 58f9021..0000000
--- a/linden/indra/newview/help/Concepts/Reporting_Errors.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-        <title>Reporting Errors, Problems, and Asking Questions</title>
-</head>
-
-<body>
-<br>
-The software behind Second Life is, as you might imagine, extremely complicated and much of technology is very new and is constantly being improved, updated, and expanded. As a result, it may not work perfectly all the time.
-<p>
-If you have any problems with Second Life, please let us know. Tell us about bugs, problems and anything else that makes Second Life less than wonderful.
-<p>
-If you're having little problems that aren't preventing you from playing Second Life (little things aren't working right), tell us about them using the Bug Reporter tool located under the Help menu at the top of your screen.  Bug Reports are always read, and we'll use your report to help make Second Life better.  However, you may not receive a response to a Bug Report, so it's not a good choice for a problem you need help with.
-<p>
-If you're having a big problem with Second Life that you need help with, you can contact Support at <a href="mailto:support@secondlife.com">support@secondlife.com</a> or through the phone number listed on our Contact page at secondlife.com.
-<p>
-If you need help with something inworld, you can contact Live Help, a group of volunteer residents who can answer many questions about things in Second Life.  Simply open the Help menu and select Live Help, then type your question into the group IM session that opens up.  (Be sure to leave the group IM open so you can receive a response!)
-<p>
-Problems can also be discussed in the Second Life Forums. Feature suggestions are welcome, and there's a special discussion board in the Forums for suggesting and discussing new features. 
-<p>
-That's it for the Second Life Concepts. 
-<p>
-If you're still thirsty for knowledge, you can jump ahead to the <a href="../Advanced/Advanced_Second_Life_Skills.html">Advanced Second Life Skills</a>.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Many_Ways_to_Get_Help.html">Previous</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Scripting.html b/linden/indra/newview/help/Concepts/Scripting.html
deleted file mode 100644
index dc41317..0000000
--- a/linden/indra/newview/help/Concepts/Scripting.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-        <title>Scripting</title>
-</head>
-
-<body>
-<br>
-A very powerful feature of Second Life is the ability to add a script, or small program, to an object. Scripts can turn simple objects into interactive experiences that impart information, play sounds, move or ... just about anything.
-<p>
-The scripting language has been designed so even non-programmers can make simple modifications and customizations. (For instance, a door may have a script so it opens with a password. It will be easy to modify the door script to the password of your choice.)
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Building_Tools.html">Previous</a> | <a href="Many_Ways_to_Get_Help.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Second_Life_Concepts.html b/linden/indra/newview/help/Concepts/Second_Life_Concepts.html
deleted file mode 100644
index fee49e0..0000000
--- a/linden/indra/newview/help/Concepts/Second_Life_Concepts.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-        <title>Second Life Concepts</title>
-</head>
-
-<body>
-<br>
-Here are a few basic concepts that will help you understand and get the most out of Second Life.
-<p>
-<a href="World.html">The World, the Play, the Reason for Being</a>
-<br><a href="Strengths.html">Use Your Strengths</a>
-<br><a href="Updates.html">Updates</a>
-<br><a href="Hours.html">Hours</a>
-<br><a href="Things_to_do.html">Things to do in Second Life</a>
-<br><a href="Your_Avatar.html">Your Avatar</a>
-<br><a href="Other_People.html">Other People: Meeting and Communicating</a>
-<br><a href="Tips_For_Newbies.html">Tips For Newbies</a>
-<br><a href="Money.html">Money</a>
-<br><a href="Ownership_and_Permissions.html">Ownership and Permissions</a>
-<br><a href="Getting_Around.html">Getting Around in 3-D</a>
-<br><a href="Different_Views.html">Different Views</a>
-<br><a href="Inventory.html">Inventory</a>
-<br><a href="Building_in_3D.html">Building in 3-D</a>
-<br><a href="3D_Terminology.html">3D Terminology</a>
-<br><a href="Building_Tools.html">Building Tools</a>
-<br><a href="Scripting.html">Scripting</a>
-<br><a href="Many_Ways_to_Get_Help.html">Many Ways to Get Help</a>
-<br><a href="Reporting_Errors.html">Reporting Errors, Problems and Asking Questions</a>
-<p>
-[ <a href="World.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Strengths.html b/linden/indra/newview/help/Concepts/Strengths.html
deleted file mode 100644
index 738252b..0000000
--- a/linden/indra/newview/help/Concepts/Strengths.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-        <title>Use Your Strengths</title>
-</head>
-
-<body>
-<br>
-Everyone is different. Everyone has their own strengths, skills and creative prowess. Some people excel in architecture. Others in scripting. Others in creating textures. Others in avatar fashion design, sound design, social design (organizing events and throwin' parties) or new areas that we haven't thought of yet.
-<p>
-
-You are a part of the creation of a new world. We value your strengths and personality, and expect them to help us grow and develop Second Life. Stretch a little, challenge yourself and learn new things from the others. But use your own strengths.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="World.html">Previous</a> | <a href="Updates.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Things_to_do.html b/linden/indra/newview/help/Concepts/Things_to_do.html
deleted file mode 100644
index 06cc043..0000000
--- a/linden/indra/newview/help/Concepts/Things_to_do.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-        <title>Things to do in Second Life</title>
-</head>
-
-<body>
-<br>
-Right now, when the world is fresh and new the main things to do in Second Life are:
-<p>
-- Explore
-<br>- Meet others with similar (or new) interests, network, make friends
-<br>- Participate in social events
-<br>- Participate in deadly battles in the Jessie or Rausch combat regions
-<br>- Participate in various games and contests
-<br>- Create things and places others will want to explore
-<br>- Experiment with scripting
-<br>- Create textures and sounds out-of-world, and upload them
-<br>- Collaborate with others to build something big
-<br>- Start businesses that charge for products or services
-<br>- Much more that we haven't even thought of yet -- but you will.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Hours.html">Previous</a> | <a href="Your_Avatar.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Tips_For_Newbies.html b/linden/indra/newview/help/Concepts/Tips_For_Newbies.html
deleted file mode 100644
index 3165dc1..0000000
--- a/linden/indra/newview/help/Concepts/Tips_For_Newbies.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-        <title>Tips For Newbies</title>
-</head>
-
-<body>
-<br>
-As with any society, Second Life has it's own set of cultural norms that you should be aware of so you can progress quickly while avoiding making any faux pas and causing yourself or others problems:
-<p>
-<font color="#B00000">1. It's OK to learn by emulation: look at other people's work, copy free textures, analyze others' scripts, etc.</font>
-<p>
-<font color="#B00000">2. Don't litter! Delete your unused objects.</font>
-<p>
-<font color="#B00000">3. Use physics, light, and scripted objects sparingly, they put a heavy toll on processing power and can slow the game for others.</font>
-<p>
-<font color="#B00000">4. Avoid uploading copyrighted textures, graphics, characters or text. (No movie posters, pictures of Elvis, etc.) Second Life Residents favor original content.</font>
-<p>
-<font color="#B00000">5. Don't build malicious objects. Guns and shooting aren't permitted in most areas. (Head to the regions Jessie or Rausch if you're looking for that sort of action.) Objects that follow other people around are cute-but annoying after a while.</font>
-<p>
-<font color="#B00000">6. Use sound sparingly. Don't be the neighbor with the annoying barking dog.</font>
-<p>
-<font color="#B00000">7. Know the difference between public chat and Instant Messaging. Keep private conversations private; don't copy chat and paste it somewhere else. Most of all, don't ever reveal private information (like passwords) to anyone.</font>
-<p>
-<font color="#B00000">8. Use your Inventory to store things you may want later. It doesn't cost anything to store things there, and it's almost unlimited in size.</font>
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Other_People.html">Previous</a> | <a href="Money.html">Next</a> ]
-
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Updates.html b/linden/indra/newview/help/Concepts/Updates.html
deleted file mode 100644
index f6bfab8..0000000
--- a/linden/indra/newview/help/Concepts/Updates.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-        <title>Updates</title>
-</head>
-
-<body>
-<br>
-There will occasionally be updates to the viewer program. When there's an update, you'll be notified when you try to log on, and instructed to go to the Second Life Website, sign in and download the latest version of the player.
-<p>
-Your possessions, Inventory, ratings and avatar designs will automatically be updated into the new viewer.
-<p>
-If you have any problems downloading an update, you can always download the latest version of Second Life at <a href="http://secondlife.com/download">http://secondlife.com/download</a>.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Strengths.html">Previous</a> | <a href="Hours.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/World.html b/linden/indra/newview/help/Concepts/World.html
deleted file mode 100644
index f8d105c..0000000
--- a/linden/indra/newview/help/Concepts/World.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-        <title>The World, the Play, the Reason for Being</title>
-</head>
-
-<body>
-<br>
-Second Life is an open-ended world where you can do nearly anything that you can imagine. If you’re thinking about what to do next, here are some suggestions:
-<p>
-<li>Use the “Find people” feature to check who else is online
-<li>Find a game, or somewhere to go shopping.
-<li>Customize your avatar to look like a famous person and see if other Residents can guess who you are
-<li>Visit the Second Life forums at www.secondlife.com and see what people are talking about
-<li>Build a replica of your favorite childhood toy
-<li>Click the Events button at the top of your screen to see what’s going on inworld
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Strengths.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/Concepts/Your_Avatar.html b/linden/indra/newview/help/Concepts/Your_Avatar.html
deleted file mode 100644
index fb35eaa..0000000
--- a/linden/indra/newview/help/Concepts/Your_Avatar.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-        <title>Your Avatar</title>
-</head>
-
-<body>
-<br>
-Your avatar is your representative in Second Life.
-<p>
-Your avatar may be male or female, and you can customize it in almost limitless ways. 
-When you see other avatars, their names will appear above their heads. When others see you, they'll see your name above your head.
-<p>
-You can attach things to your avatar, to make it even more original (and functional). The objects that you attach may be scripted, so they can function in different ways, for instance, jet packs for faster travel, guns for games, etc.
-<p>
-Your avatar has a health rating (it will appear, when needed, in the lower left corner of your screen) only while in the Damage Enabled areas where the dangerous games are played. If your health rating reaches 0%, then your avatar is (temporarily) dead, and will be teleported to your home location and healed.
-<p>
-[ <a href="Second_Life_Concepts.html">Concepts Home</a> | <a href="Things_to_do.html">Previous</a> | <a href="Other_People.html">Next</a> ]
-
-</body>
-</html>
diff --git a/linden/indra/newview/help/LL_logo.jpg b/linden/indra/newview/help/LL_logo.jpg
deleted file mode 100644
index 272bd3d..0000000
--- a/linden/indra/newview/help/LL_logo.jpg
+++ /dev/null
diff --git a/linden/indra/newview/help/MAIN.css b/linden/indra/newview/help/MAIN.css
deleted file mode 100644
index a981505..0000000
--- a/linden/indra/newview/help/MAIN.css
+++ /dev/null
@@ -1,553 +0,0 @@
-/* GLOBAL STYLES: text, links, form elements, etc */ 
-
-body {
-        margin : 0px;
-    font-family:verdana, helvetica, sans-serif;
-        font-size:11px;
-    background-color: #ffffff;
-        color:#546368;
-        }
-        
-.body_community {
-        margin : 0px;
-    font-family:verdana, helvetica, sans-serif;
-        font-size:11px;
-    background-color: #d5e3ec;
-        color:#546368;
-        }
-        
-option.sl, input.sl, radio.sl, .S1 
-{
-        font-family:verdana, courier, courier new, sans-serif;
-        font-size: 8pt;
-        color: white;
-        background-color: #4378a4;
-        border-color:#bcbbbb;
-        border-top-width: 1px; 
-        border-right-width: 1px; 
-        border-bottom-width: 1px; 
-        border-left-width: 1px;
-}
-
-
-submit.resident
-{
-        font-family:verdana, courier, courier new, sans-serif;
-        font-size: 8pt;
-        border-top-width: 1px; 
-        border-right-width: 1px; 
-        border-bottom-width: 1px; 
-        border-left-width: 1px;
-}
-
-select.resident
-{
-        font-family:verdana, courier, courier new, sans-serif;
-        font-size: 8pt;
-        color: white;
-        background-color: #4378a4;
-        border-color:#bcbbbb;
-        border-top-width: 1px; 
-        border-right-width: 1px; 
-        border-bottom-width: 1px; 
-        border-left-width: 1px;
-}
-
-textarea.resident
-{
-        font-family:verdana, courier, courier new, sans-serif;
-        font-size: 10px;
-        color:white;
-        background-color: #4378a4;
-        border-color:#bcbbbb;
-        border-top-width: 1px; 
-        border-right-width: 1px; 
-        border-bottom-width: 1px; 
-        border-left-width: 1px;
-}
-
-a                       {color:#4378a4; text-decoration:underline;}
-a:active        {color:#50607C; text-decoration:underline;}
-a:hover         {color:#ff7900;text-decoration:underline;}
-
-a.promolink                     {color:#4378a4; text-decoration:none;}
-a.promolink:active      {color:#50607C; text-decoration:none;}
-a.promolink:hover       {color:#ff7900;text-decoration:none;}
-
-a img                   {border: 0px #FFFFFF none;}
-a:active img    {border: 0px #FFFFFF none;}
-a:hover img     {border: 0px #FFFFFF none;}
-
-a.fansite {font-weight:bold;}
-
-.headline {color:#346080; font-size:12px; font-weight:bold;}
-
-.header {color:#346080; font-size:12px; font-weight:bold;}
-
-.subheader {color:#346080; font-size:11px; font-weight:bold;}
-
-.fineprint {color:#346080; font-size:10px;}
-
-.topheader {color:#346080; font-size:13pt; font-weight:bold; font-family:verdana, helvetica, sans-serif;}
-
-.super {font-size: 9px; vertical-align:super;}
-
-.copyright {text-align: right; margin:0px 6px 0px 0px;  color:#666666; font-family:verdana, helvetica, sans-serif; font-size:x-small;
-}
-
-
-
-/* DEFAULT TEMPLATE PAGE POSITIONING */ 
-
-#DEFAULT_container      {
-                width:890px;
-                margin:0px 5px 5px 5px;
-                text-align:left;
-                background-color: #ffffff;
-                }
-
-#DEFAULT_container_community    {
-                width:900px;
-                margin:0px 5px 5px 5px;
-                text-align:center;
-                background-color: #ffffff;
-                
-                }
-                
-#DEFAULT_header {
-                width: 890px;   
-                height: 85px;    
-                background-image: url('header_banner.jpg'); 
-                background-position:  center 50%; 
-                background-repeat: no-repeat; margin-left:0px; margin-right:0px; margin-top:0px; margin-bottom:3px
-                }
-                                
-#DEFAULT_header_nav {
-                left: 0px;      
-                top: 87px;      
-                width: 890px;   
-                height: 23px;    
-                z-index: 9001;  
-                margin: 0px;
-                }
-
-#DEFAULT_container_mid  {
-                position:relative;      
-                left:0px;
-                width: 890px;
-                margin: 0px;
-                }
-
-#DEFAULT_left {
-                width: 190px;   
-                float:left;
-                margin: 0px;
-                }
-                
-#DEFAULT_menu_outside {
-                background-color:#376283;
-                }
-                
-#DEFAULT_menu_inside {
-                padding: 1px 6px 10px 6px;
-                }
-
-#DEFAULT_mid_outside {
-                vertical-align: top;
-                float:left;
-                margin: 0px 10px 10px 10px; 
-                padding: 0px;
-                }
-                
-#DEFAULT_mid_inside {
-                width: 440px; 
-                margin: 0px; 
-                padding: 0px 0px 1px 0px;
-                }
-                
-#DEFAULT_2column {
-                vertical-align: top;
-                float:left;
-                margin: 0px 0px 10px 10px; 
-                padding: 0px;
-                overflow:auto;
-                }
-                
-#DEFAULT_2column_inside {
-                width: 690px; 
-                margin: 0px; 
-                padding: 0px 0px 10px 0px;
-                overflow-x:auto;
-                }               
-                
-#DEFAULT_content_header {
-        padding:10px ;
-        margin: 0px;    
-        background-image: url('/_img/backgrounds/bg_skyheader.jpg'); 
-        background-repeat: no-repeat}
-        
-#DEFAULT_content_header_2column {
-        padding:10px ;
-        margin: 0px;    
-        background-image: url('/_img/backgrounds/bg_skyheader_2col.jpg'); 
-        background-repeat: no-repeat
-}
-        
-#DEFAULT_content_divider {
-        margin: 0px;    
-        background-image: url('/_img/backgrounds/bg_dots_grey.gif'); 
-        background-repeat: repeat-x
-}
-
-#DEFAULT_right  {
-                width: 225px; 
-                float:right;
-                margin: 0px; 
-                }
-
-#DEFAULT_module {
-                width: 215px; 
-                padding: 1px 5px 1px 5px; 
-                margin: 0px 0px 0px 0px; 
-                }
-
-#DEFAULT_footer {
-                width: 890px;
-                height: 40px;
-                margin: 10px 0px 0px 0px; 
-                float: left;
-                }
-
-/* EMBEDDED ALTERATIONS FROM DEFAULT */
-
-#embedded_container_outer   {
-                width:640px;
-                margin:0px 5px 5px 5px;
-                text-align:center;
-                background-color: #ffffff;
-                
-                }
-
-#embedded_mid_inside {
-                width: 540px; 
-                margin: 0px; 
-                padding: 0px 0px 1px 0px;
-                }
-
-#embedded_content_header {
-        padding:10px ;
-        margin: 0px;    
-        background-image: url('/_img/backgrounds/bg_skyheader.jpg');
-        background-position: right 50%; 
-        background-repeat: no-repeat}
-
-
-/* COMMUNITY MAIN PAGE */
-
-#comm_index_container {
-                width: 690px;
-                vertical-align: top;
-                float:left;
-                margin: 0px 0px 0px 10px; 
-                padding: 0px;
-                }
-                
-#comm_index_top_outside {
-                width: 690px;
-                height: 182px;
-                margin: 0px; 
-                padding: 0px;
-                background-image: url('/_img/backgrounds/bg_community.jpg'); 
-                background-repeat: no-repeat
-                }               
-
-#comm_index_top_inside {
-                width: 680px;
-                height: 182px;
-                margin: 0px 0px 0px 0px; 
-                padding: 0px;
-                }               
-
-#comm_mid_outside {
-                vertical-align: top;
-                float:left;
-                margin: 0px 10px 0px 0px; 
-                padding: 10px 0px 0px 0px;
-                }
-                
-#comm_mid_inside {
-                width: 430px; 
-                margin: 0px 10px 10px 10px; 
-                padding: 10px 0px 10px 0px;
-                }
-                
-#comm_right     {
-                width: 225px; 
-                float:right;
-                margin: 0px 0px 0px 0px; 
-                }
-
-#comm_promo     {
-                width: 225px; 
-                height: 85px;
-                margin: 10px 0px 5px 0px; 
-                }
-
-#comm_quicklinks_outside        {
-                width: 225px; 
-                background-color:#376283;
-                }
-
-#comm_quicklinks_inside {
-                margin: 0px 10px 0px 10px; 
-                padding: 10px 0px 10px 0px;
-                font-family: Verdana, Arial, Helvetica, sans-serif;
-                font-size: 10px;
-                color: #FFFFFF;
-                }
-
-#comm_quicklinks_inside a {
-                font-size: 11px;
-                font-weight: bold;
-                text-decoration: underline;
-                color: #FFFFFF;
-                }
-#comm_quicklinks_inside a:hover {
-                text-decoration: none;
-                }
-#comm_quicklinks_inside .pad    { padding: 5px 0px 5px 0px;}
-
-
-#comm_latest {
-        background-image: url('/_img/backgrounds/bg_topfade.gif');      
-        background-position:  left top;                 
-        background-repeat: repeat-x;
-        border-top: 1px solid #CCCCCC;
-        border-bottom: 1px solid #CCCCCC;
-        border-left: 1px solid #CCCCCC;
-        width: 420px;
-        height: 461px;
-        overflow:auto;
-        padding-left:8px; padding-right:3px; padding-top:0px; padding-bottom:3px
-}
-
-
-TBODY.RandomContainer TR.RandomItem { 
-        display: none;
-        }
-
-
-
-
-/* LEFT MENU STYLES */
-
-.menu_topsection {
-        font-family: Verdana, Arial, Helvetica, sans-serif;
-        font-size: 11px;
-        font-weight: bold;
-        color: #FFFFFF;
-        background-color:#376283;
-        padding: 3px 5px 3px 5px;
-        
-        }
-
-.menu_subsection {
-        font-family: Verdana, Arial, Helvetica, sans-serif;
-        font-size: 11px;
-        background-image: url('/_img/backgrounds/bg_submenu.jpg');
-        padding-left:5px; padding-right:3px; padding-top:3px; padding-bottom:3px
-        }
-
-.menu_toplink {
-        font-family: Verdana, Arial, Helvetica, sans-serif; 
-        font-size: 11px; 
-        font-weight: bold; 
-        color: #FFFFFF; 
-        text-decoration: none;
-        }
-
-.menu_sublink {
-        font-family: Verdana, Arial, Helvetica, sans-serif; 
-        font-size: 11px;
-        color:#eeeeee;
-        text-decoration: none; 
-        }
-
-.menu_toplink:hover {
-        font-family: Verdana, Arial, Helvetica, sans-serif; 
-        font-size: 11px; 
-        font-weight: bold; 
-        color: #e8eff5;
-        text-decoration: underline;
-        }
-
-.menu_sublink:hover {
-        font-family: Verdana, Arial, Helvetica, sans-serif; 
-        font-size: 11px; 
-        text-decoration: underline; 
-        }
-
-.menu_toplink_active {
-        font-family: Verdana, Arial, Helvetica, sans-serif; 
-        font-size: 11px; 
-        font-weight: bold; 
-        color: #ff9933;
-        }
-
-.menu_sublink_active {
-        font-family: Verdana, Arial, Helvetica, sans-serif; 
-        font-size: 11px; 
-        color: #ff9933;
-        }
-
-
-.menu_border {
-        background-image: url('/_img/backgrounds/bg_dots_white.gif');
-        color: #FFFFFF;
-        margin: 0px
-        }
-        
-.menu_border_sublink {
-background-image: url('/_img/backgrounds/bg_submenu_dots_blue.jpg');
-margin: 0px
-}
-
-/* ERROR HANDLING: */
-
-#display_errors  {color:#000000; border-style: solid; border-color:#aaaaaa; border-width:1px; padding:5px; background-color:#FEF7D7; margin-right:5px;}
-
-/* END ERROR HANDLING: */
-
-
-/* BOXES: */
-div.box_grey_t          {background-image: url('grey_pixel.gif');       background-position:  left top;                 background-repeat: repeat-x}
-div.box_grey_r          {background-image: url('grey_pixel.gif');       background-position:  right top;        background-repeat: repeat-y}
-div.box_grey_b          {background-image: url('grey_pixel.gif');       background-position:  left bottom;      background-repeat: repeat-x}
-div.box_grey_l          {background-image: url('grey_pixel.gif');               background-position:  left top;         background-repeat: repeat-y}
-div.box_grey_tl         {background-image: url('grey_corner_tl.gif'); background-position:  left top;           background-repeat: no-repeat}
-div.box_grey_tr         {background-image: url('grey_corner_tr.gif');   background-position:  right top;                background-repeat: no-repeat}
-div.box_grey_bl         {background-image: url('grey_corner_bl.gif');   background-position:  left bottom;      background-repeat: no-repeat}
-div.box_grey_br         {background-image: url('grey_corner_br.gif'); background-position:  right bottom;       background-repeat: no-repeat}
-
-div.box_light_t                 {background-image: url('/_img/boxes/white_bdr_top.gif');        background-position:  left top;                 background-repeat: repeat-x}
-div.box_light_r                 {background-image: url('/_img/boxes/white_bdr_right.gif');      background-position:  right top;        background-repeat: repeat-y}
-div.box_light_b                 {background-image: url('/_img/boxes/white_bdr_bot.gif');        background-position:  left bottom;      background-repeat: repeat-x}
-div.box_light_l                 {background-image: url('/_img/boxes/white_bdr_left.gif');               background-position:  left top;         background-repeat: repeat-y}
-div.box_light_tl        {background-image: url('/_img/boxes/white_corner_tl.gif'); background-position:  left top;              background-repeat: no-repeat}
-div.box_light_tr        {background-image: url('/_img/boxes/white_corner_tr.gif');      background-position:  right top;                background-repeat: no-repeat}
-div.box_light_bl        {background-image: url('/_img/boxes/white_corner_bl.gif');      background-position:  left bottom;      background-repeat: no-repeat}
-div.box_light_br        {background-image: url('/_img/boxes/white_corner_br.gif'); background-position:  right bottom;  background-repeat: no-repeat}
-
-div.box_lblue_t         {background-image: url('/_img/boxes/grey_pixel.gif');   background-position:  left top;                 background-repeat: repeat-x}
-div.box_lblue_r         {background-image: url('/_img/boxes/grey_pixel.gif');   background-position:  right top;        background-repeat: repeat-y}
-div.box_lblue_b         {background-image: url('/_img/boxes/grey_pixel.gif');   background-position:  left bottom;      background-repeat: repeat-x}
-div.box_lblue_l         {background-image: url('/_img/boxes/grey_pixel.gif');           background-position:  left top;         background-repeat: repeat-y}
-div.box_lblue_tl   {background-image: url('/_img/boxes/lblue_corner_tl.gif');background-position:  left top;            background-repeat: no-repeat}
-div.box_lblue_tr   {background-image: url('/_img/boxes/lblue_corner_tr.gif');background-position:  right top;           background-repeat: no-repeat}
-div.box_lblue_bl   {background-image: url('/_img/boxes/lblue_corner_bl.gif');background-position:  left bottom; background-repeat: no-repeat}
-div.box_lblue_br   {background-image: url('/_img/boxes/lblue_corner_br.gif');background-position:  right bottom;        background-repeat: no-repeat}
-
-div.box_mblue_t         {background-image: url('/_img/boxes/grey_pixel.gif');   background-position:  left top;                 background-repeat: repeat-x}
-div.box_mblue_r         {background-image: url('/_img/boxes/grey_pixel.gif');   background-position:  right top;        background-repeat: repeat-y}
-div.box_mblue_b         {background-image: url('/_img/boxes/grey_pixel.gif');   background-position:  left bottom;      background-repeat: repeat-x}
-div.box_mblue_l         {background-image: url('/_img/boxes/grey_pixel.gif');           background-position:  left top;         background-repeat: repeat-y}
-div.box_mblue_tl   {background-image: url('/_img/boxes/mblue_corner_tl.gif');background-position:  left top;            background-repeat: no-repeat}
-div.box_mblue_tr   {background-image: url('/_img/boxes/mblue_corner_tr.gif');background-position:  right top;           background-repeat: no-repeat}
-div.box_mblue_bl   {background-image: url('/_img/boxes/mblue_corner_bl.gif');background-position:  left bottom; background-repeat: no-repeat}
-div.box_mblue_br   {background-image: url('/_img/boxes/mblue_corner_br.gif');background-position:  right bottom;        background-repeat: no-repeat}
-
-div.box_dblue_noborder_tl   {background-image: url('/_img/boxes/dblue_corner_tl.gif');background-position:  left top;   background-repeat: no-repeat}
-div.box_dblue_noborder_tr   {background-image: url('/_img/boxes/dblue_corner_tr.gif');background-position:  right top;  background-repeat: no-repeat}
-div.box_dblue_noborder_bl   {background-image: url('/_img/boxes/dblue_corner_bl.gif');background-position:  left bottom;        background-repeat: no-repeat}
-div.box_dblue_noborder_br   {background-image: url('/_img/boxes/dblue_corner_br.gif');background-position:  right bottom;       background-repeat: no-repeat}
-
-div.comm_corner_bl      {background-image: url('/_img/boxes/comm_corner_bl.gif');       background-position:  left bottom;      background-repeat: no-repeat}
-div.comm_corner_br      {background-image: url('/_img/boxes/comm_corner_br.gif'); background-position:  right bottom;   background-repeat: no-repeat}
-
-
-
-#MEDIA_NEWS {background-color:#e9f1f8;  background-position: top left;}
-#SL_news        {
-        background-image: url('/_img/backgrounds/bg_topfade.gif'); 
-        background-repeat: repeat-x;
-        text-align:left;
-    font-family:verdana, helvetica, sans-serif;
-        font-size:x-small;
-        border-left: 1px solid #CCCCCC;
-        border-top: 1px solid #CCCCCC;
-        border-bottom: 1px solid #CCCCCC;
-        width: 179px;
-        height: 130px;
-        overflow:auto; background-position-y:50%
-}
-#SL_news .row1  { background-color:#FFFFFF; padding: 5px 5px 5px 5px;}
-#SL_news .row2  { background-color:#e9f1f8; padding: 0px;}
-#SL_news a              { font-size:x-small;}
-
-
-/* If we don't explicitly choose a size for H2, H3, Firefox and IE
-   choose sizes that are very different.
- */
-h2 { font-size: 18px }
-h3 { font-size: 14px; padding:0px; margin: 12px 0 8px 0 }
-
-/* table cells */
-td.heading { border-bottom: 1px dotted black }
-td.title { font-weight: bold }
-td.right { text-align: right }
-td.center { text-align: center }
-td.ledger-shade { background-color: #eeeeee }
-
-/* _COPIED_ "required" over from registration b/c other forms may have required fields */
-.required
-{
-    font-size: 10px;
-        color: #CC0000;
-    background-color: #FFFFCC;
-    font-weight: normal;
-}
-
-/* Known Issues format and display */
-#known_issues {
-        background-image: url('/_img/backgrounds/bg_topfade.gif');      
-        background-position:  left top;                 
-        background-repeat: repeat-x;
-        border: 1px solid #CCC;
-        width: 650px;
-        padding-left:8px; padding-right:3px; padding-top:0px; padding-bottom:3px
-}
-
-#bug {
-        border-bottom: 1px dashed #CCC;
-        padding: 12px 0px;
-}
-
-.bugrepro{ 
-        border: 1px solid #CCC;
-    display: none;
-        height: 300px;
-        width: 600px;
-        overflow: auto;
-        padding: 3px;
-} 
-
-.whenupdated {
-        text-align: center;
-        font-weight: bold;
-        font-size: large; 
-        padding: 2px;
-}
-
-.key, .buglabel {
-        padding: 0px 4px 0px 0px;
-        font-weight: bold;
-}
-
-.versionlist{
-        padding: 0px 8px 0px 0px;
-        font-style: italic;
-}
-
-.bugsummary{
-    font-weight: bold;
-}
\ No newline at end of file
diff --git a/linden/indra/newview/help/basics/basic_skills.html b/linden/indra/newview/help/basics/basic_skills.html
deleted file mode 100644
index 68dcc4e..0000000
--- a/linden/indra/newview/help/basics/basic_skills.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Basic Second Life Skills</TITLE>
-</HEAD>
-<BODY>
-<br>
-<font color="#006000">WELCOME TO BASIC SECOND LIFE SKILLS</font>
-<P>
-<font color="#006000">TOPICS</font>
-<BR>
-<A HREF="movement.html">Basic Movement</A><BR>
-<A HREF="chat.html">Chat</A><BR>
-<A HREF="im.html">Instant Messaging</A><BR>
-<A HREF="inventory.html">Inventory Basics</A><BR>
-<A HREF="customization.html">Basic Avatar Customization</A><BR>
-<A HREF="profile.html">Your Profile</A><BR>
-<A HREF="shopping.html">Shopping 101</A><BR>
-<A HREF="camera.html">An Introduction to Camera Control</A><BR>
-
-<P>
-[ <A HREF="movement.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/basics/camera.html b/linden/indra/newview/help/basics/camera.html
deleted file mode 100644
index e7a7b1e..0000000
--- a/linden/indra/newview/help/basics/camera.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<HEAD>
-        <TITLE>Camera Control</TITLE>
-</HEAD>
-<BODY>
-<br>
-Get a new perspective on your Second Life.
-<P>
-
-Because Second Life is 3-D, you have total and infinite control over where you place the camera (your eyes). 
-<P>
-Camera control is a little tricky to get the hang of, but once you do, you'll really enjoy it.
-<P>
-<font color="#000080">1. Hold down the ALT key to activate Focus mode.</font>
-<P>
-The cursor changes to a magnifying glass.
-<P>
-<font color="#000080">3. With ALT held down, click and release on various spots on the landscape.</font>
-<P>
-Notice that the view re-centers on the place where you clicked.
-<P>
-<font color="#000080">4. Click on your avatar and drag the mouse SLOWLY around.</font>
-<P>
-As you move the mouse forward and backward and side to side, the view zooms in and out and around your avatar.
-<P>
-<font color="#000080">5. Now hold down the ATL and CTRL keys at the same time.</font>
-<p>
-The cursor changes again to indicate Orbit mode.
-<P>
-<font color="#000080">6. With both ALT and CTRL held down, click and drag SLOWLY on the avatar again.</font>
-<P>
-Now, as you move the mouse, the view stays approximately the same distance from your avatar, but the camera orbits around it in all directions.
-<P>
-<font color="#000080">7. Now hold down ALT, CTRL, and Shift at the same time.</font>
-<P>
-The cursor changes to indicate Pan mode.
-<P>
-<font color="#000080">8. Click and drag SLOWLY on the avatar again.</font>
-<P>
-Now, as you move the mouse, the camera slides across the landscape. It looks like you're dragging the ground around.
-<P>
-<font color="#000080">9. Hit the Esc key to return to normal view.</font>
-<P>
-You'll also find a Camera Control panel under the View menu at the top of the screen.
-<p>
-Mastering camera control will take some practice. One you have a feel for it, it's not only fun, but very useful when you start to build things and need to see them from all angles.
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="economy.html">Previous</A> | <A HREF="congratulations.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/basics/chat.html b/linden/indra/newview/help/basics/chat.html
deleted file mode 100644
index 59cf64a..0000000
--- a/linden/indra/newview/help/basics/chat.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Chat</TITLE>
-</HEAD>
-<BODY>
-<br>
-Time to learn how to chat.
-<P>
-The first step is to find someone to chat with.  Use the Mini Map or World Map to locate other Second Life Residents.
-<P>
-Once you've located someone to chat with, get only as close to then as you would to chat in real life. 
-<P>
-<font color="#000080">1. Press the Enter (or Return) key, type a message, then hit Enter (Return) again to say your message.</font><P>
-Everyone within a certain range will hear you.
-<P>
-<font color="#000080">2. By default, you'll automatically stay in chat mode as long as you're talking. (You can change this later in Preferences.) When you're done with your conversation, hit the ESC key to exit chat mode.</font>
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="landmarks.html">Previous</A> | <A HREF="im.html">Next</A> ]
-</BODY>
-</HTML> 
\ No newline at end of file
diff --git a/linden/indra/newview/help/basics/congratulations.html b/linden/indra/newview/help/basics/congratulations.html
deleted file mode 100644
index 1ff33bf..0000000
--- a/linden/indra/newview/help/basics/congratulations.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML> 
-<HEAD>
-        <TITLE>Congratulations!</TITLE>
-</HEAD>
-<BODY>
-<P>
-When you're ready to learn more, take a quick look through <a href="../Concepts/Second_Life_Concepts.html">Second Life Concepts</a>, where you'll gain some background in how things work around here.
-<p>
-Or, if you prefer, you can jump right into the <a href="../Advanced/Advanced_Second_Life_Skills.html">Advanced Second Life Skills</a>.
-<P>
-
-
-<P>
-[ <A HREF="camera.html">Previous</A> ]
-</BODY>
-</HTML> 
diff --git a/linden/indra/newview/help/basics/customization.html b/linden/indra/newview/help/basics/customization.html
deleted file mode 100644
index e3e46af..0000000
--- a/linden/indra/newview/help/basics/customization.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Basic Avatar Customization</TITLE>
-</HEAD>
-<BODY>
-<br>
-Turn yourself into a work of art.
-<P>
-<font color="#000080">1. Open the Edit menu and select <font color="#B00000">Appearance...</font>.</font>
-<P>
-You'll see a large dialog box and a close-up of your avatar's face.
-<P>
-Along the left side of the dialog are a number of tabs that divide up the job into various body parts or articles of clothing.
-<P>
-<font color="#000080">2. Click on the <font color="#B00000">Shape tab</font> on the left.</font>
-<P>
-You're now ready to change your avatar's shape.
-<P>
-Within the Shape tab are a number of other choices: Face, Torso, Legs and Body. Plus, you can change your avatar's gender with a single click. 
-<p>
-<font color="#000080">3. If your avatar is male, click on female. If it's female, click on male.</font>
-<P>
-Your avatar will instantly change from one gender to another. The clothing will stay the same, but there will be a number of easy-to-notice changes. Go back and forth, then pick whichever one you want for now.
-<P>
-<font color="#000080">4. Click on the <font color="#B00000">Face</font> button.</font>
-<P>
-Now it's time to play.
-<P>
-Take your time and go through all the face sliders. Don't be afraid to giggle; you can't hurt your avatar's feelings.
-<P>
-Use the left- and right-arrow keys to rotate your avatar and see it from all sides as you play.
-<P>
-When you've finished with the face:
-<P>
-<font color="#000080">5. Click on the <font color="#B00000">Torso</font> button, and play with the sliders.</font>
-<P>
-<font color="#000080">6. Click on the <font color="#B00000">Legs</font> button, and play with the sliders.</font>
-<P>
-<font color="#000080">7. Click on the <font color="#B00000">Body</font> button, and play with the sliders.</font>
-<P>
-Once you've played with the adjustments for a while and want to keep what you've got:
-<P>
-<font color="#000080">8. Click on <font color="#B00000">Save As...</font>.</font>
-<P>
-A dialog box will open asking you to choose a name for your new shape. It will appear in your Clothing folder of your Inventory.
-<p>
-You can create as many shapes as you want, and instantly change between them just by double-clicking on their name in the Inventory box.
-<P>
-So far, you've only played with the Shape tab. There's a lot more you can do to your avatar on the Skin, Hair and Eyes Tabs -- and even more with the clothing tabs.
-<P>
-If you want, stay and play. Try the other tabs and see what you can come up with.
-
-<p>
-When you're ready to move on, click Next below.
-
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="inventory.html">Previous</A> | <A HREF="profile.html">Next</A> ]
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/linden/indra/newview/help/basics/economy.html b/linden/indra/newview/help/basics/economy.html
deleted file mode 100644
index f68b990..0000000
--- a/linden/indra/newview/help/basics/economy.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>The Second Life Economy</TITLE>
-</HEAD>
-<BODY>
-<br>
-Second Life features a vibrant inworld economy that's a lot different than many other online worlds.
-<P>
-Every week, you'll receive a weekly stipend of ingame currency, or L$.  This amount is determined by your membership (Basic or Premium) as well as a bonus amount based on your inworld reputation (as rated by other residents).
-<P>
-There are many ways to make money in Second Life; generally, if it works (and is legal) in the real world, it may be possible in Second Life.  You can create objects, clothing, etc. and sell them.  If you own land, you can create any number of businesses--dance club, arcade, coffee house, chicken ranch, space station, roller coaster, etc.--and earn rewards for the time other people spend at your build.  You can even charge admission.  If you're skilled, other residents may hire you to help them with their own builds, businesses, and creations.
-<P>
-If you prefer not to work, or need more cash fast, you can even purchase L$ with USD$ dollars.  On the other hand, if you're rolling in the L$ dough, you can sell L$ and make real-world cash!  (See <a href="http://secondlife.com/help">http://secondlife.com/help</a> for more information.)
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="shopping.html">Previous</A> | <A HREF="camera.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/basics/im.html b/linden/indra/newview/help/basics/im.html
deleted file mode 100644
index 182bb6a..0000000
--- a/linden/indra/newview/help/basics/im.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Instant Messaging</TITLE>
-</HEAD>
-<BODY>
-<br>
-Read on to learn how to use Instant Messaging.
-<P>
-
-Instant Messaging is private, and only the Residents you send an Instant Message to can hear it. 
-<P>
-Let's take a look at the Instant Messaging box.
-<P>
-<font color="#000080">1. Click on the IM button in the lower-left corner of the screen.</font>
-<P>
-The New Instant Messaging box opens.
-<P>
-Until you meet some people and add them to your Friends list, there won't be anyone listed for Instant Messaging.  Instead, you can find someone to IM using the Find menu or Right-Clicking another Resident near you and selecting "Send IM".
-<P>
-Let's send an IM to someone to see how IM works.
-<P>
-<font color="#000080">2. Select a name in the New IM menu (if you've collected any calling cards) or use the Find menu to locate another Resident and select "Send IM".</font>
-<P>
-The IM box changes. The title now says Instant Message with the Resident you selected.
-<P>
-Also, now there are two tabs a the bottom of the box, one to return to New IM (your list of people you can IM), plus one where you're now ready to carry on an IM conversation.
-<P>
-<font color="#000080">3. Type in an appropriate message and press Enter (Return).</font>
-<P>
-Your message will be sent.
-<P>
-IM is a great way to leave messages for others even when they're not in-world. And once you have a number of Friends, you can carry on multiple IM conversations at once.
-<P>
-If you find someone who you want to add to your Friends list:
-<P>
-<font color="#000080">4. Click on their avatar, and from the pie menu, select Add Friend.</font>
-<P>
-They'll get a dialog asking them if they want to accept your offer of Friendship. If they say &quot;no,&quot; then they won't appear on your Friends list.. 
-<P>
-If someone clicks on your avatar and wants to become your Friend, you'll be given the chance to say yes or no before it happens.
-<P>
-If you decide at a later time that you no longer want to be Friends with a particular person, you can remove them from your Friends list, and you will automatically be removed from theirs.
-
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> |<A HREF="chat.html">Previous</A> | <A HREF="inventory.html">Next</A> ]
-</BODY>
-</HTML> 
diff --git a/linden/indra/newview/help/basics/inventory.html b/linden/indra/newview/help/basics/inventory.html
deleted file mode 100644
index bcbda45..0000000
--- a/linden/indra/newview/help/basics/inventory.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Inventory</TITLE>
-</HEAD>
-<BODY>
-<P>
-Your Inventory is your treasure chest. It holds everything that you build, own and need.  There's even a Library that contains objects, clothing, outfits, textures, and more for you to use.
-<P>
-Let's take a quick look at it:
-<P>
-<font color="#000080">1. Click on the Inventory button in the lower-right corner of the screen.</font><P>
-The Inventory box is set up like a filing cabinet, with folders and files. You can have folders inside other folders to help organize things as you gather more and more stuff.
-<P>
-Think of your Inventory as a huge electronic closet.
-<P>
-<font color="#000080">2. Look at the name of all the folders in your Inventory, then go ahead and look through them.</font>
-<P>
-<font color="#000080">3. Click on the small &quot;+&quot; next to a folder to open it, then click on the &quot;-&quot; to close it.</font>
-<P>
-The main folders are:
-<P>
-<font color="#006000">Body Parts</font> -- here's a place to store different body parts. The ones that are in bold text are currently worn by your avatar. Double-click on a body part to wear it.
-<P>
-<font color="#006000">Calling Cards</font> -- here's where the calling cards that you gather are stored, plus your own. Double-click on a calling card to find out more information about the person behind the card. 
-<P>
-<font color="#006000">Clothing</font> -- this is a folder where you can keep assorted pieces of clothing, plus whole outfits, so you can change your avatar's looks as often as you like. Outfits can even hold body parts and shapes, so when you change, you really change. Clothes that you're currently wearing are shown in bold text.
-<P>
-<font color="#006000">Landmarks</font> -- this folder holds all of your landmarks, including the ones you make yourself.
-<P>
-<font color="#006000">Note Cards</font> -- this folder holds note cards, which are like sticky notes: a place to keep text notes to yourself.
-<P>
-<font color="#006000">Objects</font> -- this is a folder that holds various things that you make or buy in Second Life. They can range from small toys to whole houses.
-<P>
-<font color="#006000">Photo Album</font> -- this is where the screenshots you take are stored. You can take screenshots by selecting <font color="#006000">Take Screenshot</font> in the File menu.
-<P>
-<font color="#006000">Scripts</font> -- this folder holds a number of useful scripts that can be attached to objects to make them more interactive. You can write your own scripts if you choose, or use scripts created by others and just modify them. For instance, you can use a Door script on the door to your house and easily modify the password.
-<P>
-<font color="#006000">Sounds</font> -- this folder holds sounds that you can play or attach to avatar gestures (we'll do this later). You can record your own sounds and upload them into your Inventory.
-<P>
-<font color="#006000">Textures</font> -- this folder is for graphics that you can use to decorate your walls, to add flair to anything you build, and even create new items of clothing.
-<p>
-<font color="#006000">Trash</font> -- this is where everything you delete from your Inventory goes until you empty the trash. It's a safety feature that helps you get back things you may have accidentally deleted.
-<p>
-<font color="#000080">5. Click on the X button to close the Inventory box.</font>
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="im.html">Previous</A> | <A HREF="customization.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/basics/keyboard.html b/linden/indra/newview/help/basics/keyboard.html
deleted file mode 100644
index 2963a1b..0000000
--- a/linden/indra/newview/help/basics/keyboard.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Walking and Flying with the Keyboard</TITLE>
-</HEAD>
-<BODY>
-<br>
-As you learn to move around in Second Life, you may find that you may want to use one hand on the keyboard to move around while you're using the mouse to do other things.  As a result, it's easiest to learn how to move with the mouse and keyboard.
-<P>
-Follow the instructions below to learn how to move your avatar with the keyboard.
-<P>
-<font color="#000080">1. Take a look at this chart:</font>
-<P>
-<font color="#B00000">W = Forward<BR>
-S = Backward
-<P>
-A = Left<BR>
-D = Right
-<P>
-E = Fly Up (Jump)<BR>
-C = Fly Down (Duck)
-<P>
-F = Fly toggle</font>
-<P>
-<font color="#000080">2. Play around with these keys and walk around until you get the hang of it.</font>
-<P>
-If your avatar starts typing instead of walking, press ESC a few times to get out of Chat.
-<P>
-Notice that you can press two keys at a time. For instance, while pressing W to move forward, tap on the D or A keys to turn without stopping. 
-<P>
-If you'd rather use your right hand, you can also use the arrow keys:
-<P>
-<font color="#B00000">Up Arrow = Forward<BR>
-Down Arrow = Backward
-<P>
-Left Arrow = Left<BR>
-Right Arrow = Right
-<P>
-PageUp = Fly Up (Jump)<BR>
-PageDown = Fly Down (Duck)
-<P>
-Home = Fly toggle</font>
-<P>
-<P>
-<font color="#000080">3. Press the F key.</font>
-<P>
-Your avatar flies.
-<P>
-<font color="#000080">4. Fly around using the keyboard.</font>
-<P>
-Again, take some time to get the hang of it.
-<P>
-<font color="#000080">5. Press the F key to stop flying.</font>
-<P>
-If you were up very high, your landing might not be very pretty, but don't worry ... it won't hurt.
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="movement.html">Previous</A> | <A HREF="landmarks.html">Next</A> ]
-</BODY>
-</HTML> 
\ No newline at end of file
diff --git a/linden/indra/newview/help/basics/landmarks.html b/linden/indra/newview/help/basics/landmarks.html
deleted file mode 100644
index 5842080..0000000
--- a/linden/indra/newview/help/basics/landmarks.html
+++ /dev/null
@@ -1,43 +0,0 @@
-        <HTML>
-<HEAD>
-        <TITLE>Using Landmarks</TITLE>
-</HEAD>
-<BODY>
-<br>
-Landmarks help you find your way to new places, or find your way back to a place you liked. You have a number of useful, ready-to-use landmarks at your disposal. Later, you'll be making your own.
-<P>
-<font color="#000080">1. Look at the Mini-Map. (Click on the "Mini-Map" button if you don't see it.)</font>
-<P>
-In addition to showing an overview of the world, the Mini-Map also helps you find your way around.
-<P>
-<font color="#000080">2. Click on Mini Map to open the World Map window.</font>
-<P>
-The World Map shows more of the Second Life world.  Some extra controls appear on the right side of the map, including a pull-down list of landmarks.
-<P>
-<font color="#000080">3. Click on Landmark pull-down</font>
-<P>
-<font color="#000080">4. Select a Landmark that sounds interesting to you.</font>
-<P>
-Once you select a landmark in this list, a couple of things happen: the landmark appears on the map as a red square, and a large beacon appears in the world at the landmark's location. 
-<P>
-You only see beacons while a landmark is selected, and only you can see it. So don't tell someone to go to the big red beacon, because they won't see it unless they have the same landmark selected.
-<P>
-If you've wandered a ways from your starting point, you may not be able to see the landmark on the map. If that's the case:
-<P>
-<font color="#000080">5. Slide the Zoom slider to shrink the map until you can see the red square that marks the landmark.</font>
-<P>
-Once you see the landmark on the map:
-<P>
-<font color="#000080">6. Click the Teleport button on the World Map.</font>
-<P>
-Your avatar will teleport to a Telehub.  This is a central teleport location that's close to your landmark.  You'll need to fly the rest of the way.
-<P>
-<font color="#000080">7. Use the A and D keys, or left and right arrow keys, to turn your avatar until the red arrow inworld points in front of you (the center of the screen).</font>
-<P>
-At this point, your avatar is facing the landmark. You should be able to see a tall red beacon marking the landmark in-world.
-<P>
-<font color="#000080">8. Go to the landmark.</font>
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="keyboard.html">Previous</A> | <A HREF="chat.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/basics/leading.html b/linden/indra/newview/help/basics/leading.html
deleted file mode 100644
index fc78729..0000000
--- a/linden/indra/newview/help/basics/leading.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Leading the Avatar</TITLE>
-</HEAD>
-<BODY>
-<br>
-There are multiple ways to move around, but first, we'll learn the basic mouse movement methods. The easiest way to move your avatar is to lead it around by pointing to where you want it to go.
-<p>
-<font color="#000080">1. Right-click on the ground close to the avatar.</font><p>
-A pie menu opens.
-<P>
-<font color="#000080">2. Move the cursor up and click on &quot;Go Here.&quot;</font><P> 
-The avatar walks to the place where you clicked. 
-<P>
-<font color="#000080">3. Click on the ground far away from the avatar.</font>
-<P>
-<font color="#000080">4. When the pie menu opens, move the cursor up and click on &quot;Go Here.&quot;</font>
-<P>
-If the distance was far enough, your avatar flew to the spot.<BR>
-Take some time now lead your avatar around for a while.
-
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="movement.html">Previous</A> | <A HREF="mouse.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/basics/mouse.html b/linden/indra/newview/help/basics/mouse.html
deleted file mode 100644
index aff23a0..0000000
--- a/linden/indra/newview/help/basics/mouse.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Walking and Flying with the Mouse</TITLE>
-</HEAD>
-<BODY>
-<br>
-The point-and-go method is fine if you know where you want to go, but if you want to just wander around, there's a better way to go.
-<P>
-<font color="#000080">1. Click on your avatar.</font>
-<P>
-<font color="#000080">2. When the pie menu opens, move the cursor up and click on &quot;Go...&quot;.</font><P>
-A small box with arrows in it opens near the bottom of the screen.
-<P>
-<font color="#000080">3. Click (or click and hold) on all of the arrows, one at a time.</font><P>
-If you play with these for a while, you'll get the hang of moving forward and backward, turning left and right, side-walking left and right, and even jumping and crouching.
-<P>
-Now we'll try a shortcut:
-<P>
-<font color="#000080">4. Click and hold on the forward arrow, then, while still holding, slide the cursor out of the box, left and right, forward and backward.</font>
-<P>
-Take some time and practice guiding your avatar around in this way.
-<P>
-<font color="#000080">5. Click on the Fly button.</font>
-<P>
-Your avatar rises into the air.
-<P>
-<font color="#000080">6. Use the arrows as before to fly around. Don't forget to try the up and down arrows.</font>
-<P>
-Take your time and practice a little before you move on.
-<P>
-<font color="#000080">7. Click on the Fly button again to return to the ground.</font>
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="leading.html">Previous</A> | <A HREF="keyboard.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/basics/movement.html b/linden/indra/newview/help/basics/movement.html
deleted file mode 100644
index a2d9d06..0000000
--- a/linden/indra/newview/help/basics/movement.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Basic Movement</TITLE>
-</HEAD>
-<BODY>
-
-<br>
-Click on the first topic below to get moving.
-<P>
-<A HREF="keyboard.html">Walking and Flying with the Keyboard</A><BR>
-<A HREF="landmarks.html">Using Landmarks</A><BR>
-
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="basic_skills.html">Previous</A> | <A HREF="keyboard.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/basics/profile.html b/linden/indra/newview/help/basics/profile.html
deleted file mode 100644
index ea08be4..0000000
--- a/linden/indra/newview/help/basics/profile.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-        <title>Your Profile</title>
-</head>
-
-<body>
-
-<br>
-Your avatar's appearance tells people something about you (the person behind the avatar). There's also another way to let others know about yourself: your Profile.
-<P>
-<font color="#000080">1. Click on your avatar.</font>
-<P>
-<font color="#000080">2. From the pie menu, select My Profile ... </font>
-<P>
-Your Profile opens. It has your screen name and some checkboxes and spaces to supply informaiton about yourself. It also shows how others have rated you and how many others you have rated.
-<P>
-There's also a place to put an image. The image can be your (human) picture, your avatar's picture, a logo, or anything else (or nothing) that you want. To change the image, click on it. An Image Picking dialog will open and let you select from all the images at your disposal.
-<P>
-The information in your Profile is public. The Find feature searches through profiles to help you find others with similar interests (and others find you).
-<P>
-<font color="#000080">3. Take some time and tell us about yourself. You can always come back and change or add to this information later.</font>
-<P>
-When you're ready to move on, click Next below.
-
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="customization.html">Previous</A> | <A HREF="shopping.html">Next</A> ]
-</body>
-</html>
diff --git a/linden/indra/newview/help/basics/shopping.html b/linden/indra/newview/help/basics/shopping.html
deleted file mode 100644
index 4e0bbcc..0000000
--- a/linden/indra/newview/help/basics/shopping.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Shopping 101</TITLE>
-</HEAD>
-<BODY>
-<br>
-Let's go shopping.
-<P>
-In Second Life, there are &quot;official&quot; stores and vending machines where you can buy things, but you can also buy (or take a free copy of) many things that aren't in stores. In fact, you can put a price on anything you build and if people want it, they can buy it and you get the money.
-<P>
-You can use the Find window to look up a variety of places, selling virtually anything imaginable.  Whatever your interest, there's probably a store selling it somewhere in Second Life.  When you've selected a store in the Find window, you can teleport to it or mark it on your Map.
-<P>
-"Window shopping" in Second Life is actually quite simple.
-<P>
-<font color="#000080">1. Find an object that interests you, and point to it.</font>
-<P>
-After a second or so some information about the object will pop up. The information will include whether it's for sale and how much it costs.  If the object is not listed as For Sale, try left-clicking it to see if it's a scripted vendor instead.  (If so, it'll tell you in chat how much the item costs.)
-<P>
-Once you find something that interests you:
-<P>
-<font color="#000080">2. Right-click on the object.</font>
-<P>
-A pie menu opens.
-<P>
-<font color="#000080">3. Select Buy on the left of the pie menu.</font>
-<P>
-A confirmation dialog will open giving you the details of the transaction, including the price. If you want it:
-<P>
-<font color="#000080">4. Click on Buy.</font>
-<P>
-If the object's popup doesn't list it as For Sale, but clicking it tells you the price, then the Buy menu choice probably isn't available.  In this case, we're going to Pay the vendor, and it'll give us the item:
-<P>
-<font color="#000080">4. Right-click on the vendor and choose Pay.  Enter the cost of the item you're trying to buy, and click OK.  When a blue box comes up offering you the item you just bought, click Accept.</font>
-<P>
-You've just made your first financial transaction. The object you just bought is placed in your Inventory.  Notice that its name may include <b>(no copy)</b>, <b>(no modify)</b>, or <b>(no transfer)</b>; this means that you can't copy the object, can't edit the object, or can't give the object away, respectively.
-<P>
-<font color="#000080">6. If you bought clothing, drag it from Inventory onto your avatar.  If you bought an object, drag it from Inventory to some location inworld.</font>
-<P>
-If you bought clothing, your avatar will wear the clothing when you drag it onto yourself.  If you bought an object, it'll appear inworld at the place you drop it.
-<P>
-If you thought you bought clothing, but end up with a box on your head when you drag it onto yourself, don't worry!  Right-click the box and <b>Detach</b> it, then drag in somewhere else (just like an object).  Right-click the box and choose <b>Edit</b>, then click <b>More</b>, then finally choose its <b>Contents</b>.  You should find the clothing you bought in there; drag it from the box's Contents into your Inventory.  You can then wear your new clothing.
-<P>
-If the object you bought is <b>(no copy)</b>, notice how it disappears from inventory when you bring it inworld.  If you lose track of a no-copy object when it's inworld, it may be very hard to find it again!  You can right-click your object and choose <b>Take</b> to put it back in your inventory.  If the object isn't (no copy), notice how it remains in your Inventory even when you bring it inworld.  You'll always have a copy of this object (unless you manually delete the Inventory copy, of course!)
-<P>
-<font color="#000080">7. To take back an object inworld, right-click on the object you created, and choose Take.  To delete the object, right-click it, and press the Del key on your keyboard.</font>
-<P>
-You should only delete an object if you still have a copy in Inventory!  If you don't have a copy in your Inventory, be sure and Take it instead.
-<P>
-You can go on a shopping binge now, or click Next to move on.
-<P>
-[ <a href="basic_skills.html">Basic Skills Home</a> | <A HREF="customization.html">Previous</A> | <A HREF="economy.html">Next</A> ]
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/linden/indra/newview/help/bg_dots_grey.gif b/linden/indra/newview/help/bg_dots_grey.gif
deleted file mode 100644
index f9ec608..0000000
--- a/linden/indra/newview/help/bg_dots_grey.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/community_standards.html b/linden/indra/newview/help/community_standards.html
deleted file mode 100644
index cf94cc6..0000000
--- a/linden/indra/newview/help/community_standards.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html>
-<head>
-        <title>Second Life Community Standards</title>
-</head>
-<body>
-<br>
-<b>Second Life(TM): Community Standards</b><br>
-<br>
-Welcome to Second Life. We hope you'll have a richly rewarding experience, filled with creativity, self expression and fun. The goals of the Community Standards are simple: treat each other with respect and without harassment, adhere to local standards as indicated by simulator ratings, and refrain from any hate activity which slurs a real-world individual or real-world community.
-<p>
-<b>The Big Six</b><br>
-Within Second Life, we want to support Residents in shaping their specific experiences and making their own choices. The Community Standards sets out six behaviors, the "Big Six", that will result in suspension or, with repeated violations, expulsion from the Second Life Community. All Second Life Community Standards apply to all areas of Second Life, the Second Life Forums, and the Second Life Website.
-<p>
-<b>1. Intolerance</b><br>
-Combating intolerance is a cornerstone of Second Life's Community Standards. Actions that marginalize, belittle, or defame individuals or groups inhibit the satisfying exchange of ideas and diminish the Second Life community as whole. The use of derogatory or demeaning language or images in reference to another Resident's race, ethnicity, gender, religion, or sexual preference is never allowed in Second Life.
-<p>
-<b>2. Harassment</b><br>
-Given the myriad capabilities of Second Life, harassment can take many forms. Communicating or behaving in a manner which is offensively coarse, intimidating or threatening, constitutes unwelcome sexual advances or requests for sexual favors, or is otherwise likely to cause annoyance or alarm is Harassment.
-<p>
-<b>3. Assault</b><br>
-Most areas in Second Life are identified as Safe. Assault in Second Life means: shooting, pushing, or shoving another Resident in a Safe Area (see Global Standards below); creating or using scripted objects which singularly or persistently target another Resident in a manner which prevents their enjoyment of Second Life.
-<p>
-<b>4. Disclosure</b><br>
-Residents are entitled to a reasonable level of privacy with regard to their Second Lives. Sharing personal information about a fellow Resident --including gender, religion, age, marital status, race, sexual preference, and real-world location beyond what is provided by the Resident in the First Life page of their Resident profile is a violation of that Resident's privacy. Remotely monitoring conversations, posting conversation logs, or sharing conversation logs without consent are all prohibited in Second Life and on the Second Life Forums.
-<p>
-<b>5. Indecency</b><br>
-Second Life is an adult community, but Mature material is not necessarily appropriate in all areas (see Global Standards below). Content, communication, or behavior which involves intense strong language or expletives, nudity or sexual content, the depiction of sex or strong violence, or anything else broadly offensive must be contained within private land in areas rated Mature (M). Names of Residents, objects, places and groups are broadly viewable in Second Life directories and on the Second Life website, and must adhere to PG guidelines.
-<p>
-<b>6. Disturbing the Peace</b><br>
-Every Resident has a right to live their Second Life. Disrupting scheduled events, repeated transmission of undesired advertising content, the use of repetitive sounds, following or self-spawning items, or other objects that intentionally slow server performance or inhibit another Resident's ability to enjoy Second Life are examples of Disturbing the Peace.
-<p>
-<b>Policies and Policing</b><br>
-<br>
-<b>Global Standards, Local Ratings</b><br>
-All areas of Second Life, including the www.secondlife.com website and the Second Life Forums, adhere to the same Community Standards. Locations within Second Life are noted as Safe or Unsafe and rated Mature (M) or non-Mature (PG), and behavior must conform to the local ratings. Any unrated area of Second Life or the Second Life website should be considered non-Mature (PG).
-<p>
-<b>Warning, Suspension, Banishment</b><br>
-Second Life is a complex society, and it can take some time for new Residents to gain a full understanding of local customs and mores. Generally, violations of the Community Standards will first result in a Warning, followed by Suspension and eventual Banishment from Second Life. In-World Representatives, called Liaisons, may occasionally address disciplinary problems with a temporary removal from Second Life.
-<p>
-<b>Global Attacks</b><br>
-Community Standards violations which broadly interfere with or disrupt the Second Life community, the Second Life servers or other systems related to Second Life cannot be tolerated in any form. Such actions will result in a minimum two-week suspension and a review of your account for probable removal from Second Life.
-<p>
-<b>Alternate Accounts</b><br>
-While Residents may choose to play Second Life with more than one account, specifically or consistently using an alternate account to harass other Residents or violate the Community Standards is not acceptable. Alternate accounts are generally treated as separate from a Resident's principal account, but misuse of alternate accounts can and will result in disciplinary action on the principal account.
-<p>
-<b>Buyer Beware</b><br>
-Linden Lab does not exercise editorial control over the content of Second Life, and will make no specific efforts to review the textures, objects, sounds or other content created within Second Life. Additionally, Linden Lab does not certify or endorse the operation of in-world games, vending machines, or retail locations; refunds must be requested from the owners of these objects.
-<p>
-<b>Reporting Abuse</b><br>
-Residents should report violations of the Community Standards using the Abuse Reporter tool located under the Help menu in the in-world tool bar. Every Abuse Report is individually investigated, and the identity of the reporter is kept strictly confidential. If you need immediate assistance, in-world Liaisons may be available to help. Look for Residents with the last name Linden.
-</body>
-</html>
diff --git a/linden/indra/newview/help/graphics_driver_update.html b/linden/indra/newview/help/graphics_driver_update.html
deleted file mode 100644
index 3a3b25c..0000000
--- a/linden/indra/newview/help/graphics_driver_update.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-        <META HTTP-EQUIV=Refresh CONTENT="2; URL=http://www.secondlife.com/support/">
-        <title>Second Life: Graphics Driver Update</title>
-</head>
-<body bgcolor="white" vlink="blue" alink="blue" link="blue">
-<basefont face="Arial,Helvetica,sans-serif" size="3">
-<p>Taking you to the Second Life Support page at 
-<a href="http://www.secondlife.com/support/">http://www.secondlife.com/support/</a>.</p>
-</body>
-</html>
diff --git a/linden/indra/newview/help/grey_corner_bl.gif b/linden/indra/newview/help/grey_corner_bl.gif
deleted file mode 100644
index 14e076a..0000000
--- a/linden/indra/newview/help/grey_corner_bl.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/grey_corner_br.gif b/linden/indra/newview/help/grey_corner_br.gif
deleted file mode 100644
index f4520fc..0000000
--- a/linden/indra/newview/help/grey_corner_br.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/grey_corner_tl.gif b/linden/indra/newview/help/grey_corner_tl.gif
deleted file mode 100644
index ef7434d..0000000
--- a/linden/indra/newview/help/grey_corner_tl.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/grey_corner_tr.gif b/linden/indra/newview/help/grey_corner_tr.gif
deleted file mode 100644
index d53c4d8..0000000
--- a/linden/indra/newview/help/grey_corner_tr.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/grey_pixel.gif b/linden/indra/newview/help/grey_pixel.gif
deleted file mode 100644
index 491eec6..0000000
--- a/linden/indra/newview/help/grey_pixel.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/header_banner.jpg b/linden/indra/newview/help/header_banner.jpg
deleted file mode 100644
index 3e37c65..0000000
--- a/linden/indra/newview/help/header_banner.jpg
+++ /dev/null
diff --git a/linden/indra/newview/help/index.html b/linden/indra/newview/help/index.html
deleted file mode 100644
index 197cbed..0000000
--- a/linden/indra/newview/help/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
-<html>
-<head>
-        <title>Second Life Help</title>
-</head>
-<body>
-<br>
-Choose your topic:
-<P>
-<a href="welcome/welcome.html">Welcome to Second Life Orientation</a><br>
-<a href="welcome/welcomeback.html">Welcome Back to Second Life </a><br>
-<a href="basics/basic_skills.html">Basic Second Life Skills</a><br>
-<a href="Concepts/Second_Life_Concepts.html">Second Life Concepts</a><br>
-<a href="Advanced/Advanced_Second_Life_Skills.html">Advanced Second Life Skills</a>
-<p>
-<a href="community_standards.html">Second Life Community Standards</a>
-</body>
-</html>
diff --git a/linden/indra/newview/help/sl_logo.gif b/linden/indra/newview/help/sl_logo.gif
deleted file mode 100644
index 037ec80..0000000
--- a/linden/indra/newview/help/sl_logo.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/spacer.gif b/linden/indra/newview/help/spacer.gif
deleted file mode 100644
index 35d42e8..0000000
--- a/linden/indra/newview/help/spacer.gif
+++ /dev/null
diff --git a/linden/indra/newview/help/unable_to_connect.html b/linden/indra/newview/help/unable_to_connect.html
deleted file mode 100644
index a8973a1..0000000
--- a/linden/indra/newview/help/unable_to_connect.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<link href="MAIN.css" rel="stylesheet" type="text/css"><title>Second Life | Unable to Connect</title></head><body>
-<table align="center" border="0" cellpadding="0" cellspacing="0">
-  <tbody><tr><td>
-  
-        <div id="DEFAULT_container" align="center">
-        
-                <div id="DEFAULT_header">
-                <div class="box_grey_r">
-                <div class="box_grey_l">
-                <div class="box_grey_b">
-                <div class="box_grey_bl">
-                <div class="box_grey_br">
-                                                
-                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                        <tbody><tr>
-                                <td align="left">
-                                        <a href="http://secondlife.com/"><img src="spacer.gif" align="left" border="0" height="85" width="230"></a>
-                                </td>
-                                <td align="right" valign="top">
-                                </td>
-                        </tr>
-                        </tbody></table>
-                                                
-                </div>
-                </div>
-                </div>
-                </div>
-                </div>
-                </div>
-  
-
-                        
-                        <table border="0" cellpadding="10" cellspacing="0" width="100%">
-                                <tbody><tr>
-                                          <td>
-                                                <p>&nbsp;</p>                   
-        
-        
-        
-        
-        
-            <h2>Second Life - Unable to Connect to Server.</h2>
-            <table bgcolor="#c9c9c9" border="0" cellpadding="1" cellspacing="0" width="100%">
-            <tbody><tr>
-                <td>
-                <table border="0" cellpadding="8" cellspacing="0" width="100%">
-                <tbody><tr>
-                    <td style="color: rgb(51, 51, 51);" bgcolor="#e5e5e5">
-           <blockquote><h5>
-              <p> Second Life has failed to connect to its server.  This 
-message can appear because you are not connected to the Internet; because
-your router or firewall is blocking Second Life network access; because
-third-party software (such as firewall or internet security software) is
-blocking Second Life; or because the Second Life servers are offline.<br>
-              </p>
-              <p>First, make sure you can reach a common web site like <a
- href="http://www.google.com/">Google</a>. If you cannot connect to
-Google, the problem is probably with your network or your Internet
-Service Provider.<br>
-              </p>
-              <p>Next, check the <a
- href="http://www.secondlife.com/status/">Second Life Status</a> web
-page to make sure the servers are up.<br>
-              </p>
-              <p>If the servers are up but you are still having
-problems, please visit Second Life Help for assistance:<br>
-              </p>
-              <p><a href="http://www.secondlife.com/help/">http://www.secondlife.com/help/</a> </p>
-                </blockquote>
-                                        </h5>
-                                                            </td>
-                </tr>
-                </tbody></table>
-                </td>
-            </tr>
-            </tbody></table>
-                                    <br>
-            <p>
-                                For additional details about system upgrades, maintenance, outages, or other known problems please read
-                                the <a style="text-decoration: underline;" href="http://blog.secondlife.com/">Official Linden Blog</a>.
-                        </p>
-                                                
-                        
-                        
-                        
-                                        </td>
-                                </tr>
-                        </tbody></table>
-                        
-                        
-                        <div id="DEFAULT_footer" align="center">
-                        
-                        
-                        <div class="box_grey_t">
-                        <div class="box_grey_r">
-                        <div class="box_grey_l">
-                        <div class="box_grey_b">
-                        <div class="box_grey_tl">
-                        <div class="box_grey_tr">
-                        <div class="box_grey_bl">
-                        <div class="box_grey_br">
-                        
-                                <div id="SL_footer">
-                                        <table border="0" cellpadding="8" cellspacing="0" width="100%">
-                                                <tbody><tr>
-                                                        <td align="left"> 
-                                                                <a href="http://secondlife.com/corporate/sysreqs.php">system requirements</a> |
-                                                                <a href="http://secondlife.com/corporate/privacy.php">privacy</a> |
-                                                                <a href="http://secondlife.com/corporate/cs.php">community standards</a> |
-                                                                <a href="http://secondlife.com/corporate/tos.php">terms of service</a> |
-                                                                <a href="http://secondlife.com/corporate/dmca.php">dmca</a> |
-                                                                <!--
-                                                                <a href="/corporate/affiliates.php">affiliates</a> | education | support |
-                                                                -->                     
-                                                                <a href="http://secondlife.com/status/">grid status</a> |
-                                                                <a href="http://lindenlab.com/employment">jobs</a>
-                                                                
-                                                        </td>
-                                                        <td align="right" valign="middle"> 
-                                                                &nbsp;©2006 Linden Research Inc.
-                                                        </td>
-                                                        <td align="right" valign="middle"> 
-                                                                <a href="http://lindenlab.com/"><img src="LL_logo.jpg"></a>
-                                                        </td>
-                                                </tr>
-                                        </tbody></table>
-                                </div>
-                        
-                        </div>
-                        </div>
-                        </div>
-                        </div>
-                        </div>
-                        </div>
-                        </div>
-                        </div>
-
-
-                        </div>
-
-        
-        </div>
-</td></tr></tbody></table></body></html>
\ No newline at end of file
diff --git a/linden/indra/newview/help/unsupported_card.html b/linden/indra/newview/help/unsupported_card.html
deleted file mode 100644
index 2d58b75..0000000
--- a/linden/indra/newview/help/unsupported_card.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Second Life Error</title>
-</head>
-<body bgcolor="#ffffff" vlink="blue" alink="blue" link="blue">
-<basefont face="Arial,Helvetica,sans-serif" size="3">
-<center>
-<table bgcolor="#000000" width="600" border="0" cellspacing="0"
- cellpadding="1">
-  <tbody>
-    <tr>
-      <td>
-      <table bgcolor="#ffffff" width="100%" border="0" cellspacing="0"
- cellpadding="0">
-        <tbody>
-          <tr>
-            <td colspan="2" bgcolor="#30333e">
-            <table border="0" cellpadding="5" cellspacing="0"
- width="100%">
-              <tbody>
-                <tr>
-                  <td align="left"><img width="167" height="68"
- border="0" src="sl_logo.gif"></td>
-                </tr>
-              </tbody>
-            </table>
-            </td>
-          </tr>
-          <tr>
-            <td> <br>
-            <p align="center"><font size="+1"><b>Unsupported Graphics
-Card</b></font></p>
-            <blockquote>
-              <p>If you are receiving this message, your graphics card may not be compatible with Second Life.  
-Attempting to use Second Life with your current system configuration may cause the program to crash 
-or become unresponsive.  Minimum system requirements are listed on the Second Life Support web site:</p>
-              <p> <a href="http://secondlife.com/support/">http://secondlife.com/support/</a> </p>
-              <p> If you are using a supported video card, contact the
-manufacturer to obtain video driver updates.         Video driver
-updates for ATI and Nvidia graphics products are available for download
-from the         following web sites: </p>
-              <p> <a href="http://www.ati.com/">http://www.ati.com/</a><br>
-              <a href="http://www.nvidia.com/">http://www.nvidia.com/</a> </p>
-              <p>Finally, try setting your display to "True Color
-(32-bit)" under Control Panels, Display before running Second Life.</p>
-                </blockquote>
-                 </td>
-          </tr>
-        </tbody>
-      </table>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</center>
-</body>
-</html>
diff --git a/linden/indra/newview/help/welcome/avatar.html b/linden/indra/newview/help/welcome/avatar.html
deleted file mode 100644
index 2a272eb..0000000
--- a/linden/indra/newview/help/welcome/avatar.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Your Avatar</TITLE>
-</HEAD>
-<BODY>
-<br>
-Your <font color="#006000">avatar</font> is your representative in Second Life.
-<P>
-It's been randomly created to get you started, but you'll be able to customize it to look almost any way you want -- and you can change it as often as you like. 
-<p>
-You can create and save complete outfits consisting of clothing, body shape, attachments and more, and change the total look of your avatar with a simple drag and drop.
-<p>
-Avatars can be male or female, and can be just about any size or shape you can imagine. Avatars can wear layers of clothes, and can have accessories -- ranging from jet packs to jewelry -- attached to a number of places.
-<P>
-All around your avatar is Second Life, filled with hills, valleys, trees, grass, bodies of water, buildings, all sorts of objects, and people. Don't worry, you'll be exploring it soon.
-<P>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="screen.html">Previous</A> | <A HREF="menus.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/welcome/buttons.html b/linden/indra/newview/help/welcome/buttons.html
deleted file mode 100644
index 7936862..0000000
--- a/linden/indra/newview/help/welcome/buttons.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>The Buttons</TITLE>
-</HEAD>
-<BODY>
-<br>
-Along the bottom of the screen, you'll see a number of buttons.
-<P>
-<font color="#006000">IM</font> lets you Instant Message friends, groups, and people you meet.
-<P>
-<font color="#006000">Chat</font> opens a chat bar you can use to talk to people nearby.
-<P>
-<font color="#006000">Friends</font> pulls up your Friends list, so you can add people you know, view their profile, etc.
-<P>
-<font color="#006000">Fly</font> lets your avatar take flight.  (You can also use F or the Home key when you're not chatting.)
-<P>
-<font color="#006000">Snapshot</font> takes a snapshot of the current screen, which you can save to Inventory or disk, or mail as a postcard to someone else.
-<P>
-<font color="#006000">Events</font> allows you to view upcoming events.
-<p>
-<font color="#006000">Find</font> opens a dialog to help you find people, places, groups, events, and other things in Second Life.
-<P>
-<font color="#006000">Mini-Map</font> shows or hides the small map in the upper-right corner of your screen.
-<P>
-<font color="#006000">Map</font> opens the World Map window to give you a bigger picture of where you are.
-<P>
-There's one more button to look at, in the lower-right corner of the screen: Inventory.
-<P>
-<font color="#006000">Inventory</font> opens your Inventory -- your storage "bag" for everything from Friends' contact information, to landmarks, to outfits for your avatar.
-<P>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="menus.html">Previous</A> | <A HREF="map.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/welcome/chat.html b/linden/indra/newview/help/welcome/chat.html
deleted file mode 100644
index 5143dc4..0000000
--- a/linden/indra/newview/help/welcome/chat.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Chat and Instant Messaging</TITLE>
-</HEAD>
-<BODY>
-<br>
-The bottom of the screen is dedicated to communication: <font color="#006000">Chat and Instant Messaging.</font>
-<P>
-<font color="#006000">Chat</font> is the quickest and easiest way to communicate with anyone who's nearby. 
-<P>
-<font color="#006000">Instant Messaging</font> is a more private way to talk to people you already know.
-<P>
-<font color="#000080">To chat, hit Enter (Return), type your message, then hit Enter (Return) again.</font>
-<p>
-We'll talk more about <font color="#006000">Instant Messaging</font> soon.
-<P>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="map.html">Previous</A> | <A HREF="graduation.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/welcome/graduation.html b/linden/indra/newview/help/welcome/graduation.html
deleted file mode 100644
index b7cd673..0000000
--- a/linden/indra/newview/help/welcome/graduation.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Graduation
-</TITLE>
-</HEAD>
-<BODY>
-<br>
-<font color="#006000">Congratulations! You've finished your first session.</font> 
-<P>
-Click <font color="#006000">Next</font> to continue your journey.
-<P>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="chat.html">Previous</A> | <A HREF="../basics/basic_skills.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/welcome/map.html b/linden/indra/newview/help/welcome/map.html
deleted file mode 100644
index 2f92870..0000000
--- a/linden/indra/newview/help/welcome/map.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>The Map Window</TITLE>
-</HEAD>
-<BODY>
-<br>
-The <font color="#006000">Mini Map</font> window shows you an overhead view of the part of the world near you. It will help you find people and places, as well as navigate your way around the world. 
-<p>
-Each <font color="#006000">Region</font> (a named area also called a "simulator") on the map is shown as a square tile, representing about 16 acres of the world.
-<p>
-The mini-map doesn't display the whole world -- only the nearest few Regions. (<font color="#000080">For a view of the whole world, Click on the Mini Map to view the World Map.</font>) The map moves as you move, with new regions appearing as you approach them. 
-<p>
-In both the Mini Map and World Map, water is shown on the map as dark blue, and the ground is green, brown or white, depending on the alitude. Gray blocks indicate buildings or other human-made structures to investigate. Your avatar always appears in the center of the Map window as a white dot, with a faint gray triangle indicating your 3D field of view. Other avatars appear as green dots. 
-<p>
-In the World Map, if you select a landmark with the <font color="#006000">Landmark Tracking</font> pull-down, the landmark will be shown on the map as a red dot. (If the landmark isn't within view, a red arrow will point in its direction.) Active landmarks also appear in the world as a red "beacon" that only you can see.
-<p>
-People on your Friends list can be displayed on the map using the <font color="#006000">Resident Tracking</font> pull-down. While you're tracking them, a red "beacon" (that only you can see) will mark their location in the world.
-<p>
-The World Map window can be enlarged, resized and moved. The map itself can be enlarged or shrunk within the window, with the <font color="#006000">Zoom slider</font>.
-<p>
-Finally, the <font color="#006000">Background</font> pull-down menu allows to set the World Map to display terrain, new places, popular places, items for sale, and available land.
-<p>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="buttons.html">Previous</A> | <A HREF="chat.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/welcome/menus.html b/linden/indra/newview/help/welcome/menus.html
deleted file mode 100644
index b9def09..0000000
--- a/linden/indra/newview/help/welcome/menus.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>The Menus</TITLE>
-</HEAD>
-<BODY>
-<br>
-The menus along the top of the screen work like menus in most programs: <font color="#00080">Click on a menu to open it, then click on the menu item to select it.</font> 
-<P>
-Open each menu and look over the different menu items as you read the descriptions.
-<P>
-- The <font color="#006000">File</font> menu handles uploading audio clips and textures, taking screenshots and quitting.<BR>
-- The <font color="#006000">Edit</font> menu lets you do the usual Edit menu tasks like cut, copy, paste and find, plus edit some Second Life specific things, like your avatar, groups and preferences. <BR>
-- The <font color="#006000">View</font> menu handles what you see on your screen, and lets you display things like flying controls and your Linden Dollar account history.<BR>
-- The <font color="#006000">World</font> menu creates landmarks, lets you set your home location and enables you to teleport home.<BR>
-- The <font color="#006000">Tools</font> menu provides access to many of the advanced creation tools that you can use to build your own objects -- or even a home.<BR>
-- The <font color="#006000">Help</font> menu lets you access this and other help screens.
-<p>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="avatar.html">Previous</A> | <A HREF="buttons.html">Next</A> ]
-</BODY>
-</HTML>
-
diff --git a/linden/indra/newview/help/welcome/screen.html b/linden/indra/newview/help/welcome/screen.html
deleted file mode 100644
index 5d931a8..0000000
--- a/linden/indra/newview/help/welcome/screen.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>The Screen</TITLE>
-</HEAD>
-<BODY>
-<br>
-When you first enter Second Life you see a few things:
-<P>
-- <font color="#006000">You</font>, standing in your Second Life.<BR>
-- This <font color="#006000">Help window</font>.<BR>
-- A <font color="#006000">Menu bar</font> at the top of the screen on the left.<BR>
-- Some <font color="#006000">buttons</font> across the bottom of the screen.<BR>
-- The <font color="#006000">Mini Map window</font> near the upper-right corner of the screen.<BR>
-- <font color="#006000">Chat</font> and <font color="#006000">Instant Messaging</font> along the bottom of the screen.<BR>
-- Your bank <font color="#006000">account balance</font> upper-right corner.
-<P>
-[<a href="welcomeback.html">Welcome Home</a> | <A HREF="welcome.html">Previous</A> | <A HREF="avatar.html">Next</A> ]
-</BODY>
-</HTML>
diff --git a/linden/indra/newview/help/welcome/welcome.html b/linden/indra/newview/help/welcome/welcome.html
deleted file mode 100644
index 2632f0a..0000000
--- a/linden/indra/newview/help/welcome/welcome.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Welcome</title>
-</head>
-<body>
-<br>
-<font color="#006000">WELCOME TO SECOND LIFE ORIENTATION ISLAND</font>
-<p>You are in a safe, protected place where you can explore, learn and
-progress at your own pace.
-</p>
-<p><font color="#000080">Press the arrow keys on your keyboard to walk
-and look around.</font>
-</p>
-<p><font color="#000080">Follow the path to the help stations.&nbsp; At
-each station, click on the spinning Second Life hand to learn what to
-do.<br>
-</font></p>
-<p>The person you see in front of you is your avatar -- your
-representative in Second Life. You'll be able to change how it looks
-soon.
-</p>
-<p>You can close this help window now to unclutter your view. You can
-always bring it back by hitting F1 or selecting Basic Help in the Help
-menu.
-</p>
-<p>If you've already finished your orientation and moved on to the
-mainland, <a href="welcomeback.html">click here</a>.
-</p>
-</body>
-</html>
diff --git a/linden/indra/newview/help/welcome/welcomeback.html b/linden/indra/newview/help/welcome/welcomeback.html
deleted file mode 100644
index 1a674b4..0000000
--- a/linden/indra/newview/help/welcome/welcomeback.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Welcome Back!</TITLE>
-</HEAD>
-<BODY>
-
-<br>
-<font color="#006000">WELCOME BACK TO SECOND LIFE</font>
-<p>
-If you haven't finished your orientation yet, then <a href="welcome.html">click here</a>.
-<p>
-If you have finished your orientation and are now on the Second Life mainland, you're ready to explore a whole new world.
-<p>
-This help system will walk you through a series of topics that will build on your orientation experience and teach you everything  you need to begin your Second Life.
-<p>
-You don't have to plow through the whole thing in one sitting -- you can close the help system and return to it at any time. Just hit F1 or select Basic Help from the Help menu.
-<p>
-<font color="#000080">Click on the first topic below to get started.</font>
-<P>
-<font color="#006000">TOPICS</font><BR>
-<A HREF="screen.html">The Screen</A><BR>
-<A HREF="avatar.html">Your Avatar and the World</A><BR>
-<A HREF="menus.html">The Menus</A><BR>
-<A HREF="buttons.html">The Buttons</A><BR>
-<A HREF="map.html">The Map Window</A><BR>
-<A HREF="chat.html">Chat and Instant Messaging</A>
-<P>
-[ <A HREF="screen.html">Next</A> ]
-</BODY>
-</HTML>
-
-
diff --git a/linden/indra/newview/help/window_creation_error.html b/linden/indra/newview/help/window_creation_error.html
deleted file mode 100644
index e6d155e..0000000
--- a/linden/indra/newview/help/window_creation_error.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Second Life Error</title>
-</head>
-<body bgcolor="white" vlink="blue" alink="blue" link="blue">
-<basefont face="Arial,Helvetica,sans-serif" size="3">
-<center>
-<table bgcolor="#000000" width="600" border="0" cellspacing="0"
- cellpadding="1">
-  <tbody>
-    <tr>
-      <td>
-      <table bgcolor="#dcdcdc" width="100%" border="0" cellspacing="0"
- cellpadding="0">
-        <tbody>
-          <tr>
-            <td colspan="2" bgcolor="#30333e">
-            <table border="0" cellpadding="5" cellspacing="0"
- width="100%">
-              <tbody>
-                <tr>
-                  <td align="left"><img width="167" height="68"
- border="0" src="sl_logo.gif"></td>
-                </tr>
-              </tbody>
-            </table>
-            </td>
-          </tr>
-          <tr>
-            <td> <br>
-            <p align="center"><font size="+1"><b>Unable to Configure
-Display</b></font></p>
-            <blockquote>        
-              <p>Second Life tries to create a display window at a resolution of 1024x768 pixels at a color depth of 32-bit. This
-message indicates that Windows is unable to create that window.  This message often appears when your graphics hardware does not meet Second Life's Minimum System Requirements; however, it may also appear if your current Windows display settings aren't high enough.</p>
-              <p> Suggestions:<br>
-Set your monitor to True Color (32-bit). <font
- size="2">
-              <ol>
-                <li>Click <b>Start</b>, point to <b>Settings</b>,
-click <b>Control Panel</b> </li>
-                <li>Click <b>Display</b> </li>
-                <li>On the <b>Settings</b> tab, under <b>Color Quality</b>,
-select <b>Highest (32 bit)</b>. </li>
-                <li>Make sure the display resolution is <b>1024x768</b> or higher.</li>
-                <li>Click <b>OK</b></li>
-                <li>When you are prompted to keep this setting, click <b>Yes</b>.</li>
-              </ol>
-              </font> </p>
-              <p> If the problem continues, contact your video card
-manufacturer to obtain video driver updates.         Video driver
-updates for ATI and Nvidia graphics products are available for download
-from the         following websites: </p>
-              <p> <a href="http://www.ati.com/support/driver.html">http://www.ati.com/support/driver.html</a><br>
-              <a
- href="http://www.nvidia.com/content/drivers/drivers.asp">http://www.nvidia.com/content/drivers/drivers.asp</a> </p>
-              <p> For help with identifying supported video cards,
-please visit Second Life Help:<br>
-              </p>
-              <p> <a href="http://www.secondlife.com/help/">http://www.secondlife.com/help/</a> </p>
-                </blockquote>
-                                 </td>
-          </tr>
-        </tbody>
-      </table>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</center>
-</body>
-</html>
diff --git a/linden/indra/newview/installer.vcproj b/linden/indra/newview/installer.vcproj
deleted file mode 100644
index 86bac7d..0000000
--- a/linden/indra/newview/installer.vcproj
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-        ProjectType="Visual C++"
-        Version="7.10"
-        Name="installer"
-        ProjectGUID="{DEB7B859-BA03-4B8E-AEC6-327E6FB5D957}"
-        RootNamespace="installer"
-        Keyword="ManagedCProj">
-        <Platforms>
-                <Platform
-                        Name="Win32"/>
-        </Platforms>
-        <Configurations>
-                <Configuration
-                        Name="ADITI|Win32"
-                        OutputDirectory="."
-                        IntermediateDirectory="."
-                        ConfigurationType="10"
-                        CharacterSet="1"
-                        DeleteExtensionsOnClean="">
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                </Configuration>
-                <Configuration
-                        Name="DMZ|Win32"
-                        OutputDirectory="."
-                        IntermediateDirectory="."
-                        ConfigurationType="10"
-                        CharacterSet="1"
-                        DeleteExtensionsOnClean="">
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                </Configuration>
-                <Configuration
-                        Name="MUSEUM|Win32"
-                        OutputDirectory="."
-                        IntermediateDirectory="."
-                        ConfigurationType="10"
-                        CharacterSet="1"
-                        DeleteExtensionsOnClean="">
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                </Configuration>
-                <Configuration
-                        Name="AGNI|Win32"
-                        OutputDirectory="."
-                        IntermediateDirectory="."
-                        ConfigurationType="10"
-                        CharacterSet="1"
-                        DeleteExtensionsOnClean="">
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                </Configuration>
-                <Configuration
-                        Name="UPDATE|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
-                        ConfigurationType="1"
-                        CharacterSet="1">
-                        <Tool
-                                Name="VCCLCompilerTool"/>
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCLinkerTool"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                        <Tool
-                                Name="VCPreLinkEventTool"/>
-                        <Tool
-                                Name="VCResourceCompilerTool"/>
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"/>
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"/>
-                        <Tool
-                                Name="VCWebDeploymentTool"/>
-                        <Tool
-                                Name="VCManagedWrapperGeneratorTool"/>
-                        <Tool
-                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-                </Configuration>
-        </Configurations>
-        <References>
-        </References>
-        <Files>
-                <Filter
-                        Name="Source Files"
-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-                </Filter>
-                <Filter
-                        Name="Header Files"
-                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-                </Filter>
-                <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-                </Filter>
-                <File
-                        RelativePath=".\secondlife setup.nsi">
-                        <FileConfiguration
-                                Name="ADITI|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description="Creating $(ConfigurationName) install file..."
-                                        CommandLine="C:\Program Files\NSIS\makensis /D$(ConfigurationName) $(InputFileName)
-"
-                                        Outputs="$(ProjectDir)Second Life Preview Setup.exe"/>
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="DMZ|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description="Creating $(ConfigurationName) install file..."
-                                        CommandLine="C:\Program Files\NSIS\makensis /D$(ConfigurationName) $(InputFileName)
-"
-                                        Outputs="$(ProjectDir)Second Life DMZ Setup.exe"/>
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="MUSEUM|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description="Creating $(ConfigurationName) install file..."
-                                        CommandLine="C:\Program Files\NSIS\makensis /D$(ConfigurationName) $(InputFileName)
-"
-                                        Outputs="$(ProjectDir)Second Life 1-5-7 Setup.exe"/>
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="AGNI|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description="Creating $(ConfigurationName) install file..."
-                                        CommandLine="C:\Program Files\NSIS\makensis /D$(ConfigurationName) $(InputFileName)
-"
-                                        Outputs="$(ProjectDir)Second Life 1-5-7 Setup.exe"/>
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="UPDATE|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description="Creating $(ConfigurationName) install file..."
-                                        CommandLine="C:\Program Files\NSIS\makensis /D$(ConfigurationName) $(InputFileName)
-"
-                                        Outputs="$(ProjectDir)Second Life 1-5-7 Update.exe"/>
-                        </FileConfiguration>
-                </File>
-        </Files>
-        <Globals>
-                <Global
-                        Name="Foo"
-                        Value="Bar"/>
-        </Globals>
-</VisualStudioProject>
diff --git a/linden/indra/newview/installers/darwin/mac_image_DS_Store b/linden/indra/newview/installers/darwin/mac_image_DS_Store
new file mode 100644
index 0000000..ac44787
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/mac_image_DS_Store
diff --git a/linden/indra/newview/installers/darwin/mac_image_background.tga b/linden/indra/newview/installers/darwin/mac_image_background.tga
new file mode 100644
index 0000000..2539366
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/mac_image_background.tga
diff --git a/linden/indra/newview/installers/darwin/mac_image_hidden b/linden/indra/newview/installers/darwin/mac_image_hidden
new file mode 100644
index 0000000..a39bde4
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/mac_image_hidden
@@ -0,0 +1 @@
+background.tga

diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
new file mode 100644
index 0000000..8ab7c4f
--- /dev/null
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -0,0 +1,862 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; @file viewer_manifest.py

+;;; @author James Cook, Don Kjer

+;;; @brief NSIS script for creating a Windows installer.

+;;;  This file has variables expanded by viewer_manifest.py 

+;;;  to produce the complete nsi script file.

+;;; For info, see http://www.nullsoft.com/free/nsis/

+;;; NSIS 2.02 or higher required

+;;;

+;;; Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.

+;;; $License$

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Compiler flags

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+;;; Detect NSIS compiler version

+!define "NSIS${NSIS_VERSION}"

+!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"

+    ;;; before 2.07 defaulted lzma to solid (whole file)

+    SetCompressor lzma

+!else

+    ;;; after 2.07 required /solid for whole file compression

+    SetCompressor /solid lzma

+!endif

+

+SetOverwrite on                         ; overwrite files

+SetCompress auto                        ; compress iff saves space

+SetDatablockOptimize off                ; only saves us 0.1%, not worth it

+XPStyle on                              ; add an XP manifest to the installer

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Project flags

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+%%VERSION%%

+

+;;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

+%%GRID_VARS%%

+

+Name ${INSTNAME}

+

+SubCaption 0 " Setup"                   ; override "license agreement" text

+

+BrandingText " "                                ; bottom of window text

+Icon res\install_icon.ico               ; our custom icon

+UninstallIcon res\uninstall_icon.ico    ; our custom icon

+WindowIcon on                                   ; show our icon in left corner

+BGGradient off                                  ; no big background window

+CRCCheck on                                             ; make sure CRC is OK

+InstProgressFlags smooth colored                ; new colored smooth look

+ShowInstDetails nevershow               ; no details, no "show" button

+SetOverwrite on                                 ; stomp files by default

+AutoCloseWindow true                    ; after all files install, close window

+

+!ifdef UPDATE

+LicenseText "This package will update Second Life to version ${VERSION_LONG}." "Next >"

+!else

+LicenseText "This package will install Second Life on your computer." "Next >"

+!endif

+

+LicenseData "releasenotes.txt"

+

+InstallDir "$PROGRAMFILES\${INSTNAME}"

+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""

+!ifdef UPDATE

+DirText "Installation Directory" "Select the Second Life directory to update:"

+!else

+DirText "Installation Directory" "Select the directory to install Second Life in:"

+!endif

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Variables

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Var INSTPROG

+Var INSTEXE

+Var INSTFLAGS

+Var INSTSHORTCUT

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Sections

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+Section ""                                              ; (default section)

+

+SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)

+

+

+; Start with some default values.

+StrCpy $INSTFLAGS "${INSTFLAGS}"

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+

+IfSilent +2

+Goto NOT_SILENT

+  Call CheckStartupParams                 ; Figure out where, what and how to install.

+NOT_SILENT:

+Call CheckWindowsVersion                ; warn if on Windows 98/ME

+Call CheckIfAdministrator               ; Make sure the user can install/uninstall

+Call CheckIfAlreadyCurrent              ; Make sure that we haven't already installed this version

+Call CloseSecondLife                    ; Make sure we're not running

+Call RemoveNSIS                                 ; Check for old NSIS install to remove

+

+;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

+;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted

+                                                                ; VFS and cache files.

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Files

+;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

+%%INSTALL_FILES%%

+

+; If this is a silent update, we don't need to re-create these shortcuts or registry entries.

+IfSilent POST_INSTALL

+

+; Shortcuts in start menu

+CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"

+SetOutPath "$INSTDIR"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+

+!ifdef MUSEUM

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \

+

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \

+

+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+!endif

+

+WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \

+                                "InternetShortcut" "URL" \

+                                "http://www.secondlife.com/registration/"

+WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \

+                                "InternetShortcut" "URL" \

+                                "http://www.secondlife.com/account/"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk" \

+                                "$INSTDIR\releasenotes.txt"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \

+                                "$INSTDIR\lsl_guide.html"

+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

+

+; Other shortcuts

+SetOutPath "$INSTDIR"

+CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

+CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

+

+!ifdef MUSEUM

+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+

+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+

+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

+

+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

+

+!endif

+

+; Write registry

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'

+

+; Write URL registry info

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

+WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'

+

+Goto WRITE_UNINST

+

+POST_INSTALL:

+; Run a post-executable script if necessary.

+Call PostInstallExe

+

+WRITE_UNINST:

+; write out uninstaller

+WriteUninstaller "$INSTDIR\uninst.exe"

+

+; end of default section

+SectionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; PostInstallExe

+; This just runs any post installation scripts.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function PostInstallExe

+push $0

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"

+  ;MessageBox MB_OK '$0'

+  ExecWait '$0'

+pop $0

+FunctionEnd

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; CheckStartupParameters

+; Sets INSTFLAGS, INSTPROG, and INSTEXE.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckStartupParams

+push $0

+push $R0

+

+  ; Look for a registry entry with info about where to update.

+  Call GetProgramName

+  pop $R0

+  StrCpy $INSTPROG "$R0"

+  StrCpy $INSTEXE "$R0.exe"

+

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

+  ; If key doesn't exist, skip install

+  IfErrors ABORT

+  StrCpy $INSTDIR "$0"

+

+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

+  IfErrors +2

+  StrCpy $INSTFLAGS "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

+  IfErrors +2

+  StrCpy $INSTSHORTCUT "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

+  IfErrors +2

+  StrCpy $INSTEXE "$0"

+  Goto FINISHED

+

+ABORT:

+  MessageBox MB_OK "Could not find the program '$INSTPROG'. Silent update failed."

+  Quit

+

+FINISHED:

+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

+pop $R0

+pop $0

+FunctionEnd

+

+Function un.CheckStartupParams

+push $0

+push $R0

+

+  ; Look for a registry entry with info about where to update.

+  Call un.GetProgramName

+  pop $R0

+  StrCpy $INSTPROG "$R0"

+  StrCpy $INSTEXE "$R0.exe"

+

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

+  ; If key doesn't exist, skip install

+  IfErrors ABORT

+  StrCpy $INSTDIR "$0"

+

+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

+  IfErrors +2

+  StrCpy $INSTFLAGS "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

+  IfErrors +2

+  StrCpy $INSTSHORTCUT "$0"

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

+  IfErrors +2

+  StrCpy $INSTEXE "$0"

+  Goto FINISHED

+

+ABORT:

+  MessageBox MB_OK "Could not find the program '$INSTPROG'. Silent update failed."

+  Quit

+

+FINISHED:

+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

+pop $R0

+pop $0

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; After install completes, offer readme file

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function .onInstSuccess

+        MessageBox MB_YESNO \

+        "Start Second Life now?" /SD IDYES IDNO NoReadme

+                ; Assumes SetOutPath $INSTDIR

+                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'

+        NoReadme:

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Remove old NSIS version. Modifies no variables.

+; Does NOT delete the LindenWorld directory, or any

+; user files in that directory.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RemoveNSIS

+  Push $0

+  ; Grab the installation directory of the old version

+  DetailPrint "Checking for old version..."

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

+

+  ; If key doesn't exist, skip uninstall

+  IfErrors NO_NSIS

+

+  ; Clean up legacy beta shortcuts

+  Delete "$SMPROGRAMS\Second Life Beta.lnk"

+  Delete "$DESKTOP\Second Life Beta.lnk"

+  Delete "$SMPROGRAMS\Second Life.lnk"

+  

+  ; Clean up old newview.exe file

+  Delete "$INSTDIR\newview.exe"

+

+  ; Intentionally don't delete the stuff in

+  ; Documents and Settings, so we keep the user's settings

+

+  NO_NSIS:

+  Pop $0

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Make sure we're not on Windows 98 / ME

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckWindowsVersion

+        DetailPrint "Checking Windows version..."

+        Call GetWindowsVersion

+        Pop $R0

+        ; Just get first two characters, ignore 4.0 part of "NT 4.0"

+        StrCpy $R0 $R0 2

+        ; Blacklist certain OS versions

+        StrCmp $R0 "95" win_ver_bad

+        StrCmp $R0 "98" win_ver_bad

+        StrCmp $R0 "ME" win_ver_bad

+        StrCmp $R0 "NT" win_ver_bad

+        Return

+win_ver_bad:

+        MessageBox MB_YESNO 'Second Life only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' IDNO win_ver_abort

+        Return

+win_ver_abort:

+        Quit

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Make sure the user can install/uninstall

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckIfAdministrator

+                DetailPrint "Checking for permission to install..."

+         UserInfo::GetAccountType

+         Pop $R0

+         StrCmp $R0 "Admin" is_admin

+         MessageBox MB_OK 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'

+         Quit

+is_admin:

+         Return

+FunctionEnd

+

+Function un.CheckIfAdministrator

+                DetailPrint "Checking for permission to uninstall..."

+         UserInfo::GetAccountType

+         Pop $R0

+         StrCmp $R0 "Admin" is_admin

+         MessageBox MB_OK 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'

+         Quit

+is_admin:

+         Return

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Checks to see if the current version has already been installed (according to the registry).

+; If it has, allow user to bail out of install process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CheckIfAlreadyCurrent

+  Push $0

+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"

+    StrCmp $0 ${VERSION_LONG} 0 DONE

+        MessageBox MB_OKCANCEL "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" /SD IDOK IDOK DONE

+    Quit

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+        

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Close the program, if running. Modifies no variables.

+; Allows user to bail out of install process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function CloseSecondLife

+  Push $0

+  FindWindow $0 "Second Life" ""

+  IntCmp $0 0 DONE

+  MessageBox MB_OKCANCEL "Second Life can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation." IDOK CLOSE IDCANCEL CANCEL_INSTALL

+

+  CANCEL_INSTALL:

+    Quit

+

+  CLOSE:

+    DetailPrint "Waiting for Second Life to shut down..."

+    SendMessage $0 16 0 0

+

+  LOOP:

+          FindWindow $0 "Second Life" ""

+          IntCmp $0 0 DONE

+          Sleep 500

+          Goto LOOP

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Delete files in Documents and Settings\<user>\SecondLife\cache

+; Delete files in Documents and Settings\All Users\SecondLife\cache

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function RemoveCacheFiles

+

+; Delete files in Documents and Settings\<user>\SecondLife

+Push $0

+Push $1

+Push $2

+  DetailPrint "Deleting cache files in Documents and Settings folder"

+

+  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+

+  LOOP:

+    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+    StrCmp $1 "" DONE               ; no more users

+

+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+

+    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+    ExpandEnvStrings $2 $2

+

+        ; When explicitly uninstalling, everything goes away

+    RMDir /r "$2\Application Data\SecondLife\cache"

+

+  CONTINUE:

+    IntOp $0 $0 + 1

+    Goto LOOP

+  DONE:

+Pop $2

+Pop $1

+Pop $0

+

+; Delete files in Documents and Settings\All Users\SecondLife

+Push $0

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+  StrCmp $0 "" +2

+  RMDir /r "$0\SecondLife\cache"

+Pop $0

+

+; Delete filse in C:\Windows\Application Data\SecondLife

+; If the user is running on a pre-NT system, Application Data lives here instead of

+; in Documents and Settings.

+RMDir /r "$WINDIR\Application Data\SecondLife\cache"

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Delete files in Documents and Settings\<user>\SecondLife

+; Delete files in Documents and Settings\All Users\SecondLife

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.DocumentsAndSettingsFolder

+

+; Delete files in Documents and Settings\<user>\SecondLife

+Push $0

+Push $1

+Push $2

+

+  DetailPrint "Deleting files in Documents and Settings folder"

+

+  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

+

+  LOOP:

+    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+    StrCmp $1 "" DONE               ; no more users

+

+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

+

+    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

+    ExpandEnvStrings $2 $2

+

+        ; If uninstalling a normal install remove everything

+        ; Otherwise (preview/dmz etc) just remove cache

+    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE

+      RM_ALL:

+        RMDir /r "$2\Application Data\SecondLife"

+        GoTo CONTINUE

+      RM_CACHE:

+        RMDir /r "$2\Application Data\SecondLife\Cache"

+

+  CONTINUE:

+    IntOp $0 $0 + 1

+    Goto LOOP

+  DONE:

+

+Pop $2

+Pop $1

+Pop $0

+

+; Delete files in Documents and Settings\All Users\SecondLife

+Push $0

+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+  StrCmp $0 "" +2

+  RMDir /r "$0\SecondLife"

+Pop $0

+

+; Delete filse in C:\Windows\Application Data\SecondLife

+; If the user is running on a pre-NT system, Application Data lives here instead of

+; in Documents and Settings.

+RMDir /r "$WINDIR\Application Data\SecondLife"

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; Close the program, if running. Modifies no variables.

+; Allows user to bail out of uninstall process.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.CloseSecondLife

+  Push $0

+  FindWindow $0 "Second Life" ""

+  IntCmp $0 0 DONE

+  MessageBox MB_OKCANCEL "Second Life can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Second Life and continue.$\nSelect CANCEL to cancel installation." IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

+

+  CANCEL_UNINSTALL:

+    Quit

+

+  CLOSE:

+    DetailPrint "Waiting for Second Life to shut down..."

+    SendMessage $0 16 0 0

+

+  LOOP:

+          FindWindow $0 "Second Life" ""

+          IntCmp $0 0 DONE

+          Sleep 500

+          Goto LOOP

+

+  DONE:

+    Pop $0

+    Return

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Delete the installed files

+;;; This deletes the uninstall executable, but it works 

+;;; because it is copied to temp directory before running

+;;;

+;;; Note:  You must list all files here, because we only

+;;; want to delete our files, not things users left in the

+;;; application directories.

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Function un.ProgramFiles

+

+;; Remove mozilla file first so recursive directory deletion doesn't get hung up

+Delete "$INSTDIR\app_settings\mozilla\components"

+

+;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py

+%%DELETE_FILES%%

+

+;; Optional/obsolete files.  Delete won't fail if they don't exist.

+Delete "$INSTDIR\dronesettings.ini"

+Delete "$INSTDIR\message_template.msg"

+Delete "$INSTDIR\newview.pdb"

+Delete "$INSTDIR\newview.map"

+Delete "$INSTDIR\SecondLife.pdb"

+Delete "$INSTDIR\SecondLife.map"

+Delete "$INSTDIR\comm.dat"

+Delete "$INSTDIR\*.glsl"

+Delete "$INSTDIR\motions\*.lla"

+Delete "$INSTDIR\trial\*.html"

+Delete "$INSTDIR\newview.exe"

+;; Remove entire help directory

+Delete "$INSTDIR\help\Advanced\*"

+RMDir  "$INSTDIR\help\Advanced"

+Delete "$INSTDIR\help\basics\*"

+RMDir  "$INSTDIR\help\basics"

+Delete "$INSTDIR\help\Concepts\*"

+RMDir  "$INSTDIR\help\Concepts"

+Delete "$INSTDIR\help\welcome\*"

+RMDir  "$INSTDIR\help\welcome"

+Delete "$INSTDIR\help\*"

+RMDir  "$INSTDIR\help"

+

+Delete "$INSTDIR\uninst.exe"

+RMDir "$INSTDIR"

+

+IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

+

+FOLDERFOUND:

+  MessageBox MB_YESNO "There are still files in your SecondLife program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" IDNO NOFOLDER

+  RMDir /r "$INSTDIR"

+

+NOFOLDER:

+

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Uninstall settings

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+UninstallText "This will uninstall Second Life ${VERSION_LONG} from your system."

+ShowUninstDetails show

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;; Uninstall section

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+Section Uninstall

+

+; Start with some default values.

+StrCpy $INSTFLAGS "${INSTFLAGS}"

+StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTEXE "${INSTEXE}"

+StrCpy $INSTSHORTCUT "${SHORTCUT}"

+Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.

+Call un.CheckIfAdministrator            ; Make sure the user can install/uninstall

+

+; uninstall for all users (if you change this, change it in the install as well)

+SetShellVarContext all                  

+

+; Make sure we're not running

+Call un.CloseSecondLife

+

+; Clean up registry keys

+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

+

+; Clean up shortcuts

+Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

+RMDir  "$SMPROGRAMS\$INSTSHORTCUT"

+

+Delete "$DESKTOP\$INSTSHORTCUT.lnk"

+Delete "$INSTDIR\$INSTSHORTCUT.lnk"

+Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

+

+; Clean up cache and log files.

+; Leave them in-place for non AGNI installs.

+

+!ifdef UNINSTALL_SETTINGS

+Call un.DocumentsAndSettingsFolder

+!endif

+

+Call un.ProgramFiles

+

+SectionEnd                              ; end of uninstall section

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; (From the NSIS wiki, DK)

+; GetParameterValue

+;

+; Usage:

+; !insertmacro GetParameterValue "/L=" "1033"

+; pop $R0

+;

+; Returns on top of stack

+;

+; Example command lines:

+; foo.exe /S /L=1033 /D=C:\Program Files\Foo

+; or:

+; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"

+; gpv "/L=" "1033"

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+

+ !macro GetParameterValue SWITCH DEFAULT

+   Push $0

+   Push $1

+   Push $2

+   Push $3

+   Push $4

+

+ ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'

+   Push "$CMDLINE"

+   Push '${SWITCH}"'

+   !insertmacro StrStr

+   Pop $0

+   StrCmp "$0" "" gpv_notquoted

+ ;$0='/L="1033" /S'

+   StrLen $2 "$0"

+   Strlen $1 "${SWITCH}"

+   IntOp $1 $1 + 1

+   StrCpy $0 "$0" $2 $1

+ ;$0='1033" /S'

+   Push "$0"

+   Push '"'

+   !insertmacro StrStr

+   Pop $1

+   StrLen $2 "$0"

+   StrLen $3 "$1"

+   IntOp $4 $2 - $3

+   StrCpy $0 $0 $4 0

+   Goto gpv_done

+

+   gpv_notquoted:

+   Push "$CMDLINE"

+   Push "${SWITCH}"

+   !insertmacro StrStr

+   Pop $0

+   StrCmp "$0" "" gpv_done

+ ;$0='/L="1033" /S'

+   StrLen $2 "$0"

+   Strlen $1 "${SWITCH}"

+   StrCpy $0 "$0" $2 $1

+ ;$0=1033 /S'

+   Push "$0"

+   Push ' '

+   !insertmacro StrStr

+   Pop $1

+   StrLen $2 "$0"

+   StrLen $3 "$1"

+   IntOp $4 $2 - $3

+   StrCpy $0 $0 $4 0

+   Goto gpv_done

+

+   gpv_done:

+   StrCmp "$0" "" 0 +2

+   StrCpy $0 "${DEFAULT}"

+

+   Pop $4

+   Pop $3

+   Pop $2

+   Pop $1

+   Exch $0

+ !macroend

+

+; And I had to modify StrStr a tiny bit.

+; Possible upgrade switch the goto's to use ${__LINE__}

+

+!macro STRSTR

+  Exch $R1 ; st=haystack,old$R1, $R1=needle

+  Exch    ; st=old$R1,haystack

+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack

+  Push $R3

+  Push $R4

+  Push $R5

+  StrLen $R3 $R1

+  StrCpy $R4 0

+  ; $R1=needle

+  ; $R2=haystack

+  ; $R3=len(needle)

+  ; $R4=cnt

+  ; $R5=tmp

+ ;  loop;

+    StrCpy $R5 $R2 $R3 $R4

+    StrCmp $R5 $R1 +4

+    StrCmp $R5 "" +3

+    IntOp $R4 $R4 + 1

+    Goto -4

+ ;  done;

+  StrCpy $R1 $R2 "" $R4

+  Pop $R5

+  Pop $R4

+  Pop $R3

+  Pop $R2

+  Exch $R1

+!macroend

+

+Function GetProgramName

+  !insertmacro GetParameterValue "/P=" "SecondLife"

+FunctionEnd

+

+Function un.GetProgramName

+  !insertmacro GetParameterValue "/P=" "SecondLife"

+FunctionEnd

+

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+; (From the NSIS documentation, JC)

+; GetWindowsVersion

+;

+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/

+; Updated by Joost Verburg

+;

+; Returns on top of stack

+;

+; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)

+; or

+; '' (Unknown Windows Version)

+;

+; Usage:

+;   Call GetWindowsVersion

+;   Pop $R0

+;   ; at this point $R0 is "NT 4.0" or whatnot

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+ 

+Function GetWindowsVersion

+ 

+   Push $R0

+   Push $R1

+ 

+   ReadRegStr $R0 HKLM \

+   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion

+

+   IfErrors 0 lbl_winnt

+   

+   ; we are not NT

+   ReadRegStr $R0 HKLM \

+   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber

+ 

+   StrCpy $R1 $R0 1

+   StrCmp $R1 '4' 0 lbl_error

+ 

+   StrCpy $R1 $R0 3

+ 

+   StrCmp $R1 '4.0' lbl_win32_95

+   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98

+ 

+   lbl_win32_95:

+     StrCpy $R0 '95'

+   Goto lbl_done

+ 

+   lbl_win32_98:

+     StrCpy $R0 '98'

+   Goto lbl_done

+ 

+   lbl_win32_ME:

+     StrCpy $R0 'ME'

+   Goto lbl_done

+ 

+   lbl_winnt:

+ 

+   StrCpy $R1 $R0 1

+ 

+   StrCmp $R1 '3' lbl_winnt_x

+   StrCmp $R1 '4' lbl_winnt_x

+ 

+   StrCpy $R1 $R0 3

+ 

+   StrCmp $R1 '5.0' lbl_winnt_2000

+   StrCmp $R1 '5.1' lbl_winnt_XP

+   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error

+ 

+   lbl_winnt_x:

+     StrCpy $R0 "NT $R0" 6

+   Goto lbl_done

+ 

+   lbl_winnt_2000:

+     Strcpy $R0 '2000'

+   Goto lbl_done

+ 

+   lbl_winnt_XP:

+     Strcpy $R0 'XP'

+   Goto lbl_done

+ 

+   lbl_winnt_2003:

+     Strcpy $R0 '2003'

+   Goto lbl_done

+ 

+   lbl_error:

+     Strcpy $R0 ''

+   lbl_done:

+ 

+   Pop $R1

+   Exch $R0

+ 

+FunctionEnd

diff --git a/linden/indra/newview/licenses-linux.txt b/linden/indra/newview/licenses-linux.txt
index f7ccf27..20b76c8 100644
--- a/linden/indra/newview/licenses-linux.txt
+++ b/linden/indra/newview/licenses-linux.txt
@@ -16,6 +16,38 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+==============
+Base32 License
+==============
+
+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the authors nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
 ==========
 Cg License
 ==========
@@ -404,6 +436,39 @@ Subject to the following 3 conditions, Epinions, Inc. permits you, free of charg
 3) IN NO EVENT SHALL EPINIONS, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT OF OR IN CONNECTION WITH THE SOFTWARE (HOWEVER ARISING, INCLUDING NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES. 
 
 
+===============
+libuuid License
+===============
+
+Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, and the entire permission notice in its entirety,
+   including the disclaimer of warranties.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+
 ============
 zlib License
 ============
diff --git a/linden/indra/newview/licenses-mac.txt b/linden/indra/newview/licenses-mac.txt
index f761ed6..77541ba 100644
--- a/linden/indra/newview/licenses-mac.txt
+++ b/linden/indra/newview/licenses-mac.txt
@@ -16,6 +16,38 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+==============
+Base32 License
+==============
+
+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the authors nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
 ==========
 Cg License
 ==========
diff --git a/linden/indra/newview/licenses-win32.txt b/linden/indra/newview/licenses-win32.txt
index f761ed6..77541ba 100644
--- a/linden/indra/newview/licenses-win32.txt
+++ b/linden/indra/newview/licenses-win32.txt
@@ -16,6 +16,38 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+==============
+Base32 License
+==============
+
+ * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the authors nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
 ==========
 Cg License
 ==========
diff --git a/linden/indra/newview/linux_tools/client-manifest-i686 b/linden/indra/newview/linux_tools/client-manifest-i686
deleted file mode 100644
index 04ab1f6..0000000
--- a/linden/indra/newview/linux_tools/client-manifest-i686
+++ /dev/null
@@ -1,48 +0,0 @@
-# This file defines which files to include in the linux tarball.
-# Each line is a comma-separated definition of source,destination
-# pairs.  The packaging script will read all source files 
-# from indra/newview/<source>, and place them in the package
-# located at <Package_dir>/<dest>.
-#
-# If no comma is used, the destination name is assumed to be
-# the same as the source name.
-#
-# A 'file' ending with a '/' defines an empty directory to create.
-# A '*' wildcard in the source will recursively copy everything
-# in that directory (except CVS directories)
-
-featuretable.txt
-licenses-linux.txt,licenses.txt
-releasenotes.txt
-lsl_guide.html
-gpu_table.txt
-res/ll_icon.ico,secondlife.ico
-linux_tools/client-readme.txt,README-linux.txt
-linux_tools/wrapper.sh,secondlife
-secondlife-i686-bin-stripped,bin/do-not-directly-run-secondlife-bin
-#../../libraries/i686-linux/lib_release_client/libllkdu.so,bin/libllkdu.so
-#../linux_crash_logger/linux-crash-logger-i686-bin-stripped,linux-crash-logger.bin
-linux_tools/unicode.ttf,unicode.ttf
-linux_tools/launch_url.sh,launch_url.sh
-app_settings/*
-character/*
-fonts/*
-help/*
-skins/*
-res-sdl/*
-../../scripts/messages/message_template.msg,app_settings/message_template.msg
-#../../libraries/i686-linux/lib_release_client/libkdu_v42R.so,lib/libkdu_v42R.so
-../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so
-../../libraries/i686-linux/lib_release_client/libapr-1.so.0,lib/libapr-1.so.0
-../../libraries/i686-linux/lib_release_client/libaprutil-1.so.0,lib/libaprutil-1.so.0
-../../libraries/i686-linux/lib_release_client/libdb-4.2.so,lib/libdb-4.2.so
-../../libraries/i686-linux/lib_release_client/libogg.so.0,lib/libogg.so.0
-../../libraries/i686-linux/lib_release_client/libvorbis.so.0,lib/libvorbis.so.0
-../../libraries/i686-linux/lib_release_client/libvorbisfile.so.0,lib/libvorbisfile.so.0
-../../libraries/i686-linux/lib_release_client/libvorbisenc.so.0,lib/libvorbisenc.so.0
-../../libraries/i686-linux/lib_release_client/libcurl.so.3,lib/libcurl.so.3
-../../libraries/i686-linux/lib_release_client/libcrypto.so.0.9.7,lib/libcrypto.so.0.9.7
-../../libraries/i686-linux/lib_release_client/libssl.so.0.9.7,lib/libssl.so.0.9.7
-../../libraries/i686-linux/lib_release_client/libexpat.so.1,lib/libexpat.so.1
-#../../libraries/i686-linux/lib_release_client/libstdc++.so.6,lib/libstdc++.so.6
-../../libraries/i686-linux/lib_release_client/libelfio.so,lib/libelfio.so
diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index 4748eaf..7c972bb 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -71,29 +71,31 @@ you wish.
 4. KNOWN ISSUES
 -=-=-=-=-=-=-=-
 
-The following user-visible features are currently not fully implemented on
-the Linux client and are therefore known not to work properly:
+These are the most commonly-encountered known issues which are specific to
+the Alpha release of the Linux client.
+
+* VISUAL EFFECTS AND PERFORMANCE - many Linux graphics drivers are not as
+  robust as their counterparts for other operating systems, so some advanced
+  Second Life graphical features have been DISABLED by default to aid
+  stability.  See PROBLEM 3 in the TROUBLESHOOTING section if you wish to
+  turn these on to possibly enhance your experience.
+
+* MISC - The following user-visible features are not currently fully
+  implemented on the Linux client and are therefore known not to work properly
+  at this time:
   * QuickTime movie playback and movie recording
-  * F1 Help
-  * Embedded Web Profiles and HTML Login Screen
   * Video memory detection
   * Full Unicode font rendering
   * Auto-updater
 
+* UPLOAD / SAVE / COLOR-PICKER DIALOGS - These only appear when the client
+  is in 'windowed' mode, not 'fullscreen' mode.
+
 * UPDATING - when the client detects that a new version of Second Life
   is available, it will ask you if you wish to download the new version.
   This option is not implemented; to upgrade, you should manually download a
   new version from the Second Life web site, <http://www.secondlife.com/>.
 
-* UPLOAD / SAVE / COLOR-PICKER DIALOGS - These only function when the client
-  is in 'windowed' mode, not 'fullscreen' mode.
-
-* GRAPHICAL SPEED/QUALITY - as many Linux graphics drivers are not as robust
-  as their counterparts for some other operating systems, advanced Second Life
-  graphical features have been disabled to aid stability.  See PROBLEM 3 in the
-  TROUBLESHOOTING section if you wish to turn these on to enhance your
-  experience.
-
 
 5. TROUBLESHOOTING
 -=-=-=-=-=-=-=-=-=
@@ -132,8 +134,8 @@ SOLUTION:- As a last resort, you can disable most of Second Life's advanced
    from the line which reads '#export LL_GL_NOEXT=x'
 
 PROBLEM 3:- Performance or graphical quality are not as high as I expect.
+PROBLEM:- 'SHINY' doesn't work.
 PROBLEM:- I can't turn on Anisotropic Filtering, Ripple Water, or AGP.
-PROBLEM:- 'Shiny' doesn't work.
 SOLUTION:- Some graphics performance features in Second Life are disabled
    by default for the Linux version due to stability issues with some common
    Linux graphic drivers.  You can re-enable these features at the slight
diff --git a/linden/indra/newview/linux_tools/package-client.sh b/linden/indra/newview/linux_tools/package-client.sh
deleted file mode 100755
index b054386..0000000
--- a/linden/indra/newview/linux_tools/package-client.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-MANIFEST=$1
-PACKAGE_NAME=$2
-GRID=$3
-
-# Check that the entire client manifest is there.
-cd newview
-echo Checking manifest...
-
-# Strip out comment lines and empty lines
-# Replace anything with a source,dest pairs with just source filename
-if ! ls -d `cat "$MANIFEST" | \
-        grep -v ^# | grep -v ^$ | \
-        sed 's/,.*//'` 1>/dev/null
-then
-        echo Client manifest defined in newview/$MANIFEST is not complete.
-        exit 1
-fi
-echo "Done."
-
-# See if the package already exists.
-BUILD_PACKAGE=YES
-if [ -a $PACKAGE_NAME ]
-then
-        echo The directory "newview/$PACKAGE_NAME" already exists.
-        echo Checking for complete client manifest...
-
-        cd $PACKAGE_NAME
-
-        # Strip out comment lines and empty lines
-        # Replace source,dest pairs with just dest filename
-        if ls -d `cat "../$MANIFEST" | \
-                grep -v ^# | grep -v ^$ | \
-                sed 's/.*,\(.*\)/\1/'` 1>/dev/null
-        then
-                echo "Done."
-                echo Package at "newview/$PACKAGE_NAME" looks complete.
-                cd ..
-                BUILD_PACKAGE=NO
-        else
-                echo Incomplete package at "newview/$PACKAGE_NAME"!
-                echo Removing corrupt package...
-                cd ..
-                rm -rf $PACKAGE_NAME
-                echo Done.
-        fi
-fi
-
-echo Building newview/$PACKAGE_NAME directory...
-## First read all directories mentioned in the manifest, and create a package skeleton.
-
-# Strip out comment lines and empty lines
-# Replace source,dest pairs with just dest filename
-# Strip out and line that does not include a directory in its path (ie contains a '/')
-# Extract everything up to the last '/' and prefix with $PACKAGE_NAME
-# Print out just the unique directores, and make them.
-mkdir -p `cat $MANIFEST | \
-        grep -v ^# | \
-        grep -v ^$ | \
-        sed 's/.*,\(.*\)/\1/' | \
-        grep \/ | \
-        sed "s/\(^.*\)\/[^\/]*/$PACKAGE_NAME\/\1/" | \
-        sort | uniq`
-
-## Copy the manifest.
-
-# Strip out comment lines and empty lines
-# Strip out empty directories
-# Replace any line without a ',' with 'line,line'
-for pair in `cat $MANIFEST | \
-                grep -v ^# | \
-                grep -v ^$ | \
-                grep -v \/$ | \
-                sed 's/\(^[^,]*$\)/\1,\1/' `
-do
-        # $pair is 'source,dest' ... split it up
-        SOURCE=`echo "$pair" | awk -F, '{ print $1; }'`
-        DEST=`echo "$pair" | awk -F, '{ print $2; }'`
-        # If this is a wildcard copy (pair contains a '*'), then remove the wildcard from $DEST 
-        # and make the copy recursive
-        RECURSE=""
-        if [ ! x == x`echo "$SOURCE" | grep \*$` ]
-        then
-                DEST=`echo "$DEST" | sed 's/\*$//'`
-                RECURSE="-R"
-        fi
-        # The -a makes us copy links as links, plus timestamps etc.
-        cp -a $RECURSE $SOURCE "$PACKAGE_NAME/$DEST"
-done
-
-echo Done.
-
-## Clean up any CVS directories that might have been recursively included.
-echo Pruning CVS directories from newview/$PACKAGE_NAME directory...
-find $PACKAGE_NAME -type d -name CVS -exec rm -rf {} \; 2>/dev/null
-echo "Done removing CVS directories."
-
-## Clean up any SVN directories that might have been recursively included.
-echo Pruning .svn directories from newview/$PACKAGE_NAME directory...
-find $PACKAGE_NAME -type d -name \.svn -exec rm -rf {} \; 2>/dev/null
-echo "Done removing .svn directories."
-
-# Create an appropriate gridargs.dat for this package, denoting required grid.
-if [ X$GRID == X'default' ]
-then
-    echo 'Default grid - creating empty gridargs.dat'
-    echo " " > $PACKAGE_NAME/gridargs.dat
-else
-    if [ X$GRID == X'firstlook' ]
-    then
-        # firstlook is a special case... it's not really a grid.
-        echo "Creating gridargs.dat for firstlook"
-        echo "-settings settings_firstlook.xml" > $PACKAGE_NAME/gridargs.dat
-    else
-        echo "Creating gridargs.dat for package, grid $GRID"
-        echo "-settings settings_beta.xml --${GRID} -helperuri http://preview-${GRID}.secondlife.com/helpers/" > $PACKAGE_NAME/gridargs.dat
-    fi
-fi
-
-TARBALL=$PACKAGE_NAME.tar.bz2
-
-# See if the tarball already exists.
-if [ -a $TARBALL ]
-then
-        echo Tarball "newview/$TARBALL" already exists.  Skipping tarball creation.
-        exit 0
-fi
-
-echo Creating tarball "newview/$TARBALL"...
-# --numeric-owner hides the username of the builder for security etc.
-tar --numeric-owner -cjf $TARBALL $PACKAGE_NAME
-echo Done.
-
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 222ce98..cdc36a8 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -13,8 +13,9 @@
 #export LL_BAD_ALSA=x
 
 ## - Avoids the optional OpenGL extensions which have proven most problematic
-##   on some hardware.  Disabling this option may cause crashes and hangs on
-##   some unstable combinations of drivers and hardware.
+##   on some hardware.  Disabling this option may cause BETTER PERFORMANCE but
+##   may also cause CRASHES and hangs on some unstable combinations of drivers
+##   and hardware.
 export LL_GL_BASICEXT=x
 
 ## - Avoids *all* optional OpenGL extensions.  This is the safest and least-
@@ -38,7 +39,7 @@ export SDL_VIDEO_X11_DGAMOUSE=0
 
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}"
-LD_LIBRARY_PATH="`pwd`"/lib:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat
+LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat
 
 echo
 echo '*********************************************************'
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 6d9137d..a6ec948 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -122,7 +122,6 @@
 // end Ventrella
 
 extern LLMenuBarGL* gMenuBarView;
-extern F32 gMinObjectDistance;
 extern U8 gLastPickAlpha;
 extern F32 gFrameDTClamped;
 
@@ -481,17 +480,20 @@ void LLAgent::resetView(BOOL reset_camera)
 
         if (!gNoRender)
         {
-                gSelectMgr->deselectAll();
                 gSelectMgr->unhighlightAll();
 
                 // By popular request, keep land selection while walking around. JC
                 // gParcelMgr->deselectLand();
 
+                // force deselect when walking and attachment is selected
+                // this is so people don't wig out when their avatar moves without animating
+                if (gSelectMgr->getSelection()->isAttachment())
+                {
+                        gSelectMgr->deselectAll();
+                }
+
                 // Hide all popup menus
-                gPieSelf->hide(FALSE);
-                gPieAvatar->hide(FALSE);
-                gPieObject->hide(FALSE);
-                gPieLand->hide(FALSE);
+                gMenuHolder->hideMenus();
         }
 
         if (reset_camera && !gSavedSettings.getBOOL("FreezeTime"))
@@ -787,7 +789,7 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
                 // char host_name[MAX_STRING];
                 // regionp->getHost().getHostName(host_name, MAX_STRING);
 
-                char ip[MAX_STRING];
+                char ip[MAX_STRING];            /*Flawfinder: ignore*/
                 regionp->getHost().getString(ip, MAX_STRING);
                 llinfos << "Moving agent into region: " << regionp->getName()
                                 << " located at " << ip << llendl;
@@ -850,6 +852,8 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
         // we could trake this at the dataserver side, but that's harder
         U64 handle = regionp->getHandle();
         mRegionsVisited.insert(handle);
+
+        gSelectMgr->updateSelectionCenter();
 }
 
 
@@ -1584,7 +1588,8 @@ F32 LLAgent::getCameraZoomFraction()
 {
         // 0.f -> camera zoomed all the way out
         // 1.f -> camera zoomed all the way in
-        if (gSelectMgr->getObjectCount() && gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
         {
                 // already [0,1]
                 return mAvatarObject->mHUDTargetZoom;
@@ -1631,7 +1636,9 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
 {
         // 0.f -> camera zoomed all the way out
         // 1.f -> camera zoomed all the way in
-        if (gSelectMgr->getObjectCount() && gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
+        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
         {
                 mAvatarObject->mHUDTargetZoom = fraction;
         }
@@ -1681,7 +1688,8 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
 //-----------------------------------------------------------------------------
 void LLAgent::cameraOrbitAround(const F32 radians)
 {
-        if (gSelectMgr->getObjectCount() && gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
         {
                 // do nothing for hud selection
         }
@@ -1703,7 +1711,8 @@ void LLAgent::cameraOrbitAround(const F32 radians)
 //-----------------------------------------------------------------------------
 void LLAgent::cameraOrbitOver(const F32 angle)
 {
-        if (gSelectMgr->getObjectCount() && gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
         {
                 // do nothing for hud selection
         }
@@ -1737,7 +1746,8 @@ void LLAgent::cameraZoomIn(const F32 fraction)
                 return;
         }
 
-        if (gSelectMgr->getObjectCount() && gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
         {
                 // just update hud zoom level
                 mAvatarObject->mHUDTargetZoom /= fraction;
@@ -2256,11 +2266,9 @@ void LLAgent::stopAutoPilot(BOOL user_cancel)
                         resetAxes(mAutoPilotTargetFacing);
                 }
                 //NB: auto pilot can terminate for a reason other than reaching the destination
-                //TODO: enforce rotation constraint here as well
-                if (mAutoPilotFinishedCallback && 
-                        ((mAutoPilotTargetDist < mAutoPilotStopDistance) || (mAutoPilotNoProgressFrameCount > AUTOPILOT_MAX_TIME_NO_PROGRESS * gFPSClamped)))
+                if (mAutoPilotFinishedCallback)
                 {
-                        mAutoPilotFinishedCallback(!user_cancel && dist_vec(gAgent.getPositionGlobal(), mAutoPilotTargetGlobal) < mAutoPilotTargetDist, mAutoPilotCallbackData);
+                        mAutoPilotFinishedCallback(!user_cancel && dist_vec(gAgent.getPositionGlobal(), mAutoPilotTargetGlobal) < mAutoPilotStopDistance, mAutoPilotCallbackData);
                 }
                 mLeaderID = LLUUID::null;
 
@@ -2731,8 +2739,8 @@ U8 LLAgent::getRenderState()
                 stopTyping();
         }
         
-        if ((!gSelectMgr->isEmpty() && gSelectMgr->shouldShowSelection())
-                || gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) )->isEditing() )
+        if ((!gSelectMgr->getSelection()->isEmpty() && gSelectMgr->shouldShowSelection())
+                || gToolMgr->getCurrentTool()->isEditing() )
         {
                 setRenderState(AGENT_STATE_EDITING);
         }
@@ -2774,8 +2782,7 @@ void LLAgent::endAnimationUpdateUI()
                 gMenuBarView->setVisible(TRUE);
                 gStatusBar->setVisibleForMouselook(true);
 
-                gCurrentToolset = gBasicToolset;
-                gToolMgr->useSelectedTool( gCurrentToolset );
+                gToolMgr->setCurrentToolset(gBasicToolset);
 
                 // Only pop if we have pushed...
                 if (TRUE == mViewsPushed)
@@ -2823,8 +2830,7 @@ void LLAgent::endAnimationUpdateUI()
         {
                 // make sure we ask to save changes
 
-                gCurrentToolset = gBasicToolset;
-                gToolMgr->useSelectedTool( gCurrentToolset );
+                gToolMgr->setCurrentToolset(gBasicToolset);
 
                 // HACK: If we're quitting, and we were in customize avatar, don't
                 // let the mini-map go visible again. JC
@@ -2861,8 +2867,7 @@ void LLAgent::endAnimationUpdateUI()
                 // JC - Added for always chat in third person option
                 gFocusMgr.setKeyboardFocus(NULL, NULL);
 
-                gCurrentToolset = gMouselookToolset;
-                gToolMgr->useSelectedTool( gMouselookToolset );
+                gToolMgr->setCurrentToolset(gMouselookToolset);
 
                 mViewsPushed = TRUE;
 
@@ -2920,8 +2925,7 @@ void LLAgent::endAnimationUpdateUI()
         }
         else if (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR)
         {
-                gCurrentToolset = gFaceEditToolset;
-                gToolMgr->useSelectedTool( gFaceEditToolset );
+                gToolMgr->setCurrentToolset(gFaceEditToolset);
 
                 gFloaterMap->pushVisible(FALSE);
                 /*
@@ -3336,7 +3340,7 @@ void LLAgent::updateCamera()
                         attachment;
                         attachment = mAvatarObject->mAttachmentPoints.getNextData())
                 {
-                        LLViewerObject *attached_object = attachment->getObject(0);
+                        LLViewerObject *attached_object = attachment->getObject();
                         if (attached_object && !attached_object->isDead() && attached_object->mDrawable.notNull())
                         {
                                 // clear any existing "early" movements of attachment
@@ -3446,21 +3450,26 @@ LLVector3d LLAgent::calcFocusPositionTargetGlobal()
                 {
                         LLDrawable* drawablep = mFocusObject->mDrawable;
                         
-                        if (mTrackFocusObject && drawablep && drawablep->isActive())
+                        if (mTrackFocusObject &&
+                                drawablep && 
+                                drawablep->isActive())
                         {
-                                if (mFocusObject->isSelected())
+                                if (!mFocusObject->isAvatar())
                                 {
-                                        gPipeline.updateMoveNormalAsync(drawablep);
-                                }
-                                else
-                                {
-                                        if (drawablep->isState(LLDrawable::MOVE_UNDAMPED))
+                                        if (mFocusObject->isSelected())
                                         {
                                                 gPipeline.updateMoveNormalAsync(drawablep);
                                         }
                                         else
                                         {
-                                                gPipeline.updateMoveDampedAsync(drawablep);
+                                                if (drawablep->isState(LLDrawable::MOVE_UNDAMPED))
+                                                {
+                                                        gPipeline.updateMoveNormalAsync(drawablep);
+                                                }
+                                                else
+                                                {
+                                                        gPipeline.updateMoveDampedAsync(drawablep);
+                                                }
                                         }
                                 }
                         }
@@ -3471,11 +3480,6 @@ LLVector3d LLAgent::calcFocusPositionTargetGlobal()
                         }
                         LLVector3 focus_agent = mFocusObject->getRenderPosition() + mFocusObjectOffset;
                         mFocusTargetGlobal.setVec(getPosGlobalFromAgent(focus_agent));
-                        // *FIX: get camera pointat behavior working
-                        //if (mTrackFocusObject)
-                        //{
-                        //      mCameraFocusOffset = gAgent.getPosGlobalFromAgent(gCamera->getOrigin()) - mFocusTargetGlobal;
-                        //}
                 }
                 return mFocusTargetGlobal;
         }
@@ -3840,8 +3844,6 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
         if (camera_position_global.mdV[VZ] < camera_land_height + camera_min_off_ground)
         {
                 camera_position_global.mdV[VZ] = camera_land_height + camera_min_off_ground;
-
-                gMinObjectDistance = MIN_NEAR_PLANE;
                 isConstrained = TRUE;
         }
 
@@ -3873,6 +3875,7 @@ void LLAgent::handleScrollWheel(S32 clicks)
         }
         else
         {
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
                 const F32 ROOT_ROOT_TWO = sqrt(F_SQRT2);
 
                 // Block if camera is animating
@@ -3881,7 +3884,7 @@ void LLAgent::handleScrollWheel(S32 clicks)
                         return;
                 }
 
-                if (gSelectMgr->getObjectCount() && gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         F32 zoom_factor = (F32)pow(0.8, -clicks);
                         cameraZoomIn(zoom_factor);
@@ -3952,9 +3955,7 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
         // unpause avatar animation
         mPauseRequest = NULL;
 
-        gCurrentToolset = gMouselookToolset;
-        gCurrentToolset->selectFirstTool();
-        gToolMgr->useSelectedTool( gCurrentToolset );
+        gToolMgr->setCurrentToolset(gMouselookToolset);
 
         gSavedSettings.setBOOL("FirstPersonBtnState",   FALSE);
         gSavedSettings.setBOOL("MouselookBtnState",             TRUE);
@@ -4036,9 +4037,7 @@ void LLAgent::changeCameraToFollow(BOOL animate)
                 
                 if (gBasicToolset)
                 {
-                        gCurrentToolset = gBasicToolset;
-                        gCurrentToolset->selectFirstTool();
-                        gToolMgr->useSelectedTool( gCurrentToolset );
+                        gToolMgr->setCurrentToolset(gBasicToolset);
                 }
 
                 if (mAvatarObject)
@@ -4111,9 +4110,7 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
         {
                 if (gBasicToolset)
                 {
-                        gCurrentToolset = gBasicToolset;
-                        gCurrentToolset->selectFirstTool();
-                        gToolMgr->useSelectedTool( gCurrentToolset );
+                        gToolMgr->setCurrentToolset(gBasicToolset);
                 }
 
                 mCameraLag.clearVec();
@@ -4176,9 +4173,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL animate)
 
         if (gFaceEditToolset)
         {
-                gCurrentToolset = gFaceEditToolset;
-                gCurrentToolset->selectFirstTool();
-                gToolMgr->useSelectedTool( gCurrentToolset );
+                gToolMgr->setCurrentToolset(gFaceEditToolset);
         }
 
         gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
@@ -4673,14 +4668,26 @@ void LLAgent::requestStopMotion( LLMotion* motion )
         // Notify all avatars that a motion has stopped.
         // This is needed to clear the animation state bits
         LLUUID anim_state = motion->getID();
+        onAnimStop(motion->getID());
 
         // if motion is not looping, it could have stopped by running out of time
         // so we need to tell the server this
 //      llinfos << "Sending stop for motion " << motion->getName() << llendl;
         sendAnimationRequest( anim_state, ANIM_REQUEST_STOP );
+}
 
+void LLAgent::onAnimStop(const LLUUID& id)
+{
         // handle automatic state transitions (based on completion of animation playback)
-        if (anim_state == ANIM_AGENT_STANDUP)
+        if (id == ANIM_AGENT_STAND)
+        {
+                stopFidget();
+        }
+        else if (id == ANIM_AGENT_AWAY)
+        {
+                clearAFK();
+        }
+        else if (id == ANIM_AGENT_STANDUP)
         {
                 // send stand up command
                 setControlFlags(AGENT_CONTROL_FINISH_ANIM);
@@ -4689,7 +4696,7 @@ void LLAgent::requestStopMotion( LLMotion* motion )
                 if (mAvatarObject.notNull() && !mAvatarObject->mBelowWater && rand() % 3 == 0)
                         sendAnimationRequest( ANIM_AGENT_BRUSH, ANIM_REQUEST_START );
         }
-        else if (anim_state == ANIM_AGENT_PRE_JUMP || anim_state == ANIM_AGENT_LAND || anim_state == ANIM_AGENT_MEDIUM_LAND)
+        else if (id == ANIM_AGENT_PRE_JUMP || id == ANIM_AGENT_LAND || id == ANIM_AGENT_MEDIUM_LAND)
         {
                 setControlFlags(AGENT_CONTROL_FINISH_ANIM);
         }
@@ -5184,7 +5191,7 @@ void LLAgent::processAgentGroupDataUpdate(LLMessageSystem *msg, void **)
         LLGroupData group;
         S32 index = -1;
         bool need_floater_update = false;
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
         for(S32 i = 0; i < count; ++i)
         {
                 msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group.mID, i);
@@ -6593,7 +6600,7 @@ void LLAgent::makeNewOutfit(
                         S32 attachment_pt = attachments_to_include[i];
                         LLViewerJointAttachment* attachment = mAvatarObject->mAttachmentPoints.getIfThere( attachment_pt );
                         if(!attachment) continue;
-                        LLViewerObject* attached_object = attachment->getObject(0);
+                        LLViewerObject* attached_object = attachment->getObject();
                         if(!attached_object) continue;
                         const LLUUID& item_id = attachment->getItemID();
                         if(item_id.isNull()) continue;
@@ -7216,7 +7223,7 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
                  attachment;
                  attachment = avatarp->mAttachmentPoints.getNextData())
         {
-                LLViewerObject* objectp = attachment->getObject(0);
+                LLViewerObject* objectp = attachment->getObject();
                 if (objectp)
                 {
                         gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index b86ab69..faf94ab 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -350,6 +350,7 @@ public:
 
         // Animation functions
         void                    requestStopMotion( LLMotion* motion );
+        void                    onAnimStop(const LLUUID& id);
 
         void                    sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request);
         void                    sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request);
@@ -667,8 +668,8 @@ public:
         U8                              mAccess;        // SIM_ACCESS_MATURE or SIM_ACCESS_PG
         U64                             mGroupPowers;
         BOOL                    mHideGroupTitle;
-        char                    mGroupTitle[DB_GROUP_TITLE_BUF_SIZE];   // honorific, like "Sir"
-        char                    mGroupName[DB_GROUP_NAME_BUF_SIZE];
+        char                    mGroupTitle[DB_GROUP_TITLE_BUF_SIZE];   /*Flawfinder: ignore*/  // honorific, like "Sir"
+        char                    mGroupName[DB_GROUP_NAME_BUF_SIZE];     /*Flawfinder: ignore*/
         LLUUID                  mGroupID;
         //LLUUID                        mGroupInsigniaID;
         LLUUID                  mInventoryRootID;
diff --git a/linden/indra/newview/llagentpilot.cpp b/linden/indra/newview/llagentpilot.cpp
index 45c1770..45d29cc 100644
--- a/linden/indra/newview/llagentpilot.cpp
+++ b/linden/indra/newview/llagentpilot.cpp
@@ -55,13 +55,14 @@ LLAgentPilot::~LLAgentPilot()
 
 void LLAgentPilot::load(const char *filename)
 {
-        llifstream file;
+        if(!filename) return;
 
-        file.open(filename);
+        llifstream file(filename);
 
         if (!file)
         {
-                llinfos << "Couldn't open " << filename << ", aborting agentpilot load!" << llendl;
+                lldebugs << "Couldn't open " << filename
+                        << ", aborting agentpilot load!" << llendl;
                 return;
         }
         else
@@ -90,7 +91,7 @@ void LLAgentPilot::load(const char *filename)
 void LLAgentPilot::save(const char *filename)
 {
         llofstream file;
-        file.open(filename);
+        file.open(filename);                    /*Flawfinder: ignore*/
 
         if (!file)
         {
diff --git a/linden/indra/newview/llagparray.h b/linden/indra/newview/llagparray.h
deleted file mode 100644
index 2569d95..0000000
--- a/linden/indra/newview/llagparray.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/** 
- * @file llagparray.h
- * @brief LLAGPArray - arrays used for rendering w/ AGP memory (if on)
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLAGPARRAY_H
-#define LL_LLAGPARRAY_H
-
-#include <stdlib.h>
-#include "llagpmempool.h"
-
-class LLAGPMemBlock;
-
-template <class Type> class LLAGPArray
-{
-public:
-        enum
-        {
-                OKAY = 0,
-                FAIL = -1
-        };
-
-        inline LLAGPArray(const S32 size=0, const U32 target=0);
-        inline ~LLAGPArray();
-
-        inline void init();
-        inline void destroy();
-
-        inline void flushAGP();
-        inline void setDirty()                                                  { mDirty = TRUE; }
-        inline BOOL isDirty() const                                             { return mDirty; }
-
-        inline BOOL setUseAGP(const BOOL on = TRUE);    // Returns false if AGP memory is not available
-        inline BOOL isAGP() const                                               { return mAGPp ? TRUE : FALSE; }
-        LLAGPMemBlock *getAGPMemBlock() const                   { return mAGPp; }
-
-        inline BOOL realloc(U32 newsize);
-        inline S32  getMax() const                                              { return mMaxObj; }
-        inline S32  count() const;
-        inline S32  shrinkTo(S32 newcount);
-        inline void reset(S32 reserve_count);
-        
-        inline S32 find      (const Type &obj) const;
-        inline S32 fastRemove(const S32 i);
-        inline S32 safeRemove(const S32 r);
-        inline S32 remove    (const S32 i);
-        inline S32 removeObj (const Type &obj);
-        inline S32 removeLast()                                                 { return (mNumObj > 0 ? mNumObj-- : 0); }
-
-        inline Type* reserve_block(const U32 num);
-
-        inline S32         put(const Type &obj);
-        inline const Type& get(const S32 i) const;
-        inline Type&       get(const S32 i);
-
-        inline BOOL        sync     ();
-        inline BOOL        syncColor();
-
-        inline const Type* getMem  () const;
-        inline const S32   getIndex(const Type *objp) const { return objp - mMemp; }
-        inline const Type& operator[](const S32 i) const;
-        inline Type&       operator[](const S32 i);
-
-        void bindGLVertexPointer(const U32 stride, const U32 offset);
-        void bindGLTexCoordPointer(const U32 stride, const U32 offset);
-        void bindGLNormalPointer(const U32 stride, const U32 offset);
-        void bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset);
-        void bindGLColorPointer(const U32 stride, const U32 offset);
-        void bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset);
-        void bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset);
-
-        void copyToMem(const S32 offset, const U8 *source, const S32 size);
-
-        U8*  getScratchMemory();
-
-        U32  createFence()        { return (mAGPp ? mAGPp->createFence() : 0); }
-        void deleteFence(const U32 fence) { if (mAGPp) { mAGPp->deleteFence(fence); } }
-        void sendFence(U32 fence) { if (mAGPp) mAGPp->sendFence(fence); }
-        void waitFence(U32 fence) { if (mAGPp) mAGPp->waitFence(fence); }
-
-        S32                     getSysMemUsage() { return sizeof(Type)*mMaxObj; }
-
-protected:
-        BOOL            mDirty;
-        BOOL            mUseAGP;
-        U32                     mNumObj;
-        U32                     mMaxObj;
-        U8                      *mUnalignedMemp;
-        Type            *mMemp;
-        U32                     mTarget;        //for VBO implementations of this class, store the type of buffer this is
-
-        LLAGPMemBlock *mAGPp;
-
-public:
-        BOOL       mSynced; // for graph only -- not critical
-        
-public:
-        static S32 sNumRealloced;
-        static S32 sBytesRealloced;
-        static char* sTypeName;
-};
-
-template <class Type> S32 LLAGPArray<Type>::sNumRealloced = 0;
-template <class Type> S32 LLAGPArray<Type>::sBytesRealloced = 0;
-
-// constructor is in .inl file because it calls realloc()
-// which access gPipeline (yuck!)
-
-template <class Type>
-LLAGPArray<Type>::~LLAGPArray()
-{
-        destroy();
-}
-
-template <class Type> void
-LLAGPArray<Type>::destroy()
-{
-        realloc(0);
-        delete mAGPp;
-        mAGPp = NULL;
-}
-
-template <class Type>
-const Type *LLAGPArray<Type>::getMem() const
-{
-        return mMemp;
-}
-
-template <class Type>
-const Type& LLAGPArray<Type>::get(const S32 i) const
-{
-        llassert(i < (S32)mNumObj);
-        return mMemp[i];
-}
-
-template <class Type>
-Type& LLAGPArray<Type>::get(const S32 i)
-{
-        setDirty();
-        llassert(i < (S32)mNumObj);
-        return mMemp[i];
-}
-
-template <class Type>
-const Type& LLAGPArray<Type>::operator[](const S32 i) const
-{ 
-        return get(i); 
-}
-
-template <class Type>
-Type& LLAGPArray<Type>::operator[](const S32 i)
-{
-        return get(i); 
-}
-
-template <class Type>
-S32 LLAGPArray<Type>::fastRemove(const S32 i)
-{
-        if (i < 0 || mNumObj <= 0) return FAIL;
-        setDirty();
-        mMemp[i] = mMemp[--mNumObj];
-
-        return OKAY;
-}
-
-template <class Type>
-S32 LLAGPArray<Type>::remove(const S32 i)
-{
-        setDirty();
-        return fastRemove(i);
-}
-
-template <class Type>
-S32 LLAGPArray<Type>::removeObj(const Type& obj)
-{
-        setDirty();
-
-        S32 ind = find(obj);
-        if (ind >= 0)
-        {
-                return fastRemove(ind);
-        }
-        return FAIL;
-}
-
-template <class Type>
-S32     LLAGPArray<Type>::count() const
-{
-        return mNumObj;
-}
-
-
-#endif // LL_LLAGPARRAY_H
diff --git a/linden/indra/newview/llagparray.inl b/linden/indra/newview/llagparray.inl
deleted file mode 100644
index 418f7d9..0000000
--- a/linden/indra/newview/llagparray.inl
+++ /dev/null
@@ -1,519 +0,0 @@
-/** 
- * @file llagparray.inl
- * @brief LLAGPArray - arrays used for rendering w/ AGP memory (if on)
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llagpmempool.h"
-#include "llglheaders.h"
-#include "pipeline.h" // for gPipeline
-#include "v4math.h"
-
-template <class Type>
-void LLAGPArray<Type>::flushAGP()
-{
-        delete mAGPp;
-        mAGPp = NULL;
-
-        setDirty();
-}
-
-template <class Type>
-void LLAGPArray<Type>::reset(S32 reserve_count)    
-{
-        mNumObj = 0;
-        realloc(reserve_count);
-        setDirty();
-}
-
-template <class Type>
-S32 LLAGPArray<Type>::find(const Type &obj) const
-{
-        for ( S32 i = 0; i < (S32)mNumObj; i++ )
-        {
-                if (mMemp[i] == obj)
-                {
-                        return i;
-                }
-        }
-        return FAIL;
-}
-
-template <class Type>
-Type* LLAGPArray<Type>::reserve_block(const U32 num)
-{
-        if (!num) 
-        {
-                return NULL;
-        }
-
-        setDirty();
-
-        U32 new_count = mNumObj + num;
-        if (new_count >= mMaxObj)
-        {
-                if (!realloc(new_count))
-                {
-                        llwarns << "Unable to realloc " << num << " objects in LLAGPArray!" << llendl;
-                        return NULL;
-                }
-        }
-
-        if (mMemp)
-        {
-                Type *ret   = &mMemp[mNumObj];
-                mNumObj    += num;
-                return ret;
-        }
-
-        return NULL;
-}
-
-template <class Type>
-S32     LLAGPArray<Type>::put(const Type &obj) 
-{ 
-        if (mNumObj >= mMaxObj)
-        {
-                if (!mMaxObj)
-                {
-                        mMaxObj = 1;
-                }
-                if (!realloc(mMaxObj*2))
-                {
-                        llwarns << "Unable to put in AGPArray due to realloc!" << llendl;
-                        return FAIL;
-                }
-        }
-
-        mMemp[mNumObj] = obj;
-        mNumObj++;
-        setDirty();
-        return OKAY;
-}
-
-template <class Type>
-S32     LLAGPArray<Type>::shrinkTo(S32 newcount)
-{
-        mNumObj = newcount;
-        return mNumObj;
-}
-
-template <class Type>
-LLAGPArray<Type>::LLAGPArray(const S32 size, const U32 target) 
-{
-        if (!target)
-        {
-                mTarget = GL_ARRAY_BUFFER_ARB;
-        }
-        else
-        {
-                mTarget = target;
-        }
-
-        mSynced = FALSE;
-        mMaxObj = 0; 
-        mNumObj = 0; 
-        mMemp = NULL;
-        mUnalignedMemp = NULL;
-        mUseAGP = FALSE;
-        mAGPp = NULL;
-        mDirty = TRUE;
-
-        if (size)
-        {
-                if (!realloc(size))
-                {
-                        llerrs << "Unable to allocate AGP array of size: " << size << llendl;
-                }
-        }
-}
-
-template <class Type>
-BOOL LLAGPArray<Type>::realloc(U32 new_count)
-{
-        const U32 min_count = 1024;
-        U32 max_count = llmax(min_count, mMaxObj);
-        if (new_count == 0)
-        {
-                delete[] mUnalignedMemp;
-                mUnalignedMemp = NULL;
-                mMemp = NULL;
-
-                delete mAGPp;
-                mAGPp  = NULL;
-
-                mNumObj  = 0;
-                mMaxObj  = 0;
-
-                return TRUE;
-        }
-        if (new_count < min_count)
-        {
-                new_count = min_count;
-        }
-        else if (new_count < max_count>>1)
-        {
-                new_count = new_count + (new_count>>1);
-        }
-        else
-        {
-                while (max_count < new_count)
-                {
-                        max_count += max_count>>1;
-                }
-                new_count = max_count;
-        }
-        if (new_count != mMaxObj)
-        {
-                //Type *new_obj_array = new Type[new_count];
-                const size_t ALIGN_BYTES = 64;
-                U8* new_unaligned_obj_array = new U8[ sizeof(Type) * new_count + ALIGN_BYTES - 1];
-                if (!new_unaligned_obj_array)
-                {
-                        llerrs << "Out of system memory in LLAGPArray::realloc - tried to alloc " << new_count << llendl;
-                        return FALSE;
-                }
-
-                Type* new_obj_array;
-                // Use size_t to avoid warning -- size_t should be the same size as a pointer
-                // for 32 and 64 bit architectures. JC
-                size_t offset = (size_t)new_unaligned_obj_array;
-                S32 skip_bytes = (S32)(offset % ALIGN_BYTES);
-                if( skip_bytes )
-                {
-                        new_obj_array = (Type*) (new_unaligned_obj_array + ALIGN_BYTES - skip_bytes);
-                }
-                else
-                {
-                        new_obj_array = (Type*) new_unaligned_obj_array;
-                }
-
-                delete mAGPp;
-                mAGPp = NULL;
-
-                if (mUseAGP)
-                {
-                        mAGPp = gPipeline.allocAGPFromPool(new_count * sizeof(Type), mTarget);
-                        setDirty();
-                }
-
-                if (!mAGPp && mUseAGP)
-                {
-#ifdef DEBUG_AGP
-                        llwarns << "Failed AGP allocation in realloc!" << llendl;
-#endif
-                }
-
-                // Copying data from previous array to new array.
-                if (new_count < mNumObj)
-                {
-                        mNumObj = new_count;
-                }
-
-                if (mNumObj > 0  &&  mMemp)
-                {
-                        memcpy(new_obj_array, mMemp, mNumObj*sizeof(Type));
-                }
-                
-                delete[] mUnalignedMemp;
-                mUnalignedMemp = new_unaligned_obj_array;
-                mMemp = new_obj_array;
-
-                mMaxObj = new_count;
-        }
-
-        return TRUE;
-}
-
-template <class Type>
-void LLAGPArray<Type>::copyToMem(const S32 offset, const U8 *source, const S32 size)
-{
-        llassert(mMemp);
-        memcpy((mMemp + offset), source, size*sizeof(Type)); 
-}
-
-template <class Type>
-BOOL LLAGPArray<Type>::sync()
-{
-        if (mUseAGP && !mAGPp && !mDirty)
-        {
-                llwarns << "No AGP, yet not dirty!" << llendl;
-        }
-
-        if (mUseAGP && mDirty && mNumObj)
-        {
-                if (!mAGPp)
-                {
-                        mAGPp = gPipeline.allocAGPFromPool(mMaxObj * sizeof(Type), mTarget);
-                        if (!mAGPp)
-                        {
-#ifdef DEBUG_AGP
-                                llwarns << "Failure to allocate AGP in sync!" << llendl;
-#endif
-                                mUseAGP = FALSE;
-                        }
-                        else
-                        {
-                                mAGPp->copy(mMemp, mNumObj * sizeof(Type));
-                        }
-                }
-                else
-                {
-                        mAGPp->copy(mMemp, mNumObj * sizeof(Type));
-                }
-                mSynced = TRUE;
-        }
-        mDirty = FALSE;
-        return mSynced;
-}
-
-template <class Type>
-BOOL LLAGPArray<Type>::syncColor()
-{
-        if (mUseAGP && mDirty && mNumObj)
-        {
-                if (!mAGPp)
-                {
-                        mAGPp = gPipeline.allocAGPFromPool(mMaxObj * sizeof(Type), mTarget);
-                        if (!mAGPp)
-                        {
-#ifdef DEBUG_AGP
-                                llwarns << "Failure to allocate AGP in synccolor!" << llendl;
-#endif
-                                mUseAGP = FALSE;
-                        }
-                        else
-                        {
-                                mAGPp->copyColor(mMemp, mNumObj * sizeof(Type));
-                        }
-                }
-                else
-                {
-                        mAGPp->copyColor(mMemp, mNumObj * sizeof(Type));
-                }
-                mSynced = TRUE;
-        }
-        mDirty = FALSE;
-        return mSynced;
-}
-
-template <class Type>
-BOOL LLAGPArray<Type>::setUseAGP(const BOOL on)
-{
-        if (on == mUseAGP)
-        {
-                return TRUE;
-        }
-
-        mUseAGP = on;
-        if (!on)
-        {
-                delete mAGPp;
-                mAGPp = NULL;
-        }
-        else if (on)
-        {
-                mAGPp = gPipeline.allocAGPFromPool(mMaxObj * sizeof(Type), mTarget);
-                setDirty();
-                if (!mAGPp)
-                { 
-#ifdef DEBUG_AGP
-                        llwarns << "Failure to allocate AGP in setUseAGP! Block size = " << (mMaxObj * sizeof(Type)) << llendl;
-#endif
-                        mUseAGP = FALSE;
-                        return FALSE;
-                }
-        }
-        return TRUE;
-}
-
-extern U8* gAGPVertices;
-extern U8* gAGPNormals;
-
-template <class Type>
-U8* LLAGPArray<Type>::getScratchMemory()
-{
-        U8* memp = NULL;
-
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                 memp = mAGPp->getMappedMem();
-        }
-        if (!memp)
-        {
-                memp = ((U8*)mMemp);
-        }
-
-        return memp;
-}
-
-template <class Type>
-void LLAGPArray<Type>::bindGLVertexPointer(const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLVertexPointer(stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llerrs << "Binding non-AGP vertex pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty vertex array" << llendl;
-                }
-                llassert(mMemp);
-                glVertexPointer(3, GL_FLOAT, stride, ((U8 *)mMemp) + offset);
-        }
-}
-
-template <class Type>
-void LLAGPArray<Type>::bindGLTexCoordPointer(const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLTexCoordPointer(stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llwarns << "Binding non-AGP texture coords pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty tex coord array" << llendl;
-                }
-                glTexCoordPointer(2, GL_FLOAT, stride, ((U8 *)mMemp) + offset);
-        }
-}
-
-template <class Type>
-void LLAGPArray<Type>::bindGLNormalPointer(const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLNormalPointer(stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llwarns << "Binding non-AGP normals pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty normal array" << llendl;
-                }
-                glNormalPointer(GL_FLOAT, stride, ((U8 *)mMemp) + offset);
-        }
-}
-
-template <class Type>
-void LLAGPArray<Type>::bindGLBinormalPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLBinormalPointer(index, stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llwarns << "Binding non-AGP binormal pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty binormal array" << llendl;
-                }
-                set_binormals(index, stride, (LLVector3 *)(((U8 *)mMemp) + offset));
-        }
-}
-
-
-template <class Type>
-void LLAGPArray<Type>::bindGLColorPointer(const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLColorPointer(stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llwarns << "Binding non-AGP color pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty color array" << llendl;
-                }
-                glColorPointer(4, GL_UNSIGNED_BYTE, stride, ((U8 *)mMemp) + offset);
-        }
-}
-
-template <class Type>
-void LLAGPArray<Type>::bindGLVertexWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLVertexWeightPointer(index, stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llwarns << "Binding non-AGP vertex weight pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty vertex weight array" << llendl;
-                }
-                set_vertex_weights(index, (F32 *)(((U8 *)mMemp) + offset));
-        }
-}
-
-template <class Type>
-void LLAGPArray<Type>::bindGLVertexClothingWeightPointer(const S32 index, const U32 stride, const U32 offset)
-{
-        if (mAGPp && gPipeline.isAGPBound())
-        {
-                mAGPp->bindGLVertexClothingWeightPointer(index, stride, offset);
-        }
-        else
-        {
-                if (gPipeline.isAGPBound())
-                {
-                        llwarns << "Binding non-AGP vertex weight pointer when AGP enabled" << llendl;
-                }
-                if (!mMemp)
-                {
-                        llerrs << "Binding empty vertex weight array" << llendl;
-                }
-                set_vertex_clothing_weights(index, stride, (LLVector4 *)(((U8 *)mMemp) + offset));
-        }
-}
-
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 1c094bb..7c615dd 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -1,29 +1,6 @@
-/** 
- * @file llmapresponders.h
- * @brief Processes responses received for asset upload requests.
- *
- * Copyright (c) 2006-2007, Linden Research, Inc.
- * 
- * 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.
- */
+// llassetuploadresponders.cpp
+// Copyright 2006, Linden Research, Inc.
+// Processes responses received for asset upload requests.
 
 #include "llviewerprecompiledheaders.h"
 
@@ -38,39 +15,71 @@
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
 #include "llpermissionsflags.h"
+#include "llpreviewnotecard.h"
+#include "llpreviewscript.h"
+#include "llscrolllistctrl.h"
 #include "lluploaddialog.h"
-#include "llviewermenu.h"       // for upload_new_resource()
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "llviewermenu.h"
 #include "llviewerwindow.h"
 #include "viewer.h"
 
-LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLUUID& uuid,
-                                                                                                                   const LLSD &post_data)
-        : LLHTTPClient::Responder()
+void dialog_refresh_all();
+
+LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
+                                                                                           const LLUUID& vfile_id,
+                                                                                           LLAssetType::EType asset_type)
+        : LLHTTPClient::Responder(),
+          mPostData(post_data),
+          mVFileID(vfile_id),
+          mAssetType(asset_type)
+{
+        if (!gVFS->getExists(vfile_id, asset_type))
+        {
+                llwarns << "LLAssetUploadResponder called with nonexistant vfile_id" << llendl;
+                mVFileID.setNull();
+                mAssetType = LLAssetType::AT_NONE;
+                return;
+        }
+}
+
+LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
+                                                                                           const std::string& file_name)
+        : LLHTTPClient::Responder(),
+          mPostData(post_data),
+          mFileName(file_name)
+{
+}
+
+LLAssetUploadResponder::~LLAssetUploadResponder()
 {
-        mUUID = uuid;
-        mPostData = post_data;
+        if (!mFileName.empty())
+        {
+                // Delete temp file
+                LLFile::remove(mFileName.c_str());
+        }
 }
 
 // virtual
-void LLNewAgentInventoryResponder::error(U32 statusNum, const std::string& reason)
+void LLAssetUploadResponder::error(U32 statusNum, const std::string& reason)
 {
-        llinfos << "LLNewAgentInventoryResponder::error " << statusNum << llendl;
+        llinfos << "LLAssetUploadResponder::error " << statusNum 
+                        << " reason: " << reason << llendl;
         LLStringBase<char>::format_map_t args;
         switch(statusNum)
         {
                 case 400:
-                        args["[FILE]"] = mPostData["inventory_type"].asString();
-                        args["[REASON]"] = "invalid parameters in upload request";
+                        args["[FILE]"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
+                        args["[REASON]"] = "Error in upload request.  Please contact "
+                                "support@lindenlab.com for help fixing this problem.";
                         gViewerWindow->alertXml("CannotUploadReason", args);
                         break;
-                case 402:
-                        //(result["message"].asString() == "insufficient funds")
-                        LLFloaterBuyCurrency::buyCurrency("Uploading costs", gGlobalEconomy->getPriceUpload());
-                        break;
                 case 500:
                 default:
-                        args["[FILE]"] = mPostData["inventory_type"].asString();
-                        args["[REASON]"] = "the server is experiencing unexpected difficulties";
+                        args["[FILE]"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
+                        args["[REASON]"] = "The server is experiencing unexpected "
+                                "difficulties. Please try again later.";
                         gViewerWindow->alertXml("CannotUploadReason", args);
                         break;
         }
@@ -78,139 +87,373 @@ void LLNewAgentInventoryResponder::error(U32 statusNum, const std::string& reaso
 }
 
 //virtual 
-void LLNewAgentInventoryResponder::result(const LLSD& result)
+void LLAssetUploadResponder::result(const LLSD& content)
 {
-        lldebugs << "LLNewAgentInventoryResponder::result from capabilities" << llendl;
+        lldebugs << "LLAssetUploadResponder::result from capabilities" << llendl;
 
-        if (!result["success"])
+        std::string state = content["state"];
+        if (state == "upload")
+        {
+                uploadUpload(content);
+        }
+        else if (state == "complete")
+        {
+                // rename file in VFS with new asset id
+                if (mFileName.empty())
+                {
+                        // rename the file in the VFS to the actual asset id
+                        gVFS->renameFile(mVFileID, mAssetType, content["new_asset"].asUUID(), mAssetType);
+                }
+                uploadComplete(content);
+        }
+        else
+        {
+                uploadFailure(content);
+        }
+}
+
+void LLAssetUploadResponder::uploadUpload(const LLSD& content)
+{
+        std::string uploader = content["uploader"];
+        if (mFileName.empty())
+        {
+                LLHTTPClient::postFile(uploader, mVFileID, mAssetType, this);
+        }
+        else
+        {
+                LLHTTPClient::postFile(uploader, mFileName, this);
+        }

+}
+
+void LLAssetUploadResponder::uploadFailure(const LLSD& content)
+{
+        std::string reason = content["state"];
+        // deal with money errors
+        if (reason == "insufficient funds")
+        {
+                LLFloaterBuyCurrency::buyCurrency("Uploading costs", gGlobalEconomy->getPriceUpload());
+        }
+        else
         {
                 LLStringBase<char>::format_map_t args;
-                args["[FILE]"] = mPostData["inventory_type"].asString();
-                args["[REASON]"] = "the server is experiencing unexpected difficulties";
+                args["[FILE]"] = (mFileName.empty() ? mVFileID.asString() : mFileName);
+                args["[REASON]"] = content["message"].asString();
                 gViewerWindow->alertXml("CannotUploadReason", args);
-                return;
         }
+}
+
+void LLAssetUploadResponder::uploadComplete(const LLSD& content)
+{
+}
+
+LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data,
+                                                                                                                   const LLUUID& vfile_id,
+                                                                                                                   LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, vfile_id, asset_type)
+{
+}
+
+LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name)
+: LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+//virtual 
+void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
+{
+        lldebugs << "LLNewAgentInventoryResponder::result from capabilities" << llendl;
 
-        std::string uploader = result["uploader"];
         LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString().c_str());
         LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString().c_str());
-        // request succeeded
-        if (!uploader.empty())
+
+        // Update money and ownership credit information
+        // since it probably changed on the server
+        if (asset_type == LLAssetType::AT_TEXTURE ||
+                asset_type == LLAssetType::AT_SOUND ||
+                asset_type == LLAssetType::AT_ANIMATION)
         {
-                LLHTTPClient::postFile(uploader, mUUID, asset_type, this);
+                gMessageSystem->newMessageFast(_PREHASH_MoneyBalanceRequest);
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                gMessageSystem->nextBlockFast(_PREHASH_MoneyData);
+                gMessageSystem->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
+                gAgent.sendReliableMessage();
+
+                LLString::format_map_t args;
+                args["[AMOUNT]"] = llformat("%d",gGlobalEconomy->getPriceUpload());
+                LLNotifyBox::showXml("UploadPayment", args);
         }
-        // upload succeeded
-        else
-        {
-                // rename the file in the VFS to the actual asset id
-                gVFS->renameFile(mUUID, asset_type, result["new_asset"].asUUID(), asset_type);
 
-                // TODO: only request for textures, sound, and animation uploads
-                // Update money and ownership credit information
-                // since it probably changed on the server
-                if (mPostData["asset_type"].asString() == "texture" || 
-                        mPostData["asset_type"].asString() == "sound" ||
-                        mPostData["asset_type"].asString() == "animatn")
+        // Actually add the upload to viewer inventory
+        llinfos << "Adding " << content["new_inventory_item"].asUUID() << " "
+                        << content["new_asset"].asUUID() << " to inventory." << llendl;
+        if(mPostData["folder_id"].asUUID().notNull())
+        {
+                LLPermissions perm;
+                U32 next_owner_perm;
+                perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+                if (mPostData["inventory_type"].asString() == "snapshot")
                 {
-                        gMessageSystem->newMessageFast(_PREHASH_MoneyBalanceRequest);
-                        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-                        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                        gMessageSystem->nextBlockFast(_PREHASH_MoneyData);
-                        gMessageSystem->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
-                        gAgent.sendReliableMessage();
-
-                        LLString::format_map_t args;
-                        args["[AMOUNT]"] = llformat("%d",gGlobalEconomy->getPriceUpload());
-                        LLNotifyBox::showXml("UploadPayment", args);
+                        next_owner_perm = PERM_ALL;
                 }
-                // Actually add the upload to viewer inventory
-                llinfos << "Adding " << result["new_inventory_item"].asUUID() << " "
-                                << result["new_asset"].asUUID() << " to inventory." << llendl;
-                if(mPostData["folder_id"].asUUID().notNull())
+                else
                 {
-                        LLPermissions perm;
-                        U32 next_owner_perm;
-                        perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
-                        if (mPostData["inventory_type"].asString() == "snapshot")
+                        next_owner_perm = PERM_MOVE | PERM_TRANSFER;
+                }
+                perm.initMasks(PERM_ALL, PERM_ALL, PERM_NONE, PERM_NONE, next_owner_perm);
+                S32 creation_date_now = time_corrected();
+                LLPointer<LLViewerInventoryItem> item
+                        = new LLViewerInventoryItem(content["new_inventory_item"].asUUID(),
+                                                                                mPostData["folder_id"].asUUID(),
+                                                                                perm,
+                                                                                content["new_asset"].asUUID(),
+                                                                                asset_type,
+                                                                                inventory_type,
+                                                                                mPostData["name"].asString(),
+                                                                                mPostData["description"].asString(),
+                                                                                LLSaleInfo::DEFAULT,
+                                                                                LLInventoryItem::II_FLAGS_NONE,
+                                                                                creation_date_now);
+                gInventory.updateItem(item);
+                gInventory.notifyObservers();
+
+                // Show the preview panel for textures and sounds to let
+                // user know that the image (or snapshot) arrived intact.
+                LLInventoryView* view = LLInventoryView::getActiveInventory();
+                if(view)
+                {
+                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                        LLFocusMgr::FocusLostCallback callback = gFocusMgr.getFocusCallback();
+
+                        view->getPanel()->setSelection(content["new_inventory_item"].asUUID(), TAKE_FOCUS_NO);
+                        if((LLAssetType::AT_TEXTURE == asset_type)
+                                || (LLAssetType::AT_SOUND == asset_type))
                         {
-                                next_owner_perm = PERM_ALL;
+                                view->getPanel()->openSelected();
                         }
-                        else
+                        //LLInventoryView::dumpSelectionInformation((void*)view);
+                        // restore keyboard focus
+                        gFocusMgr.setKeyboardFocus(focus_ctrl, callback);
+                }
+        }
+        else
+        {
+                llwarns << "Can't find a folder to put it in" << llendl;
+        }
+
+        // remove the "Uploading..." message
+        LLUploadDialog::modalUploadFinished();
+        
+        // *FIX: This is a pretty big hack. What this does is check the
+        // file picker if there are any more pending uploads. If so,
+        // upload that file.
+        const char* next_file = LLFilePicker::instance().getNextFile();
+        if(next_file)
+        {
+                const char* name = LLFilePicker::instance().getDirname();
+
+                LLString asset_name = name;
+                LLString::replaceNonstandardASCII( asset_name, '?' );
+                LLString::replaceChar(asset_name, '|', '?');
+                LLString::stripNonprintable(asset_name);
+                LLString::trim(asset_name);
+
+                char* asset_name_str = (char*)asset_name.c_str();
+                char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
+                if( !end_p )
+                {
+                         end_p = asset_name_str + strlen( asset_name_str );                     /*Flawfinder: ignore*/
+                }
+                        
+                S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
+
+                asset_name = asset_name.substr( 0, len );
+
+                upload_new_resource(next_file, asset_name, asset_name,
+                                                        0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
+        }
+}
+
+
+LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& post_data,
+                                                                                                                                 const LLUUID& vfile_id,
+                                                                                                                                 LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, vfile_id, asset_type)
+{
+}
+
+LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& post_data,
+                                                                                                                                 const std::string& file_name)
+: LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+//virtual 
+void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
+{
+        llinfos << "LLUpdateAgentInventoryResponder::result from capabilities" << llendl;
+        LLUUID item_id = mPostData["item_id"];
+
+        LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem(item_id);
+        if(!item)
+        {
+                llwarns << "Inventory item for " << mVFileID
+                        << " is no longer in agent inventory." << llendl;
+                return;
+        }
+
+        // Update viewer inventory item
+        LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
+        new_item->setAssetUUID(content["new_asset"].asUUID());
+        gInventory.updateItem(new_item);
+        gInventory.notifyObservers();
+
+        llinfos << "Inventory item " << item->getName() << " saved into "
+                << content["new_asset"].asString() << llendl;
+
+        LLInventoryType::EType inventory_type = new_item->getInventoryType();
+        switch(inventory_type)
+        {
+                case LLInventoryType::IT_NOTECARD:
                         {
-                                next_owner_perm = PERM_MOVE | PERM_TRANSFER;
+
+                                // Update the UI with the new asset.
+                                LLPreviewNotecard* nc;
+                                nc = (LLPreviewNotecard*)LLPreview::find(new_item->getUUID());
+                                if(nc)
+                                {
+                                        // *HACK: we have to delete the asset in the VFS so
+                                        // that the viewer will redownload it. This is only
+                                        // really necessary if the asset had to be modified by
+                                        // the uploader, so this can be optimized away in some
+                                        // cases. A better design is to have a new uuid if the
+                                        // script actually changed the asset.
+                                        if(nc->hasEmbeddedInventory())
+                                        {
+                                                gVFS->removeFile(
+                                                        content["new_asset"].asUUID(),
+                                                        LLAssetType::AT_NOTECARD);
+                                        }
+                                        nc->refreshFromInventory();
+                                }
                         }
-                        perm.initMasks(PERM_ALL, PERM_ALL, PERM_NONE, PERM_NONE, next_owner_perm);
-                        S32 creation_date_now = time_corrected();
-                        LLPointer<LLViewerInventoryItem> item
-                                = new LLViewerInventoryItem(result["new_inventory_item"].asUUID(),
-                                                                                        mPostData["folder_id"].asUUID(),
-                                                                                        perm,
-                                                                                        result["new_asset"].asUUID(),
-                                                                                        asset_type,
-                                                                                        inventory_type,
-                                                                                        mPostData["name"].asString(),
-                                                                                        mPostData["description"].asString(),
-                                                                                        LLSaleInfo::DEFAULT,
-                                                                                        LLInventoryItem::II_FLAGS_NONE,
-                                                                                        creation_date_now);
-                        gInventory.updateItem(item);
-                        gInventory.notifyObservers();
-
-                        // Show the preview panel for textures and sounds to let
-                        // user know that the image (or snapshot) arrived intact.
-                        LLInventoryView* view = LLInventoryView::getActiveInventory();
-                        if(view)
+                        break;
+                case LLInventoryType::IT_LSL:
                         {
-                                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
-                                LLFocusMgr::FocusLostCallback callback = gFocusMgr.getFocusCallback();
-
-                                view->getPanel()->setSelection(result["new_inventory_item"].asUUID(), TAKE_FOCUS_NO);
-                                if((LLAssetType::AT_TEXTURE == asset_type)
-                                        || (LLAssetType::AT_SOUND == asset_type))
+                                // Find our window and close it if requested.
+                                LLPreviewLSL* preview = (LLPreviewLSL*)LLPreview::find(item_id);
+                                if (preview)
                                 {
-                                        view->getPanel()->openSelected();
+                                        // Bytecode save completed
+                                        if (content["compiled"])
+                                        {
+                                                preview->callbackLSLCompileSucceeded();
+                                        }
+                                        else
+                                        {
+                                                preview->callbackLSLCompileFailed(content["errors"]);
+                                        }
                                 }
-                                //LLInventoryView::dumpSelectionInformation((void*)view);
-                                // restore keyboard focus
-                                gFocusMgr.setKeyboardFocus(focus_ctrl, callback);
                         }
-                }
-                else
-                {
-                        llwarns << "Can't find a folder to put it in" << llendl;
-                }
+                        break;
+                case LLInventoryType::IT_WEARABLE:
+                default:
+                        break;
+        }
+}
 
-                // remove the "Uploading..." message
-                LLUploadDialog::modalUploadFinished();
-                
-                // *NOTE: This is a pretty big hack. What this does is check
-                // the file picker if there are any more pending uploads. If
-                // so, upload that file.
-                const char* next_file = LLFilePicker::instance().getNextFile();
-                if(next_file)
-                {
-                        const char* name = LLFilePicker::instance().getDirname();
 
-                        LLString asset_name = name;
-                        LLString::replaceNonstandardASCII( asset_name, '?' );
-                        LLString::replaceChar(asset_name, '|', '?');
-                        LLString::stripNonprintable(asset_name);
-                        LLString::trim(asset_name);
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                                                                                 const LLUUID& vfile_id,
+                                                                                                                                 LLAssetType::EType asset_type)
+: LLAssetUploadResponder(post_data, vfile_id, asset_type)
+{
+}
 
-                        char* asset_name_str = (char*)asset_name.c_str();
-                        char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
-                        if( !end_p )
+LLUpdateTaskInventoryResponder::LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                                                                           const std::string& file_name)
+: LLAssetUploadResponder(post_data, file_name)
+{
+}
+
+//virtual 
+void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
+{
+        llinfos << "LLUpdateTaskInventoryResponder::result from capabilities" << llendl;
+        LLUUID item_id = mPostData["item_id"];
+        LLUUID task_id = mPostData["task_id"];
+
+        LLViewerObject* object = gObjectList.findObject(task_id);
+        if (!object)
+        {
+                llwarns << "LLUpdateTaskInventoryResponder::uploadComplete task " << task_id
+                        << " no longer exist." << llendl;
+                return;
+        }
+        LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(item_id);
+        if (!item)
+        {
+                llwarns << "LLUpdateTaskInventoryResponder::uploadComplete item "
+                        << item_id << " is no longer in task " << task_id
+                        << "'s inventory." << llendl;
+                return;
+        }
+        LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
+        // Update Viewer inventory
+        object->updateViewerInventoryAsset(new_item, content["new_asset"]);
+        dialog_refresh_all();
+        
+        LLInventoryType::EType inventory_type = new_item->getInventoryType();
+        switch(inventory_type)
+        {
+                case LLInventoryType::IT_NOTECARD:
                         {
-                                end_p = asset_name_str + strlen( asset_name_str );
-                        }
-                                
-                        S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
 
-                        asset_name = asset_name.substr( 0, len );
+                                // Update the UI with the new asset.
+                                LLPreviewNotecard* nc;
+                                nc = (LLPreviewNotecard*)LLPreview::find(new_item->getUUID());
+                                if(nc)
+                                {
+                                        // *HACK: we have to delete the asset in the VFS so
+                                        // that the viewer will redownload it. This is only
+                                        // really necessary if the asset had to be modified by
+                                        // the uploader, so this can be optimized away in some
+                                        // cases. A better design is to have a new uuid if the
+                                        // script actually changed the asset.
+                                        if(nc->hasEmbeddedInventory())
+                                        {
+                                                gVFS->removeFile(
+                                                        content["new_asset"].asUUID(),
+                                                        LLAssetType::AT_NOTECARD);
+                                        }
 
-                        upload_new_resource(next_file, asset_name, asset_name,
-                                                                0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
-                }
+                                        nc->refreshFromInventory();
+                                }
+                        }
+                        break;
+                case LLInventoryType::IT_LSL:
+                        {
+                                LLLiveLSLEditor* preview = LLLiveLSLEditor::find(item_id, task_id);
+                                if (preview)
+                                {
+                                        // Bytecode save completed
+                                        if (content["compiled"])
+                                        {
+                                                preview->callbackLSLCompileSucceeded(
+                                                        task_id,
+                                                        item_id,
+                                                        mPostData["is_script_running"]);
+                                        }
+                                        else
+                                        {
+                                                preview->callbackLSLCompileFailed(content["errors"]);
+                                        }
+                                }
+                        }
+                        break;
+                case LLInventoryType::IT_WEARABLE:
+                default:
+                        break;
         }
 }
diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h
index 13d535e..ef8cd38 100644
--- a/linden/indra/newview/llassetuploadresponders.h
+++ b/linden/indra/newview/llassetuploadresponders.h
@@ -1,45 +1,65 @@
-/** 
- * @file llmapresponders.h
- * @brief Processes responses received for asset upload requests.
- *
- * Copyright (c) 2006-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLNEWAGENTINVENTORYRESPONDER_H
-#define LL_LLNEWAGENTINVENTORYRESPONDER_H
+// llassetuploadresponders.h
+// Copyright 2006, Linden Research, Inc.
+// Processes responses received for asset upload requests.
+
+#ifndef LL_LLASSETUPLOADRESPONDER_H
+#define LL_LLASSETUPLOADRESPONDER_H
 
 #include "llhttpclient.h"
 
-class LLNewAgentInventoryResponder : public LLHTTPClient::Responder
+// Abstract class for supporting asset upload
+// via capabilities
+class LLAssetUploadResponder : public LLHTTPClient::Responder
 {
 public:
-        LLNewAgentInventoryResponder(const LLUUID& uuid, const LLSD& post_data);
-    void error(U32 statusNum, const std::string& reason);
+        LLAssetUploadResponder(const LLSD& post_data,
+                                                        const LLUUID& vfile_id,
+                                                        LLAssetType::EType asset_type);
+        LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name);
+        ~LLAssetUploadResponder();
+    virtual void error(U32 statusNum, const std::string& reason);
         virtual void result(const LLSD& content);
+        virtual void uploadUpload(const LLSD& content);
+        virtual void uploadComplete(const LLSD& content);
+        virtual void uploadFailure(const LLSD& content);
 
-private:
-        LLUUID mUUID;
+protected:
         LLSD mPostData;
+        LLUUID mVFileID;
+        LLAssetType::EType mAssetType;
+        std::string mFileName;
+};
+
+class LLNewAgentInventoryResponder : public LLAssetUploadResponder
+{
+public:
+        LLNewAgentInventoryResponder(const LLSD& post_data,
+                                                                const LLUUID& vfile_id,
+                                                                LLAssetType::EType asset_type);
+        LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name);
+        virtual void uploadComplete(const LLSD& content);
+};
+
+class LLUpdateAgentInventoryResponder : public LLAssetUploadResponder
+{
+public:
+        LLUpdateAgentInventoryResponder(const LLSD& post_data,
+                                                                const LLUUID& vfile_id,
+                                                                LLAssetType::EType asset_type);
+        LLUpdateAgentInventoryResponder(const LLSD& post_data,
+                                                                const std::string& file_name);
+        virtual void uploadComplete(const LLSD& content);
+};
+
+class LLUpdateTaskInventoryResponder : public LLAssetUploadResponder
+{
+public:
+        LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                const LLUUID& vfile_id,
+                                                                LLAssetType::EType asset_type);
+        LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                const std::string& file_name);
+        virtual void uploadComplete(const LLSD& content);
 };
 
-#endif // LL_LLNEWAGENTINVENTORYRESPONDER_H
+#endif // LL_LLASSETUPLOADRESPONDER_H
diff --git a/linden/indra/newview/llasynchostbyname.h b/linden/indra/newview/llasynchostbyname.h
index 39f1b82..351fc2a 100644
--- a/linden/indra/newview/llasynchostbyname.h
+++ b/linden/indra/newview/llasynchostbyname.h
@@ -52,7 +52,7 @@ public:
         static void     handleMessageCallback(const MSG& msg);
 private:
         HANDLE  mRequestHandle;
-        char    mOutputBuffer[ MAXGETHOSTSTRUCT ];
+        char    mOutputBuffer[ MAXGETHOSTSTRUCT ];                      /*Flawfinder: ignore*/
 
         LLAsyncHostByNameCallback mCallback;
         void*   mUserdata;
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 83a5fac..d1fdda6 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -262,8 +262,8 @@ S32 LLAvatarTracker::addBuddyList(const LLAvatarTracker::buddy_map_t& buds)
         using namespace std;
 
         U32 new_buddy_count = 0;        
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
         LLUUID agent_id;
         for(buddy_map_t::const_iterator itr = buds.begin(); itr != buds.end(); ++itr)
         {
@@ -560,8 +560,8 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
                         {
                                 if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^  new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
                                 {
-                                        char first[DB_FIRST_NAME_BUF_SIZE];
-                                        char last[DB_LAST_NAME_BUF_SIZE];
+                                        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+                                        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
                                         LLStringBase<char>::format_map_t args;
                                         if(gCacheName->getName(agent_id, first, last))
                                         {
@@ -617,8 +617,8 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                                 setBuddyOnline(agent_id,online);
                                 if(chat_notify)
                                 {
-                                        char first[DB_FIRST_NAME_BUF_SIZE];
-                                        char last[DB_LAST_NAME_BUF_SIZE];
+                                        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+                                        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
                                         if(gCacheName->getName(agent_id, first, last))
                                         {
                                                 notify = TRUE;
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index 75d06ee..1b2a643 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -208,8 +208,8 @@ public:
         virtual bool operator()(const LLUUID& buddy_id, LLRelationship* buddy);
         typedef std::map<std::string, LLUUID, LLDictionaryLess> buddy_map_t;
         buddy_map_t mMappable;
-        char mFirst[DB_FIRST_NAME_BUF_SIZE];
-        char mLast[DB_LAST_NAME_BUF_SIZE];
+        char mFirst[DB_FIRST_NAME_BUF_SIZE];    /* Flawfinder: ignore */
+        char mLast[DB_LAST_NAME_BUF_SIZE];      /* Flawfinder: ignore */
 };
 
 // collect dictionary sorted map of name -> agent_id for every online buddy
@@ -221,8 +221,8 @@ public:
         virtual bool operator()(const LLUUID& buddy_id, LLRelationship* buddy);
         typedef std::map<std::string, LLUUID, LLDictionaryLess> buddy_map_t;
         buddy_map_t mOnline;
-        char mFirst[DB_FIRST_NAME_BUF_SIZE];
-        char mLast[DB_LAST_NAME_BUF_SIZE];
+        char mFirst[DB_FIRST_NAME_BUF_SIZE];            /*Flawfinder: ignore*/
+        char mLast[DB_LAST_NAME_BUF_SIZE];              /*Flawfinder: ignore*/  
 };
 
 // collect dictionary sorted map of name -> agent_id for every buddy,
@@ -236,8 +236,8 @@ public:
         typedef std::map<std::string, LLUUID, LLDictionaryLess> buddy_map_t;
         buddy_map_t mOnline;
         buddy_map_t mOffline;
-        char mFirst[DB_FIRST_NAME_BUF_SIZE];
-        char mLast[DB_LAST_NAME_BUF_SIZE];
+        char mFirst[DB_FIRST_NAME_BUF_SIZE];    /*Flawfinder: ignore*/  
+        char mLast[DB_LAST_NAME_BUF_SIZE];              /*Flawfinder: ignore*/
 };
 
 #endif // LL_LLCALLINGCARD_H
diff --git a/linden/indra/newview/llcameraview.cpp b/linden/indra/newview/llcameraview.cpp
index c510823..6c63359 100644
--- a/linden/indra/newview/llcameraview.cpp
+++ b/linden/indra/newview/llcameraview.cpp
@@ -124,17 +124,11 @@ void LLFloaterCamera::onClose(bool app_quitting)
 // static
 void LLFloaterCamera::show(void*)
 {
-        if (gFloaterCamera)
-        {
-                gFloaterCamera->open();
-        }
-        else
+        if(!gFloaterCamera)
         {
                 gFloaterCamera = new LLFloaterCamera("camera floater");
-
-                gFloaterCamera->open();
         }
-        
+        gFloaterCamera->open(); /* Flawfinder: ignore */
         gSavedSettings.setBOOL("ShowCameraControls", TRUE);
 }
 
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index e62e0cb..394399e 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -599,8 +599,6 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
                 //      << " outlen " << out_str.getLength()
                 //      << llendl;
         }
-        // make sure we don't do UI-only render as it is apparent avatar isn't animating
-        gViewerWindow->finishFastFrame();
 }
 
 // static
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index ca05562..b14f6d5 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -116,16 +116,14 @@ void LLCloudGroup::updatePuffs(const F32 dt)
                 mVOCloudsp->setPositionRegion(mCenterRegion);
                 mVOCloudsp->setScale(LLVector3(256.f/CLOUD_GROUPS_PER_EDGE + CLOUD_PUFF_WIDTH,
                                                                                  256.f/CLOUD_GROUPS_PER_EDGE + CLOUD_PUFF_WIDTH,
-                                                                                 CLOUD_HEIGHT_RANGE + CLOUD_PUFF_HEIGHT));
+                                                                                 CLOUD_HEIGHT_RANGE + CLOUD_PUFF_HEIGHT)*0.5f);
                 gPipeline.addObject(mVOCloudsp);
         }
 
-        S32 i;
-
         LLVector3 velocity;
         LLVector3d vel_d;
         // Update the positions of all of the clouds
-        for (i = 0; i < mCloudPuffs.count(); i++)
+        for (U32 i = 0; i < mCloudPuffs.size(); i++)
         {
                 LLCloudPuff &puff = mCloudPuffs[i];
                 velocity = mCloudLayerp->getRegion()->mWind.getCloudVelocity(mCloudLayerp->getRegion()->getPosRegionFromGlobal(puff.mPositionGlobal));
@@ -140,8 +138,8 @@ void LLCloudGroup::updatePuffs(const F32 dt)
 
 void LLCloudGroup::updatePuffOwnership()
 {
-        S32 i = 0;
-        while (i < mCloudPuffs.count())
+        U32 i = 0;
+        while (i < mCloudPuffs.size())
         {
                 if (mCloudPuffs[i].getLifeState() == LL_PUFF_DYING)
                 {
@@ -165,10 +163,11 @@ void LLCloudGroup::updatePuffOwnership()
                         continue;
                 }
                 //llinfos << "Puff handed off!" << llendl;
-                LLCloudPuff *puffp = new_cgp->mCloudPuffs.reserve_block(1);
-                puffp->mPositionGlobal = mCloudPuffs[i].mPositionGlobal;
-                puffp->mAlpha = mCloudPuffs[i].mAlpha;
-                mCloudPuffs.remove(i);
+                LLCloudPuff puff;
+                puff.mPositionGlobal = mCloudPuffs[i].mPositionGlobal;
+                puff.mAlpha = mCloudPuffs[i].mAlpha;
+                mCloudPuffs.erase(mCloudPuffs.begin() + i);
+                new_cgp->mCloudPuffs.push_back(puff);
         }
 
         //llinfos << "Puff count: " << LLCloudPuff::sPuffCount << llendl;
@@ -184,7 +183,7 @@ void LLCloudGroup::updatePuffCount()
         S32 target_puff_count = llround(CLOUD_DENSITY * mDensity);
         target_puff_count = llmax(0, target_puff_count);
         target_puff_count = llmin(CLOUD_COUNT_MAX, target_puff_count);
-        S32 current_puff_count = mCloudPuffs.count();
+        S32 current_puff_count = (S32) mCloudPuffs.size();
         // Create a new cloud if we need one
         if (current_puff_count < target_puff_count)
         {
@@ -205,7 +204,7 @@ void LLCloudGroup::updatePuffCount()
 
         // Count the number of live puffs
         S32 live_puff_count = 0;
-        for (i = 0; i < mCloudPuffs.count(); i++)
+        for (i = 0; i < (S32) mCloudPuffs.size(); i++)
         {
                 if (mCloudPuffs[i].getLifeState() != LL_PUFF_DYING)
                 {
@@ -231,12 +230,12 @@ void LLCloudGroup::updatePuffCount()
 
         // Remove fully dead puffs
         i = 0;
-        while (i < mCloudPuffs.count())
+        while (i < (S32) mCloudPuffs.size())
         {
                 if (mCloudPuffs[i].isDead())
                 {
                         //llinfos << "Removing dead puff!" << llendl;
-                        mCloudPuffs.remove(i);
+                        mCloudPuffs.erase(mCloudPuffs.begin() + i);
                         LLCloudPuff::sPuffCount--;
                 }
                 else
diff --git a/linden/indra/newview/llcloud.h b/linden/indra/newview/llcloud.h
index 8567792..0b670ee 100644
--- a/linden/indra/newview/llcloud.h
+++ b/linden/indra/newview/llcloud.h
@@ -129,7 +129,7 @@ public:
         BOOL inGroup(const LLCloudPuff &puff) const;
 
         F32 getDensity() const                                                  { return mDensity; }
-        S32 getNumPuffs() const                                                 { return mCloudPuffs.count(); }
+        S32 getNumPuffs() const                                                 { return (S32) mCloudPuffs.size(); }
         const LLCloudPuff &getPuff(const S32 i)                 { return mCloudPuffs[i]; }
 protected:
         LLCloudLayer *mCloudLayerp;
@@ -137,7 +137,7 @@ protected:
         F32 mDensity;
         S32 mTargetPuffCount;
 
-        LLDynamicArray<LLCloudPuff> mCloudPuffs;
+        std::vector<LLCloudPuff> mCloudPuffs;
         LLPointer<LLVOClouds> mVOCloudsp;
 };
 
diff --git a/linden/indra/newview/llcolorswatch.h b/linden/indra/newview/llcolorswatch.h
index 98bc85e..b52d6ac 100644
--- a/linden/indra/newview/llcolorswatch.h
+++ b/linden/indra/newview/llcolorswatch.h
@@ -31,6 +31,7 @@
 #include "lluictrl.h"
 #include "v4color.h"
 #include "llfloater.h"
+#include "llviewerimage.h"
 
 //
 // Classes
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index e42677d..c5ad2b9 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -197,8 +197,8 @@ void LLFloaterScriptQueue::addObject(const LLUUID& id)
 BOOL LLFloaterScriptQueue::start()
 {
         //llinfos << "LLFloaterCompileQueue::start()" << llendl;
-        char buffer[MAX_STRING];
-        sprintf(buffer, "Starting %s of %d items.", mStartString, mObjectIDs.count());
+        char buffer[MAX_STRING];                                /*Flawfinder: ignore*/
+        snprintf(buffer, sizeof(buffer), "Starting %s of %d items.", mStartString, mObjectIDs.count());         /*Flawfinder: ignore*/
         
         LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
         list->addSimpleItem(buffer);
@@ -237,8 +237,8 @@ BOOL LLFloaterScriptQueue::nextObject()
                 LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
 
                 mDone = TRUE;
-                char buffer[MAX_STRING];
-                sprintf(buffer, "Done.");       
+                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                snprintf(buffer, sizeof(buffer), "Done.");                      /*Flawfinder: ignore*/
                 list->addSimpleItem(buffer);
                 childSetEnabled("close",TRUE);
         }
@@ -287,7 +287,7 @@ LLFloaterCompileQueue* LLFloaterCompileQueue::create()
         rect.translate(left - rect.mLeft, top - rect.mTop);
         LLFloaterCompileQueue* new_queue = new LLFloaterCompileQueue("queue",
                                                                                                                                  rect);
-        new_queue->open();
+        new_queue->open();              /*Flawfinder: ignore*/ 
         return new_queue;
 }
 
@@ -372,25 +372,25 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
         if(!data) return;
         LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*> 
                                 (LLFloaterScriptQueue::findInstance(data->mQueueID));
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /*Flawfinder: ignore*/  
         buffer[0] = '\0';
         if(queue && (0 == status))
         {
                 //llinfos << "ITEM NAME 3: " << data->mScriptName << llendl;
 
                 // Dump this into a file on the local disk so we can compile it.
-                char filename[LL_MAX_PATH] = "";
+                char filename[LL_MAX_PATH] = "";                /*Flawfinder: ignore*/
                 LLVFile file(vfs, asset_id, type);
-                char uuid_str[UUID_STR_LENGTH];
+                char uuid_str[UUID_STR_LENGTH];         /*Flawfinder: ignore*/
                 asset_id.toString(uuid_str);
-                sprintf(filename,"%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));
+                snprintf(filename, sizeof(filename), "%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type)); /*Flawfinder: ignore*/
 
-                FILE *fp = LLFile::fopen(filename, "wb");
+                FILE *fp = LLFile::fopen(filename, "wb");        /*Flawfinder: ignore*/
                 if (fp)
                 {
                         const S32 buf_size = 65536;
                         U8 copy_buf[buf_size];
-                        while (file.read(copy_buf, buf_size))
+                        while (file.read(copy_buf, buf_size))    /*Flawfinder: ignore*/
                         {
                                 if (fwrite(copy_buf, file.getLastBytesRead(), 1, fp) < 1)
                                 {
@@ -403,7 +403,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
                 }
 
                 // It's now in the file, now compile it.
-                sprintf(buffer, "Downloaded, now compiling '%s'.", data->mScriptName.c_str());
+                snprintf(buffer, sizeof(buffer), "Downloaded, now compiling '%s'.", data->mScriptName.c_str());  /*Flawfinder: ignore*/
                 queue->compile(filename, asset_id);
 
                 // Delete it after we're done compiling?
@@ -420,19 +420,19 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
                 {
                         LLChat chat("Script not found on server.");
                         LLFloaterChat::addChat(chat);
-                        sprintf(buffer, "Problem downloading %s.",
+                        snprintf(buffer, sizeof(buffer), "Problem downloading %s.", /*Flawfinder: ignore*/
                                 data->mScriptName.c_str());
                 }
                 else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
                 {
                         LLChat chat("Insufficient permissions to download a script.");
                         LLFloaterChat::addChat(chat);
-                        sprintf(buffer, "Insufficient permissions for '%s'.",
+                        snprintf(buffer, sizeof(buffer), "Insufficient permissions for '%s'.", /*Flawfinder: ignore*/
                                 data->mScriptName.c_str());
                 }
                 else
                 {
-                        sprintf(buffer, "Unknown failure to download %s.",
+                        snprintf(buffer, sizeof(buffer), "Unknown failure to download %s.", /*Flawfinder: ignore*/
                                 data->mScriptName.c_str());
                 }
 
@@ -493,12 +493,12 @@ void LLFloaterCompileQueue::compile(const char* filename,
         tid.generate();
         new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
         
-        char uuid_string[UUID_STR_LENGTH];
+        char uuid_string[UUID_STR_LENGTH];  /*Flawfinder: ignore*/
         new_asset_id.toString(uuid_string);
-        char dst_filename[LL_MAX_PATH];
-        sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        char err_filename[LL_MAX_PATH];
-        sprintf(err_filename, "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
+        char dst_filename[LL_MAX_PATH];  /*Flawfinder: ignore*/
+        snprintf(dst_filename, sizeof(dst_filename), "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());       /*Flawfinder: ignore*/
+        char err_filename[LL_MAX_PATH];  /*Flawfinder: ignore*/
+        snprintf(err_filename, sizeof(err_filename), "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());       /*Flawfinder: ignore*/
 
         gAssetStorage->storeAssetData(filename, tid,
                                                                   LLAssetType::AT_LSL_TEXT,
@@ -590,7 +590,7 @@ LLFloaterResetQueue* LLFloaterResetQueue::create()
         rect.translate(left - rect.mLeft, top - rect.mTop);
         LLFloaterResetQueue* new_queue = new LLFloaterResetQueue("queue",
                                                                                                                                  rect);
-        new_queue->open();
+        new_queue->open();       /*Flawfinder: ignore*/
         return new_queue;
 }
 
@@ -621,8 +621,8 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
                         {
                                 LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
                                 LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
-                                char buffer[MAX_STRING];
-                                sprintf(buffer, "Resetting '%s'.", item->getName().c_str());    
+                                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
+                                snprintf(buffer, sizeof(buffer), "Resetting '%s'.", item->getName().c_str());            /*Flawfinder: ignore*/
                                 list->addSimpleItem(buffer);
                                 LLMessageSystem* msg = gMessageSystem;
                                 msg->newMessageFast(_PREHASH_ScriptReset);
@@ -653,7 +653,7 @@ LLFloaterRunQueue* LLFloaterRunQueue::create()
         rect.translate(left - rect.mLeft, top - rect.mTop);
         LLFloaterRunQueue* new_queue = new LLFloaterRunQueue("queue",
                                                                                                                                  rect);
-        new_queue->open();
+        new_queue->open();               /*Flawfinder: ignore*/
         return new_queue;
 }
 
@@ -684,8 +684,8 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
                         {
                                 LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
                                 LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
-                                char buffer[MAX_STRING];
-                                sprintf(buffer, "Running '%s'.", item->getName().c_str());      
+                                char buffer[MAX_STRING];        /*Flawfinder: ignore*/
+                                snprintf(buffer, sizeof(buffer), "Running '%s'.", item->getName().c_str());              /*Flawfinder: ignore*/
                                 list->addSimpleItem(buffer);
 
                                 LLMessageSystem* msg = gMessageSystem;
@@ -718,7 +718,7 @@ LLFloaterNotRunQueue* LLFloaterNotRunQueue::create()
         rect.translate(left - rect.mLeft, top - rect.mTop);
         LLFloaterNotRunQueue* new_queue = new LLFloaterNotRunQueue("queue",
                                                                                                                                  rect);
-        new_queue->open();
+        new_queue->open();       /*Flawfinder: ignore*/
         return new_queue;
 }
 
@@ -749,8 +749,8 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
                         {
                                 LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
                                 LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
-                                char buffer[MAX_STRING];
-                                sprintf(buffer, "Not running '%s'.", item->getName().c_str());  
+                                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
+                                snprintf(buffer, sizeof(buffer), "Not running '%s'.", item->getName().c_str());  /*Flawfinder: ignore*/
                                 list->addSimpleItem(buffer);
         
                                 LLMessageSystem* msg = gMessageSystem;
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 1ed0e17..ce092a7 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -118,6 +118,8 @@ void LLConsole::draw()
 {
         LLGLSUIDefault gls_ui;
 
+        addQueuedLines();
+
         // skip lines added more than mLinePersistTime ago
         F32 cur_time = mTimer.getElapsedTimeF32();
         
@@ -243,38 +245,57 @@ void LLConsole::addLine(const LLString& utf8line, F32 size, const LLColor4 &colo
 
 void LLConsole::addLine(const LLWString& wline, F32 size, const LLColor4 &color)
 {
-        if (!wline.empty() && mFont != NULL)
+        while (mLineQueue.size() >= mMaxLines)
+        {
+                mLineQueue.pop_front();
+        }
+        mLineQueue.push_back(LineInfo(wline, size, color, mTimer.getElapsedTimeF32()));
+}
+
+void LLConsole::addQueuedLines()
+{
+        for (line_queue_t::iterator iter = mLineQueue.begin();
+                 iter != mLineQueue.end(); ++iter)
         {
-                // Wrap lines that are longer than the view is wide.
-                S32 offset = 0;
-                while( offset < (S32)wline.length() )
+                LineInfo& line_info = *iter;
+                LLWString wline = line_info.wline;
+                //F32 size = line_info.size;
+                LLColor4 color = line_info.color;
+                if (!wline.empty() && mFont != NULL)
                 {
-                        S32 skip_chars; // skip '\n'
-                        // Figure out if a word-wrapped line fits here.
-                        LLWString::size_type line_end = wline.find_first_of(llwchar('\n'), offset);
-                        if (line_end != LLWString::npos)
-                        {
-                                skip_chars = 1; // skip '\n'
-                        }
-                        else
-                        {
-                                line_end = wline.size();
-                                skip_chars = 0;
-                        }
-                        U32 drawable = mFont->maxDrawableChars(wline.c_str()+offset, (F32)mRect.getWidth(), line_end-offset, TRUE);
-                        if (drawable != 0)
-                        {
-                                LLFixedBuffer::addLine(wline.substr(offset, drawable));
-                        }
-                        else
+                        // Wrap lines that are longer than the view is wide.
+                        S32 offset = 0;
+                        while( offset < (S32)wline.length() )
                         {
-                                // force a blank line
-                                LLFixedBuffer::addLine(" ");
+                                S32 skip_chars; // skip '\n'
+                                // Figure out if a word-wrapped line fits here.
+                                LLWString::size_type line_end = wline.find_first_of(llwchar('\n'), offset);
+                                if (line_end != LLWString::npos)
+                                {
+                                        skip_chars = 1; // skip '\n'
+                                }
+                                else
+                                {
+                                        line_end = wline.size();
+                                        skip_chars = 0;
+                                }
+                                U32 drawable = mFont->maxDrawableChars(wline.c_str()+offset, (F32)mRect.getWidth(), line_end-offset, TRUE);
+                                if (drawable != 0)
+                                {
+                                        LLFixedBuffer::addLine(wline.substr(offset, drawable));
+                                        mAddTimes[mAddTimes.size()-1] = line_info.add_time;
+                                }
+                                else
+                                {
+                                        // force a blank line
+                                        LLFixedBuffer::addLine(" ");
+                                }
+                                mColors.push_back(color);
+                                offset += (drawable + skip_chars);
                         }
-                        mColors.push_back(color);
-                        offset += (drawable + skip_chars);
                 }
         }
+        mLineQueue.clear();
 }
 
 void LLConsole::removeExtraLines()
diff --git a/linden/indra/newview/llconsole.h b/linden/indra/newview/llconsole.h
index 2a072f9..525cab3 100644
--- a/linden/indra/newview/llconsole.h
+++ b/linden/indra/newview/llconsole.h
@@ -45,6 +45,21 @@ private:
         S32                     mLastBoxHeight;
         S32                     mLastBoxWidth;
 
+        struct LineInfo
+        {
+                LineInfo(const LLWString &wln, F32 sz, const LLColor4& clr, F32 time)
+                        : wline(wln), size(sz), color(clr), add_time(time)
+                {
+                        
+                }
+                LLWString wline;
+                F32 size;
+                LLColor4 color;
+                F32 add_time;
+        };
+        typedef std::list<LineInfo> line_queue_t;
+        line_queue_t mLineQueue;
+        
 public:
         // Font size:
         // -1 = monospace, 0 means small, font size = 1 means big
@@ -65,7 +80,8 @@ public:
 
         void                    addLine(const LLString& utf8line, F32 size, const LLColor4 &color);
         void                    addLine(const LLWString& wline, F32 size, const LLColor4 &color);
-
+        void                    addQueuedLines();
+        
         // Overrides
         /*virtual*/ void        draw();
         /*virtual*/ void        addLine(const LLString& utf8line);
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 850b5bf..cd4cf4d 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -186,7 +186,12 @@ void declare_settings()
         gSavedSettings.declareString("FontMonospace",           "profontwindows.ttf", "Name of monospace font (Truetype file name)");
         gSavedSettings.declareString("FontSansSerif",           "MtBkLfRg.ttf", "Name of san-serif font (Truetype file name)");
 #if LL_WINDOWS
-        gSavedSettings.declareString("FontSansSerifFallback",   "ArialUni.ttf", "Name of fallback san-serif font (Truetype file name)");
+        // Lists Japanese, Korean, and Chinese sanserif fonts available in
+        // Windows XP and Vista, as well as "Arial Unicode MS".
+        gSavedSettings.declareString(
+                "FontSansSerifFallback",
+                "MSGOTHIC.TTC;gulim.ttc;simhei.ttf;ArialUni.ttf",
+                "Name of fallback san-serif font (Truetype file name)");
 #elif LL_DARWIN
         // This is a fairly complete Japanese font that ships with Mac OS X.
         // The first filename is in UTF8, but it shows up in the font menu as "Hiragino Kaku Gothic Pro W3".
@@ -654,7 +659,6 @@ void declare_settings()
         gSavedSettings.declareF32( "RenderFarClip",                             256.f, "Distance of far clip plane from camera (meters)" );
         gSavedSettings.declareF32( "RenderFogRatio",                    2.0f, "Distance from camera where fog reaches maximum density (fraction or multiple of far clip distance)");
         gSavedSettings.declareBOOL("RenderAnisotropic",                 FALSE, "Render textures using anisotropic filtering" );
-        gSavedSettings.declareBOOL("RenderLightGlows",                  FALSE, "Render glow sprites on top of light sources" );
         gSavedSettings.declareBOOL("ShowXUINames",                          FALSE, "Display XUI Names as Tooltips" );
         gSavedSettings.declareS32("RenderLightingDetail",               1, "Amount of detail for lighting objects/avatars/terrain (0=sun/moon only, 1=enable local lights)" );
         gSavedSettings.declareS32("RenderTerrainDetail",                2, "Detail applied to terrain texturing (0 = none, 1 or 2 = full)" );
@@ -664,13 +668,13 @@ void declare_settings()
         gSavedSettings.declareF32( "RenderAvatarLODFactor",             0.5f, "Controls level of detail of avatars (multiplier for current screen area when calculated level of detail)" );
         gSavedSettings.declareF32( "RenderBumpmapMinDistanceSquared", 100.f, "Maximum distance at which to render bumpmapped primitives (distance in meters, squared)" );
         gSavedSettings.declareS32( "RenderMaxPartCount",                4096, "Maximum number of particles to display on screen");
-        gSavedSettings.declareBOOL("RenderUseAGP",                              TRUE, "Used AGP for fast transfer of data to graphics card" );
-        gSavedSettings.declareBOOL("RenderUseVBO",                              FALSE, "Use GL Vertex Buffer Objects" );
+        gSavedSettings.declareBOOL("RenderVBOEnable",                   TRUE, "Use GL Vertex Buffer Objects" );
         //gSavedSettings.declareBOOL("RenderUseTriStrips",              FALSE, "[NOT USED]");
         //gSavedSettings.declareBOOL("RenderCullBySize",                        FALSE, "[NOT USED]" );
         gSavedSettings.declareF32("RenderTerrainScale",                 12.f, "Terrain detail texture scale");
         gSavedSettings.declareBOOL("VertexShaderEnable",                FALSE, "Enable/disable all GLSL shaders (debug)");
         gSavedSettings.declareBOOL("RenderRippleWater",                 FALSE, "Display more realistic water, with refraction (requires pixel shader support on your video card)");
+        gSavedSettings.declareBOOL("RenderDynamicReflections",  FALSE, "Generate a dynamic cube map for reflections (objects reflect their environment, experimental).");
         gSavedSettings.declareBOOL("RenderObjectBump",                  TRUE, "Show bumpmapping on primitives");
         gSavedSettings.declareS32("RenderAvatarMode",                   1, "Controls how avatars are rendered (0 = normal, 1 = bump mapped, 2 = bump mapped and wavy cloth)");
         gSavedSettings.declareBOOL("RenderAvatarVP",                    TRUE, "Use vertex programs to perform hardware skinning of avatar");
@@ -683,6 +687,7 @@ void declare_settings()
         gSavedSettings.declareBOOL("RenderUIInSnapshot",                FALSE, "Display user interface in snapshot" );
         gSavedSettings.declareBOOL("RenderHUDInSnapshot",               FALSE, "Display HUD attachments in snapshot" );
         gSavedSettings.declareBOOL("HighResSnapshot",                   FALSE, "Double resolution of snapshot from current window resolution" );
+        gSavedSettings.declareBOOL("CompressSnapshotsToDisk",   FALSE, "Compress snapshots saved to disk (Using JPEG 2000)" );
         gSavedSettings.declareBOOL("FreezeTime",                                FALSE, "", FALSE );
         gSavedSettings.declareBOOL("UseFreezeFrame",                    FALSE, "Freeze time when taking snapshots.");
         gSavedSettings.declareBOOL("CloseSnapshotOnKeep",               TRUE, "Close snapshot window after saving snapshot" );
@@ -711,6 +716,10 @@ void declare_settings()
         //gSavedSettings.declareS32("ImageRadioTexMem", 0, "Texture memory allocation (0 = <512 megabytes system RAM, 1 = >512 megabytes system RAM)");
         //gSavedSettings.declareS32("ImageRadioVidCardMem", 1, "Video card onboard memory (0 = 16MB, 1 = 32MB, 2 = 64MB, 3 = 128MB, 4 = 256MB, 5 = 512MB)");
         //gSavedSettings.declareU32("LastRAMDetected", 0, "[DO NOT MODIFY] Detected system memory (bytes)");  // used to detect RAM changes
+        gSavedSettings.declareBOOL("ImagePipelineUseHTTP", FALSE, "If TRUE use HTTP GET to fetch textures from the server");
+
+        // Threading
+        gSavedSettings.declareBOOL("RunMultipleThreads", FALSE, "If TRUE keep background threads active during render");
 
         // Camera control
         gSavedSettings.declareBOOL("AutoPilotLocksCamera", FALSE, "Keep camera position locked when avatar walks to selected position");
@@ -746,6 +755,9 @@ void declare_settings()
         // Currently matches BW_PRESET_300
         gSavedSettings.declareF32("ThrottleBandwidthKBPS", 500.f, "Maximum allowable downstream bandwidth (kilo bits per second)");
 
+        gSavedSettings.declareBOOL("ConnectionPortEnabled", FALSE, "Use the custom connection port?");
+        gSavedSettings.declareU32("ConnectionPort", 13000, "Custom connection port number");
+
         // File xfer throttle
         gSavedSettings.declareF32("XferThrottle", 150000.f, "Maximum allowable downstream bandwidth for asset transfers (bits per second)");
 
@@ -884,6 +896,8 @@ void declare_settings()
         gSavedSettings.declareF32 ("GridDrawSize", 12.0f, "Visible extent of 2D snap grid (meters)");
         gSavedSettings.declareBOOL("GridSubUnit", FALSE, "Display fractional grid steps, relative to grid size");
         gSavedSettings.declareF32("GridOpacity", 0.7f, "Grid line opacity (0.0 = completely transparent, 1.0 = completely opaque)");
+        gSavedSettings.declareBOOL("GridCrossSections", FALSE, "Highlight cross sections of prims with grid manipulation plane.");
+        
         gSavedSettings.declareS32("GridMode", 0, "Snap grid reference frame (0 = world, 1 = local, 2 = reference object)");
         //gSavedSettings.declareBOOL("GridIsLocal", FALSE, "[NOT USED]");
         gSavedSettings.declareS32("GridSubdivision", 32, "Maximum number of times to divide single snap grid unit when GridSubUnit is true");
@@ -1027,10 +1041,17 @@ void declare_settings()
         gSavedSettings.declareColor3("SkyNightColorShift", LLColor3(0.7f, 0.7f, 1.0f), "Controls moonlight color (base color applied to moon as light source)");
         gSavedSettings.declareBOOL("FixedWeather", FALSE, "Weather effects do not change over time");
 
-        // VFS stuff
+        // Cache Stuff
         gSavedSettings.declareU32("VFSSalt", 1, "[DO NOT MODIFY] Controls local file caching behavior");
-        gSavedSettings.declareU32("VFSOldSize", 2, "[DO NOT MODIFY] Controls resizing of local file cache");
-        gSavedSettings.declareU32("VFSSize", 2, "Controls amount of hard drive space reserved for local file caching (0 = 50MB, 1 = 200MB, 2 = 500MB, 3 = 1000MB)");
+        gSavedSettings.declareU32("VFSOldSize", 0, "[DO NOT MODIFY] Controls resizing of local file cache");
+//      gSavedSettings.declareU32("VFSSize", 2, "Controls amount of hard drive space reserved for local file caching (0 = 50MB, 1 = 200MB, 2 = 500MB, 3 = 1000MB)");
+        gSavedSettings.declareU32("CacheSize", 500, "Controls amount of hard drive space reserved for local file caching in MB");
+        gSavedSettings.declareString("CacheLocation", "", "Controls the location of the local disk cache");
+        gSavedSettings.declareString("NewCacheLocation", "", "Change the location of the local disk cache to this");
+        gSavedSettings.declareU32("CacheValidateCounter", 0, "Used to distribute cache validation");
+        // Delete all files in cache directory on startup
+        gSavedSettings.declareBOOL("PurgeCacheOnStartup", FALSE, "Clear local file cache every time viewer is run");
+        gSavedSettings.declareBOOL("PurgeCacheOnNextStartup", FALSE, "Clear local file cache next time viewer is run");
 
         // Used for special titles such as "Second Life - Special E3 2003 Beta"
         gSavedSettings.declareBOOL("ShowOverlayTitle", FALSE, "Prints watermark text message on screen");
@@ -1060,6 +1081,8 @@ void declare_settings()
         // The last version that was run with this prefs file.  Default to a version that will never be current,
         // and update after the setting is used in the startup sequence.
         gSavedSettings.declareString("LastRunVersion", "0.0.0", "Version number of last instance of the viewer that you ran");
+        // Local cache version (change if format changes)
+        gSavedSettings.declareS32("LocalCacheVersion", 0, "Version number of cache");
 
         // cached mean collision values
         gSavedSettings.declareBOOL("MeanCollisionBump", FALSE, "You have experienced an abuse of being bumped by an object or avatar" );
@@ -1072,7 +1095,7 @@ void declare_settings()
         gSavedSettings.declareBOOL("LeftClickShowMenu", FALSE, "Left click opens pie menu (FALSE = left click touches or grabs object)");
 
         gSavedSettings.declareF32("MouseSensitivity", 3.f, "Controls responsiveness of mouse when in mouselook mode (fraction or multiple of default mouse sensitivity)");
-
+        gSavedSettings.declareBOOL("MouseSmooth", FALSE, "Smooths out motion of mouse when in mouselook mode.");
         gSavedSettings.declareBOOL("InvertMouse", FALSE, "When in mouselook, moving mouse up looks down and vice verse (FALSE = moving up looks up)");
 
         gSavedSettings.declareBOOL("EditCameraMovement", FALSE, "When entering build mode, camera moves up above avatar");
@@ -1145,8 +1168,8 @@ void declare_settings()
 
         // Checkboxes in Find -> Popular
         // Should these all be the same?  I imagine we might want a single "show mature." - bbc
-        gSavedSettings.declareBOOL("ShowMatureFindAll",TRUE, "Display results of find all that are in mature sims");
-        gSavedSettings.declareBOOL("ShowMatureSims", TRUE, "Display results of find places or find popular that are in mature sims");
+        gSavedSettings.declareBOOL("ShowMatureFindAll",FALSE, "Display results of find all that are in mature sims");
+        gSavedSettings.declareBOOL("ShowMatureSims", FALSE, "Display results of find places or find popular that are in mature sims");
         gSavedSettings.declareBOOL("ShowMatureEvents", FALSE, "Display results of find events that are flagged as mature");
         gSavedSettings.declareBOOL("ShowMatureClassifieds", FALSE, "Display results of find classifieds that are flagged as mature");
         
@@ -1185,10 +1208,6 @@ void declare_settings()
         gSavedSettings.declareBOOL("ShowLandHoverTip", FALSE, "Show descriptive tooltip when mouse hovers over land");
         gSavedSettings.declareBOOL("ShowAllObjectHoverTip", FALSE, "Show descriptive tooltip when mouse hovers over non-interactive and interactive objects.");
 
-        // Delete all files in cache directory on startup
-        gSavedSettings.declareBOOL("PurgeCacheOnStartup", FALSE, "Clear local file cache every time viewer is run");
-        gSavedSettings.declareBOOL("PurgeCacheOnNextStartup", FALSE, "Clear local file cache next time viewer is run");
-
         // Use an external web browser (Firefox, Internet Explorer)
         // CP: making this TRUE by default since there is no internal Web browser
         //         now and other components may interrogate this setting
@@ -1223,3 +1242,15 @@ void declare_settings()
         gCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
                 "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)");
 }
+
+void settings_version_fixup()
+{
+#if LL_RELEASE_FOR_DOWNLOAD
+        if (gCurrentVersion == "1.13.3" || gCurrentVersion == "1.13.4")
+        {
+                // In case these were set to true in an early 'First Look' version:
+                gSavedSettings.setBOOL("RenderDynamicReflections", FALSE);
+                gSavedSettings.setBOOL("ImagePipelineUseHTTP", FALSE);
+        }
+#endif
+}
diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/newview/llcubemap.cpp
index 4406bc8..415b849 100644
--- a/linden/indra/newview/llcubemap.cpp
+++ b/linden/indra/newview/llcubemap.cpp
@@ -176,8 +176,6 @@ void LLCubeMap::bind()
 
                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, (use_cube_mipmaps? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR));
-                
-                glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         }
         else
         {
@@ -220,11 +218,23 @@ void LLCubeMap::setMatrix(S32 stage)
 {
         mMatrixStage = stage;
         glActiveTextureARB(GL_TEXTURE0_ARB+stage);
+
+        F32 mat[16];
+        
+        glGetFloatv(GL_MODELVIEW_MATRIX, mat);
+        
+        LLVector3 x(mat);
+        LLVector3 y(mat+4);
+        LLVector3 z(mat+8);
+
+        LLMatrix3 mat3;
+        mat3.setRows(x,y,z);
+        LLMatrix4 trans(mat3);
+        trans.transpose();
+
         glMatrixMode(GL_TEXTURE);
         glPushMatrix();
-        LLMatrix4 tmat;
-        gCamera->getRotMatrixToParent(tmat);
-        glLoadMatrixf((F32 *)tmat.mMatrix);
+        glLoadMatrixf((F32 *)trans.mMatrix);
         glMatrixMode(GL_MODELVIEW);
 }
 
diff --git a/linden/indra/newview/llcubemap.h b/linden/indra/newview/llcubemap.h
index 6596257..7be6706 100644
--- a/linden/indra/newview/llcubemap.h
+++ b/linden/indra/newview/llcubemap.h
@@ -36,7 +36,7 @@
 class LLVector3;
 
 // Environment map hack!
-class LLCubeMap
+class LLCubeMap : public LLRefCount
 {
 public:
         LLCubeMap();
diff --git a/linden/indra/newview/llcurrencyuimanager.cpp b/linden/indra/newview/llcurrencyuimanager.cpp
index 5893836..615d9fb 100644
--- a/linden/indra/newview/llcurrencyuimanager.cpp
+++ b/linden/indra/newview/llcurrencyuimanager.cpp
@@ -144,10 +144,10 @@ void LLCurrencyUIManager::Impl::updateCurrencyInfo()
         }
         
         LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-        keywordArgs.appendString("agentId",
-                gAgent.getID().getString());
-        keywordArgs.appendString("secureSessionId",
-                gAgent.getSecureSessionID().getString());
+        keywordArgs.appendString("agentId", gAgent.getID().asString());
+        keywordArgs.appendString(
+                "secureSessionId",
+                gAgent.getSecureSessionID().asString());
         keywordArgs.appendInt("currencyBuy", mUserCurrencyBuy);
         
         LLXMLRPCValue params = LLXMLRPCValue::createArray();
@@ -191,10 +191,10 @@ void LLCurrencyUIManager::Impl::startCurrencyBuy(const std::string& password)
         mCurrencyChanged = false;
         
         LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-        keywordArgs.appendString("agentId",
-                gAgent.getID().getString());
-        keywordArgs.appendString("secureSessionId",
-                gAgent.getSecureSessionID().getString());
+        keywordArgs.appendString("agentId", gAgent.getID().asString());
+        keywordArgs.appendString(
+                "secureSessionId",
+                gAgent.getSecureSessionID().asString());
         keywordArgs.appendInt("currencyBuy", mUserCurrencyBuy);
         keywordArgs.appendInt("estimatedCost", mSiteCurrencyEstimatedCost);
         keywordArgs.appendString("confirm", mSiteConfirm);
diff --git a/linden/indra/newview/llcylinder.cpp b/linden/indra/newview/llcylinder.cpp
index b3eaa44..9f76648 100644
--- a/linden/indra/newview/llcylinder.cpp
+++ b/linden/indra/newview/llcylinder.cpp
@@ -34,7 +34,7 @@
 #include "llmath.h"
 #include "noise.h"
 #include "v3math.h"
-
+#include "llvertexbuffer.h"
 #include "llgl.h"
 #include "llglheaders.h"
 
@@ -43,6 +43,10 @@ LLCone		gCone;
 
 GLUquadricObj* gQuadObj = NULL;
 
+static const GLint SLICES[] = { 30, 20, 12, 6 };                // same as sphere slices
+static const GLint STACKS = 2;
+static const GLfloat RADIUS = 0.5f;
+        
 // draws a cylinder or cone
 // returns approximate number of triangles required
 U32 draw_cylinder_side(GLint slices, GLint stacks, GLfloat base_radius, GLfloat top_radius)
@@ -106,46 +110,27 @@ U32 draw_cylinder_cap(GLint slices, GLfloat base_radius, BOOL is_top)
         return triangles;
 }
 
+void LLCylinder::drawSide(S32 detail)
+{
+        draw_cylinder_side(SLICES[detail], STACKS, RADIUS, RADIUS);
+}
 
-void LLCylinder::prerender()
+void LLCylinder::drawTop(S32 detail)
 {
-        GLint stacks = 2;
-        GLfloat radius = 0.5f;
-        GLint slices[CYLINDER_LEVELS_OF_DETAIL] = { 30, 20, 12, 6 };            // same as sphere slices
+        draw_cylinder_cap(SLICES[detail], RADIUS, TOP);
+}
 
-        for (S32 detail = 0; detail < CYLINDER_LEVELS_OF_DETAIL; detail++)
-        {
-                mTriangleCount[detail] = 0;
-
-                mDisplayListSide[detail] = glGenLists(1);
-                glNewList(mDisplayListSide[detail], GL_COMPILE);
-                mTriangleCount[detail] += draw_cylinder_side( slices[detail], stacks, radius, radius );
-                glEndList();
-
-                mDisplayListTop[detail] = glGenLists(1);
-                glNewList( mDisplayListTop[detail], GL_COMPILE);
-                mTriangleCount[detail] += draw_cylinder_cap( slices[detail], radius, TOP );
-                glEndList();
-
-                mDisplayListBottom[detail] = glGenLists(1);
-                glNewList( mDisplayListBottom[detail], GL_COMPILE);
-                mTriangleCount[detail] += draw_cylinder_cap( slices[detail], radius, BOTTOM );
-                glEndList();
-        }
+void LLCylinder::drawBottom(S32 detail)
+{
+        draw_cylinder_cap(SLICES[detail], RADIUS, BOTTOM);
 }
 
-void LLCylinder::cleanupGL()
+void LLCylinder::prerender()
 {
-        for (S32 detail = 0; detail < CYLINDER_LEVELS_OF_DETAIL; detail++)
-        {
-                glDeleteLists(mDisplayListSide[detail], 1);
-                mDisplayListSide[detail] = 0;
-                glDeleteLists(mDisplayListTop[detail], 1);
-                mDisplayListTop[detail] = 0;
-                glDeleteLists(mDisplayListBottom[detail], 1);
-                mDisplayListBottom[detail] = 0;
-        }
+}
 
+void LLCylinder::cleanupGL()
+{
         if (gQuadObj)
         {
                 gluDeleteQuadric(gQuadObj);
@@ -197,19 +182,21 @@ void LLCylinder::renderface(F32 pixel_area, S32 face)
                 return;
         }
 
+        LLVertexBuffer::unbind();
+        
         switch(face)
         {
         case 0:
                 glTranslatef(0.f, 0.f, -0.5f);
-                glCallList(mDisplayListSide[level_of_detail]);
+                drawSide(level_of_detail);
                 break;
         case 1:
                 glTranslatef(0.0f, 0.f, 0.5f);
-                glCallList(mDisplayListTop[level_of_detail]);
+                drawTop(level_of_detail);
                 break;
         case 2:
                 glTranslatef(0.0f, 0.f, -0.5f);
-                glCallList(mDisplayListBottom[level_of_detail]);
+                drawBottom(level_of_detail);
                 break;
         default:
                 llerror("LLCylinder::renderface() fell out of switch", 0);
@@ -227,37 +214,10 @@ void LLCylinder::renderface(F32 pixel_area, S32 face)
 
 void LLCone::prerender()
 {
-        GLint stacks = 2;
-        GLfloat radius = 0.5f;
-        GLint slices[CONE_LEVELS_OF_DETAIL] = { 32, 18, 12, 6 };
-
-        for (S32 detail = 0; detail < CONE_LEVELS_OF_DETAIL; detail++)
-        {
-                mTriangleCount[detail] = 0;
-
-                mDisplayListSide[detail] = glGenLists(1);
-                glNewList(mDisplayListSide[detail], GL_COMPILE);
-                mTriangleCount[detail] += draw_cylinder_side( slices[detail], stacks, radius, 0.f );
-                glEndList();
-
-                mDisplayListBottom[detail] = glGenLists(1);
-                glNewList( mDisplayListBottom[detail], GL_COMPILE);
-                mTriangleCount[detail] += draw_cylinder_cap( slices[detail], radius, BOTTOM );
-                glEndList();
-        }
 }
 
 void LLCone::cleanupGL()
 {
-        for (S32 detail = 0; detail < CYLINDER_LEVELS_OF_DETAIL; detail++)
-        {
-                glDeleteLists(mDisplayListSide[detail], 1);
-                mDisplayListSide[detail] = 0;
-
-                glDeleteLists(mDisplayListBottom[detail], 1);
-                mDisplayListBottom[detail] = 0;
-        }
-
         if (gQuadObj)
         {
                 gluDeleteQuadric(gQuadObj);
@@ -265,6 +225,15 @@ void LLCone::cleanupGL()
         }
 }
 
+void LLCone::drawSide(S32 detail)
+{
+        draw_cylinder_side( SLICES[detail], STACKS, RADIUS, 0.f );      
+}
+
+void LLCone::drawBottom(S32 detail)
+{
+        draw_cylinder_cap( SLICES[detail], RADIUS, BOTTOM );
+}
 
 void LLCone::render(S32 level_of_detail)
 {
@@ -282,8 +251,9 @@ void LLCone::render(S32 level_of_detail)
         // center object at 0
         glTranslatef(0.f, 0.f, - height / 2.0f);
 
-        glCallList(mDisplayListSide[level_of_detail]);
-        glCallList(mDisplayListBottom[level_of_detail]);
+        LLVertexBuffer::unbind();
+        drawSide(level_of_detail);
+        drawBottom(level_of_detail);
 
         glMatrixMode(GL_MODELVIEW);
         glPopMatrix();
@@ -307,15 +277,17 @@ void LLCone::renderface(S32 level_of_detail, S32 face)
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
 
+        LLVertexBuffer::unbind();
+        
         switch(face)
         {
         case 0:
                 glTranslatef(0.f, 0.f, -0.5f);
-                glCallList(mDisplayListSide[level_of_detail]);
+                drawSide(level_of_detail);
                 break;
         case 1:
                 glTranslatef(0.f, 0.f, -0.5f);
-                glCallList(mDisplayListBottom[level_of_detail]);
+                drawBottom(level_of_detail);
                 break;
         default:
                 llerror("LLCylinder::renderface() fell out of switch", 0);
diff --git a/linden/indra/newview/llcylinder.h b/linden/indra/newview/llcylinder.h
index b9e0a0e..fbd1298 100644
--- a/linden/indra/newview/llcylinder.h
+++ b/linden/indra/newview/llcylinder.h
@@ -39,20 +39,15 @@ const S32 CYLINDER_FACES = 3;
 
 class LLCylinder
 {
-protected:
-        U32     mDisplayListSide[CYLINDER_LEVELS_OF_DETAIL];
-        U32     mDisplayListTop[CYLINDER_LEVELS_OF_DETAIL];
-        U32     mDisplayListBottom[CYLINDER_LEVELS_OF_DETAIL];
-        U32             mTriangleCount[CYLINDER_LEVELS_OF_DETAIL];
-
 public:
         void prerender();
+        void drawTop(S32 detail);
+        void drawSide(S32 detail);
+        void drawBottom(S32 detail);
         void cleanupGL();
 
         void render(F32 pixel_area);
         void renderface(F32 pixel_area, S32 face);
-
-        U32             getTriangleCount(S32 level_of_detail)           { return mTriangleCount[level_of_detail]; }
 };
 
 
@@ -65,20 +60,14 @@ const S32 CONE_LEVELS_OF_DETAIL = 4;
 const S32 CONE_FACES = 2;
 
 class LLCone
-{
-protected:
-        U32     mDisplayListSide[CONE_LEVELS_OF_DETAIL];
-        U32     mDisplayListBottom[CONE_LEVELS_OF_DETAIL];
-        U32             mTriangleCount[CONE_LEVELS_OF_DETAIL];
-
+{       
 public:
         void prerender();
         void cleanupGL();
-
+        void drawSide(S32 detail);
+        void drawBottom(S32 detail);
         void render(S32 level_of_detail);
         void renderface(S32 level_of_detail, S32 face);
-
-        U32             getTriangleCount(S32 level_of_detail)           { return mTriangleCount[level_of_detail]; }
 };
 
 extern LLCylinder gCylinder;
diff --git a/linden/indra/newview/lldebugmessagebox.cpp b/linden/indra/newview/lldebugmessagebox.cpp
index 46dffdf..e6c1bf1 100644
--- a/linden/indra/newview/lldebugmessagebox.cpp
+++ b/linden/indra/newview/lldebugmessagebox.cpp
@@ -163,7 +163,7 @@ LLDebugVarMessageBox* LLDebugVarMessageBox::show(const std::string& title, EDebu
                 sInstances[title_string] = box;
                 gFloaterView->addChild(box);
                 box->reshape(200,150);
-                box->open();
+                box->open();             /*Flawfinder: ignore*/
                 box->mTitle = title_string;
         }
 
@@ -206,18 +206,18 @@ void LLDebugVarMessageBox::onClose(bool app_quitting)
 
 void LLDebugVarMessageBox::draw()
 {
-        char text[128];
+        char text[128];  /*Flawfinder: ignore*/
         switch(mVarType)
         {
         case VAR_TYPE_F32:
-                sprintf(text, "%.3f", *((F32*)mVarData));
+                snprintf(text, sizeof(text), "%.3f", *((F32*)mVarData));                 /*Flawfinder: ignore*/
                 break;
         case VAR_TYPE_S32:
-                sprintf(text, "%d", *((S32*)mVarData));
+                snprintf(text, sizeof(text), "%d", *((S32*)mVarData));           /*Flawfinder: ignore*/
                 break;
         case VAR_TYPE_VEC3:
                 LLVector3* vec_p = (LLVector3*)mVarData;
-                sprintf(text, "%.3f %.3f %.3f", vec_p->mV[VX], vec_p->mV[VY], vec_p->mV[VZ]);
+                snprintf(text, sizeof(text), "%.3f %.3f %.3f", vec_p->mV[VX], vec_p->mV[VY], vec_p->mV[VZ]);     /*Flawfinder: ignore*/
                 break;
         }
         mText->setText(text);
diff --git a/linden/indra/newview/lldirpicker.cpp b/linden/indra/newview/lldirpicker.cpp
index 38a008c..75f8056 100644
--- a/linden/indra/newview/lldirpicker.cpp
+++ b/linden/indra/newview/lldirpicker.cpp
@@ -203,7 +203,7 @@ OSStatus	LLDirPicker::doNavChooseDialog()
                 AEKeyword       theAEKeyword;
                 DescType        typeCode;
                 Size            actualSize = 0;
-                char            path[LL_MAX_PATH];
+                char            path[LL_MAX_PATH];               /*Flawfinder: ignore*/
                 
                 memset(&fsRef, 0, sizeof(fsRef));
                 error = AEGetNthPtr(&navReply.selection, 1, typeFSRef, &theAEKeyword, &typeCode, &fsRef, sizeof(fsRef), &actualSize);
diff --git a/linden/indra/newview/lldirpicker.h b/linden/indra/newview/lldirpicker.h
index 72b5675..71a65fd 100644
--- a/linden/indra/newview/lldirpicker.h
+++ b/linden/indra/newview/lldirpicker.h
@@ -83,7 +83,7 @@ private:
         
 #endif
 
-        char mDirs[DIRNAME_BUFFER_SIZE];
+        char mDirs[DIRNAME_BUFFER_SIZE]; /*Flawfinder: ignore*/
         LLString* mFileName;
         LLString  mDir;
         BOOL mLocked;
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index af4f205..4d9083e 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -33,8 +33,6 @@
 #include "material_codes.h"
 
 // viewer includes
-#include "llagparray.h"
-#include "llagparray.inl"
 #include "llcriticaldamp.h"
 #include "llface.h"
 #include "lllightconstants.h"
@@ -77,6 +75,8 @@ U32 LLDrawable::sNumZombieDrawables = 0;
 F32 LLDrawable::sCurPixelAngle = 0;
 LLDynamicArrayPtr<LLPointer<LLDrawable> > LLDrawable::sDeadList;
 
+#define FORCE_INVISIBLE_AREA 16.f
+
 // static
 void LLDrawable::incrementVisible() 
 {
@@ -127,12 +127,11 @@ void LLDrawable::destroy()
         std::for_each(mFaces.begin(), mFaces.end(), DeletePointer());
         mFaces.clear();
                 
-        /*
-        if (!(sNumZombieDrawables % 10))
+        
+        /*if (!(sNumZombieDrawables % 10))
         {
                 llinfos << "- Zombie drawables: " << sNumZombieDrawables << llendl;
-        }
-        */
+        }*/     
 }
 
 void LLDrawable::markDead()
@@ -269,7 +268,7 @@ void LLDrawable::removeFace(const S32 i)
 }
 #endif
 
-LLFace* LLDrawable::addFace(LLDrawPool *poolp, LLViewerImage *texturep, const BOOL shared_geom)
+LLFace* LLDrawable::addFace(LLFacePool *poolp, LLViewerImage *texturep)
 {
         LLMemType mt(LLMemType::MTYPE_DRAWABLE);
         
@@ -278,16 +277,12 @@ LLFace*	LLDrawable::addFace(LLDrawPool *poolp, LLViewerImage *texturep, const BO
         if (face)
         {
                 mFaces.push_back(face);
-                face->setPool(poolp, texturep);
 
-                if (shared_geom)
+                if (poolp)
                 {
-                        face->setState(LLFace::SHARED_GEOM);
-                }
-                else if (!isVisible()) 
-                {
-                        face->setState(LLFace::BACKLIST);
+                        face->setPool(poolp, texturep);
                 }
+
                 if (isState(UNLIT))
                 {
                         face->setState(LLFace::FULLBRIGHT);
@@ -296,7 +291,27 @@ LLFace*	LLDrawable::addFace(LLDrawPool *poolp, LLViewerImage *texturep, const BO
         return face;
 }
 
-void LLDrawable::setNumFaces(const S32 newFaces, LLDrawPool *poolp, LLViewerImage *texturep)
+LLFace* LLDrawable::addFace(const LLTextureEntry *te, LLViewerImage *texturep)
+{
+        LLMemType mt(LLMemType::MTYPE_DRAWABLE);
+        
+        LLFace *face = new LLFace(this, mVObjp);
+
+        face->setTEOffset(mFaces.size());
+        face->setTexture(texturep);
+        face->setPoolType(gPipeline.getPoolTypeFromTE(te, texturep));
+        mFaces.push_back(face);
+
+        if (isState(UNLIT))
+        {
+                face->setState(LLFace::FULLBRIGHT);
+        }
+
+        return face;
+
+}
+
+void LLDrawable::setNumFaces(const S32 newFaces, LLFacePool *poolp, LLViewerImage *texturep)
 {
         if (newFaces == (S32)mFaces.size())
         {
@@ -317,7 +332,7 @@ void LLDrawable::setNumFaces(const S32 newFaces, LLDrawPool *poolp, LLViewerImag
         }
 }
 
-void LLDrawable::setNumFacesFast(const S32 newFaces, LLDrawPool *poolp, LLViewerImage *texturep)
+void LLDrawable::setNumFacesFast(const S32 newFaces, LLFacePool *poolp, LLViewerImage *texturep)
 {
         if (newFaces <= (S32)mFaces.size() && newFaces >= (S32)mFaces.size()/2)
         {
@@ -372,21 +387,43 @@ void LLDrawable::updateMaterial()
 
 void LLDrawable::makeActive()
 {               
+#if !LL_RELEASE_FOR_DOWNLOAD
+        if (mVObjp.notNull())
+        {
+                U32 pcode = mVObjp->getPCode();
+                if (pcode == LLViewerObject::LL_VO_WATER ||
+                        pcode == LLViewerObject::LL_VO_SURFACE_PATCH ||
+                        pcode == LLViewerObject::LL_VO_PART_GROUP ||
+                        pcode == LLViewerObject::LL_VO_CLOUDS ||
+                        pcode == LLViewerObject::LL_VO_STARS ||
+                        pcode == LLViewerObject::LL_VO_GROUND ||
+                        pcode == LLViewerObject::LL_VO_SKY)
+                {
+                        llerrs << "Static viewer object has active drawable!" << llendl;
+                }
+        }
+#endif
+
         if (!isState(ACTIVE)) // && mGeneration > 0)
         {
                 setState(ACTIVE);
                 
+                //parent must be made active first
                 if (!isRoot() && !mParent->isActive())
                 {
                         mParent->makeActive();
                 }
-                
+
                 gPipeline.setActive(this, TRUE);
 
                 //all child objects must also be active
                 for (U32 i = 0; i < getChildCount(); i++)
                 {
-                        getChild(i)->makeActive();
+                        LLDrawable* drawable = getChild(i);
+                        if (drawable)
+                        {
+                                drawable->makeActive();
+                        }
                 }
                         
                 if (mVObjp->getPCode() == LL_PCODE_VOLUME)
@@ -403,7 +440,15 @@ void LLDrawable::makeActive()
                         gPipeline.markRebuild(this, LLDrawable::REBUILD_VOLUME, TRUE);
                 }
         }
-        mQuietCount = 0;
+        updatePartition();
+        if (isRoot())
+        {
+                mQuietCount = 0;
+        }
+        else
+        {
+                getParent()->mQuietCount = 0;
+        }
 }
 
 
@@ -416,7 +461,7 @@ void LLDrawable::makeStatic()
 
                 if (mParent.notNull() && mParent->isActive())
                 {
-                        llerrs << "Drawable became static with active parent!" << llendl;
+                        llwarns << "Drawable becamse static with active parent!" << llendl;
                 }
                 
                 S32 child_count = mVObjp->mChildList.size();
@@ -425,6 +470,10 @@ void LLDrawable::makeStatic()
                         LLDrawable* child_drawable = mVObjp->mChildList[child_num]->mDrawable;
                         if (child_drawable)
                         {
+                                if (child_drawable->getParent() != this)
+                                {
+                                        llwarns << "Child drawable has unknown parent." << llendl;
+                                }
                                 child_drawable->makeStatic();
                         }
                 }
@@ -441,6 +490,7 @@ void LLDrawable::makeStatic()
                         setSpatialBridge(NULL);
                 }
         }
+        updatePartition();
 }
 
 // Returns "distance" between target destination and resulting xfrom
@@ -499,9 +549,8 @@ F32 LLDrawable::updateXform(BOOL undamped)
                         if (scaled >= MIN_INTERPOLATE_DISTANCE_SQUARED)
                         {               
                                 //scaling requires an immediate rebuild
-                                gPipeline.markRebuild(this, LLDrawable::REBUILD_VOLUME, TRUE);
+                                gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
                         }
-
                 }
                 else
                 {
@@ -517,20 +566,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
         mXform.updateMatrix();
         
         mCurrentScale = target_scale;
-                                
-        if (!getVOVolume())
-        {
-                movePartition();
-        }
-        else if (mSpatialBridge)
-        {
-                gPipeline.markMoved(mSpatialBridge, FALSE);
-        }
-        else
-        {
-                //a child prim moved and needs its verts regenerated
-                gPipeline.markRebuild(this, LLDrawable::REBUILD_VOLUME, TRUE);
-        }
         
         return dist_squared;
 }
@@ -540,11 +575,6 @@ void LLDrawable::setRadius(F32 radius)
         if (mRadius != radius)
         {
                 mRadius = radius;
-                updateBinRadius();
-                if (!getVOVolume())
-                {
-                        movePartition();
-                }
         }
 }
 
@@ -573,13 +603,10 @@ void LLDrawable::moveUpdatePipeline(BOOL moved)
 
 void LLDrawable::movePartition()
 {
-        if (getSpatialGroup() || getVOVolume())
+        LLSpatialPartition* part = getSpatialPartition();
+        if (part)
         {
-                LLSpatialPartition* part = getSpatialPartition();
-                if (part)
-                {
-                        part->move(this, getSpatialGroup());
-                }
+                part->move(this, getSpatialGroup());
         }
 }
 
@@ -625,10 +652,27 @@ BOOL LLDrawable::updateMoveUndamped()
         }
 
         mVObjp->clearChanged(LLXform::MOVED);
-
+        
         return TRUE;
 }
 
+void LLDrawable::updatePartition()
+{
+        if (!getVOVolume())
+        {
+                movePartition();
+        }
+        else if (mSpatialBridge)
+        {
+                gPipeline.markMoved(mSpatialBridge, FALSE);
+        }
+        else
+        {
+                //a child prim moved and needs its verts regenerated
+                gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+        }
+}
+
 BOOL LLDrawable::updateMoveDamped()
 {
         F32 dist_squared = updateXform(FALSE);
@@ -654,25 +698,42 @@ BOOL LLDrawable::updateMoveDamped()
 
 void LLDrawable::updateDistance(LLCamera& camera)
 {
-        if (mVObjp->isHUDAttachment())
-        {
-                mDistanceWRTCamera = 1.0f;
-                if (sCurVisible % 16 == 0)
-                {
-                        mVObjp->updateLOD();
-                }
-                return;
-        }
-
-        LLVector3 pos(getPositionGroup());
-        
-        pos -= camera.getOrigin();      
-        mDistanceWRTCamera = pos.magVec();
-        
         //switch LOD with the spatial group to avoid artifacts
         LLSpatialGroup* sg = getSpatialGroup();
+
+        LLVector3 pos;
+
         if (!sg || sg->changeLOD())
         {
+                LLVOVolume* volume = getVOVolume();
+                if (volume)
+                {
+                        volume->updateRelativeXform();
+                        pos = LLVector3(0,0,0) * volume->getRelativeXform();
+
+                        for (S32 i = 0; i < getNumFaces(); i++)
+                        {
+                                LLFace* facep = getFace(i);
+                                if (facep->getPoolType() == LLDrawPool::POOL_ALPHA)
+                                {
+                                        LLVector3 box = (facep->mExtents[1] - facep->mExtents[0]) * 0.25f;
+                                        LLVector3 v = (facep->mCenterLocal-camera.getOrigin());
+                                        LLVector3 at = camera.getAtAxis();
+                                        for (U32 j = 0; j < 3; j++)
+                                        {
+                                                v.mV[j] -= box.mV[j] * at.mV[j];
+                                        }
+                                        facep->mDistance = v * camera.getAtAxis();
+                                }
+                        }
+                }
+                else
+                {
+                        pos = LLVector3(getPositionGroup());
+                }
+
+                pos -= camera.getOrigin();      
+                mDistanceWRTCamera = llround(pos.magVec(), 0.01f);
                 mVObjp->updateLOD();
         }
 }
@@ -687,67 +748,33 @@ void LLDrawable::updateTexture()
                 return;
         }
         
-        // *FIX: this updates textures on all faces in this drawable, not
-        // just the viewer object we care about
-        if (mVObjp->getNumTEs())
+        if (getNumFaces() != mVObjp->getNumTEs())
+        { //drawable is transitioning its face count
+                return;
+        }
+
+        if (getVOVolume())
         {
-                // For each face in this drawable, change the drawpool if necessary.
-                for (S32 i = 0; i < getNumFaces(); i++)
+                if (!isActive())
+                {
+                        gPipeline.markMoved(this);
+                }
+                else
                 {
-                        LLFace *facep = mFaces[i];
-                        U32 pool_type = facep->getPool()->getType();
-
-                        if ((pool_type == LLDrawPool::POOL_SIMPLE) ||
-                                (pool_type == LLDrawPool::POOL_ALPHA) ||
-                                (pool_type == LLDrawPool::POOL_HUD) ||
-                                (pool_type == LLDrawPool::POOL_MEDIA) ||
-                                (pool_type == LLDrawPool::POOL_BUMP))
+                        if (isRoot())
                         {
-                                LLViewerObject* objp = facep->getViewerObject();
-                                S32 te_offset = facep->getTEOffset();
-
-                                if (te_offset >= objp->getNumTEs()) // Shouldn't happen
-                                {
-                                        llwarns << "TE offsets don't match!" << llendl;
-                                        facep->setTEOffset(-1);
-                                        continue;
-                                }
-
-                                LLDrawPool* poolp = NULL;
-                                LLViewerImage* imagep = (te_offset >= 0) ? objp->getTEImage(te_offset) : facep->getTexture();
-                                if (facep->isState(LLFace::HUD_RENDER))
-                                {
-                                        poolp = gPipeline.getPool(LLDrawPool::POOL_HUD);
-                                }
-                                else if (te_offset >= 0)
-                                {
-                                        // This face actually uses texture entries...
-                                        const LLTextureEntry* te = facep->getTextureEntry();
-                                        poolp = LLPipeline::getPoolFromTE(te, imagep);
-                                }
-                                else
-                                {
-                                        // No texture entry for this face.
-                                        if (!imagep)
-                                        {
-                                                poolp = gPipeline.getPool(LLDrawPool::POOL_SIMPLE, NULL);
-                                        }
-                                        else if ((imagep->getComponents() == 4) || (imagep->getComponents() == 2))
-                                        {
-                                                poolp = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-                                        }
-                                        else
-                                        {
-                                                poolp = gPipeline.getPool(LLDrawPool::POOL_SIMPLE, imagep);
-                                        }
-                                }
-                                facep->setPool(poolp, imagep);
+                                mQuietCount = 0;
+                        }
+                        else
+                        {
+                                getParent()->mQuietCount = 0;
                         }
                 }
+                                
+                gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
         }
 }
 
-
 BOOL LLDrawable::updateGeometry(BOOL priority)
 {
         llassert(mVObjp.notNull());
@@ -788,12 +815,9 @@ void LLDrawable::shiftPos(const LLVector3 &shift_vector)
         mXform.setScale(1,1,1);
         mXform.updateMatrix();
 
-        if (isStatic() || // *FIX: don't know why this is happening, but
-                                        // some terrain patches are becoming active
-                                        // (earth quake, maybe?) DP
-                getRenderType() == LLPipeline::RENDER_TYPE_TERRAIN)
+        if (isStatic())
         {
-                LLStrider<LLVector3>  verticesp;
+                gPipeline.markRebuild(this, LLDrawable::REBUILD_GEOMETRY, TRUE);
 
                 for (S32 i = 0; i < getNumFaces(); i++)
                 {
@@ -802,34 +826,13 @@ void LLDrawable::shiftPos(const LLVector3 &shift_vector)
                         facep->mExtents[0] += shift_vector;
                         facep->mExtents[1] += shift_vector;
                         
-                        if (facep->hasGeometry() && !facep->isState(LLFace::SHARED_GEOM))
+                        if (facep->hasGeometry())
                         {
-                                S32 index = facep->getVertices(verticesp);
-                                if (index >= 0)
-                                {
-                                        S32 vertex_count = facep->getGeomCount();
-                                        for (S32 j = 0; j < vertex_count; j++)
-                                        {
-                                                *verticesp += shift_vector;
-                                                verticesp++;
-                                        }
-                                }
+                                facep->mVertexBuffer = NULL;
+                                facep->mLastVertexBuffer = NULL;
                         }
                 }
-        }
-        else
-        {
-                // Update the face centers.
-                for (S32 i = 0; i < getNumFaces(); i++)
-                {
-                        LLFace *facep = getFace(i);
-                        facep->mCenterAgent += shift_vector;
-                }
-        }
-
-        //update spatial extents
-        if (!getVOVolume() || isStatic())
-        {
+                
                 mExtents[0] += shift_vector;
                 mExtents[1] += shift_vector;
                 mPositionGroup += LLVector3d(shift_vector);
@@ -874,6 +877,8 @@ void LLDrawable::updateSpatialExtents()
                 mVObjp->updateSpatialExtents(mExtents[0], mExtents[1]);
         }
         
+        updateBinRadius();
+        
         if (mSpatialBridge.notNull())
         {
                 mPositionGroup.setVec(0,0,0);
@@ -883,11 +888,14 @@ void LLDrawable::updateSpatialExtents()
 
 void LLDrawable::updateBinRadius()
 {
-        S32 binLOD = mVObjp ? mVObjp->getLOD() : 2;
-        static F64 detail_bins[] = { 8, 4, 2, 1 };
-        F32 radius = getVOVolume() && isStatic() ? 
-                                (mExtents[1]-mExtents[0]).magVec() : getRadius();
-        mBinRadius = detail_bins[binLOD] * llmax((F64) radius, (3-binLOD)*0.25);
+        if (mVObjp.notNull())
+        {
+                mBinRadius = mVObjp->getBinRadius();
+        }
+        else
+        {
+                mBinRadius = getRadius()*4.f;
+        }
 }
 
 void LLDrawable::updateLightSet()
@@ -898,6 +906,7 @@ void LLDrawable::updateLightSet()
                 return;
         }
 
+        LLSpatialPartition* part = gPipeline.getSpatialPartition(LLPipeline::PARTITION_VOLUME);
         LLVOVolume* light = getVOVolume();
         if (isLight() && light)
         {
@@ -907,7 +916,7 @@ void LLDrawable::updateLightSet()
                         gPipeline.markRelight(*iter);
                 }
                 mLightSet.clear();
-                gPipeline.mObjectPartition->getObjects(getPositionAgent(), light->getLightRadius(), mLightSet);
+                part->getObjects(getPositionAgent(), light->getLightRadius(), mLightSet);
                 for (drawable_set_t::iterator iter = mLightSet.begin(); iter != mLightSet.end(); iter++)
                 {
                         gPipeline.markRelight(*iter);
@@ -917,9 +926,9 @@ void LLDrawable::updateLightSet()
         {
                 // mLightSet points to nearby lights
                 mLightSet.clear();
-                gPipeline.mObjectPartition->getLights(getPositionAgent(), getRadius(), mLightSet);
-                const U32 max_lights = 16;
-                if (mLightSet.size() > max_lights)
+                part->getLights(getPositionAgent(), getRadius(), mLightSet);
+                const drawable_set_t::size_type MAX_LIGHTS = 16;
+                if (mLightSet.size() > MAX_LIGHTS)
                 {
                         typedef std::set<std::pair<F32,LLPointer<LLDrawable> > > sorted_pair_set_t;
                         sorted_pair_set_t sorted_set;
@@ -1053,28 +1062,28 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
 { 
         LLSpatialPartition* retval = NULL;
         
-        if (mVObjp->isHUDAttachment())
-        {       //HUD attachments don't get space partitioned
-                return NULL;
-        }
-
         if (!mVObjp || 
                 !getVOVolume() ||
                 isStatic())
         {
-                retval = gPipeline.mObjectPartition;
+                retval = gPipeline.getSpatialPartition((LLViewerObject*) mVObjp);
         }
-
-        //must be an active volume
-        if (!retval && isRoot())
-        {       
+        else if (isRoot())
+        {       //must be an active volume
                 if (!mSpatialBridge)
                 {
-                        setSpatialBridge(new LLSpatialBridge(this));
+                        if (mVObjp->isHUDAttachment())
+                        {
+                                setSpatialBridge(new LLHUDBridge(this));
+                        }
+                        else
+                        {
+                                setSpatialBridge(new LLVolumeBridge(this));
+                        }
                 }
                 return mSpatialBridge->asPartition();
         }
-        else if (!retval)
+        else 
         {
                 retval = getParent()->getSpatialPartition();
         }
@@ -1088,27 +1097,73 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
         return retval;
 }
 
+
+BOOL LLDrawable::isVisible() const
+{
+        if (mVisible == sCurVisible)
+        {
+                return TRUE;
+        }
+        
+        if (isActive())
+        {
+                if (isRoot())
+                {
+                        LLSpatialGroup* group = mSpatialBridge.notNull() ? mSpatialBridge->getSpatialGroup() :
+                                                                        getSpatialGroup();
+                        if (!group || group->isVisible())
+                        {
+                                mVisible = sCurVisible;
+                                return TRUE;
+                        }
+                }
+                else
+                {
+                        if (getParent()->isVisible())
+                        {
+                                mVisible = sCurVisible;
+                                return TRUE;
+                        }
+                }
+        }
+        else
+        {
+                LLSpatialGroup* group = getSpatialGroup();
+                if (!group || group->isVisible())
+                {
+                        mVisible = sCurVisible;
+                        return TRUE;
+                }
+        }
+
+        return FALSE;
+}
+
 //=======================================
 // Spatial Partition Bridging Drawable
 //=======================================
 
-LLSpatialBridge::LLSpatialBridge(LLDrawable* root)
+LLSpatialBridge::LLSpatialBridge(LLDrawable* root, U32 data_mask)
+: LLSpatialPartition(data_mask, FALSE)
 {
         mDrawable = root;
         root->setSpatialBridge(this);
         
-        mRenderType = mDrawable->mRenderType; //w00! magic!
-                
+        mRenderType = mDrawable->mRenderType;
+        mDrawableType = mDrawable->mRenderType;
+        
+        mPartitionType = LLPipeline::PARTITION_VOLUME;
+        
         mOctree->balance();
         
-        gPipeline.mObjectPartition->put(this);
+        gPipeline.getSpatialPartition(mPartitionType)->put(this);
 }
 
 LLSpatialBridge::~LLSpatialBridge()
 {       
         if (getSpatialGroup())
         {
-                gPipeline.mObjectPartition->remove(this, getSpatialGroup());
+                gPipeline.getSpatialPartition(mPartitionType)->remove(this, getSpatialGroup());
         }
 }
 
@@ -1116,7 +1171,6 @@ void LLSpatialBridge::updateSpatialExtents()
 {
         LLSpatialGroup* root = (LLSpatialGroup*) mOctree->getListener(0);
         
-        if (mOctree->getChildCount() > 0)
         {
                 LLFastTimer ftm(LLFastTimer::FTM_CULL_REBOUND);
                 root->rebound();
@@ -1164,6 +1218,9 @@ void LLSpatialBridge::updateSpatialExtents()
                         }
                 }
         }
+
+        LLVector3 diagonal = newMax - newMin;
+        mRadius = diagonal.magVec() * 0.5f;
         
         mPositionGroup.setVec((newMin + newMax) * 0.5f);
         updateBinRadius();
@@ -1171,9 +1228,7 @@ void LLSpatialBridge::updateSpatialExtents()
 
 void LLSpatialBridge::updateBinRadius()
 {
-        F32 rad = ((mExtents[1]-mExtents[0])*0.5f).magVec();
-        mBinRadius = llmax(rad, 2.f);
-        mRadius = rad;
+        mBinRadius = llmin((F32) mOctree->getSize().mdV[0]*0.5f, 256.f);
 }
 
 LLCamera LLSpatialBridge::transformCamera(LLCamera& camera)
@@ -1181,39 +1236,123 @@ 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());
+        LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix());
 
-        //ret.rotate(~mat->getRotation());
         LLVector3 delta = ret.getOrigin() - center;
-        delta *= ~mat->getRotation();
-        ret.setOrigin(delta);
+        LLQuaternion rot = ~mat->getRotation();
+
+        delta *= rot;
+        LLVector3 lookAt = ret.getAtAxis();
+        LLVector3 up_axis = ret.getUpAxis();
+        LLVector3 left_axis = ret.getLeftAxis();
 
+        lookAt *= rot;
+        up_axis *= rot;
+        left_axis *= rot;
+
+        ret.setOrigin(delta);
+        ret.setAxes(lookAt, left_axis, up_axis);
+                
         return ret;
 }
 
 void LLDrawable::setVisible(LLCamera& camera, std::vector<LLDrawable*>* results, BOOL for_select)
 {
         mVisible = sCurVisible;
+        
+#if 0 && !LL_RELEASE_FOR_DOWNLOAD
+        //crazy paranoid rules checking
+        if (getVOVolume())
+        {
+                if (!isRoot())
+                {
+                        if (isActive() && !mParent->isActive())
+                        {
+                                llerrs << "Active drawable has static parent!" << llendl;
+                        }
+                        
+                        if (isStatic() && !mParent->isStatic())
+                        {
+                                llerrs << "Static drawable has active parent!" << llendl;
+                        }
+                        
+                        if (mSpatialBridge)
+                        {
+                                llerrs << "Child drawable has spatial bridge!" << llendl;
+                        }
+                }
+                else if (isActive() && !mSpatialBridge)
+                {
+                        llerrs << "Active root drawable has no spatial bridge!" << llendl;
+                }
+                else if (isStatic() && mSpatialBridge.notNull())
+                {
+                        llerrs << "Static drawable has spatial bridge!" << llendl;
+                }
+        }
+#endif
 }
 
+class LLOctreeMarkNotCulled: public LLOctreeTraveler<LLDrawable>
+{
+public:
+        LLCamera* mCamera;
+        
+        LLOctreeMarkNotCulled(LLCamera* camera_in) : mCamera(camera_in) { }
+        
+        virtual void traverse(const LLOctreeNode<LLDrawable>* node)
+        {
+                LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
+                group->clearState(LLSpatialGroup::OCCLUDED | LLSpatialGroup::CULLED);
+                LLOctreeTraveler<LLDrawable>::traverse(node);
+        }
+        
+        void visit(const LLOctreeState<LLDrawable>* branch)
+        {
+                gPipeline.markNotCulled((LLSpatialGroup*) branch->getListener(0), *mCamera, TRUE);
+        }
+};
+
 void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results, BOOL for_select)
 {
+        if (!gPipeline.hasRenderType(mDrawableType))
+        {
+                return;
+        }
+
+        LLViewerObject *vobj = mDrawable->getVObj();
+        if (vobj && vobj->isAttachment() && !vobj->isHUDAttachment())
+        {
+                LLVOAvatar* av;
+                LLDrawable* parent = mDrawable->getParent();
+
+                if (parent)
+                {
+                        av = (LLVOAvatar*) parent->getVObj();
+                
+                        if (!av->isVisible())
+                        {
+                                return;
+                        }
+                }
+        }
+        
+
+        LLSpatialGroup* group = (LLSpatialGroup*) mOctree->getListener(0);
+        group->rebound();
+        
         LLVector3 center = (mExtents[0] + mExtents[1]) * 0.5f;
         LLVector3 size = (mExtents[1]-mExtents[0]) * 0.5f;
 
         if (camera_in.AABBInFrustum(center, size))
         {
-                LLVector3 lookAt = center - camera_in.getOrigin();
-                F32 distSqr = lookAt.magVecSquared();
-                F32 objRad = size.magVecSquared();
-                
-                if (objRad/distSqr < SG_MIN_DIST_RATIO*4)
+                if (LLPipeline::calcPixelArea(center, size, camera_in) < FORCE_INVISIBLE_AREA)
                 {
                         return;
                 }
 
                 LLDrawable::setVisible(camera_in);
-
+                
                 if (for_select)
                 {
                         results->push_back(mDrawable);
@@ -1222,42 +1361,36 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
                                 results->push_back(mDrawable->getChild(i));
                         }
                 }
-                else
+                else 
                 {
-                        const LLVector3* extents = mDrawable->getSpatialExtents();
-                        objRad = mDrawable->getRadius();
-                        objRad *= objRad;
-                        
-                        if (objRad/distSqr > SG_MIN_DIST_RATIO)
-                        {
-                                gPipeline.markNotCulled(mDrawable, camera_in);
-                        }
-                        
-                        for (U32 i = 0; i < mDrawable->getChildCount(); i++)
-                        {
-                                LLDrawable* child = mDrawable->getChild(i);
-                                extents = child->getSpatialExtents();
-                                objRad = child->getRadius();
-                                objRad *= objRad;
-                                
-                                if (objRad/distSqr > SG_MIN_DIST_RATIO)
-                                {
-                                        gPipeline.markNotCulled(mDrawable->getChild(i), camera_in);
-                                }
-                        }
-                }
+                        LLCamera trans_camera = transformCamera(camera_in);
+                        LLOctreeMarkNotCulled culler(&trans_camera);
+                        culler.traverse(mOctree);
+                }               
         }
 }
 
 void LLSpatialBridge::updateDistance(LLCamera& camera_in)
 {
+        if (mDrawable == NULL)
+        {
+                markDead();
+                return;
+        }
+
         LLCamera camera = transformCamera(camera_in);
         
         mDrawable->updateDistance(camera);
         
         for (U32 i = 0; i < mDrawable->getChildCount(); ++i)
         {
-                mDrawable->getChild(i)->updateDistance(camera);
+                LLDrawable* child = mDrawable->getChild(i);
+                if (!child)
+                {
+                        llwarns << "Corrupt drawable found while updating spatial bridge distance." << llendl;
+                        continue;
+                }
+                child->updateDistance(camera);
         }
 }
 
@@ -1280,7 +1413,7 @@ void LLSpatialBridge::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL imm
 BOOL LLSpatialBridge::updateMove()
 {
         mOctree->balance();
-        gPipeline.mObjectPartition->move(this, getSpatialGroup(), TRUE);
+        gPipeline.getSpatialPartition(mPartitionType)->move(this, getSpatialGroup(), TRUE);
         return TRUE;
 }
 
@@ -1338,3 +1471,81 @@ const LLVector3	LLDrawable::getPositionAgent() const
         }
 }
 
+BOOL LLDrawable::isAnimating() const
+{
+        if (!getVObj())
+        {
+                return TRUE;
+        }
+
+        if (getScale() != mVObjp->getScale())
+        {
+                return TRUE;
+        }
+
+        if (mVObjp->isFlexible())
+        {
+                return TRUE;
+        }
+
+        if (mVObjp->getPCode() == LLViewerObject::LL_VO_PART_GROUP)
+        {
+                return TRUE;
+        }
+
+        if (mVObjp->getPCode() == LLViewerObject::LL_VO_CLOUDS)
+        {
+                return TRUE;
+        }
+
+        LLVOVolume* vol = getVOVolume();
+        if (vol && vol->mTextureAnimp)
+        {
+                return TRUE;
+        }
+
+        if (!isRoot() && !mVObjp->getAngularVelocity().isExactlyZero())
+        {
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+void LLDrawable::updateFaceSize(S32 idx)
+{
+        if (mVObjp.notNull())
+        {
+                mVObjp->updateFaceSize(idx);
+        }
+}
+
+LLBridgePartition::LLBridgePartition()
+: LLSpatialPartition(0, TRUE) 
+{ 
+        mRenderByGroup = FALSE; 
+        mDrawableType = LLPipeline::RENDER_TYPE_AVATAR; 
+        mPartitionType = LLPipeline::PARTITION_BRIDGE;
+        mLODPeriod = 1;
+        mSlopRatio = 0.f;
+}
+
+LLHUDBridge::LLHUDBridge(LLDrawable* drawablep)
+: LLVolumeBridge(drawablep)
+{
+        mDrawableType = LLPipeline::RENDER_TYPE_HUD;
+        mPartitionType = LLPipeline::PARTITION_HUD;
+        mSlopRatio = 0.0f;
+}
+
+F32 LLHUDBridge::calcPixelArea(LLSpatialGroup* group, LLCamera& camera)
+{
+        return 1024.f;
+}
+
+
+void LLHUDBridge::shiftPos(const LLVector3& vec)
+{
+        //don't shift hud bridges on region crossing
+}
+
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h
index 062427e..6ff4d1e 100644
--- a/linden/indra/newview/lldrawable.h
+++ b/linden/indra/newview/lldrawable.h
@@ -38,8 +38,8 @@
 #include "v4coloru.h"
 #include "llquaternion.h"
 #include "xform.h"
+#include "llmemtype.h"
 #include "llprimitive.h"
-#include "llviewerimage.h"
 #include "lldarray.h"
 #include "llstat.h"
 #include "llviewerobject.h"
@@ -52,6 +52,7 @@ class LLSpatialGroup;
 class LLSpatialBridge;
 class LLSpatialPartition;
 class LLVOVolume;
+class LLViewerImage;
 
 extern F32 gFrameTimeSeconds;
 
@@ -74,7 +75,7 @@ public:
 
         BOOL isLight() const;
 
-        BOOL isVisible() const          { return (mVisible == sCurVisible); }
+        BOOL isVisible() const;         
         virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, BOOL for_select = FALSE);
 
 
@@ -121,10 +122,11 @@ public:
         inline S32                      getNumFaces()            const;
 
         //void                removeFace(const S32 i); // SJB: Avoid using this, it's slow
-        LLFace*                         addFace(LLDrawPool *poolp, LLViewerImage *texturep, const BOOL shared_geom = FALSE);
+        LLFace*                         addFace(LLFacePool *poolp, LLViewerImage *texturep);
+        LLFace*                         addFace(const LLTextureEntry *te, LLViewerImage *texturep);
         void                            deleteFaces(S32 offset, S32 count);
-        void                setNumFaces(const S32 numFaces, LLDrawPool *poolp, LLViewerImage *texturep);
-        void                setNumFacesFast(const S32 numFaces, LLDrawPool *poolp, LLViewerImage *texturep);
+        void                setNumFaces(const S32 numFaces, LLFacePool *poolp, LLViewerImage *texturep);
+        void                setNumFacesFast(const S32 numFaces, LLFacePool *poolp, LLViewerImage *texturep);
         void                            mergeFaces(LLDrawable* src);
 
         void init();
@@ -138,6 +140,8 @@ public:
 
         BOOL isActive() const                                                   { return isState(ACTIVE); }
         BOOL isStatic() const                                                   { return !isActive(); }
+        BOOL isAnimating() const;
+
         virtual BOOL updateMove();
         virtual void movePartition();
         
@@ -146,6 +150,7 @@ public:
         virtual void updateDistance(LLCamera& camera);
         BOOL updateGeometry(BOOL priority);
         BOOL updateLighting(BOOL priority);
+        void updateFaceSize(S32 idx);
         void updateLightSet();
         
         F32  getSunShadowFactor() const                         { return mSunShadowFactor; }
@@ -195,6 +200,7 @@ public:
 protected:
         virtual ~LLDrawable() { destroy(); }
         void moveUpdatePipeline(BOOL moved);
+        void updatePartition();
         BOOL updateMoveDamped();
         BOOL updateMoveUndamped();
         
@@ -206,6 +212,7 @@ public:
         typedef std::set<LLPointer<LLDrawable> > drawable_set_t;
         typedef std::vector<LLPointer<LLDrawable> > drawable_vector_t;
         typedef std::list<LLPointer<LLDrawable> > drawable_list_t;
+        typedef std::queue<LLPointer<LLDrawable> > drawable_queue_t;
         
         struct CompareDistanceGreater
         {
@@ -246,11 +253,14 @@ public:
                 UNLIT                   = 0x00000200,
                 LIGHT                   = 0x00000400,
                 LIGHTING_BUILT  = 0x00000800,
-                REBUILD_VOLUME  = 0x00001000,
-                REBUILD_TCOORD  = 0x00002000,
-                REBUILD_GEOMETRY= REBUILD_VOLUME|REBUILD_TCOORD,
-                REBUILD_LIGHTING= 0x00008000,
-                REBUILD_ALL             = REBUILD_GEOMETRY|REBUILD_LIGHTING,
+                REBUILD_VOLUME  = 0x00001000,   //volume changed LOD or parameters, or vertex buffer changed
+                REBUILD_TCOORD  = 0x00002000,   //texture coordinates changed
+                REBUILD_COLOR   = 0x00004000,   //color changed
+                REBUILD_LIGHTING= 0x00008000,   //lighting information changed
+                REBUILD_POSITION= 0x00010000,   //vertex positions/normals changed
+                REBUILD_GEOMETRY= REBUILD_POSITION|REBUILD_TCOORD|REBUILD_COLOR,
+                REBUILD_MATERIAL= REBUILD_TCOORD|REBUILD_COLOR,
+                REBUILD_ALL             = REBUILD_GEOMETRY|REBUILD_LIGHTING|REBUILD_VOLUME,
                 ON_SHIFT_LIST   = 0x00100000,
 //              NO_INTERP_COLOR = 0x00200000,
                 BLOCKER                 = 0x00400000,
@@ -285,6 +295,8 @@ public:
         void setSpatialBridge(LLSpatialBridge* bridge) { mSpatialBridge = (LLDrawable*) bridge; }
         LLSpatialBridge* getSpatialBridge() { return (LLSpatialBridge*) (LLDrawable*) mSpatialBridge; }
         
+        static F32 sCurPixelAngle; //current pixels per radian
+
 protected:
         typedef std::vector<LLFace*> face_list_t;
         
@@ -296,7 +308,7 @@ protected:
         LLPointer<LLDrawable> mSpatialBridge;
         S32                             mSpatialGroupOffset;
         
-        U32                             mVisible;
+        mutable U32             mVisible;
         F32                             mRadius;
         LLVector3               mExtents[2];
         LLVector3d              mPositionGroup;
@@ -308,7 +320,6 @@ protected:
         LLVector3               mCurrentScale;
         
         static U32 sCurVisible; // Counter for what value of mVisible means currently visible
-        static F32 sCurPixelAngle; //current pixels per radian
 
         static U32 sNumZombieDrawables;
         static LLDynamicArrayPtr<LLPointer<LLDrawable> > sDeadList;
@@ -318,6 +329,7 @@ protected:
 inline LLFace* LLDrawable::getFace(const S32 i) const
 {
         llassert((U32)i < mFaces.size());
+        llassert(mFaces[i]);
         return mFaces[i];
 }
 
diff --git a/linden/indra/newview/lldrawpool.cpp b/linden/indra/newview/lldrawpool.cpp
index 18d6000..dc2e6ba 100644
--- a/linden/indra/newview/lldrawpool.cpp
+++ b/linden/indra/newview/lldrawpool.cpp
@@ -32,7 +32,6 @@
 #include "llfasttimer.h"
 #include "llviewercontrol.h"
 
-#include "llagparray.h"
 #include "lldrawable.h"
 #include "lldrawpoolalpha.h"
 #include "lldrawpoolavatar.h"
@@ -43,53 +42,38 @@
 #include "lldrawpoolsky.h"
 #include "lldrawpoolstars.h"
 #include "lldrawpooltree.h"
-#include "lldrawpooltreenew.h"
 #include "lldrawpoolterrain.h"
 #include "lldrawpoolwater.h"
-#include "lldrawpoolhud.h"
 #include "llface.h"
 #include "llviewerobjectlist.h" // For debug listing.
-#include "llvotreenew.h"
 #include "pipeline.h"
 
-#include "llagparray.inl"
-
-U32 LLDrawPool::sDataSizes[LLDrawPool::DATA_MAX_TYPES] =
-{
-        12, // DATA_VERTICES
-        8,      // DATA_TEX_COORDS0
-        8,      // DATA_TEX_COORDS1
-        8,      // DATA_TEX_COORDS2
-        8,      // DATA_TEX_COORDS3
-        12, // DATA_NORMALS
-        4,      // DATA_VERTEX_WEIGHTS,
-        16, // DATA_CLOTHING_WEIGHTS
-        12,     // DATA_BINORMALS
-        4,      // DATA_COLORS
-};
-
 S32 LLDrawPool::sNumDrawPools = 0;
 
+
+//=============================
+// Draw Pool Implementation
+//=============================
 LLDrawPool *LLDrawPool::createPool(const U32 type, LLViewerImage *tex0)
 {
         LLDrawPool *poolp = NULL;
         switch (type)
         {
         case POOL_SIMPLE:
-                poolp = new LLDrawPoolSimple(tex0);
+                poolp = new LLDrawPoolSimple();
                 break;
         case POOL_ALPHA:
                 poolp = new LLDrawPoolAlpha();
                 break;
+        case POOL_ALPHA_POST_WATER:
+                poolp = new LLDrawPoolAlphaPostWater();
+                break;
         case POOL_AVATAR:
                 poolp = new LLDrawPoolAvatar();
                 break;
         case POOL_TREE:
                 poolp = new LLDrawPoolTree(tex0);
                 break;
-        case POOL_TREE_NEW:
-                poolp = new LLDrawPoolTreeNew(tex0);                    
-                break;
         case POOL_TERRAIN:
                 poolp = new LLDrawPoolTerrain(tex0);
                 break;
@@ -99,9 +83,6 @@ LLDrawPool *LLDrawPool::createPool(const U32 type, LLViewerImage *tex0)
         case POOL_STARS:
                 poolp = new LLDrawPoolStars();
                 break;
-        case POOL_CLOUDS:
-                poolp = new LLDrawPoolClouds();
-                break;
         case POOL_WATER:
                 poolp = new LLDrawPoolWater();
                 break;
@@ -109,10 +90,7 @@ LLDrawPool *LLDrawPool::createPool(const U32 type, LLViewerImage *tex0)
                 poolp = new LLDrawPoolGround();
                 break;
         case POOL_BUMP:
-                poolp = new LLDrawPoolBump(tex0);
-                break;
-        case POOL_HUD:
-                poolp = new LLDrawPoolHUD();
+                poolp = new LLDrawPoolBump();
                 break;
         default:
                 llerrs << "Unknown draw pool type!" << llendl;
@@ -123,183 +101,86 @@ LLDrawPool *LLDrawPool::createPool(const U32 type, LLViewerImage *tex0)
         return poolp;
 }
 
-LLDrawPool::LLDrawPool(const U32 type, const U32 data_mask_il, const U32 data_mask_nil)
+LLDrawPool::LLDrawPool(const U32 type)
 {
-        llassert(data_mask_il & DATA_VERTICES_MASK);
-        S32 i;
         mType = type;
         sNumDrawPools++;
         mId = sNumDrawPools;
-
-        mDataMaskIL = data_mask_il;
-        mDataMaskNIL = data_mask_nil;
-
-        U32 cur_mask = 0x01;
-        U32 cur_offset = 0;
-        for (i = 0; i < DATA_MAX_TYPES; i++)
-        {
-                mDataOffsets[i] = cur_offset;
-                if (cur_mask & mDataMaskIL)
-                {
-                        cur_offset += sDataSizes[i];
-                }
-                cur_mask <<= 1;
-        }
-
-        mStride = cur_offset;
-
-        mCleanupUnused = FALSE;
+        mVertexShaderLevel = 0;
         mIndicesDrawn = 0;
-        mRebuildFreq = 128 + rand() % 5;
-        mRebuildTime = 0;
-        mGeneration  = 1;
-        mSkippedVertices = 0;
-
-        resetDrawOrders();
-        resetVertexData(0);
-
-        if (gGLManager.mHasATIVAO && !gGLManager.mIsRadeon9700)
-        {
-                // ATI 8500 doesn't like indices > 15 bit.
-                mMaxVertices = DEFAULT_MAX_VERTICES/2;
-        }
-        else
-        {
-                mMaxVertices = DEFAULT_MAX_VERTICES;
-        }
+}
 
-        // JC: This must happen last, as setUseAGP reads many of the
-        // above variables.
-        mUseAGP = FALSE;
-        setUseAGP(gPipeline.usingAGP());
+LLDrawPool::~LLDrawPool()
+{
 
-        for (i=0; i<NUM_BUCKETS; i++)
-        {
-                mFreeListGeomHead[i] = -1;
-                mFreeListIndHead[i] = -1;
-        }
-        mVertexShaderLevel = 0;
 }
 
-void LLDrawPool::destroy()
+LLViewerImage *LLDrawPool::getDebugTexture()
 {
-        if (!mReferences.empty())
-        {
-                llinfos << mReferences.size() << " references left on deletion of draw pool!" << llendl;
-        }
+        return NULL;
 }
 
-
-LLDrawPool::~LLDrawPool()
+//virtual
+void LLDrawPool::beginRenderPass( S32 pass )
 {
-        destroy();
-
-        llassert( gPipeline.findPool( getType(), getTexture() ) == NULL );
 }
 
-BOOL LLDrawPool::setUseAGP(BOOL use_agp)
+//virtual
+void LLDrawPool::endRenderPass( S32 pass )
 {
-        BOOL ok = TRUE;
-        S32 vertex_count = mMemory.count() / mStride;
-        if (vertex_count > mMaxVertices && use_agp)
-        {
-#ifdef DEBUG_AGP
-                llwarns << "Allocating " << vertex_count << " vertices in pool type " << getType() << ", disabling AGP!" << llendl
-#endif
-                use_agp = FALSE;
-                ok = FALSE;
-        }
-
-        if (mUseAGP != use_agp)
-        {
-                mUseAGP = use_agp;
-
-                BOOL ok = TRUE;
-                ok &= mMemory.setUseAGP(use_agp);
-
-                if (mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK)
-                {
-                        ok &= mWeights.setUseAGP(use_agp);
-                }
-                if (mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK)
-                {
-                        ok &= mClothingWeights.setUseAGP(use_agp);
-                }
-
-                if (!ok)
-                {
-                        // Disable AGP if any one of these doesn't have AGP, we don't want to try
-                        // mixing AGP and non-agp arrays in a single pool.
-#ifdef DEBUG_AGP
-                        llinfos << "Aborting using AGP because set failed on a mem block!" << llendl;
-#endif
-                        setUseAGP(FALSE);
-                        ok = FALSE;
-                }
-        }
-        return ok;
+        glDisableClientState ( GL_TEXTURE_COORD_ARRAY );
+        glDisableClientState ( GL_COLOR_ARRAY );
+        glDisableClientState ( GL_NORMAL_ARRAY );
 }
 
-void LLDrawPool::flushAGP()
+U32 LLDrawPool::getTrianglesDrawn() const
 {
-        mMemory.flushAGP();
-
-        if (mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK)
-        {
-                mWeights.flushAGP();
-        }
-        if (mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK)
-        {
-                mClothingWeights.flushAGP();
-        }
+        return mIndicesDrawn / 3;
 }
 
-void LLDrawPool::syncAGP()
+void LLDrawPool::resetTrianglesDrawn()
 {
-        if (!getVertexCount())
-        {
-                return;
-        }
-        setUseAGP(gPipeline.usingAGP());
+        mIndicesDrawn = 0;
+}
 
-        BOOL all_agp_on = TRUE;
-        mMemory.sync();
-        all_agp_on &= mMemory.isAGP();
+void LLDrawPool::addIndicesDrawn(const U32 indices)
+{
+        mIndicesDrawn += indices;
+}
 
-        if (mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK)
-        {
-                mWeights.sync();
-                all_agp_on &= mWeights.isAGP();
-        }
+//=============================
+// Face Pool Implementation
+//=============================
+LLFacePool::LLFacePool(const U32 type)
+: LLDrawPool(type)
+{
+        resetDrawOrders();
+}
 
-        if (mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK)
-        {
-                mClothingWeights.sync();
-                all_agp_on &= mClothingWeights.isAGP();
-        }
+LLFacePool::~LLFacePool()
+{
+        destroy();
+}
 
-        // Since sometimes AGP allocation is done during syncs, we need
-        // to make sure that if AGP allocation fails, we fallback to non-agp.
-        if (mUseAGP && !all_agp_on)
+void LLFacePool::destroy()
+{
+        if (!mReferences.empty())
         {
-#ifdef DEBUG_AGP
-                llinfos << "setUseAGP false because of AGP sync failure!" << llendl;
-#endif
-                setUseAGP(FALSE);
+                llinfos << mReferences.size() << " references left on deletion of draw pool!" << llendl;
         }
 }
 
-void LLDrawPool::dirtyTexture(const LLViewerImage *imagep)
+void LLFacePool::dirtyTextures(const std::set<LLViewerImage*>& textures)
 {
 }
 
-BOOL LLDrawPool::moveFace(LLFace *face, LLDrawPool *poolp, BOOL copy_data)
+BOOL LLFacePool::moveFace(LLFace *face, LLDrawPool *poolp, BOOL copy_data)
 {
         return TRUE;
 }
 
 // static
-S32 LLDrawPool::drawLoop(face_array_t& face_list, const U32* index_array)
+S32 LLFacePool::drawLoop(face_array_t& face_list)
 {
         S32 res = 0;
         if (!face_list.empty())
@@ -308,19 +189,15 @@ S32 LLDrawPool::drawLoop(face_array_t& face_list, const U32* index_array)
                          iter != face_list.end(); iter++)
                 {
                         LLFace *facep = *iter;
-                        if (facep->mSkipRender)
-                        {
-                                continue;
-                        }
-                        facep->enableLights();
-                        res += facep->renderIndexed(index_array);
+                        //facep->enableLights();
+                        res += facep->renderIndexed();
                 }
         }
         return res;
 }
 
 // static
-S32 LLDrawPool::drawLoopSetTex(face_array_t& face_list, const U32* index_array, S32 stage)
+S32 LLFacePool::drawLoopSetTex(face_array_t& face_list, S32 stage)
 {
         S32 res = 0;
         if (!face_list.empty())
@@ -329,117 +206,30 @@ S32 LLDrawPool::drawLoopSetTex(face_array_t& face_list, const U32* index_array,
                          iter != face_list.end(); iter++)
                 {
                         LLFace *facep = *iter;
-                        if (facep->mSkipRender)
-                        {
-                                continue;
-                        }
                         facep->bindTexture(stage);
                         facep->enableLights();
-                        res += facep->renderIndexed(index_array);
+                        res += facep->renderIndexed();
                 }
         }
         return res;
 }
 
-void LLDrawPool::drawLoop()
+void LLFacePool::drawLoop()
 {
-        const U32* index_array = getRawIndices();       
         if (!mDrawFace.empty())
         {
-                mIndicesDrawn += drawLoop(mDrawFace, index_array);
+                mIndicesDrawn += drawLoop(mDrawFace);
         }
 }
 
-BOOL LLDrawPool::getVertexStrider(LLStrider<LLVector3> &vertices, const U32 index)
-{
-        llassert(mDataMaskIL & LLDrawPool::DATA_VERTICES_MASK);
-        vertices = (LLVector3*)(mMemory.getMem() + mDataOffsets[DATA_VERTICES] + index * mStride); 
-        vertices.setStride(mStride);
-        return TRUE;
-}
-
-BOOL LLDrawPool::getTexCoordStrider(LLStrider<LLVector2> &tex_coords, const U32 index, const U32 pass)
-{
-        llassert(mDataMaskIL & (LLDrawPool::DATA_TEX_COORDS0_MASK << pass));
-        tex_coords = (LLVector2*)(mMemory.getMem() + mDataOffsets[DATA_TEX_COORDS0 + pass] + index * mStride); 
-        tex_coords.setStride(mStride);
-        return TRUE;
-}
-
-
-BOOL LLDrawPool::getVertexWeightStrider(LLStrider<F32> &vertex_weights, const U32 index)
-{
-        llassert(mDataMaskNIL & LLDrawPool::DATA_VERTEX_WEIGHTS_MASK);
-
-        vertex_weights = &mWeights[index];
-        vertex_weights.setStride( 0 );
-        return TRUE;
-}
-
-BOOL LLDrawPool::getClothingWeightStrider(LLStrider<LLVector4> &clothing_weights, const U32 index)
-{
-        llassert(mDataMaskNIL & LLDrawPool::DATA_CLOTHING_WEIGHTS_MASK);
-
-        clothing_weights= &mClothingWeights[index];
-        clothing_weights.setStride( 0 );
-
-        return TRUE;
-}
-
-BOOL LLDrawPool::getNormalStrider(LLStrider<LLVector3> &normals, const U32 index)
-{
-        llassert((mDataMaskIL) & LLDrawPool::DATA_NORMALS_MASK);
-
-        normals = (LLVector3*)(mMemory.getMem() + mDataOffsets[DATA_NORMALS] + index * mStride); 
-
-        normals.setStride( mStride );
-
-        return TRUE;
-}
-
-
-BOOL LLDrawPool::getBinormalStrider(LLStrider<LLVector3> &binormals, const U32 index)
-{
-        llassert((mDataMaskIL) & LLDrawPool::DATA_BINORMALS_MASK);
-
-        binormals = (LLVector3*)(mMemory.getMem() + mDataOffsets[DATA_BINORMALS] + index * mStride); 
-
-        binormals.setStride( mStride );
-
-        return TRUE;
-}
-
-BOOL LLDrawPool::getColorStrider(LLStrider<LLColor4U> &colors, const U32 index)
-{
-        llassert((mDataMaskIL) & LLDrawPool::DATA_COLORS_MASK);
-
-        colors = (LLColor4U*)(mMemory.getMem() + mDataOffsets[DATA_COLORS] + index * mStride); 
-
-        colors.setStride( mStride );
-
-        return TRUE;
-}
-
-//virtual
-void LLDrawPool::beginRenderPass( S32 pass )
-{
-}
-
-//virtual
-void LLDrawPool::endRenderPass( S32 pass )
-{
-        glDisableClientState ( GL_TEXTURE_COORD_ARRAY );
-        glDisableClientState ( GL_COLOR_ARRAY );
-        glDisableClientState ( GL_NORMAL_ARRAY );
-}
-void LLDrawPool::renderFaceSelected(LLFace *facep, 
+void LLFacePool::renderFaceSelected(LLFace *facep, 
                                                                         LLImageGL *image, 
                                                                         const LLColor4 &color,
                                                                         const S32 index_offset, const S32 index_count)
 {
 }
 
-void LLDrawPool::renderVisibility()
+void LLFacePool::renderVisibility()
 {
         if (mDrawFace.empty())
         {
@@ -525,893 +315,284 @@ void LLDrawPool::renderVisibility()
 
 }
 
-void LLDrawPool::enqueue(LLFace* facep)
-{
-        if (facep->isState(LLFace::BACKLIST))
-        {
-                mMoveFace.put(facep);
-        }
-        else
-        {
-#if ENABLE_FACE_LINKING
-                facep->mSkipRender = FALSE;
-                facep->mNextFace = NULL;
-                
-                if (mDrawFace.size() > 0)
-                {
-                        LLFace* last_face = mDrawFace[mDrawFace.size()-1];
-                        if (match(last_face, facep))
-                        {
-                                last_face->link(facep);
-                        }
-                }
-#endif
-                mDrawFace.put(facep);
-        }
-}
-
-void LLDrawPool::bindGLVertexPointer()
-{
-        mMemory.bindGLVertexPointer(getStride(DATA_VERTICES), mDataOffsets[DATA_VERTICES]);
-}
-
-void LLDrawPool::bindGLTexCoordPointer(const U32 pass)
-{
-        mMemory.bindGLTexCoordPointer(getStride(DATA_TEX_COORDS0+pass), mDataOffsets[DATA_TEX_COORDS0+pass]);
-}
-
-void LLDrawPool::bindGLNormalPointer()
-{
-        mMemory.bindGLNormalPointer(getStride(DATA_NORMALS), mDataOffsets[DATA_NORMALS]);
-}
-
-void LLDrawPool::bindGLBinormalPointer(S32 index)
-{
-        mMemory.bindGLBinormalPointer(index, getStride(DATA_BINORMALS), mDataOffsets[DATA_BINORMALS]);
-}
-
-void LLDrawPool::bindGLColorPointer()
+void LLFacePool::enqueue(LLFace* facep)
 {
-        mMemory.bindGLColorPointer(getStride(DATA_COLORS), mDataOffsets[DATA_COLORS]);
+        mDrawFace.push_back(facep);
 }
 
-void LLDrawPool::bindGLVertexWeightPointer(S32 index)
-{
-        mWeights.bindGLVertexWeightPointer(index, 0, 0);
-}
-
-void LLDrawPool::bindGLVertexClothingWeightPointer(S32 index)
-{
-        mClothingWeights.bindGLVertexClothingWeightPointer(index, 0, 0);
-}
-
-
-U32* LLDrawPool::getIndices(S32 index)
-{
-        return &mIndices[index];
-}
-
-const LLVector3& LLDrawPool::getVertex(const S32 index)
-{
-        llassert(mDataMaskIL & DATA_VERTICES_MASK);
-        llassert(index < mMemory.count());
-        llassert(mMemory.getMem());
-        return *(LLVector3*)(mMemory.getMem() + mDataOffsets[DATA_VERTICES] + index * mStride); 
-}
-
-const LLVector2& LLDrawPool::getTexCoord(const S32 index, const U32 pass)
+// virtual
+BOOL LLFacePool::addFace(LLFace *facep)
 {
-        llassert(mDataMaskIL & (LLDrawPool::DATA_TEX_COORDS0_MASK << pass));
-        llassert(index < mMemory.count());
-        return *(LLVector2*)(mMemory.getMem() + mDataOffsets[DATA_TEX_COORDS0 + pass] + index * mStride); 
+        addFaceReference(facep);
+        return TRUE;
 }
 
-const LLVector3& LLDrawPool::getNormal(const S32 index)
+// virtual
+BOOL LLFacePool::removeFace(LLFace *facep)
 {
-        llassert(mDataMaskIL & DATA_NORMALS_MASK);
-        llassert(index < mMemory.count());
-        return *(LLVector3*)(mMemory.getMem() + mDataOffsets[DATA_NORMALS] + index * mStride); 
-}
+        removeFaceReference(facep);
 
-const LLVector3& LLDrawPool::getBinormal(const S32 index)
-{
-        llassert(mDataMaskIL & DATA_BINORMALS_MASK);
-        llassert(index < mMemory.count());
-        return *(LLVector3*)(mMemory.getMem() + mDataOffsets[DATA_BINORMALS] + index * mStride); 
-}
+        vector_replace_with_last(mDrawFace, facep);
 
-const LLColor4U& LLDrawPool::getColor(const S32 index)
-{
-        llassert(mDataMaskIL & DATA_COLORS_MASK);
-        llassert(index < mMemory.count());
-        return *(LLColor4U*)(mMemory.getMem() + mDataOffsets[DATA_COLORS] + index * mStride); 
+        return TRUE;
 }
 
-const F32& LLDrawPool::getVertexWeight(const S32 index)
+// Not absolutely sure if we should be resetting all of the chained pools as well - djs
+void LLFacePool::resetDrawOrders()
 {
-        llassert(mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK);
-        llassert(index < mWeights.count());
-        llassert(mWeights.getMem());
-        return mWeights[index];
+        mDrawFace.resize(0);
 }
 
-const LLVector4& LLDrawPool::getClothingWeight(const S32 index)
+LLViewerImage *LLFacePool::getTexture()
 {
-        llassert(mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK);
-        llassert(index < mClothingWeights.count());
-        llassert(mClothingWeights.getMem());
-        return mClothingWeights[index];
+        return NULL;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-
-#define USE_FREE_LIST 0
-#define DEBUG_FREELIST 0
-
-struct tFreeListNode
+void LLFacePool::removeFaceReference(LLFace *facep)
 {
-        U32 count;
-        S32 next;
-};
-
-#if DEBUG_FREELIST
-static void check_list(U8 *pool, S32 stride, S32 head, S32 max)
-{
-        int count = 0;
-        
-        while (head >= 0)
+        if (facep->getReferenceIndex() != -1)
         {
-                tFreeListNode *node = (tFreeListNode *)(pool + head*stride);
-                count++;
-                if ((count > max) || ((node->count>>20) != 0xabc) || ((node->count&0xfffff) < 2))
-                        llerrs << "Bad Ind List" << llendl;
-                head = node->next;
+                if (facep->getReferenceIndex() != (S32)mReferences.size())
+                {
+                        LLFace *back = mReferences.back();
+                        mReferences[facep->getReferenceIndex()] = back;
+                        back->setReferenceIndex(facep->getReferenceIndex());
+                }
+                mReferences.pop_back();
         }
+        facep->setReferenceIndex(-1);
 }
-#define CHECK_LIST(x) check_list##x
-#else
-#define CHECK_LIST(x)
-#endif
 
-// DEBUG!
-void LLDrawPool::CheckIntegrity()
+void LLFacePool::addFaceReference(LLFace *facep)
 {
-#if DEBUG_FREELIST
-        int bucket;
-        for (bucket=0; bucket<NUM_BUCKETS; bucket++)
+        if (-1 == facep->getReferenceIndex())
         {
-                CHECK_LIST(((U8 *)mMemory.getMem(), mStride, mFreeListGeomHead[bucket], mMemory.count() / mStride));
-                CHECK_LIST(((U8 *)mIndices.getMem(), 4, mFreeListIndHead[bucket], mIndices.count()));
+                facep->setReferenceIndex(mReferences.size());
+                mReferences.push_back(facep);
         }
-#endif
 }
 
-int LLDrawPool::freeListBucket(U32 count)
+BOOL LLFacePool::verify() const
 {
-        int bucket;
-
-        // llassert(NUM_BUCKETS == 8)
+        BOOL ok = TRUE;
         
-        if (count & ~511) // >= 512
-                bucket = 7;
-        else if (count & 256) // 256-511
-                bucket = 6;
-        else if (count & 128)
-                bucket = 5;
-        else if (count & 64)
-                bucket = 4;
-        else if (count & 32)
-                bucket = 3;
-        else if (count & 16)
-                bucket = 2;
-        else if (count & 8)      // 8-15
-                bucket = 1;
-        else                             // 0-7
-                bucket = 0;
-        return bucket;
-}
-
-void remove_node(int nodeidx, int pidx, U8 *membase, int stride, int *head)
-{
-        LLDrawPool::FreeListNode *node = (LLDrawPool::FreeListNode *)(membase + nodeidx*stride);
-        if (pidx >= 0)
-        {
-                LLDrawPool::FreeListNode *pnode = (LLDrawPool::FreeListNode *)(membase + pidx*stride);
-                pnode->next = node->next;
-        }
-        else
-        {
-                *head = node->next;
-        }
-}
-
-void LLDrawPool::freeListAddGeom(S32 index, U32 count)
-{
-#if USE_FREE_LIST
-        int i;
-        U8 *membase = (U8*)mMemory.getMem();
-        // See if next block or previous block is free, if so combine them
-        for (i=0; i<NUM_BUCKETS; i++)
-        {
-                int pidx = -1;
-                int nodeidx = mFreeListGeomHead[i];
-                while(nodeidx >= 0)
-                {
-                        int change = 0;
-                        FreeListNode *node = (FreeListNode *)(membase + nodeidx*mStride);
-                        int nodecount = node->count & 0xffff;
-                        // Check for prev block
-                        if (nodeidx + nodecount == index)
-                        {
-                                remove_node(nodeidx, pidx, membase, mStride, &mFreeListGeomHead[i]);
-                                // Combine nodes
-                                index = nodeidx;
-                                count += nodecount;
-                                i = 0; // start over ; i = NUM_BUCKETS // done
-                                change = 1;
-                                //break;
-                        }
-                        // Check for next block
-                        if (nodeidx == index + count)
-                        {
-                                remove_node(nodeidx, pidx, membase, mStride, &mFreeListGeomHead[i]);
-                                // Combine nodes
-                                count += nodecount;
-                                i = 0; // start over ; i = NUM_BUCKETS // done
-                                change = 1;
-                                //break;
-                        }                               
-                        if (change)
-                                break;
-                        pidx = nodeidx;
-                        nodeidx = node->next;
-                }
-        }
-        // Add (extended) block to free list
-        if (count >= 2) // need 2 words to store free list (theoreticly mStride could = 4)
+        for (std::vector<LLFace*>::const_iterator iter = mDrawFace.begin();
+                 iter != mDrawFace.end(); iter++)
         {
-                CheckIntegrity();
-                if ((index + count)*mStride >= mMemory.count())
+                const LLFace* facep = *iter;
+                if (facep->getPool() != this)
                 {
-                        mMemory.shrinkTo(index*mStride);
+                        llinfos << "Face in wrong pool!" << llendl;
+                        facep->printDebugInfo();
+                        ok = FALSE;
                 }
-                else
+                else if (!facep->verify())
                 {
-                        int bucket = freeListBucket(count);
-                        FreeListNode *node = (FreeListNode *)(membase + index*mStride);
-                        node->count = count | (0xabc<<20);
-                        node->next = mFreeListGeomHead[bucket]; 
-                        mFreeListGeomHead[bucket] = index;
+                        ok = FALSE;
                 }
-                CheckIntegrity();
         }
-#endif
-}
 
-void LLDrawPool::freeListAddInd(S32 index, U32 count)
-{
-#if USE_FREE_LIST
-        int i;
-        const U32 *membase = mIndices.getMem();
-        // See if next block or previous block is free, if so combine them
-        for (i=0; i<NUM_BUCKETS; i++)
-        {
-                int pidx = -1;
-                int nodeidx = mFreeListIndHead[i];
-                while(nodeidx >= 0)
-                {
-                        int change = 0;
-                        FreeListNode *node = (FreeListNode *)(membase + nodeidx);
-                        int nodecount = node->count & 0xffff;
-                        // Check for prev block
-                        if (nodeidx + nodecount == index)
-                        {
-                                remove_node(nodeidx, pidx, (U8*)membase, 4, &mFreeListIndHead[i]);
-                                // Combine nodes
-                                index = nodeidx;
-                                count += nodecount;
-                                i = 0; // start over ; i = NUM_BUCKETS // done
-                                change = 1;
-                                //break;
-                        }
-                        // Check for next block
-                        if (nodeidx == index + count)
-                        {
-                                remove_node(nodeidx, pidx, (U8*)membase, 4, &mFreeListIndHead[i]);
-                                // Combine nodes
-                                count += nodecount;
-                                i = 0; // start over ; i = NUM_BUCKETS // done
-                                change = 1;
-                                //break;
-                        }
-                        if (change)
-                                break;
-                        pidx = nodeidx;
-                        nodeidx = node->next;
-                }
-        }
-        // Add (extended) block to free list
-        if (count >= 2) // need 2 words to store free list
-        {
-                CheckIntegrity();
-                if (index + count >= mIndices.count())
-                {
-                        mIndices.shrinkTo(index);
-                }
-                else
-                {
-                        int bucket = freeListBucket(count);
-                        FreeListNode *node = (FreeListNode *)(membase + index);
-                        node->count = count | (0xabc<<20);
-                        node->next = mFreeListIndHead[bucket];
-                        mFreeListIndHead[bucket] = index;
-                }
-                CheckIntegrity();
-        }
-#endif
+        return ok;
 }
 
-S32 LLDrawPool::freeListFindGeom(U32 count)
+void LLFacePool::printDebugInfo() const
 {
-#if USE_FREE_LIST
-        int i, nodeidx, pidx;
-        int firstbucket = freeListBucket(count);
-        U8 *membase = (U8*)mMemory.getMem();
-        for (i=firstbucket; i<NUM_BUCKETS; i++)
-        {
-                pidx = -1;
-                nodeidx = mFreeListGeomHead[i];
-                CHECK_LIST(((U8 *)mMemory.getMem(), mStride, mFreeListGeomHead[i], mMemory.count() / mStride));
-                while(nodeidx >= 0)
-                {
-                        FreeListNode *node = (FreeListNode *)(membase + nodeidx*mStride);
-                        int nodecount = node->count & 0xffff;
-                        llassert((node->count>>20) == 0xabc);
-                        if (nodecount >= count)
-                        {
-                                remove_node(nodeidx, pidx, membase, mStride, &mFreeListGeomHead[i]);
-#if 1
-                                if (nodecount > count)
-                                {
-                                        int leftover = nodecount - count;
-                                        freeListAddGeom(nodeidx + count, leftover);
-                                }
-#endif
-                                return nodeidx;
-                        }
-                        pidx = nodeidx;
-                        nodeidx = node->next;
-                }
-        }
-#endif // USE_FREE_LIST
-        return -1;
+        llinfos << "Pool " << this << " Type: " << getType() << llendl;
 }
 
-S32 LLDrawPool::freeListFindInd(U32 count)
+BOOL LLFacePool::LLOverrideFaceColor::sOverrideFaceColor = FALSE;
+
+void LLFacePool::LLOverrideFaceColor::setColor(const LLColor4& color)
 {
-#if USE_FREE_LIST
-        int i, nodeidx, pidx;
-        int firstbucket = freeListBucket(count);
-        U32 *membase = (U32 *)mIndices.getMem();
-        for (i=firstbucket; i<NUM_BUCKETS; i++)
+        if (mPool->getVertexShaderLevel() > 0 && mPool->getMaterialAttribIndex() > 0)
         {
-                pidx = -1;
-                nodeidx = mFreeListIndHead[i];
-                CHECK_LIST(((U8 *)mIndices.getMem(), 4, mFreeListIndHead[i], mIndices.count()));
-                while(nodeidx >= 0)
-                {
-                        FreeListNode *node = (FreeListNode *)(membase + nodeidx);
-                        int nodecount = node->count & 0xffff;
-                        llassert((node->count>>20) == 0xabc);
-                        if (nodecount >= count)
-                        {
-                                remove_node(nodeidx, pidx, (U8*)membase, 4, &mFreeListIndHead[i]);
-#if 1
-                                if (nodecount > count)
-                                {
-                                        int leftover = nodecount - count;
-                                        freeListAddInd(nodeidx + count, leftover);
-                                }
-#endif
-                                return nodeidx;
-                        }
-                        pidx = nodeidx;
-                        nodeidx = node->next;
-                }
+                glVertexAttrib4fvARB(mPool->getMaterialAttribIndex(), color.mV);
         }
-#endif // USE_FREE_LIST
-        return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-S32 LLDrawPool::reserveGeom(const U32 geom_count)
-{
-        LLFastTimer t(LLFastTimer::FTM_GEO_RESERVE);
-        
-        S32 index;
-        index = freeListFindGeom(geom_count);
-        if (index < 0)
+        else
         {
-                index = mMemory.count() / mStride;
-                if (!geom_count)
-                {
-                        llwarns << "Attempting to reserve zero bytes!" << llendl;
-                        return index;
-                }
-
-                S32 bytes = geom_count * mStride;
-
-                if ((index + (S32)geom_count) > (S32)mMaxVertices)
-                {
-                        //
-                        // Various drivers have issues with the number of indices being greater than a certain number.
-                        // if you're using AGP.  Disable AGP if we've got more vertices than in the pool.
-                        //
-#ifdef DEBUG_AGP
-                        llinfos << "setUseAGP false because of large vertex count in reserveGeom" << llendl;
-#endif
-                        setUseAGP(FALSE);
-                }
-
-                mMemory.reserve_block(bytes);
-                if (mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK)
-                {
-                        mWeights.reserve_block(geom_count);
-                }
-                if (mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK)
-                {
-                        mClothingWeights.reserve_block(geom_count);
-                }
+                glColor4fv(color.mV);
         }
-        CHECK_LIST(((U8 *)mMemory.getMem(), mStride, mFreeListGeomHead[0], mMemory.count() / mStride));
-        return index;
 }
 
-S32 LLDrawPool::reserveInd(U32 indCount)
+void LLFacePool::LLOverrideFaceColor::setColor(const LLColor4U& color)
 {
-        S32 index;
-        index = freeListFindInd(indCount);
-        if (index < 0)
+        if (mPool->getVertexShaderLevel() > 0 && mPool->getMaterialAttribIndex() > 0)
         {
-                index = mIndices.count();
-
-                if (indCount)
-                {
-                        mIndices.reserve_block(indCount);
-                }
+                glVertexAttrib4ubvARB(mPool->getMaterialAttribIndex(), color.mV);
         }
-        for (U32 i=0;i<indCount;i++)
+        else
         {
-                mIndices[index+i]=0;
+                glColor4ubv(color.mV);
         }
-        CHECK_LIST(((U8 *)mIndices.getMem(), 4, mFreeListIndHead[0], mIndices.count()));
-        return index;
 }
 
-S32 LLDrawPool::unReserveGeom(const S32 index, const U32 count)
+void LLFacePool::LLOverrideFaceColor::setColor(F32 r, F32 g, F32 b, F32 a)
 {
-        if (index < 0 || count == 0)
-                return -1;
-
-        freeListAddGeom(index, count);
-        
-#if 0
-        int i;
-        S32 bytes,words;
-        U32 *memp;
-        // Fill mem with bad data (for testing only)
-        bytes = count * mStride;
-        bytes -= sizeof(FreeListNode);
-        memp = (U32*)(mMemory.getMem() + index * mStride);      
-        memp += sizeof(FreeListNode)>>2;
-        words = bytes >> 2;
-        for (i=0; i<words; i++)
-                *memp++ = 0xffffffff;
-
-        words = count; //  (sizeof each array is a word)
-        if (mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK)
+        if (mPool->getVertexShaderLevel() > 0 && mPool->getMaterialAttribIndex() > 0)
         {
-                memp = (U32*)(&mWeights[index]);
-                for (i=0; i<words; i++)
-                        *memp++ = 0xffffffff;
+                glVertexAttrib4fARB(mPool->getMaterialAttribIndex(), r,g,b,a);
         }
-        if (mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK)
+        else
         {
-                memp = (U32*)(&mClothingWeights[index]);
-                for (i=0; i<count; i++)
-                        *memp++ = 0xffffffff;
+                glColor4f(r,g,b,a);
         }
-#endif
-        return -1;
 }
 
-S32 LLDrawPool::unReserveInd(const S32 index, const U32 count)
-{
-        if (index < 0 || count == 0)
-                return -1;
 
-        freeListAddInd(index, count);
-        
-#if 0
-        int i;
-        U32 *memp = &mIndices[index];
-        for (i=0; i<count; i++)
-                *memp++ = 0xffffffff;
-#endif
-        return -1;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-const U32 LLDrawPool::getIndexCount() const
+//=============================
+// Render Pass Implementation
+//=============================
+LLRenderPass::LLRenderPass(const U32 type)
+: LLDrawPool(type)
 {
-        return mIndices.count();
-}
 
-const U32 LLDrawPool::getVertexCount() const
-{
-        return mMemory.count() / mStride;
 }
 
-const U32 LLDrawPool::getTexCoordCount(U32 pass) const
+LLRenderPass::~LLRenderPass()
 {
-        return mMemory.count() / mStride;
-}
 
-
-const U32 LLDrawPool::getNormalCount() const
-{
-        return mMemory.count() / mStride;
 }
 
-
-const U32 LLDrawPool::getBinormalCount() const
+LLDrawPool* LLRenderPass::instancePool()
 {
-        return mMemory.count() / mStride;
-}
-
-const U32 LLDrawPool::getColorCount() const
-{
-        return mMemory.count() / mStride;
-}
-
-const U32 LLDrawPool::getVertexWeightCount() const
-{
-        return mWeights.count();
+#if LL_RELEASE_FOR_DOWNLOAD
+        llwarns << "Attempting to instance a render pass.  Invalid operation." << llendl;
+#else
+        llerrs << "Attempting to instance a render pass.  Invalid operation." << llendl;
+#endif
+        return NULL;
 }
 
-// virtual
-BOOL LLDrawPool::addFace(LLFace *facep)
-{
-        addFaceReference(facep);
-        return TRUE;
+void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture)
+{                                       
+        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        
+        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+        {
+                LLDrawInfo& params = **k;
+                pushBatch(params, mask, texture);
+        }
 }
 
-// virtual
-BOOL LLDrawPool::removeFace(LLFace *facep)
+void LLRenderPass::renderInvisible(U32 mask)
 {
-        removeFaceReference(facep);
-
-        vector_replace_with_last(mDrawFace, facep);
-
-        facep->unReserve();
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
         
-        return TRUE;
-}
+        std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[LLRenderPass::PASS_INVISIBLE];
 
-// Not absolutely sure if we should be resetting all of the chained pools as well - djs
-void LLDrawPool::resetDrawOrders()
-{
-        mDrawFace.resize(0);
+        U32* indices_pointer = NULL;
+        for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
+        {
+                LLDrawInfo& params = **i;
+                params.mVertexBuffer->setBuffer(mask);
+                indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+                glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                                                        GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+                gPipeline.mTrianglesDrawn += params.mCount/3;
+        }
 }
 
-void LLDrawPool::resetIndices(S32 indices_count)
+void LLRenderPass::renderTexture(U32 type, U32 mask)
 {
-        mIndices.reset(indices_count);
-        for (S32 i=0; i<NUM_BUCKETS; i++)
-                mFreeListIndHead[i] = -1;
-}
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
 
-void LLDrawPool::resetVertexData(S32 reserve_count)
-{
-        mMemory.reset(reserve_count*mStride);
-                
-        for (S32 i=0; i<NUM_BUCKETS; i++)
-        {
-                mFreeListGeomHead[i] = -1;
-        }
-        if (mDataMaskNIL & DATA_VERTEX_WEIGHTS_MASK)
-        {
-                mWeights.reset(reserve_count);
-        }
+        std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[type];
 
-        if (mDataMaskNIL & DATA_CLOTHING_WEIGHTS_MASK)
+        for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
         {
-                mClothingWeights.reset(reserve_count);
+                LLDrawInfo& params = **i;
+                pushBatch(params, mask, TRUE);
         }
 }
 
-void LLDrawPool::resetAll()
-{
-        resetDrawOrders();
-        resetVertexData(0);
-        mGeneration++;
-
-}
-
-S32 LLDrawPool::rebuild()
+void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
 {
-        mRebuildTime++;
-
-        BOOL needs_rebuild = FALSE;
-        S32 rebuild_cost = 0;
-        
-        if (mUseAGP)
-        {
-                if (getVertexCount() > 0.75f*DEFAULT_MAX_VERTICES)
-                {
-                        if (mRebuildTime > 8)
-                        {
-                                needs_rebuild = TRUE;
-                        }
-#ifdef DEBUG_AGP
-                        llwarns << "More than " << DEFAULT_MAX_VERTICES << " in pool type " << (S32)mType << " at rebuild!" << llendl;
-#endif
-                }
-        }
-        
-        // rebuild de-allocates 'stale' objects, so we still need to do a rebuild periodically
-        if (mRebuildFreq > 0 && mRebuildTime >= mRebuildFreq)
+        if (params.mVertexBuffer.isNull())
         {
-                needs_rebuild = TRUE;
+                return;
         }
 
-        if (needs_rebuild) 
+        if (texture)
         {
-                mGeneration++;
-
-                if (mReferences.empty())
+                if (params.mTexture.notNull())
                 {
-                        resetIndices(0);
-                        resetVertexData(0);
-                }
-                else
-                {
-                        for (std::vector<LLFace*>::iterator iter = mReferences.begin();
-                                 iter != mReferences.end(); iter++)
-                        {
-                                LLFace *facep = *iter;
-                                if (facep->hasGeometry() && !facep->isState(LLFace::BACKLIST | LLFace::SHARED_GEOM))
-                                {
-                                        facep->backup();
-                                }
-                        }
-                        S32 tot_verts = 0;
-                        S32 tot_indices = 0;
-                        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-                                 iter != mDrawFace.end(); iter++)
-                        {
-                                LLFace *facep = *iter;
-                                if (facep->isState(LLFace::BACKLIST))
-                                {
-                                        tot_verts += facep->getGeomCount();
-                                        tot_indices += facep->getIndicesCount();
-                                }
-                        }
-                        for (std::vector<LLFace*>::iterator iter = mMoveFace.begin();
-                                 iter != mMoveFace.end(); iter++)
+                        params.mTexture->bind();
+                        if (params.mTextureMatrix)
                         {
-                                LLFace *facep = *iter;
-                                if (facep->isState(LLFace::BACKLIST))
-                                {
-                                        tot_verts += facep->getGeomCount();
-                                        tot_indices += facep->getIndicesCount();
-                                }
-                        }
-                        
-                        resetIndices(tot_indices);
-                        flushAGP();
-                        resetVertexData(tot_verts);
-
-                        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-                                 iter != mDrawFace.end(); iter++)
-                        {
-                                LLFace *facep = *iter;
-                                llassert(facep->getPool() == this);
-                                facep->restore();
+                                glMatrixMode(GL_TEXTURE);
+                                glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
                         }
+                        params.mTexture->addTextureStats(params.mVSize);
                 }
-                mRebuildTime = 0;
-                setDirty();
-        }
-
-        if (!mMoveFace.empty())
-        {
-                for (std::vector<LLFace*>::iterator iter = mMoveFace.begin();
-                         iter != mMoveFace.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        facep->restore();
-                        enqueue(facep);
-                }
-                setDirty();
-                mMoveFace.reset();
-                rebuild_cost++;
-        }
-        return rebuild_cost;
-}
-
-LLViewerImage *LLDrawPool::getTexture()
-{
-        return NULL;
-}
-
-LLViewerImage *LLDrawPool::getDebugTexture()
-{
-        return NULL;
-}
-
-void LLDrawPool::removeFaceReference(LLFace *facep)
-{
-        if (facep->getReferenceIndex() != -1)
-        {
-                if (facep->getReferenceIndex() != (S32)mReferences.size())
+                else
                 {
-                        LLFace *back = mReferences.back();
-                        mReferences[facep->getReferenceIndex()] = back;
-                        back->setReferenceIndex(facep->getReferenceIndex());
+                        LLImageGL::unbindTexture(0);
                 }
-                mReferences.pop_back();
         }
-        facep->setReferenceIndex(-1);
-}
+        
+        params.mVertexBuffer->setBuffer(mask);
+        U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+        glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                                                GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+        gPipeline.mTrianglesDrawn += params.mCount/3;
 
-void LLDrawPool::addFaceReference(LLFace *facep)
-{
-        if (-1 == facep->getReferenceIndex())
+        if (params.mTextureMatrix && texture && params.mTexture.notNull())
         {
-                facep->setReferenceIndex(mReferences.size());
-                mReferences.push_back(facep);
+                glLoadIdentity();
+                glMatrixMode(GL_MODELVIEW);
         }
 }
 
-U32 LLDrawPool::getTrianglesDrawn() const
+void LLRenderPass::renderActive(U32 type, U32 mask, BOOL texture)
 {
-        return mIndicesDrawn / 3;
-}
-
-void LLDrawPool::resetTrianglesDrawn()
-{
-        mIndicesDrawn = 0;
-}
-
-void LLDrawPool::addIndicesDrawn(const U32 indices)
-{
-        mIndicesDrawn += indices;
-}
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
 
-BOOL LLDrawPool::verify() const
-{
-        BOOL ok = TRUE;
-        // Verify all indices in the pool are in the right range
-        const U32 *indicesp = getRawIndices();
-        for (U32 i = 0; i < getIndexCount(); i++)
+        LLSpatialBridge* last_bridge = NULL;
+        glPushMatrix();
+        
+        for (LLSpatialGroup::sg_vector_t::iterator i = gPipeline.mActiveGroups.begin(); i != gPipeline.mActiveGroups.end(); ++i)
         {
-                if (indicesp[i] > getVertexCount())
+                LLSpatialGroup* group = *i;
+                if (!group->isDead() &&
+                        gPipeline.hasRenderType(group->mSpatialPartition->mDrawableType) &&
+                        group->mDrawMap.find(type) != group->mDrawMap.end())
                 {
-                        ok = FALSE;
-                        llinfos << "Bad index in tree pool!" << llendl;
-                }
-        }
+                        LLSpatialBridge* bridge = (LLSpatialBridge*) group->mSpatialPartition;
+                        if (bridge != last_bridge)
+                        {
+                                glPopMatrix();
+                                glPushMatrix();
+                                glMultMatrixf((F32*) bridge->mDrawable->getRenderMatrix().mMatrix);
+                                last_bridge = bridge;
+                        }
 
-        for (std::vector<LLFace*>::const_iterator iter = mDrawFace.begin();
-                 iter != mDrawFace.end(); iter++)
-        {
-                const LLFace* facep = *iter;
-                if (facep->getPool() != this)
-                {
-                        llinfos << "Face in wrong pool!" << llendl;
-                        facep->printDebugInfo();
-                        ok = FALSE;
-                }
-                else if (!facep->verify())
-                {
-                        ok = FALSE;
+                        renderGroup(group,type,mask,texture);
                 }
         }
-
-        return ok;
-}
-
-void LLDrawPool::printDebugInfo() const
-{
-        llinfos << "Pool " << this << " Type: " << getType() << llendl;
-        llinfos << "--------------------" << llendl;
-        llinfos << "Vertex count: "  << getVertexCount() << llendl;
-        llinfos << "Normal count: "  << getNormalCount() << llendl; 
-        llinfos << "Indices count: " << getIndexCount() << llendl;
-        llinfos << llendl;
-}
-
-
-S32 LLDrawPool::getMemUsage(const BOOL print)
-{
-        S32 mem_usage = 0;
-
-        mem_usage += sizeof(this);
-
-        // Usage beyond the pipeline allocated data (color and mMemory)
-        mem_usage += mIndices.getMax() * sizeof(U32);
-        mem_usage += mDrawFace.capacity() * sizeof(LLFace *);
-        mem_usage += mMoveFace.capacity() * sizeof(LLFace *);
-        mem_usage += mReferences.capacity() * sizeof(LLFace *);
-
-        mem_usage += mMemory.getSysMemUsage();
-        mem_usage += mWeights.getSysMemUsage();
-        mem_usage += mClothingWeights.getSysMemUsage();
-
-        return mem_usage;
-}
-
-LLColor3 LLDrawPool::getDebugColor() const
-{
-        return LLColor3(0.f, 0.f, 0.f);
-}
-
-void LLDrawPool::setDirty()
-{ 
-        mMemory.setDirty(); 
-        mWeights.setDirty();
-        mClothingWeights.setDirty();
-}
-
-BOOL LLDrawPool::LLOverrideFaceColor::sOverrideFaceColor = FALSE;
-
-void LLDrawPool::LLOverrideFaceColor::setColor(const LLColor4& color)
-{
-        if (mPool->mVertexShaderLevel > 0 && mPool->getMaterialAttribIndex() > 0)
-        {
-                glVertexAttrib4fvARB(mPool->getMaterialAttribIndex(), color.mV);
-        }
-        else
-        {
-                glColor4fv(color.mV);
-        }
+        
+        glPopMatrix();
 }
 
-void LLDrawPool::LLOverrideFaceColor::setColor(const LLColor4U& color)
+void LLRenderPass::renderStatic(U32 type, U32 mask, BOOL texture)
 {
-        if (mPool->mVertexShaderLevel > 0 && mPool->getMaterialAttribIndex() > 0)
-        {
-                glVertexAttrib4ubvARB(mPool->getMaterialAttribIndex(), color.mV);
-        }
-        else
-        {
-                glColor4ubv(color.mV);
-        }
-}
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
 
-void LLDrawPool::LLOverrideFaceColor::setColor(F32 r, F32 g, F32 b, F32 a)
-{
-        if (mPool->mVertexShaderLevel > 0 && mPool->getMaterialAttribIndex() > 0)
-        {
-                glVertexAttrib4fARB(mPool->getMaterialAttribIndex(), r,g,b,a);
-        }
-        else
+        for (LLSpatialGroup::sg_vector_t::iterator i = gPipeline.mVisibleGroups.begin(); i != gPipeline.mVisibleGroups.end(); ++i)
         {
-                glColor4f(r,g,b,a);
+                LLSpatialGroup* group = *i;
+                if (!group->isDead() &&
+                        gPipeline.hasRenderType(group->mSpatialPartition->mDrawableType) &&
+                        group->mDrawMap.find(type) != group->mDrawMap.end())
+                {
+                        renderGroup(group,type,mask,texture);
+                }
         }
 }
-
-// virtual
-void LLDrawPool::enableShade()
-{ }
-
-// virtual
-void LLDrawPool::disableShade()
-{ }
-
-// virtual
-void LLDrawPool::setShade(F32 shade)
-{ }
diff --git a/linden/indra/newview/lldrawpool.h b/linden/indra/newview/lldrawpool.h
index 2ce13fb..6cd5f8e 100644
--- a/linden/indra/newview/lldrawpool.h
+++ b/linden/indra/newview/lldrawpool.h
@@ -28,270 +28,168 @@
 #ifndef LL_LLDRAWPOOL_H
 #define LL_LLDRAWPOOL_H
 
-#include "llagparray.h"
-#include "lldarray.h"
-#include "lldlinked.h"
-#include "llstrider.h"
-#include "llviewerimage.h"
 #include "v4coloru.h"
 #include "v2math.h"
 #include "v3math.h"
-#include "llstrider.h"
+#include "llvertexbuffer.h"
 
 class LLFace;
 class LLImageGL;
 class LLViewerImage;
+class LLSpatialGroup;
+class LLDrawInfo;
 
 #define DEFAULT_MAX_VERTICES 65535
 
 class LLDrawPool
 {
 public:
-        typedef LLDynamicArray<LLFace*, 128> face_array_t;
-        
+        static S32 sNumDrawPools;
+
         enum
         {
-                SHADER_LEVEL_SCATTERING = 2
+                // Correspond to LLPipeline render type
+                POOL_SKY = 1,
+                POOL_STARS,
+                POOL_GROUND,
+                POOL_TERRAIN,   
+                POOL_SIMPLE,
+                POOL_BUMP,
+                POOL_AVATAR,
+                POOL_TREE,
+                POOL_ALPHA,
+                POOL_WATER,
+                POOL_ALPHA_POST_WATER,
+                NUM_POOL_TYPES,
         };
-
-public:
-        LLDrawPool(const U32 type, const U32 data_mask_il, const U32 data_mask_nil); 
+        
+        LLDrawPool(const U32 type);
         virtual ~LLDrawPool();
 
-        static LLDrawPool* createPool(const U32 type, LLViewerImage *tex0 = NULL);
+        virtual BOOL isDead() = 0;
 
-        void flushAGP(); // Flush the AGP buffers so they can be repacked and reallocated.
-        void syncAGP();
+        S32 getId() const { return mId; }
+        U32 getType() const { return mType; }
 
-        virtual LLDrawPool *instancePool() = 0; // Create an empty new instance of the pool.
+        virtual LLViewerImage *getDebugTexture();
         virtual void beginRenderPass( S32 pass );
         virtual void endRenderPass( S32 pass );
         virtual S32      getNumPasses() { return 1; }
         virtual void render(S32 pass = 0) = 0;
+        virtual void prerender() = 0;
+        virtual S32 getMaterialAttribIndex() = 0;
+        virtual U32 getVertexDataMask() = 0;
+        virtual BOOL verify() const { return TRUE; }            // Verify that all data in the draw pool is correct!
+        virtual S32 getVertexShaderLevel() const { return mVertexShaderLevel; }
+        
+        static LLDrawPool* createPool(const U32 type, LLViewerImage *tex0 = NULL);
+        virtual LLDrawPool *instancePool() = 0; // Create an empty new instance of the pool.
+        virtual LLViewerImage* getTexture() = 0;
+        virtual BOOL isFacePool() { return FALSE; }
+        virtual void resetDrawOrders() = 0;
+
+        U32     getTrianglesDrawn() const;
+        void resetTrianglesDrawn();
+        void addIndicesDrawn(const U32 indices);
+
+protected:
+        S32 mVertexShaderLevel;
+        S32     mId;
+        U32 mType;                              // Type of draw pool
+        S32     mIndicesDrawn;
+};
+
+class LLRenderPass : public LLDrawPool
+{
+public:
+        enum
+        {
+                PASS_SIMPLE = NUM_POOL_TYPES,
+                PASS_FULLBRIGHT,
+                PASS_GLOW,
+                PASS_INVISIBLE,
+                PASS_SHINY,
+                PASS_BUMP,
+                PASS_GRASS,
+                PASS_ALPHA,
+                NUM_RENDER_TYPES,
+        };
+
+        LLRenderPass(const U32 type);
+        virtual ~LLRenderPass();
+        /*virtual*/ LLDrawPool* instancePool();
+        /*vritual*/ S32 getMaterialAttribIndex() { return -1; }
+        /*virtual*/ LLViewerImage* getDebugTexture() { return NULL; }
+        LLViewerImage* getTexture() { return NULL; }
+        BOOL isDead() { return FALSE; }
+        void resetDrawOrders() { }
+
+        virtual void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture);
+        virtual void renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE);
+        virtual void renderStatic(U32 type, U32 mask, BOOL texture = TRUE);
+        virtual void renderActive(U32 type, U32 mask, BOOL texture = TRUE);
+        virtual void renderInvisible(U32 mask);
+        virtual void renderTexture(U32 type, U32 mask);
+
+};
+
+class LLFacePool : public LLDrawPool
+{
+public:
+        typedef std::vector<LLFace*> face_array_t;
+        
+        enum
+        {
+                SHADER_LEVEL_SCATTERING = 2
+        };
+
+public:
+        LLFacePool(const U32 type);
+        virtual ~LLFacePool();
+        
         virtual void renderForSelect() = 0;
-        virtual BOOL match(LLFace* last_face, LLFace* facep) { return FALSE; }
+        BOOL isDead() { return mReferences.empty(); }
         virtual void renderFaceSelected(LLFace *facep, LLImageGL *image, const LLColor4 &color,
                                                                         const S32 index_offset = 0, const S32 index_count = 0);
 
-        virtual void prerender() = 0;
-        virtual S32 rebuild();
-
-        virtual S32 getMaterialAttribIndex() = 0;
-
         virtual LLViewerImage *getTexture();
-        virtual LLViewerImage *getDebugTexture();
-        virtual void dirtyTexture(const LLViewerImage* texturep);
+        virtual void dirtyTextures(const std::set<LLViewerImage*>& textures);
 
         virtual void enqueue(LLFace *face);
         virtual BOOL addFace(LLFace *face);
         virtual BOOL removeFace(LLFace *face);
 
         virtual BOOL verify() const;            // Verify that all data in the draw pool is correct!
-        virtual LLColor3 getDebugColor() const; // For AGP debug display
-
+        
         virtual void resetDrawOrders();
-        virtual void resetVertexData(S32 reserve_count);
-        virtual void resetIndices(S32 num_indices);
         void resetAll();
 
         BOOL moveFace(LLFace *face, LLDrawPool *poolp, BOOL copy_data = FALSE);
 
-
-        S32 getId() const { return mId; }
-        U32 getType() const { return mType; }
-
-        const U32 getStride() const;
-        inline const U32 getStride(const U32 data_type) const;
-        inline const U32 getOffset(const U32 data_type) const;
-
-        S32     reserveGeom(U32 count);
-        S32     reserveInd (U32 count);
-        S32 unReserveGeom(const S32 index, const U32 count);
-        S32 unReserveInd(const S32 index, const U32 count);
-
-        void bindGLVertexPointer();
-        void bindGLTexCoordPointer(const U32 pass=0);
-        void bindGLNormalPointer();
-        void bindGLBinormalPointer(S32 index);
-        void bindGLColorPointer();
-        void bindGLVertexWeightPointer(S32 index);
-        void bindGLVertexClothingWeightPointer(S32 index);
-
-        const U32  getIndexCount() const;
-        const U32  getTexCoordCount(const U32 pass=0) const;
-        const U32  getVertexCount() const;
-        const U32  getNormalCount() const;
-        const U32  getBinormalCount() const;
-        const U32  getColorCount() const;
-        const U32  getVertexWeightCount() const;
-
-        void  setDirty();
-        void  setDirtyMemory()                                          { mMemory.setDirty(); }
-        void  setDirtyWeights()                                         { mWeights.setDirty(); }
-
-        const U32* getRawIndices() const                        { return mIndices.getMem(); }
-
-        U32 getIndex(const S32 index)                           { return mIndices[index]; } // Use to get one index
-        U32 *getIndices(const S32 index);                       // Used to get an array of indices for reading/writing
-        void CheckIntegrity(); // DEBUG
-        
-        const LLVector3& getVertex(const S32 index);
-        const LLVector2& getTexCoord(const S32 index, const U32 pass);
-        const LLVector3& getNormal(const S32 index);
-        const LLVector3& getBinormal(const S32 index);
-        const LLColor4U& getColor(const S32 index);
-        const F32& getVertexWeight(const S32 index);
-        const LLVector4& getClothingWeight(const S32 index);
-
-        void setRebuild(const BOOL rebuild);
-
         void destroy();
 
         void buildEdges();
 
-        static S32 drawLoop(face_array_t& face_list, const U32* index_array);
-        static S32 drawLoopSetTex(face_array_t& face_list, const U32* index_array, S32 stage);
+        static S32 drawLoop(face_array_t& face_list);
+        static S32 drawLoopSetTex(face_array_t& face_list, S32 stage);
         void drawLoop();
 
         void renderVisibility();
 
         void addFaceReference(LLFace *facep);
         void removeFaceReference(LLFace *facep);
-        U32     getTrianglesDrawn() const;
-        void resetTrianglesDrawn();
-        void addIndicesDrawn(const U32 indices);
 
         void printDebugInfo() const;
-        S32 getMemUsage(const BOOL print = FALSE);
         
-        BOOL setUseAGP(BOOL use_agp);
-        BOOL canUseAGP() const          { return mMemory.isAGP(); } // Return TRUE if this pool can use AGP
+        BOOL isFacePool() { return TRUE; }
 
-        S32 getMaxVertices() const      { return mMaxVertices; }
-        S32 getVertexShaderLevel() const { return mVertexShaderLevel; }
-        
         friend class LLFace;
         friend class LLPipeline;
 public:
-
-        enum
-        {
-                // Correspond to LLPipeline render type
-                POOL_SKY = 1,
-                POOL_STARS,
-                POOL_GROUND,
-                POOL_TERRAIN,   
-                POOL_SIMPLE,
-                POOL_MEDIA,             // unused
-                POOL_BUMP,
-                POOL_AVATAR,
-                POOL_TREE,
-                POOL_TREE_NEW,
-                POOL_WATER,             
-                POOL_CLOUDS,
-                POOL_ALPHA,
-                POOL_HUD,
-        };
-
-
-        // If you change the order or add params to these, you also need to adjust the sizes in the
-        // mDataSizes array defined in lldrawpool.cpp
-        typedef enum e_data_type
-        {
-                DATA_VERTICES           = 0,
-                DATA_TEX_COORDS0        = 1,
-                DATA_TEX_COORDS1        = 2,
-                DATA_TEX_COORDS2        = 3,
-                DATA_TEX_COORDS3        = 4,
-                DATA_NORMALS            = 5,
-                DATA_VERTEX_WEIGHTS = 6,
-                DATA_CLOTHING_WEIGHTS = 7,
-                DATA_BINORMALS          = 8,
-                DATA_COLORS                     = 9,
-                DATA_MAX_TYPES          = 10
-        } EDataType;
-
-        typedef enum e_data_mask
-        {
-                DATA_VERTICES_MASK                      = 1 << DATA_VERTICES,
-                DATA_TEX_COORDS0_MASK           = 1 << DATA_TEX_COORDS0,
-                DATA_TEX_COORDS1_MASK           = 1 << DATA_TEX_COORDS1,
-                DATA_TEX_COORDS2_MASK           = 1 << DATA_TEX_COORDS2,
-                DATA_TEX_COORDS3_MASK           = 1 << DATA_TEX_COORDS3,
-                DATA_NORMALS_MASK                       = 1 << DATA_NORMALS,
-                DATA_VERTEX_WEIGHTS_MASK        = 1 << DATA_VERTEX_WEIGHTS,
-                DATA_CLOTHING_WEIGHTS_MASK      = 1 << DATA_CLOTHING_WEIGHTS,
-                DATA_BINORMALS_MASK                     = 1 << DATA_BINORMALS,
-                DATA_COLORS_MASK                        = 1 << DATA_COLORS,
-
-                // Masks for standard types.
-                // IL for interleaved, NIL for non-interleaved.
-                DATA_SIMPLE_IL_MASK                             = DATA_VERTICES_MASK | DATA_TEX_COORDS0_MASK | DATA_NORMALS_MASK,
-                DATA_SIMPLE_NIL_MASK                    = 0,
-                DATA_BUMP_IL_MASK                               = DATA_SIMPLE_IL_MASK | DATA_BINORMALS_MASK | DATA_TEX_COORDS1_MASK,
-        } EDataMask;
-
         face_array_t    mDrawFace;
         face_array_t    mMoveFace;
         face_array_t    mReferences;
 
-        U32 mDataMaskIL;        // Interleaved data
-        U32 mDataMaskNIL;       // Non-interleaved data
-        U32 mDataOffsets[DATA_MAX_TYPES];
-        S32 mStride;
-
-        S32     mRebuildFreq;
-        S32     mRebuildTime;
-        S32     mGeneration;
-
-        
-        S32 mSkippedVertices;
-
-        static U32 sDataSizes[DATA_MAX_TYPES];
-        static S32 sNumDrawPools;
-
-protected:
-        LLAGPArray<U8>          mMemory;
-        LLAGPArray<F32>                 mWeights;
-        LLAGPArray<LLVector4>   mClothingWeights;
-        LLAGPArray<U32>         mIndices;
-
-public:
-
-        BOOL getVertexStrider      (LLStrider<LLVector3> &vertices,   const U32 index = 0);
-        BOOL getTexCoordStrider    (LLStrider<LLVector2> &tex_coords, const U32 index = 0, const U32 pass=0);
-        BOOL getNormalStrider      (LLStrider<LLVector3> &normals,    const U32 index = 0);
-        BOOL getBinormalStrider    (LLStrider<LLVector3> &binormals,  const U32 index = 0);
-        BOOL getColorStrider       (LLStrider<LLColor4U> &colors,  const U32 index = 0);
-        BOOL getVertexWeightStrider(LLStrider<F32>       &vertex_weights, const U32 index = 0);
-        BOOL getClothingWeightStrider(LLStrider<LLVector4>       &clothing_weights, const U32 index = 0);
-
-public:
-        enum { NUM_BUCKETS = 8 };       // Need to change freeListBucket() if NUM_BUCKETS changes
-        struct FreeListNode
-        {
-                U32 count;
-                S32 next;
-        };
-protected:
-        int freeListBucket(U32 count);
-        void freeListAddGeom(S32 index, U32 count);
-        void freeListAddInd(S32 index, U32 count);
-        S32 freeListFindGeom(U32 count);
-        S32 freeListFindInd(U32 count);
-        
-protected:
-        BOOL mUseAGP;
-        S32 mVertexShaderLevel;
-        S32     mId;
-        U32 mType;                              // Type of draw pool
-        S32 mMaxVertices;
-        S32     mIndicesDrawn;
-        BOOL mCleanupUnused; // Cleanup unused data when too full
-
-        S32 mFreeListGeomHead[8];
-        S32 mFreeListIndHead[8];
-
 public:
         class LLOverrideFaceColor
         {
@@ -330,38 +228,6 @@ public:
                 LLDrawPool* mPool;
                 static BOOL sOverrideFaceColor;
         };
-
-        virtual void enableShade();
-        virtual void disableShade();
-        virtual void setShade(F32 shade);
-        
 };
 
-inline const U32 LLDrawPool::getStride() const
-{
-        return mStride;
-}
-
-inline const U32 LLDrawPool::getOffset(const U32 data_type) const
-{
-        return  mDataOffsets[data_type];
-}
-
-inline const U32 LLDrawPool::getStride(const U32 data_type) const
-{
-        if (mDataMaskIL & (1 << data_type))
-        {
-                return mStride;
-        }
-        else if (mDataMaskNIL & (1 << data_type))
-        {
-                return 0;
-        }
-        else
-        {
-                llerrs << "Getting stride for unsupported data type " << data_type << llendl;
-                return 0;
-        }
-}
-
 #endif //LL_LLDRAWPOOL_H
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp
index c62db17..b50be95 100644
--- a/linden/indra/newview/lldrawpoolalpha.cpp
+++ b/linden/indra/newview/lldrawpoolalpha.cpp
@@ -29,11 +29,11 @@
 
 #include "lldrawpoolalpha.h"
 
+#include "llglheaders.h"
 #include "llviewercontrol.h"
 #include "llcriticaldamp.h"
 #include "llfasttimer.h"
 
-#include "llagparray.h"
 #include "llcubemap.h"
 #include "llsky.h"
 #include "llagent.h"
@@ -44,104 +44,25 @@
 #include "llviewerobjectlist.h" // For debugging
 #include "llviewerwindow.h"
 #include "pipeline.h"
-
-const F32 MAX_DIST = 512.f;
-const F32 ALPHA_FALLOFF_START_DISTANCE = 0.8f;
+#include "llviewerregion.h"
 
 BOOL LLDrawPoolAlpha::sShowDebugAlpha = FALSE;
 
-LLDrawPoolAlpha::LLDrawPoolAlpha() :
-        LLDrawPool(POOL_ALPHA,
-                           DATA_SIMPLE_IL_MASK | DATA_COLORS_MASK,
-                           DATA_SIMPLE_NIL_MASK)
+LLDrawPoolAlpha::LLDrawPoolAlpha(U32 type) :
+        LLRenderPass(type)
 {
-        mRebuiltLastFrame = FALSE;
-        mMinDistance = 0.f;
-        mMaxDistance = MAX_DIST;
-        mInvBinSize = NUM_ALPHA_BINS/(mMaxDistance - mMinDistance);
-        mCleanupUnused = TRUE;
-        //mRebuildFreq = -1 ; // Only rebuild if nearly full
-
-//      for (S32 i = 0; i < NUM_ALPHA_BINS; i++)
-//      {
-//              mDistanceBins[i].realloc(200);
-//      }
-}
 
-LLDrawPoolAlpha::~LLDrawPoolAlpha()
-{
 }
 
-LLDrawPool *LLDrawPoolAlpha::instancePool()
+LLDrawPoolAlphaPostWater::LLDrawPoolAlphaPostWater()
+: LLDrawPoolAlpha(POOL_ALPHA_POST_WATER)
 {
-        llerrs << "Should never be calling instancePool on an alpha pool!" << llendl;
-        return NULL;
 }
 
-void LLDrawPoolAlpha::enqueue(LLFace *facep)
+LLDrawPoolAlpha::~LLDrawPoolAlpha()
 {
-        if (!facep->isState(LLFace::GLOBAL))
-        {
-                facep->mCenterAgent = facep->mCenterLocal * facep->getRenderMatrix();
-        }
-        facep->mDistance = (facep->mCenterAgent - gCamera->getOrigin()) * gCamera->getAtAxis();
-        
-        if (facep->isState(LLFace::BACKLIST))
-        {
-                mMoveFace.put(facep);
-        }
-        else
-        {
-                mDrawFace.put(facep);
-        }
-
-        {
-                S32 dist_bin = lltrunc( (mMaxDistance - (facep->mDistance+32))*mInvBinSize );
-
-                if (dist_bin >= NUM_ALPHA_BINS)
-                {
-                        mDistanceBins[NUM_ALPHA_BINS-1].put(facep);
-                        //mDistanceBins[NUM_ALPHA_BINS-1].push(facep, (U32)(void*)facep->getTexture());
-                }
-                else if (dist_bin > 0)
-                {
-                        mDistanceBins[dist_bin].put(facep);
-                        //mDistanceBins[dist_bin].push(facep, (U32)(void*)facep->getTexture());
-                }
-                else
-                {
-                        mDistanceBins[0].put(facep);
-                        //mDistanceBins[0].push(facep, (U32)(void*)facep->getTexture());
-                }
-        }
 }
 
-BOOL LLDrawPoolAlpha::removeFace(LLFace *facep)
-{
-        BOOL removed = FALSE;
-
-        LLDrawPool::removeFace(facep);
-
-        {
-                for (S32 i = 0; i < NUM_ALPHA_BINS; i++)
-                {
-                        if (mDistanceBins[i].removeObj(facep) != -1)
-                        {
-                                if (removed)
-                                {
-                                        llerrs << "Warning! " << "Face in multiple distance bins on removal" << llendl;
-                                }
-                                removed = TRUE;
-                        }
-                }
-        }
-        if (removed)
-        {
-                return TRUE;
-        }
-
-        return FALSE;
-}
 
 void LLDrawPoolAlpha::prerender()
 {
@@ -150,454 +71,270 @@ void LLDrawPoolAlpha::prerender()
 
 void LLDrawPoolAlpha::beginRenderPass(S32 pass)
 {
-        if (mDrawFace.empty())
-        {
-                // No alpha objects, early exit.
-                return;
-        }
-
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
-        if (gPipeline.getLightingDetail() >= 2)
-        {
-                glEnableClientState(GL_COLOR_ARRAY);
-        }
+        glEnableClientState(GL_COLOR_ARRAY);
 }
 
-
-void LLDrawPoolAlpha::render(S32 pass)
+void setup_clip_plane(BOOL pre_water)
 {
-        LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+        F32 height = gAgent.getRegion()->getWaterHeight();
+        BOOL above = gCamera->getOrigin().mV[2] > height ? TRUE : FALSE;
         
-        if (mDrawFace.empty())
-        {
-                // No alpha objects, early exit.
-                return;
-        }
-
-        GLfloat shiny[4] =
-        {
-                0.00f,
-                0.25f,
-                0.5f,
-                0.75f
-        };
-
-        GLint specularIndex = (mVertexShaderLevel > 0) ? 
-                gPipeline.mObjectAlphaProgram.mAttribute[LLPipeline::GLSL_SPECULAR_COLOR] : 0;
+        F64 plane[4];
+        
+        plane[0] = 0;
+        plane[1] = 0;
+        plane[2] = above == pre_water ? -1.0 : 1.0;
+        plane[3] = -plane[2] * height;
+        
+        glClipPlane(GL_CLIP_PLANE0, plane);
+}
 
-        S32 diffTex = 0;
-        S32 envTex = -1;
+void LLDrawPoolAlphaPostWater::render(S32 pass)
+{
+    LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
 
-        if (mVertexShaderLevel > 0) //alpha pass uses same shader as shiny/bump
+        if (gPipeline.hasRenderType(LLDrawPool::POOL_ALPHA))
         {
-                envTex = gPipeline.mObjectAlphaProgram.enableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-                LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-                if (envTex >= 0 && cube_map)
-                {
-                        cube_map->bind();
-                        cube_map->setMatrix(1);
-                }
-                
-                if (specularIndex > 0)
-                {
-                        glVertexAttrib4fARB(specularIndex, 0, 0, 0, 0);
-                }
-                
-                S32 scatterTex = gPipeline.mObjectAlphaProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-
-                diffTex = gPipeline.mObjectAlphaProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
+                LLGLEnable clip(GL_CLIP_PLANE0);
+                setup_clip_plane(FALSE);
+                LLDrawPoolAlpha::render(gPipeline.mAlphaGroupsPostWater);
         }
-
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
-        bindGLNormalPointer();
-        if (gPipeline.getLightingDetail() >= 2)
+        else
         {
-                bindGLColorPointer();
+                LLDrawPoolAlpha::render(gPipeline.mAlphaGroupsPostWater);
         }
+}
 
-        S32 i, j;
-        glAlphaFunc(GL_GREATER,0.01f);
-        // This needs to be turned off or there will be lots of artifacting with the clouds - djs
-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+void LLDrawPoolAlpha::render(S32 pass)
+{
+        LLFastTimer t(LLFastTimer::FTM_RENDER_ALPHA);
+        
+        LLGLEnable clip(GL_CLIP_PLANE0);
+        setup_clip_plane(TRUE);
+        render(gPipeline.mAlphaGroups);
+}
 
+void LLDrawPoolAlpha::render(std::vector<LLSpatialGroup*>& groups)
+{
+        LLGLDepthTest gls_depth(GL_TRUE);
         LLGLSPipelineAlpha gls_pipeline_alpha;
 
-        LLDynamicArray<LLFace*>* distance_bins;
-        distance_bins = mDistanceBins;
-
-        S32 num_bins_no_alpha_test = ((gPickAlphaThreshold != 0.f) && gUsePickAlpha) ? 
-                (NUM_ALPHA_BINS - llmax(2, (S32)(ALPHA_FALLOFF_START_DISTANCE * mInvBinSize))) : 
-                NUM_ALPHA_BINS;
-
-        typedef std::vector<LLFace*> face_list_t;
+        gPipeline.enableLightsDynamic(1.f);
+        renderAlpha(getVertexDataMask(), groups);
 
-        for (i = 0; i < num_bins_no_alpha_test; i++)
+        if (sShowDebugAlpha)
         {
-                S32 obj_count = distance_bins[i].count();
-
-                if (!obj_count)
-                {
-                        continue;
-                }
-                else if (i > (NUM_ALPHA_BINS / 2) && obj_count < 100)
-                {
-                        face_list_t pri_queue;
-                        pri_queue.reserve(distance_bins[i].count());
-                        for (j = 0; j < distance_bins[i].count(); j++)
-                        {
-                                pri_queue.push_back(distance_bins[i][j]);
-                        }
-                        std::sort(pri_queue.begin(), pri_queue.end(), LLFace::CompareDistanceGreater());
-                        
-                        for (face_list_t::iterator iter = pri_queue.begin(); iter != pri_queue.end(); iter++)
-                        {
-                                const LLFace &face = *(*iter);
-                                face.enableLights();
-                                face.bindTexture(diffTex);
-                                if ((mVertexShaderLevel > 0) && face.getTextureEntry() && specularIndex > 0)
-                                {
-                                        U8 s = face.getTextureEntry()->getShiny();
-                                        glVertexAttrib4fARB(specularIndex, shiny[s], shiny[s], shiny[s], shiny[s]);
-                                }
-                                face.renderIndexed(getRawIndices());
-                                mIndicesDrawn += face.getIndicesCount();
-                        }
-                }
-                else
-                {
-                        S32 count = distance_bins[i].count();
-                        for (j = 0; j < count; j++)
-                        {
-                                const LLFace &face = *distance_bins[i][j];
-                                face.enableLights();
-                                face.bindTexture(diffTex);
-                                if ((mVertexShaderLevel > 0) && face.getTextureEntry() && specularIndex > 0)
-                                {
-                                        U8 s = face.getTextureEntry()->getShiny();
-                                        glVertexAttrib4fARB(specularIndex, shiny[s], shiny[s], shiny[s], shiny[s]);
-                                }
-                                face.renderIndexed(getRawIndices());
-                                mIndicesDrawn += face.getIndicesCount();
-                        }
-                }
+                glDisableClientState(GL_NORMAL_ARRAY);
+                glDisableClientState(GL_COLOR_ARRAY);
+                gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
+                glColor4f(1,0,0,1);
+                LLViewerImage::sSmokeImagep->addTextureStats(1024.f*1024.f);
+        LLViewerImage::sSmokeImagep->bind();
+                renderAlphaHighlight(LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_TEXCOORD, groups);
         }
+}
 
-        GLfloat                 ogl_matrix[16];
-        gCamera->getOpenGLTransform(ogl_matrix);
+void LLDrawPoolAlpha::renderAlpha(U32 mask, std::vector<LLSpatialGroup*>& groups)
+{
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
 
-        for (i = num_bins_no_alpha_test; i < NUM_ALPHA_BINS; i++)
-        {
-                BOOL use_pri_queue = distance_bins[i].count() < 100;
+        LLSpatialBridge* last_bridge = NULL;
+        LLSpatialPartition* last_part = NULL;
+        glPushMatrix();
+        LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 
-                face_list_t pri_queue;
-                
-                if (use_pri_queue)
-                {
-                        pri_queue.reserve(distance_bins[i].count());
-                        for (j = 0; j < distance_bins[i].count(); j++)
-                        {
-                                pri_queue.push_back(distance_bins[i][j]);
-                        }
-                        std::sort(pri_queue.begin(), pri_queue.end(), LLFace::CompareDistanceGreater());
-                }
-
-                S32 count = distance_bins[i].count();
-                for (j = 0; j < count; j++)
+        for (std::vector<LLSpatialGroup*>::iterator i = groups.begin(); i != groups.end(); ++i)
+        {
+                LLSpatialGroup* group = *i;
+                if (group->mSpatialPartition->mRenderByGroup &&
+                        !group->isDead())
                 {
-                        const LLFace &face = use_pri_queue ? *pri_queue[j] : *distance_bins[i][j];
-                        F32 fade_value = face.mAlphaFade * gPickAlphaThreshold;
-
-                        face.enableLights();
-                        
-                        if (fade_value < 1.f)
+                        LLSpatialPartition* part = group->mSpatialPartition;
+                        if (part != last_part)
                         {
+                                LLSpatialBridge* bridge = part->asBridge();
+                                if (bridge != last_bridge)
                                 {
-                                        LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);
-                                        glAlphaFunc(GL_LESS, fade_value);
-                                        glBlendFunc(GL_ZERO, GL_ONE);
-                                        LLViewerImage::bindTexture(gPipeline.mAlphaSizzleImagep, diffTex);
-                                        LLVector4 s_params(ogl_matrix[2], ogl_matrix[6], ogl_matrix[10], ogl_matrix[14]);
-                                        LLVector4 t_params(ogl_matrix[1], ogl_matrix[5], ogl_matrix[9], ogl_matrix[13]);
-
-                                        LLGLEnable gls_texgen_s(GL_TEXTURE_GEN_S);
-                                        LLGLEnable gls_texgen_t(GL_TEXTURE_GEN_T);
-                                        glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-                                        glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-                                        glTexGenfv(GL_S, GL_OBJECT_PLANE, s_params.mV);
-                                        glTexGenfv(GL_T, GL_OBJECT_PLANE, t_params.mV);
-                                        if ((mVertexShaderLevel > 0) && face.getTextureEntry() && specularIndex > 0)
+                                        glPopMatrix();
+                                        glPushMatrix();
+                                        if (bridge)
                                         {
-                                                U8 s = face.getTextureEntry()->getShiny();
-                                                glVertexAttrib4fARB(specularIndex, shiny[s], shiny[s], shiny[s], shiny[s]);
+                                                glMultMatrixf((F32*) bridge->mDrawable->getRenderMatrix().mMatrix);
                                         }
-                                        face.renderIndexed(getRawIndices());
+                                        last_bridge = bridge;
                                 }
 
-                                {
-                                        // should get GL_GREATER to work, as it's faster
-                                        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_LESS);
-                                        glAlphaFunc(GL_GEQUAL, fade_value);
-                                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-                                        face.bindTexture(diffTex);
-                                        if ((mVertexShaderLevel > 0) && face.getTextureEntry() && specularIndex > 0)
-                                        {
-                                                U8 s = face.getTextureEntry()->getShiny();
-                                                glVertexAttrib4fARB(specularIndex, shiny[s], shiny[s], shiny[s], shiny[s]);
-                                        }
-                                        face.renderIndexed(getRawIndices());
-                                }
+//                              if (!last_part || part->mDepthMask != last_part->mDepthMask)
+//                              {
+//                                      glDepthMask(part->mDepthMask);
+//                              }
+                                last_part = part;
                         }
 
-                        // render opaque portion of actual texture
-                        glAlphaFunc(GL_GREATER, 0.98f);
-
-                        face.bindTexture(diffTex);
-                        face.renderIndexed(getRawIndices());
-
-                        glAlphaFunc(GL_GREATER, 0.01f);
-
-                        mIndicesDrawn += face.getIndicesCount();
+                        renderGroupAlpha(group,LLRenderPass::PASS_ALPHA,mask,TRUE);
                 }
         }
+        
+        glPopMatrix();
+}
 
-        if (mVertexShaderLevel > 0) //single pass shader driven shiny/bump
-        {
-                gPipeline.mObjectAlphaProgram.disableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-                LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-                if (envTex >= 0 && cube_map)
-                {
-                        cube_map->restoreMatrix();
-                }
-                gPipeline.mObjectAlphaProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                gPipeline.mObjectAlphaProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-
-                glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                glActiveTextureARB(GL_TEXTURE0_ARB);
-                glEnable(GL_TEXTURE_2D);
-        }
+void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask, std::vector<LLSpatialGroup*>& groups)
+{
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
 
-        if (sShowDebugAlpha)
+        LLSpatialBridge* last_bridge = NULL;
+        LLSpatialPartition* last_part = NULL;
+        glPushMatrix();
+        
+        for (std::vector<LLSpatialGroup*>::iterator i = groups.begin(); i != groups.end(); ++i)
         {
-                gPipeline.disableLights();
-                if ((mVertexShaderLevel > 0))
+                LLSpatialGroup* group = *i;
+                if (group->mSpatialPartition->mRenderByGroup &&
+                        !group->isDead())
                 {
-                        gPipeline.mHighlightProgram.bind();
-                }
-                
-                LLViewerImage::sSmokeImagep->bind();
-                LLOverrideFaceColor override_color(this, 1.f, 0.f, 0.f, 1.f);
-                glColor4f(1.f, 0.f, 0.f, 1.f); // in case vertex shaders are enabled
-                glDisableClientState(GL_COLOR_ARRAY);
-                
-                for (S32 i = 0; i < NUM_ALPHA_BINS; i++)
-                {
-                        if (distance_bins[i].count() < 100)
+                        LLSpatialPartition* part = group->mSpatialPartition;
+                        if (part != last_part)
                         {
-                                face_list_t pri_queue;
-                                pri_queue.reserve(distance_bins[i].count());
-                                for (j = 0; j < distance_bins[i].count(); j++)
+                                LLSpatialBridge* bridge = part->asBridge();
+                                if (bridge != last_bridge)
                                 {
-                                        pri_queue.push_back(distance_bins[i][j]);
-                                }
-                                std::sort(pri_queue.begin(), pri_queue.end(), LLFace::CompareDistanceGreater());
-
-                                for (face_list_t::iterator iter = pri_queue.begin(); iter != pri_queue.end(); iter++)
-                                {
-                                        const LLFace &face = *(*iter);
-                                        face.renderIndexed(getRawIndices());
-                                        mIndicesDrawn += face.getIndicesCount();
+                                        glPopMatrix();
+                                        glPushMatrix();
+                                        if (bridge)
+                                        {
+                                                glMultMatrixf((F32*) bridge->mDrawable->getRenderMatrix().mMatrix);
+                                        }
+                                        last_bridge = bridge;
                                 }
+                                
+                                last_part = part;
                         }
-                        else
+
+                        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[LLRenderPass::PASS_ALPHA];
+
+                        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
                         {
-                                for (j = 0; j < distance_bins[i].count(); j++)
+                                LLDrawInfo& params = **k;
+                                
+                                if (params.mParticle)
                                 {
-                                        const LLFace &face = *distance_bins[i][j];
-                                        face.renderIndexed(getRawIndices());
-                                        mIndicesDrawn += face.getIndicesCount();
+                                        continue;
                                 }
+                                params.mVertexBuffer->setBuffer(mask);
+                                U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+                                glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                                                                        GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+                                
+                                addIndicesDrawn(params.mCount);
                         }
                 }
+        }
+        glPopMatrix();
+}
 
-                if ((mVertexShaderLevel > 0))
-                {
-                        gPipeline.mHighlightProgram.unbind();
-                }
+void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture)
+{                                       
+        BOOL light_enabled = TRUE;
 
-        }
+        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        
+        U32 prim_type = GL_TRIANGLES;
 
-}
+        //F32 width = (F32) gViewerWindow->getWindowDisplayWidth();
 
-void LLDrawPoolAlpha::renderForSelect()
-{
-        if (mDrawFace.empty() || !mMemory.count())
+        //F32 view = gCamera->getView();
+        
+        if (group->mSpatialPartition->mDrawableType == LLPipeline::RENDER_TYPE_CLOUDS)
         {
-                return;
+                glAlphaFunc(GL_GREATER, 0.f);
         }
-
-        // force faces on focus object to proper alpha cutoff based on object bbox distance
-        if (gAgent.getFocusObject())
+        else
         {
-                LLDrawable* drawablep = gAgent.getFocusObject()->mDrawable;
-
-                if (drawablep)
-                {
-                        const S32 num_faces = drawablep->getNumFaces();
-
-                        for (S32 f = 0; f < num_faces; f++)
-                        {
-                                LLFace* facep = drawablep->getFace(f);
-                                facep->mDistance = gAgent.getFocusObjectDist();
-                        }
-                }
+                glAlphaFunc(GL_GREATER, 0.01f);
         }
 
-        glEnableClientState (GL_VERTEX_ARRAY);
-        glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-
-        LLGLSObjectSelectAlpha gls_alpha;
-
-        glBlendFunc(GL_ONE, GL_ZERO);
-        glAlphaFunc(gPickTransparent ? GL_GEQUAL : GL_GREATER, 0.f);
-
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
+        /*LLGLEnable point_sprite(GL_POINT_SPRITE_ARB);
 
-        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
-        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_REPLACE);
-        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB,         GL_MODULATE);
-
-        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB,           GL_PREVIOUS);
-        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB,          GL_SRC_COLOR);
-
-        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);
-        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
-
-        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB,         GL_PRIMARY_COLOR_ARB);
-        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB,        GL_SRC_ALPHA);
-
-        LLDynamicArray<LLFace*>* distance_bins;
-        distance_bins = mDistanceBins;
-
-        S32 j;
-        S32 num_bins_no_alpha_test = (gPickAlphaThreshold != 0.f) ? 
-                (NUM_ALPHA_BINS - llmax(2, (S32)(ALPHA_FALLOFF_START_DISTANCE * mInvBinSize))) : 
-                NUM_ALPHA_BINS;
+        if (gGLManager.mHasPointParameters)
+        {
+                glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE);
+                glPointParameterfARB(GL_POINT_SIZE_MIN_ARB, 0.f);
+                glPointParameterfARB(GL_POINT_SIZE_MAX_ARB, width*16.f);
+                glPointSize(width/(view*view));
+        }*/
 
-        S32 i;
-        for (i = 0; i < num_bins_no_alpha_test; i++)
+        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
         {
-                S32 distance_bin_size = distance_bins[i].count();
-                for (j = 0; j < distance_bin_size; j++)
+                LLDrawInfo& params = **k;
+                if (texture && params.mTexture.notNull())
                 {
-                        const LLFace &face = *distance_bins[i][j];
-                        if (face.getDrawable() && !face.getDrawable()->isDead() && (face.getViewerObject()->mGLName))
+                        params.mTexture->bind();
+                        params.mTexture->addTextureStats(params.mVSize);
+                        if (params.mTextureMatrix)
                         {
-                                face.bindTexture();
-                                face.renderForSelect();
+                                glMatrixMode(GL_TEXTURE);
+                                glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
                         }
                 }
-        }
-
-        for (i = num_bins_no_alpha_test; i < NUM_ALPHA_BINS; i++)
-        {
-                S32 distance_bin_size = distance_bins[i].count();
-                if (distance_bin_size)
+                
+                if (params.mFullbright)
                 {
-                        for (j = 0; j < distance_bin_size; j++)
+                        if (light_enabled)
                         {
-                                const LLFace &face = *distance_bins[i][j];
-
-                                glAlphaFunc(GL_GEQUAL, face.mAlphaFade * gPickAlphaTargetThreshold);
-
-                                if (face.getDrawable() && !face.getDrawable()->isDead() && (face.getViewerObject()->mGLName))
-                                {
-                                        face.bindTexture();
-                                        face.renderForSelect();
-                                }
+                                gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
+                                light_enabled = FALSE;
                         }
                 }
-        }
-
-        glAlphaFunc(GL_GREATER, 0.01f);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-        glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-}
-
-
-void LLDrawPoolAlpha::renderFaceSelected(LLFace *facep, 
-                                                                        LLImageGL *image, 
-                                                                        const LLColor4 &color,
-                                                                        const S32 index_offset, const S32 index_count)
-{
-        facep->renderSelected(image, color, index_offset, index_count);
-}
-
+                else if (!light_enabled)
+                {
+                        gPipeline.enableLightsDynamic(1.f);
+                        light_enabled = TRUE;
+                }
 
-void LLDrawPoolAlpha::resetDrawOrders()
-{
-        LLDrawPool::resetDrawOrders();
+                /*if (params.mParticle)
+                {
+                        F32 size = params.mPartSize;
+                        size *= size;
+                        float param[] = { 0, 0, 0.01f/size*view*view };
+                        prim_type = GL_POINTS;
+                        glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, param);
+                }
+                else*/
+                {
+                        prim_type = GL_TRIANGLES;
+                }
 
-        for (S32 i = 0; i < NUM_ALPHA_BINS; i++)
-        {
-                mDistanceBins[i].resize(0);
-        }
-}
+                params.mVertexBuffer->setBuffer(mask);
+                U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+                glDrawRangeElements(prim_type, params.mStart, params.mEnd, params.mCount,
+                                                        GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+                
+                addIndicesDrawn(params.mCount);
 
-BOOL LLDrawPoolAlpha::verify() const
-{
-        S32 i, j;
-        BOOL ok;
-        ok = LLDrawPool::verify();
-        for (i = 0; i < NUM_ALPHA_BINS; i++)
-        {
-                for (j = 0; j < mDistanceBins[i].count(); j++)
+                if (params.mTextureMatrix && texture && params.mTexture.notNull())
                 {
-                        const LLFace &face = *mDistanceBins[i][j];
-                        if (!face.verify())
-                        {
-                                ok = FALSE;
-                        }
+                        glLoadIdentity();
+                        glMatrixMode(GL_MODELVIEW);
                 }
         }
-        return ok;
-}
-
-LLViewerImage *LLDrawPoolAlpha::getDebugTexture()
-{
-        return LLViewerImage::sSmokeImagep;
-}
-
-
-LLColor3 LLDrawPoolAlpha::getDebugColor() const
-{
-        return LLColor3(1.f, 0.f, 0.f);
-}
 
-S32 LLDrawPoolAlpha::getMaterialAttribIndex()
-{
-        return gPipeline.mObjectAlphaProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-}
+        if (!light_enabled)
+        {
+                gPipeline.enableLightsDynamic(1.f);
+        }
 
-// virtual
-void LLDrawPoolAlpha::enableShade()
-{
-        glDisableClientState(GL_COLOR_ARRAY);
-}
+        /*glPointSize(1.f);
 
-// virtual
-void LLDrawPoolAlpha::disableShade()
-{
-        glEnableClientState(GL_COLOR_ARRAY);
-}
-
-// virtual
-void LLDrawPoolAlpha::setShade(F32 shade)
-{
-        glColor4f(0,0,0,shade);
-}
+        if (gGLManager.mHasPointParameters)
+        {
+                float param[] = {1, 0, 0 };
+                glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, param);
+        }*/
+}       
diff --git a/linden/indra/newview/lldrawpoolalpha.h b/linden/indra/newview/lldrawpoolalpha.h
index ba58a7f..f7012d6 100644
--- a/linden/indra/newview/lldrawpoolalpha.h
+++ b/linden/indra/newview/lldrawpoolalpha.h
@@ -29,55 +29,43 @@
 #define LL_LLDRAWPOOLALPHA_H
 
 #include "lldrawpool.h"
-#include "llviewerimage.h"
 #include "llframetimer.h"
 
 class LLFace;
 class LLColor4;
 
-class LLDrawPoolAlpha: public LLDrawPool
+class LLDrawPoolAlpha: public LLRenderPass
 {
 public:
-        LLDrawPoolAlpha();
-        /*virtual*/ ~LLDrawPoolAlpha();
-
-        /*virtual*/ LLDrawPool *instancePool();
-
-        /*virtual*/ void beginRenderPass(S32 pass = 0);
-        /*virtual*/ void render(S32 pass = 0);
-        /*virtual*/ void renderFaceSelected(LLFace *facep, LLImageGL *image, const LLColor4 &color,
-                                                                                const S32 index_offset = 0, const S32 index_count = 0);
-        /*virtual*/ void prerender();
-        /*virtual*/ void renderForSelect();
-
-        /*virtual*/ void enqueue(LLFace *face);
-        /*virtual*/ BOOL removeFace(LLFace *face);
-        /*virtual*/ void resetDrawOrders();
-
-        /*virtual*/ void enableShade();
-        /*virtual*/ void disableShade();
-        /*virtual*/ void setShade(F32 shade);
-
-
-        virtual S32 getMaterialAttribIndex();
-
-        BOOL mRebuiltLastFrame;
         enum
         {
-                NUM_ALPHA_BINS = 1024
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_COLOR |
+                                                        LLVertexBuffer::MAP_TEXCOORD
         };
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
+        LLDrawPoolAlpha(U32 type = LLDrawPool::POOL_ALPHA);
+        /*virtual*/ ~LLDrawPoolAlpha();
 
-        /*virtual*/ BOOL verify() const;
-        /*virtual*/ LLViewerImage *getDebugTexture();
-        /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
+        /*virtual*/ void beginRenderPass(S32 pass = 0);
+        virtual void render(S32 pass = 0);
+        void render(std::vector<LLSpatialGroup*>& groups);
+        /*virtual*/ void prerender();
 
+        void renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE);
+        void renderAlpha(U32 mask, std::vector<LLSpatialGroup*>& groups);
+        void renderAlphaHighlight(U32 mask, std::vector<LLSpatialGroup*>& groups);
+        
         static BOOL sShowDebugAlpha;
-protected:
-        F32 mMinDistance;
-        F32 mMaxDistance;
-        F32 mInvBinSize;
+};
 
-        LLDynamicArray<LLFace*> mDistanceBins[NUM_ALPHA_BINS];
+class LLDrawPoolAlphaPostWater : public LLDrawPoolAlpha
+{
+public:
+        LLDrawPoolAlphaPostWater();
+        virtual void render(S32 pass = 0);
 };
 
 #endif // LL_LLDRAWPOOLALPHA_H
diff --git a/linden/indra/newview/lldrawpoolavatar.cpp b/linden/indra/newview/lldrawpoolavatar.cpp
index abf154c..fc4f64b 100644
--- a/linden/indra/newview/lldrawpoolavatar.cpp
+++ b/linden/indra/newview/lldrawpoolavatar.cpp
@@ -32,7 +32,6 @@
 #include "llvoavatar.h"
 #include "m3math.h"
 
-#include "llagparray.h"
 #include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
@@ -42,6 +41,11 @@
 #include "noise.h"
 #include "pipeline.h"
 
+static U32 sDataMask = LLDrawPoolAvatar::VERTEX_DATA_MASK;
+static U32 sBufferUsage = GL_STREAM_DRAW_ARB;
+static U32 sShaderLevel = 0;
+static LLGLSLShader* sVertexProgram = NULL;
+
 extern F32 gFrameDTClamped;
 extern BOOL gUseGLPick;
 
@@ -75,53 +79,13 @@ S32 AVATAR_VERTEX_BYTES = 48;
 
 
 BOOL gAvatarEmbossBumpMap = FALSE;
+static BOOL sRenderingSkinned = FALSE;
 
 LLDrawPoolAvatar::LLDrawPoolAvatar() :
-LLDrawPool(POOL_AVATAR, 
-                   DATA_SIMPLE_IL_MASK, 
-                   DATA_VERTEX_WEIGHTS_MASK | DATA_CLOTHING_WEIGHTS_MASK )
+LLFacePool(POOL_AVATAR)
 {
-        mCleanupUnused = FALSE;
-
-        // Overide the data layout
-        mDataMaskIL = 0;
-        mStride = 0;
-        for (S32 i = 0; i < DATA_MAX_TYPES; i++)
-        {
-                mDataOffsets[i] = 0;
-        }
-
-        // Note: padding is to speed up SSE code
-        mDataMaskIL |= DATA_VERTICES_MASK;
-        mDataOffsets[DATA_VERTICES] = mStride;
-        mStride += sDataSizes[DATA_VERTICES];
-
-        mStride += 4;
-
-        mDataMaskIL |= DATA_NORMALS_MASK;
-        mDataOffsets[DATA_NORMALS] = mStride;
-        mStride += sDataSizes[DATA_NORMALS];
-
-        mStride += 4;
-
-        // Note: binormals are stripped off in software blending
-        mDataMaskIL |= DATA_BINORMALS_MASK;
-        mDataOffsets[DATA_BINORMALS] = mStride;
-        mStride += sDataSizes[DATA_BINORMALS];
-
-        mStride += 4; // To keep the structure 16-byte aligned (for SSE happiness)
-
-        mDataMaskIL |= DATA_TEX_COORDS0_MASK;
-        mDataOffsets[DATA_TEX_COORDS0] = mStride;
-        mStride += sDataSizes[DATA_TEX_COORDS0];
-
-        mDataMaskIL |= DATA_TEX_COORDS1_MASK;
-        mDataOffsets[DATA_TEX_COORDS1] = mStride;
-        mStride += sDataSizes[DATA_TEX_COORDS1];
-
         //LLDebugVarMessageBox::show("acceleration", &CLOTHING_ACCEL_FORCE_FACTOR, 10.f, 0.1f);
-        //LLDebugVarMessageBox::show("gravity", &CLOTHING_GRAVITY_EFFECT, 10.f, 0.1f);
-        
+        //LLDebugVarMessageBox::show("gravity", &CLOTHING_GRAVITY_EFFECT, 10.f, 0.1f);  
 }
 
 //-----------------------------------------------------------------------------
@@ -132,41 +96,194 @@ LLDrawPool *LLDrawPoolAvatar::instancePool()
         return new LLDrawPoolAvatar();
 }
 
+BOOL gRenderAvatar = TRUE;
+static LLMatrix4 sModelViewMatrix = LLMatrix4();
 
-S32 LLDrawPoolAvatar::rebuild()
+S32 LLDrawPoolAvatar::getVertexShaderLevel() const
 {
-        mRebuildTime++;
-        if (mRebuildTime > mRebuildFreq)
-        {
-                flushAGP();
-
-                mRebuildTime = 0;
-        }
-
-        return 0;
+        return (S32) gPipeline.getVertexShaderLevel(LLPipeline::SHADER_AVATAR);
 }
 
-BOOL gRenderAvatar = TRUE;
-
 void LLDrawPoolAvatar::prerender()
 {
         mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_AVATAR);
+        sShaderLevel = mVertexShaderLevel;
+        
+        if (sShaderLevel > 0)
+        {
+                sBufferUsage = GL_STATIC_DRAW_ARB;
+        }
+        else
+        {
+                sBufferUsage = GL_STREAM_DRAW_ARB;
+        }
+}
+
+LLMatrix4& LLDrawPoolAvatar::getModelView()
+{
+        return sModelViewMatrix;
 }
 
 //-----------------------------------------------------------------------------
 // render()
 //-----------------------------------------------------------------------------
+
+S32 LLDrawPoolAvatar::getNumPasses()
+{
+        return 3;
+}
+
 void LLDrawPoolAvatar::render(S32 pass)
 {
         LLFastTimer t(LLFastTimer::FTM_RENDER_CHARACTERS);
-        renderAvatars(NULL); // render all avatars
+        renderAvatars(NULL, pass); // render all avatars
+}
+
+void LLDrawPoolAvatar::beginRenderPass(S32 pass)
+{
+        //reset vertex buffer mappings
+        LLVertexBuffer::unbind();
+
+        switch (pass)
+        {
+        case 0:
+                beginFootShadow();
+                break;
+        case 1:
+                glGetFloatv(GL_MODELVIEW_MATRIX, (F32*) sModelViewMatrix.mMatrix);
+                beginRigid();
+                break;
+        case 2:
+                beginSkinned();
+                break;
+        }
+}
+
+void LLDrawPoolAvatar::endRenderPass(S32 pass)
+{
+        switch (pass)
+        {
+        case 0:
+                endFootShadow();
+                break;
+        case 1:
+                endRigid();
+                break;
+        case 2:
+                endSkinned();
+        }
+}
+
+void LLDrawPoolAvatar::beginFootShadow()
+{
+        glDepthMask(GL_FALSE);
+        gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+void LLDrawPoolAvatar::endFootShadow()
+{
+        gPipeline.enableLightsDynamic(1.f);
+        glDepthMask(GL_TRUE);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+void LLDrawPoolAvatar::beginRigid()
+{
+        sVertexProgram = &gPipeline.mAvatarEyeballProgram;
+        glEnableClientState(GL_NORMAL_ARRAY);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+        if (sShaderLevel > 0)
+        {       //eyeballs render with the specular shader
+                gPipeline.mAvatarEyeballProgram.bind();
+                gPipeline.mMaterialIndex = gPipeline.mAvatarEyeballProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
+                gPipeline.mSpecularIndex = gPipeline.mAvatarEyeballProgram.mAttribute[LLPipeline::GLSL_SPECULAR_COLOR];
+        }
+}
+
+void LLDrawPoolAvatar::endRigid()
+{
+        glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+void LLDrawPoolAvatar::beginSkinned()
+{
+        glEnableClientState(GL_NORMAL_ARRAY);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+        sVertexProgram = &gPipeline.mAvatarProgram;
+
+        if (sShaderLevel > 0)  // for hardware blending
+        {
+                sRenderingSkinned = TRUE;
+                glClientActiveTextureARB(GL_TEXTURE1_ARB);
+                if (sShaderLevel >= SHADER_LEVEL_BUMP)
+                {
+                        gPipeline.mMaterialIndex = sVertexProgram->mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
+                        gPipeline.mSpecularIndex = sVertexProgram->mAttribute[LLPipeline::GLSL_SPECULAR_COLOR];
+                }
+                sVertexProgram->bind();
+                if (sShaderLevel >= SHADER_LEVEL_CLOTH)
+                {
+                        enable_cloth_weights(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_CLOTHING]);
+                }
+                enable_vertex_weighting(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
+
+                if (sShaderLevel >= SHADER_LEVEL_BUMP)
+                {
+                        enable_binormals(sVertexProgram->mAttribute[LLPipeline::GLSL_BINORMAL]);
+                }
+                
+                sVertexProgram->enableTexture(LLPipeline::GLSL_BUMP_MAP);
+                glActiveTextureARB(GL_TEXTURE0_ARB);
+        }
 }
 
-void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, BOOL no_shaders)
+void LLDrawPoolAvatar::endSkinned()
 {
-        if (no_shaders)
+        // if we're in software-blending, remember to set the fence _after_ we draw so we wait till this rendering is done
+        if (sShaderLevel > 0)
         {
-                mVertexShaderLevel = 0;
+                sRenderingSkinned = FALSE;
+                sVertexProgram->disableTexture(LLPipeline::GLSL_BUMP_MAP);
+                glActiveTextureARB(GL_TEXTURE0_ARB);
+                glClientActiveTextureARB(GL_TEXTURE0_ARB);
+                disable_vertex_weighting(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
+                if (sShaderLevel >= SHADER_LEVEL_BUMP)
+                {
+                        disable_binormals(sVertexProgram->mAttribute[LLPipeline::GLSL_BINORMAL]);
+                }
+                if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
+                {
+                        disable_cloth_weights(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_CLOTHING]);
+                }
+
+                sVertexProgram->unbind();
+        }
+
+        glActiveTextureARB(GL_TEXTURE0_ARB);
+        glClientActiveTextureARB(GL_TEXTURE0_ARB);
+
+        glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+
+void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
+{
+        if (pass == -1)
+        {
+                for (S32 i = 1; i < getNumPasses(); i++)
+                { //skip foot shadows
+                        prerender();
+                        beginRenderPass(i);
+                        renderAvatars(single_avatar, i);
+                        endRenderPass(i);
+                }
+
+                return;
         }
 
         if (!gRenderAvatar)
@@ -195,13 +312,95 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, BOOL no_shaders)
                 avatarp = (LLVOAvatar *)(facep->getDrawable()->getVObj());
         }
 
-        if (avatarp->isDead() || avatarp->mDrawable.isNull())
+    if (avatarp->isDead() || avatarp->mDrawable.isNull())
         {
                 return;
         }
 
     LLOverrideFaceColor color(this, 1.0f, 1.0f, 1.0f, 1.0f);
         
+        if (pass == 0)
+        {
+                if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FOOT_SHADOWS))
+                {
+                        mIndicesDrawn += avatarp->renderFootShadows();  
+                }
+                return;
+        }
+
+        if (avatarp->mSpecialRenderMode == 0) // normal
+        {
+                gPipeline.enableLightsAvatar(avatarp->mDrawable->getSunShadowFactor());
+        }
+        else if (avatarp->mSpecialRenderMode == 1)  // anim preview
+        {
+                gPipeline.enableLightsAvatarEdit(LLColor4(0.7f, 0.6f, 0.3f, 1.f));
+        }
+        else // 2=image preview,  3=morph view
+        {
+                gPipeline.enableLightsAvatarEdit(LLColor4(.5f, .5f, .5f, 1.f));
+        }
+
+        if (pass == 1)
+        {
+                // render rigid meshes (eyeballs) first
+                mIndicesDrawn += avatarp->renderRigid();
+
+                if (!gRenderForSelect && avatarp->mIsSelf && LLVOAvatar::sAvatarLoadTest)
+                {
+                        LLVector3 orig_pos_root = avatarp->mRoot.getPosition();
+                        LLVector3 next_pos_root = orig_pos_root;
+                        for (S32 i = 0; i < NUM_TEST_AVATARS; i++)
+                        {
+                                next_pos_root.mV[VX] += 1.f;
+                                if (i % 5 == 0)
+                                {
+                                        next_pos_root.mV[VY] += 1.f;
+                                        next_pos_root.mV[VX] = orig_pos_root.mV[VX];
+                                }
+
+                                avatarp->mRoot.setPosition(next_pos_root); // avatar load test
+                                avatarp->mRoot.updateWorldMatrixChildren(); // avatar load test
+
+                                mIndicesDrawn += avatarp->renderRigid();
+                        }
+                        avatarp->mRoot.setPosition(orig_pos_root); // avatar load test
+                        avatarp->mRoot.updateWorldMatrixChildren(); // avatar load test
+                }
+                return;
+        }
+        
+
+        if (sShaderLevel > 0)
+        {
+                gPipeline.mAvatarMatrixParam = sVertexProgram->mUniform[LLPipeline::GLSL_AVATAR_MATRIX];
+        }
+    
+        if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
+        {
+                LLMatrix4 rot_mat;
+                gCamera->getMatrixToLocal(rot_mat);
+                LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
+                rot_mat *= cfr;
+                
+                LLVector4 wind;
+                wind.setVec(avatarp->mWindVec);
+                wind.mV[VW] = 0;
+                wind = wind * rot_mat;
+                wind.mV[VW] = avatarp->mWindVec.mV[VW];
+
+                sVertexProgram->vertexAttrib4fv(LLPipeline::GLSL_AVATAR_WIND, wind.mV);
+                F32 phase = -1.f * (avatarp->mRipplePhase);
+
+                F32 freq = 7.f + (noise1(avatarp->mRipplePhase) * 2.f);
+                LLVector4 sin_params(freq, freq, freq, phase);
+                sVertexProgram->vertexAttrib4fv(LLPipeline::GLSL_AVATAR_SINWAVE, sin_params.mV);
+
+                LLVector4 gravity(0.f, 0.f, -CLOTHING_GRAVITY_EFFECT, 0.f);
+                gravity = gravity * rot_mat;
+                sVertexProgram->vertexAttrib4fv(LLPipeline::GLSL_AVATAR_GRAVITY, gravity.mV);
+        }
+
         if( !single_avatar || (avatarp == single_avatar) )
         {
                 if (LLVOAvatar::sShowCollisionVolumes)
@@ -210,8 +409,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, BOOL no_shaders)
                         avatarp->renderCollisionVolumes();
                 }
 
-                LLGLEnable normalize(GL_NORMALIZE);
-
                 if (avatarp->mIsSelf && LLAgent::sDebugDisplayTarget)
                 {
                         LLGLSNoTexture gls_no_texture;
@@ -267,171 +464,8 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, BOOL no_shaders)
                         color.setColor(1.0f, 1.0f, 1.0f, 1.0f);
                 }
 
-                glEnableClientState(GL_VERTEX_ARRAY);
-                glEnableClientState(GL_NORMAL_ARRAY);
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-                LLGLSLShader* vertex_program = &gPipeline.mAvatarProgram;
-                if (mVertexShaderLevel > 0)
-                {
-                        gPipeline.mAvatarMatrixParam = vertex_program->mUniform[LLPipeline::GLSL_AVATAR_MATRIX];
-                }
-                
-                //--------------------------------------------------------------------------------
-                // this is where we first hit the software blending path
-                // if enabled, we need to set up the proper buffers and avoid setting other state
-                //--------------------------------------------------------------------------------
-                if (!(mVertexShaderLevel > 0))
-                {
-
-                        // performance could be increased by better utilizing the buffers, for example, only using 1k buffers for lo-res
-                        // avatars. But the only problem with using fewer buffers is that we're more likely to wait for a fence to complete
-
-                        // vertex format:
-                        //  vertices 12
-                        //  texcoords 8
-                        //  normals  12
-                        //      binormals 12
-                        //  padding  4
-                        // total     48
-
-                        // Rotate to the next buffer, round-robin.
-                        gPipeline.bufferRotate();
-
-                        // Wait until the hardware is done reading the last set of vertices from the buffer before writing the next set.
-                        gPipeline.bufferWaitFence();
-
-                        // Need to do this because we may be rendering without AGP even in AGP mode
-                        U8* buffer_offset_start = gPipeline.bufferGetScratchMemory();
-                        glVertexPointer(  3, GL_FLOAT, AVATAR_VERTEX_BYTES, buffer_offset_start + AVATAR_OFFSET_POS);
-                        glTexCoordPointer(2, GL_FLOAT, AVATAR_VERTEX_BYTES, buffer_offset_start + AVATAR_OFFSET_TEX0);
-                        glNormalPointer(     GL_FLOAT, AVATAR_VERTEX_BYTES, buffer_offset_start + AVATAR_OFFSET_NORMAL);
-                        
-                }
-
-                if ((mVertexShaderLevel > 0))  // for hardware blending
-                {
-                        bindGLVertexPointer();
-                        bindGLNormalPointer();
-                        bindGLTexCoordPointer(0);
-                }
-                
-                if ((mVertexShaderLevel > 0))
-                {       //eyeballs render with the specular shader
-                        gPipeline.mAvatarEyeballProgram.bind();
-                        gPipeline.mMaterialIndex = gPipeline.mAvatarEyeballProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-                        gPipeline.mSpecularIndex = gPipeline.mAvatarEyeballProgram.mAttribute[LLPipeline::GLSL_SPECULAR_COLOR];
-
-                        S32 index = gPipeline.mAvatarEyeballProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);                
-                        gSky.mVOSkyp->getScatterMap()->bind(index);
-                                        
-                        glActiveTextureARB(GL_TEXTURE0_ARB);
-                }
-                
-                if (avatarp->mSpecialRenderMode == 0) // normal
-                {
-                        gPipeline.enableLightsAvatar(avatarp->mDrawable->getSunShadowFactor());
-                }
-                else if (avatarp->mSpecialRenderMode == 1)  // anim preview
-                {
-                        gPipeline.enableLightsAvatarEdit(LLColor4(0.7f, 0.6f, 0.3f, 1.f));
-                }
-                else // 2=image preview,  3=morph view
-                {
-                        gPipeline.enableLightsAvatarEdit(LLColor4(.5f, .5f, .5f, 1.f));
-                }
-                
-                // render rigid meshes (eyeballs) first
-                mIndicesDrawn += avatarp->renderRigid();
-
-                if ((mVertexShaderLevel > 0))
-                {       
-                        gPipeline.mAvatarEyeballProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);           
-                        glActiveTextureARB(GL_TEXTURE0_ARB);
-                }
-                
-                if (!gRenderForSelect && avatarp->mIsSelf && LLVOAvatar::sAvatarLoadTest)
-                {
-                        LLVector3 orig_pos_root = avatarp->mRoot.getPosition();
-                        LLVector3 next_pos_root = orig_pos_root;
-                        for (S32 i = 0; i < NUM_TEST_AVATARS; i++)
-                        {
-                                next_pos_root.mV[VX] += 1.f;
-                                if (i % 5 == 0)
-                                {
-                                        next_pos_root.mV[VY] += 1.f;
-                                        next_pos_root.mV[VX] = orig_pos_root.mV[VX];
-                                }
-
-                                avatarp->mRoot.setPosition(next_pos_root); // avatar load test
-                                avatarp->mRoot.updateWorldMatrixChildren(); // avatar load test
-
-                                mIndicesDrawn += avatarp->renderRigid();
-                        }
-                        avatarp->mRoot.setPosition(orig_pos_root); // avatar load test
-                        avatarp->mRoot.updateWorldMatrixChildren(); // avatar load test
-                }
-
-                if ((mVertexShaderLevel > 0))  // for hardware blending
-                {
-                        glClientActiveTextureARB(GL_TEXTURE1_ARB);
-                        if ((mVertexShaderLevel >= SHADER_LEVEL_BUMP))
-                        {
-                                bindGLTexCoordPointer(1);
-                                
-                                bindGLBinormalPointer(vertex_program->mAttribute[LLPipeline::GLSL_BINORMAL]);
-                                gPipeline.mMaterialIndex = vertex_program->mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-                                gPipeline.mSpecularIndex = vertex_program->mAttribute[LLPipeline::GLSL_SPECULAR_COLOR];
-                        }
-                        glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                        bindGLTexCoordPointer(0);
-                        vertex_program->bind();
-                        bindGLVertexWeightPointer(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
-                        if ((mVertexShaderLevel >= SHADER_LEVEL_CLOTH))
-                        {
-                                bindGLVertexClothingWeightPointer(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_CLOTHING]);
-                                enable_cloth_weights(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_CLOTHING]);
-                        }
-                        enable_vertex_weighting(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
-
-                        if ((mVertexShaderLevel >= SHADER_LEVEL_BUMP))
-                        {
-                                enable_binormals(vertex_program->mAttribute[LLPipeline::GLSL_BINORMAL]);
-                        }
-                        
-                        vertex_program->enableTexture(LLPipeline::GLSL_BUMP_MAP);
-                        S32 index = vertex_program->enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                        gSky.mVOSkyp->getScatterMap()->bind(index);
-                        glActiveTextureARB(GL_TEXTURE0_ARB);
-                }
-
-                if ((mVertexShaderLevel >= SHADER_LEVEL_CLOTH))
-                {
-                        LLMatrix4 rot_mat;
-                        gCamera->getMatrixToLocal(rot_mat);
-                        LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
-                        rot_mat *= cfr;
-                        
-                        LLVector4 wind;
-                        wind.setVec(avatarp->mWindVec);
-                        wind.mV[VW] = 0;
-                        wind = wind * rot_mat;
-                        wind.mV[VW] = avatarp->mWindVec.mV[VW];
-
-                        vertex_program->vertexAttrib4fv(LLPipeline::GLSL_AVATAR_WIND, wind.mV);
-                        F32 phase = -1.f * (avatarp->mRipplePhase);
-
-                        F32 freq = 7.f + (noise1(avatarp->mRipplePhase) * 2.f);
-                        LLVector4 sin_params(freq, freq, freq, phase);
-                        vertex_program->vertexAttrib4fv(LLPipeline::GLSL_AVATAR_SINWAVE, sin_params.mV);
-
-                        LLVector4 gravity(0.f, 0.f, -CLOTHING_GRAVITY_EFFECT, 0.f);
-                        gravity = gravity * rot_mat;
-                        vertex_program->vertexAttrib4fv(LLPipeline::GLSL_AVATAR_GRAVITY, gravity.mV);
-                }
-
                 mIndicesDrawn += avatarp->renderSkinned(AVATAR_RENDER_PASS_SINGLE);
-                
+                                
                 if (!gRenderForSelect && avatarp->mIsSelf && LLVOAvatar::sAvatarLoadTest)
                 {
                         LLVector3 orig_pos_root = avatarp->mRoot.getPosition();
@@ -453,31 +487,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, BOOL no_shaders)
                         avatarp->mRoot.setPosition(orig_pos_root); // avatar load test
                         avatarp->mRoot.updateWorldMatrixChildren(); // avatar load test
                 }
-
-                // if we're in software-blending, remember to set the fence _after_ we draw so we wait till this rendering is done
-                if (!(mVertexShaderLevel > 0))
-                {
-                        // want for the previously bound fence to finish
-                        gPipeline.bufferSendFence();
-                }
-                else
-                {
-                        vertex_program->disableTexture(LLPipeline::GLSL_BUMP_MAP);
-                        vertex_program->disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                        glActiveTextureARB(GL_TEXTURE0_ARB);
-                        glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                        disable_vertex_weighting(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
-                        if ((mVertexShaderLevel >= SHADER_LEVEL_BUMP))
-                        {
-                                disable_binormals(vertex_program->mAttribute[LLPipeline::GLSL_BINORMAL]);
-                        }
-                        if ((mVertexShaderLevel >= SHADER_LEVEL_CLOTH))
-                        {
-                                disable_cloth_weights(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_CLOTHING]);
-                        }
-
-                        vertex_program->unbind();
-                }
         }
 }
 
@@ -490,14 +499,13 @@ void LLDrawPoolAvatar::renderForSelect()
         {
                 return;
         }
-        //gGLSObjectSelectDepthAlpha.set();
-
+        
         if (!gRenderAvatar)
         {
                 return;
         }
 
-        if (mDrawFace.empty() || !mMemory.count())
+        if (mDrawFace.empty())
         {
                 return;
         }
@@ -517,80 +525,38 @@ void LLDrawPoolAvatar::renderForSelect()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-        LLGLSLShader* vertex_program = &gPipeline.mAvatarPickProgram;
-        if (mVertexShaderLevel > 0)
+        glGetFloatv(GL_MODELVIEW_MATRIX, (F32*) sModelViewMatrix.mMatrix);
+        sVertexProgram = &gPipeline.mAvatarPickProgram;
+        if (sShaderLevel > 0)
         {
-                gPipeline.mAvatarMatrixParam = vertex_program->mUniform[LLPipeline::GLSL_AVATAR_MATRIX];
+                gPipeline.mAvatarMatrixParam = sVertexProgram->mUniform[LLPipeline::GLSL_AVATAR_MATRIX];
         }
         glAlphaFunc(GL_GEQUAL, 0.2f);
         glBlendFunc(GL_ONE, GL_ZERO);
 
-        //--------------------------------------------------------------------------------
-        // this is where we first hit the software blending path
-        // if enabled, we need to set up the proper buffers and avoid setting other state
-        //--------------------------------------------------------------------------------
-        if (!(mVertexShaderLevel > 0) || gUseGLPick)
-        {
-
-                // Rotate to the next buffer, round-robin.
-                gPipeline.bufferRotate();
-
-                // Wait until the hardware is done reading the last set of vertices from the buffer before writing the next set.
-                gPipeline.bufferWaitFence();
-
-                // Need to do this because we may be rendering without AGP even in AGP mode
-                U8* buffer_offset_start = gPipeline.bufferGetScratchMemory();
-                glVertexPointer(  3, GL_FLOAT, AVATAR_VERTEX_BYTES, buffer_offset_start + AVATAR_OFFSET_POS);
-                glTexCoordPointer(2, GL_FLOAT, AVATAR_VERTEX_BYTES, buffer_offset_start + AVATAR_OFFSET_TEX0);
-                glNormalPointer(     GL_FLOAT, AVATAR_VERTEX_BYTES, buffer_offset_start + AVATAR_OFFSET_NORMAL);
-        }
-
         S32 name = avatarp->mDrawable->getVObj()->mGLName;
         LLColor4U color((U8)(name >> 16), (U8)(name >> 8), (U8)name);
         glColor4ubv(color.mV);
 
-        if ((mVertexShaderLevel > 0) && !gUseGLPick)  // for hardware blending
-        {
-                bindGLVertexPointer();
-                bindGLNormalPointer();
-                bindGLTexCoordPointer(0);
-        }
-
         // render rigid meshes (eyeballs) first
-        mIndicesDrawn += avatarp->renderRigid();
+        //mIndicesDrawn += avatarp->renderRigid();
 
-        if ((mVertexShaderLevel > 0) && !gUseGLPick)  // for hardware blending
+        if ((sShaderLevel > 0) && !gUseGLPick)  // for hardware blending
         {
                 glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                bindGLTexCoordPointer(0);
-                vertex_program->bind();
-                bindGLVertexWeightPointer(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
-                /*if ((mVertexShaderLevel >= SHADER_LEVEL_CLOTH))
-                {
-                        bindGLVertexClothingWeightPointer();
-                        enable_cloth_weights();
-                }*/
-                enable_vertex_weighting(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
+                sRenderingSkinned = TRUE;
+                sVertexProgram->bind();
+                enable_vertex_weighting(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
         }
-
+        
         mIndicesDrawn += avatarp->renderSkinned(AVATAR_RENDER_PASS_SINGLE);
 
         // if we're in software-blending, remember to set the fence _after_ we draw so we wait till this rendering is done
-        if (!(mVertexShaderLevel > 0) || gUseGLPick)
+        if ((sShaderLevel > 0) && !gUseGLPick)
         {
-                // want for the previously bound fence to finish
-                gPipeline.bufferSendFence();
-        }
-        else
-        {
-                vertex_program->unbind();
-                disable_vertex_weighting(vertex_program->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
-                
-                /*if ((mVertexShaderLevel >= SHADER_LEVEL_CLOTH))
-                {
-                        disable_cloth_weights();
-                }*/
+                sRenderingSkinned = FALSE;
+                sVertexProgram->unbind();
+                disable_vertex_weighting(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT]);
         }
 
         glAlphaFunc(GL_GREATER, 0.01f);
@@ -627,3 +593,46 @@ LLColor3 LLDrawPoolAvatar::getDebugColor() const
 {
         return LLColor3(0.f, 1.f, 0.f);
 }
+
+LLVertexBufferAvatar::LLVertexBufferAvatar()
+: LLVertexBuffer(sDataMask, 
+        gPipeline.getVertexShaderLevel(LLPipeline::SHADER_AVATAR) > 0 ? 
+        GL_STATIC_DRAW_ARB : 
+        GL_STREAM_DRAW_ARB)
+{
+
+}
+
+
+void LLVertexBufferAvatar::setupVertexBuffer(U32 data_mask) const
+{
+        if (sRenderingSkinned)
+        {
+                U8* base = useVBOs() ? NULL : mMappedData;
+
+                glVertexPointer(3,GL_FLOAT, mStride, (void*)(base + 0));
+                glNormalPointer(GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_NORMAL]));
+        
+                glClientActiveTextureARB(GL_TEXTURE1_ARB);
+                glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD2]));
+                glClientActiveTextureARB(GL_TEXTURE0_ARB);
+                glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD]));
+                
+                set_vertex_weights(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_WEIGHT], mStride, (F32*)(base + mOffsets[TYPE_WEIGHT]));
+
+                if (sShaderLevel >= LLDrawPoolAvatar::SHADER_LEVEL_BUMP)
+                {
+                        set_binormals(sVertexProgram->mAttribute[LLPipeline::GLSL_BINORMAL], mStride, (LLVector3*)(base + mOffsets[TYPE_BINORMAL]));
+                }
+        
+                if (sShaderLevel >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH)
+                {
+                        set_vertex_clothing_weights(sVertexProgram->mAttribute[LLPipeline::GLSL_AVATAR_CLOTHING], mStride, (LLVector4*)(base + mOffsets[TYPE_CLOTHWEIGHT]));
+                }
+        }
+        else
+        {
+                LLVertexBuffer::setupVertexBuffer(data_mask);
+        }
+}
+
diff --git a/linden/indra/newview/lldrawpoolavatar.h b/linden/indra/newview/lldrawpoolavatar.h
index 52a7fe4..32c02b5 100644
--- a/linden/indra/newview/lldrawpoolavatar.h
+++ b/linden/indra/newview/lldrawpoolavatar.h
@@ -32,7 +32,7 @@
 
 class LLVOAvatar;
 
-class LLDrawPoolAvatar : public LLDrawPool
+class LLDrawPoolAvatar : public LLFacePool
 {
 protected:
         S32                                     mNumFaces;
@@ -43,21 +43,48 @@ public:
                 SHADER_LEVEL_CLOTH = 3
         };
         
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD |
+                                                        LLVertexBuffer::MAP_WEIGHT |
+                                                        LLVertexBuffer::MAP_CLOTHWEIGHT |
+                                                        LLVertexBuffer::MAP_BINORMAL
+                                                        
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
+        virtual S32 getVertexShaderLevel() const;
+
         LLDrawPoolAvatar();
 
+        static LLMatrix4& getModelView();
+
         /*virtual*/ LLDrawPool *instancePool();
 
+        /*virtual*/ S32  getNumPasses();
+        /*virtual*/ void beginRenderPass(S32 pass);
+        /*virtual*/ void endRenderPass(S32 pass);
         /*virtual*/ void prerender();
         /*virtual*/ void render(S32 pass = 0);
         /*virtual*/ void renderForSelect();
-        /*virtual*/ S32 rebuild();
 
+        void beginRigid();
+        void beginFootShadow();
+        void beginSkinned();
+                
+        void endRigid();
+        void endFootShadow();
+        void endSkinned();
+                
         /*virtual*/ LLViewerImage *getDebugTexture();
         /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
 
         virtual S32 getMaterialAttribIndex() { return 0; }
 
-        void renderAvatars(LLVOAvatar *single_avatar, BOOL no_shaders = FALSE); // renders only one avatar if single_avatar is not null.
+        void renderAvatars(LLVOAvatar *single_avatar, S32 pass = -1); // renders only one avatar if single_avatar is not null.
 };
 
 
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index befcc70..916454c 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -37,12 +37,10 @@
 #include "m4math.h"
 
 #include "llagent.h"
-#include "llagparray.h"
 #include "llcubemap.h"
 #include "lldrawable.h"
 #include "lldrawpoolsimple.h"
 #include "llface.h"
-#include "llgl.h"
 #include "llsky.h"
 #include "lltextureentry.h"
 #include "llviewercamera.h"
@@ -64,9 +62,11 @@ LLBumpImageList gBumpImageList;
 
 const S32 STD_BUMP_LATEST_FILE_VERSION = 1;
 
-S32 LLDrawPoolBump::sBumpTex = -1;
-S32 LLDrawPoolBump::sDiffTex = -1;
-S32 LLDrawPoolBump::sEnvTex = -1;
+const U32 VERTEX_MASK_SHINY = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_COLOR;
+const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_TEXCOORD2;
+
+U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY;
+static LLCubeMap* sCubeMap = NULL;
 
 // static 
 void LLStandardBumpmap::init()
@@ -89,7 +89,7 @@ void LLStandardBumpmap::restoreGL()
         gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount++] = LLStandardBumpmap("Darkness");       // BE_DARKNESS
 
         std::string file_name = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "std_bump.ini" );
-        FILE* file = LLFile::fopen( file_name.c_str(), "rt" );
+        FILE* file = LLFile::fopen( file_name.c_str(), "rt" );   /*Flawfinder: ignore*/
         if( !file )
         {
                 llwarns << "Could not open std_bump <" << file_name << ">" << llendl;
@@ -114,9 +114,10 @@ void LLStandardBumpmap::restoreGL()
         while( !feof(file) && (LLStandardBumpmap::sStandardBumpmapCount < (U32)TEM_BUMPMAP_COUNT) )
         {
                 // *NOTE: This buffer size is hard coded into scanf() below.
-                char label[2048] = "";
-                char bump_file[2048] = "";
-                fields_read = fscanf( file, "\n%2047s %2047s", label, bump_file);
+                char label[2048] = "";  /* Flawfinder: ignore */
+                char bump_file[2048] = "";      /* Flawfinder: ignore */
+                fields_read = fscanf(   /* Flawfinder: ignore */
+                        file, "\n%2047s %2047s", label, bump_file);
                 if( EOF == fields_read )
                 {
                         break;
@@ -127,7 +128,7 @@ void LLStandardBumpmap::restoreGL()
                         return;
                 }
 
-                llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
+//              llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
                 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
                 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = gImageList.getImage( LLUUID(gViewerArt.getString(bump_file)) );
                 LLStandardBumpmap::sStandardBumpmapCount++;
@@ -151,15 +152,9 @@ void LLStandardBumpmap::destroyGL()
 
 ////////////////////////////////////////////////////////////////
 
-LLDrawPoolBump::LLDrawPoolBump(LLViewerImage *texturep) :
-        LLDrawPool(POOL_BUMP, DATA_BUMP_IL_MASK | DATA_COLORS_MASK, DATA_SIMPLE_NIL_MASK),
-        mTexturep(texturep)
-{
-}
-
-LLDrawPool *LLDrawPoolBump::instancePool()
+LLDrawPoolBump::LLDrawPoolBump() 
+: LLRenderPass(LLDrawPool::POOL_BUMP)
 {
-        return new LLDrawPoolBump(mTexturep);
 }
 
 
@@ -168,51 +163,16 @@ void LLDrawPoolBump::prerender()
         mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT);
 }
 
-BOOL LLDrawPoolBump::match(LLFace* last_face, LLFace* facep)  
-{
-        if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_CHAIN_FACES) &&
-                !last_face->isState(LLFace::LIGHT | LLFace::FULLBRIGHT) &&
-                !facep->isState(LLFace::LIGHT | LLFace::FULLBRIGHT) &&
-                facep->getIndicesStart() == last_face->getIndicesStart()+last_face->getIndicesCount() &&
-                facep->getRenderColor() == last_face->getRenderColor() &&
-                facep->getTextureEntry()->getShiny() == last_face->getTextureEntry()->getShiny() &&
-                facep->getTextureEntry()->getBumpmap() == last_face->getTextureEntry()->getBumpmap())
-        {
-                if (facep->isState(LLFace::GLOBAL))
-                {
-                        if (last_face->isState(LLFace::GLOBAL))
-                        {
-                                return TRUE;
-                        }
-                }
-                else
-                {
-                        if (!last_face->isState(LLFace::GLOBAL))
-                        {
-                                if (last_face->getRenderMatrix() == facep->getRenderMatrix())
-                                {
-                                        return TRUE;
-                                }
-                        }
-                }
-        }
-        
-        return FALSE;
-}
-
 // static
 S32 LLDrawPoolBump::numBumpPasses()
 {
-        if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0)
+        if (gSavedSettings.getBOOL("RenderObjectBump"))
         {
-                return 1; // single pass for shaders
+                return 2;
         }
-        else
+    else
         {
-                if (gSavedSettings.getBOOL("RenderObjectBump"))
-                        return 3;
-                else
-                        return 1;
+                return 0;
         }
 }
 
@@ -226,13 +186,10 @@ void LLDrawPoolBump::beginRenderPass(S32 pass)
         switch( pass )
         {
                 case 0:
-                        beginPass0(this);
+                        beginShiny();
                         break;
                 case 1:
-                        beginPass1();
-                        break;
-                case 2:
-                        beginPass2();
+                        beginBump();
                         break;
                 default:
                         llassert(0);
@@ -243,66 +200,17 @@ void LLDrawPoolBump::beginRenderPass(S32 pass)
 void LLDrawPoolBump::render(S32 pass)
 {
         LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
-        if (!mTexturep)
-        {
-                return;
-        }
-
-        if (mDrawFace.empty())
-        {
-                return;
-        }
-
-        const U32* index_array = getRawIndices();
         
-        S32 indices = 0;
         switch( pass )
         {
           case 0:
           {
-                  stop_glerror();
-                  
-                  bindGLVertexPointer();
-                  bindGLTexCoordPointer();
-                  bindGLNormalPointer();
-                  if (gPipeline.getLightingDetail() >= 2)
-                  {
-                          bindGLColorPointer();
-                  }
-
-                  stop_glerror();
-                  
-                  LLGLState alpha_test(GL_ALPHA_TEST, FALSE);
-                  LLGLState blend(GL_BLEND, FALSE);
-                  LLViewerImage* tex = getTexture();
-                  if (tex && tex->getPrimaryFormat() == GL_ALPHA)
-                  {
-                          // Enable Invisibility Hack
-                          alpha_test.enable();
-                          blend.enable();
-                  }
-                  indices += renderPass0(this, mDrawFace, index_array, mTexturep);
+                  renderShiny();
                   break;
           }
           case 1:
           {
-                  bindGLVertexPointer();
-                  bindGLNormalPointer();
-                  indices += renderPass1(mDrawFace, index_array, mTexturep);
-                  break;
-          }
-          case 2:
-          {
-                  bindGLVertexPointer();
-                  // Texture unit 0
-                  glActiveTextureARB(GL_TEXTURE0_ARB);
-                  glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                  bindGLTexCoordPointer();
-                  // Texture unit 1
-                  glActiveTextureARB(GL_TEXTURE1_ARB);
-                  glClientActiveTextureARB(GL_TEXTURE1_ARB);
-                  bindGLTexCoordPointer(1);
-                  indices += renderPass2(mDrawFace, index_array, mTexturep);
+                  renderBump();
                   break;
           }
           default:
@@ -311,7 +219,6 @@ void LLDrawPoolBump::render(S32 pass)
                   break;
           }
         }
-        mIndicesDrawn += indices;
 }
 
 void LLDrawPoolBump::endRenderPass(S32 pass)
@@ -319,13 +226,10 @@ void LLDrawPoolBump::endRenderPass(S32 pass)
         switch( pass )
         {
                 case 0:
-                        endPass0(this);
+                        endShiny();
                         break;
                 case 1:
-                        endPass1();
-                        break;
-                case 2:
-                        endPass2();
+                        endBump();
                         break;
                 default:
                         llassert(0);
@@ -334,252 +238,171 @@ void LLDrawPoolBump::endRenderPass(S32 pass)
 }
 
 //static
-void LLDrawPoolBump::beginPass0(LLDrawPool* pool)
+void LLDrawPoolBump::beginShiny()
 {
-        stop_glerror();
-        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        sVertexMask = VERTEX_MASK_SHINY;
+        // Second pass: environment map
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
-        if (gPipeline.getLightingDetail() >= 2)
-        {
-                glEnableClientState(GL_COLOR_ARRAY);
-        }
+        glEnableClientState(GL_COLOR_ARRAY);
 
-        if (pool->getVertexShaderLevel() > 0)
+        LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
+        if( cube_map )
         {
-                enable_binormals(gPipeline.mObjectBumpProgram.mAttribute[LLPipeline::GLSL_BINORMAL]);
+                cube_map->enable(0);
+                cube_map->setMatrix(0);
+                cube_map->bind();
 
-                sEnvTex = gPipeline.mObjectBumpProgram.enableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-                LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-                if (sEnvTex >= 0 && cube_map)
+                if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0)
                 {
-                        cube_map->bind();
-                        cube_map->setMatrix(1);
+                        LLMatrix4 mat;
+                        glGetFloatv(GL_MODELVIEW_MATRIX, (F32*) mat.mMatrix);
+                        gPipeline.mObjectShinyProgram.bind();
+                        LLVector3 vec = LLVector3(gPipeline.mShinyOrigin) * mat;
+                        LLVector4 vec4(vec, gPipeline.mShinyOrigin.mV[3]);
+                        glUniform4fvARB(gPipeline.mObjectShinyProgram.mUniform[LLPipeline::GLSL_SHINY_ORIGIN], 1,
+                                vec4.mV);
+                }
+                else
+                {
+                        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,  GL_COMBINE_ARB);
+                        
+                        //use RGB from texture
+                        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,   GL_REPLACE);
+                        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB,   GL_TEXTURE);
+                        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB,  GL_SRC_COLOR);
+
+                        // use alpha from color
+                        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB,         GL_REPLACE);
+                        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_PRIMARY_COLOR);
+                        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
                 }
-                
-                sBumpTex = gPipeline.mObjectBumpProgram.enableTexture(LLPipeline::GLSL_BUMP_MAP);
-                sDiffTex = gPipeline.mObjectBumpProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-                S32 scatterTex = gPipeline.mObjectBumpProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
         }
-        stop_glerror();
 }
 
-//static
-S32 LLDrawPoolBump::renderPass0(LLDrawPool* pool, face_array_t& face_list, const U32* index_array, LLViewerImage* tex)
+void LLDrawPoolBump::renderShiny()
 {
-        if (!tex)
-        {
-                return 0;
-        }
+        LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
         
-        if (face_list.empty())
+        sCubeMap = NULL;
+
+        if( gSky.mVOSkyp->getCubeMap() )
         {
-                return 0;
+                LLGLEnable blend_enable(GL_BLEND);
+                renderStatic(LLRenderPass::PASS_SHINY, sVertexMask);
+                renderActive(LLRenderPass::PASS_SHINY, sVertexMask);
         }
+}
 
-        stop_glerror();
+void LLDrawPoolBump::renderActive(U32 type, U32 mask, BOOL texture)
+{
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
 
-        S32 res = 0;
-        if (pool->getVertexShaderLevel() > 0)
+        LLSpatialBridge* last_bridge = NULL;
+        glPushMatrix();
+        
+        for (LLSpatialGroup::sg_vector_t::iterator i = gPipeline.mActiveGroups.begin(); i != gPipeline.mActiveGroups.end(); ++i)
         {
-                LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
-                pool->bindGLBinormalPointer(gPipeline.mObjectBumpProgram.mAttribute[LLPipeline::GLSL_BINORMAL]);
-                
-                LLViewerImage::bindTexture(tex, sDiffTex);
-
-                //single pass shader driven shiny/bump
-                LLGLDisable(GL_ALPHA_TEST);
-
-                LLViewerImage::sWhiteImagep->bind(sBumpTex);
-                
-                GLfloat alpha[4] =
+                LLSpatialGroup* group = *i;
+                if (!group->isDead() &&
+                        gPipeline.hasRenderType(group->mSpatialPartition->mDrawableType) &&
+                        group->mDrawMap.find(type) != group->mDrawMap.end())
                 {
-                        0.00f,
-                        0.25f,
-                        0.5f,
-                        0.75f
-                };
-
-                LLImageGL* last_bump = NULL;
-
-                for (std::vector<LLFace*>::iterator iter = face_list.begin();
-                         iter != face_list.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        if (facep->mSkipRender)
-                        {
-                                continue;
-                        }
-                        
-                        const LLTextureEntry* te = facep->getTextureEntry();
-                        if (te)
+                        LLSpatialBridge* bridge = (LLSpatialBridge*) group->mSpatialPartition;
+                        if (bridge != last_bridge)
                         {
-                                U8 index = te->getShiny();
-                                LLColor4 col = te->getColor();
-                                
-                                gPipeline.mObjectBumpProgram.vertexAttrib4f(LLPipeline::GLSL_MATERIAL_COLOR,
-                                        col.mV[0], col.mV[1], col.mV[2], alpha[index]);
-                                gPipeline.mObjectBumpProgram.vertexAttrib4f(LLPipeline::GLSL_SPECULAR_COLOR, 
-                                        alpha[index], alpha[index], alpha[index], alpha[index]);
-
-                                LLImageGL* bump = getBumpMap(te, tex);
-                                if (bump != last_bump)
+                                glPopMatrix();
+                                glPushMatrix();
+                                glMultMatrixf((F32*) bridge->mDrawable->getRenderMatrix().mMatrix);
+                                last_bridge = bridge;
+
+                                if (LLPipeline::sDynamicReflections)
                                 {
-                                        if (bump)
+                                        LLSpatialPartition* part = gPipeline.getSpatialPartition(LLPipeline::PARTITION_VOLUME);
+                                        LLSpatialGroup::OctreeNode* node = part->mOctree->getNodeAt(LLVector3d(bridge->mDrawable->getPositionAgent()), 32.0);
+                                        if (node)
                                         {
-                                                bump->bind(sBumpTex);
-                                        }
-                                        else
-                                        {
-                                                LLViewerImage::sWhiteImagep->bind(sBumpTex);
+                                                sCubeMap = ((LLSpatialGroup*) node->getListener(0))->mReflectionMap;
                                         }
                                 }
-                                last_bump = bump;
-
-                                // Draw the geometry
-                                facep->enableLights();
-                                res += facep->renderIndexed(index_array);
-                                stop_glerror();
-                        }
-                        else
-                        {
-                                llwarns << "DrawPoolBump has face with invalid texture entry." << llendl;
                         }
-                }
-        }
-        else
-        {
-                LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
-                LLViewerImage::bindTexture(tex);
-                res = LLDrawPool::drawLoop(face_list, index_array);
-        }
-        return res;
-}
-
-//static
-void LLDrawPoolBump::endPass0(LLDrawPool* pool)
-{
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
-        glDisableClientState(GL_COLOR_ARRAY);
 
-        if (pool->getVertexShaderLevel() > 0)
-        {
-                gPipeline.mObjectBumpProgram.disableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-                LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-                if (sEnvTex >= 0 && cube_map)
-                {
-                        cube_map->restoreMatrix();
+                        renderGroup(group,type,mask,texture);
                 }
-                
-                gPipeline.mObjectBumpProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                gPipeline.mObjectBumpProgram.disableTexture(LLPipeline::GLSL_BUMP_MAP);
-                gPipeline.mObjectBumpProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-
-                disable_binormals(gPipeline.mObjectBumpProgram.mAttribute[LLPipeline::GLSL_BINORMAL]);
-                
-                glActiveTextureARB(GL_TEXTURE0_ARB);
-                glEnable(GL_TEXTURE_2D);
         }
+        
+        glPopMatrix();
 }
 
 
-//static
-void LLDrawPoolBump::beginPass1()
-{
-        // Second pass: environment map
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_NORMAL_ARRAY);
 
-        LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-        if( cube_map )
-        {
-                cube_map->enable(0);
-                cube_map->setMatrix(0);
-                cube_map->bind();
-        }
-}
-
-//static
-S32 LLDrawPoolBump::renderPass1(face_array_t& face_list, const U32* index_array, LLViewerImage* tex)
-{
-        LLFastTimer t(LLFastTimer::FTM_RENDER_SHINY);
-        if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0) //everything happens in pass0
-        {
-                return 0;
-        }
-
-        S32 res = 0;
-        if( gSky.mVOSkyp->getCubeMap() )
+void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE)
+{                                       
+        std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        
+        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
         {
-                //LLGLSPipelineAlpha gls;
-                //LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_EQUAL);
-                LLGLEnable blend_enable(GL_BLEND);
-                
-                GLfloat alpha[4] =
+                LLDrawInfo& params = **k;
+                if (LLPipeline::sDynamicReflections)
                 {
-                        0.00f,
-                        0.25f,
-                        0.5f,
-                        0.75f
-                };
-
-                for (std::vector<LLFace*>::iterator iter = face_list.begin();
-                         iter != face_list.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        if (facep->mSkipRender)
+                        if (params.mReflectionMap.notNull())
                         {
-                                continue;
+                                params.mReflectionMap->bind();
                         }
-                        
-                        const LLTextureEntry* te = facep->getTextureEntry();
-                        if (te)
+                        else
                         {
-                                U8 index = te->getShiny();
-                                if( index > 0 )
+                                if (sCubeMap)
                                 {
-                                        LLOverrideFaceColor override_color(facep->getPool(), 1, 1, 1, alpha[index]);
-                                
-                                        // Draw the geometry
-                                        facep->enableLights();
-                                        res += facep->renderIndexed(index_array);
-                                        stop_glerror();
+                                        sCubeMap->bind();
+                                }
+                                else
+                                {
+                                        gSky.mVOSkyp->getCubeMap()->bind();
                                 }
-                        }
-                        else
-                        {
-                                llwarns << "DrawPoolBump has face with invalid texture entry." << llendl;
                         }
                 }
+                
+                params.mVertexBuffer->setBuffer(mask);
+                U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+                glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                                                        GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+                gPipeline.mTrianglesDrawn += params.mCount/3;
         }
-        return res;
 }
 
-//static
-void LLDrawPoolBump::endPass1()
+void LLDrawPoolBump::endShiny()
 {
         LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
         if( cube_map )
         {
                 cube_map->disable();
                 cube_map->restoreMatrix();
+
+                if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0)
+                {
+                        gPipeline.mObjectShinyProgram.unbind();
+                }
+
                 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_MODULATE);
         }
         
         LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-        
+        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_COLOR_ARRAY);
 }
 
 
 // static
-LLImageGL* LLDrawPoolBump::getBumpMap(const LLTextureEntry* te, LLViewerImage* tex)
+BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params)
 {
-        U32 bump_code = te->getBumpmap();
         LLImageGL* bump = NULL;
 
+        U8 bump_code = params.mBump;
+        LLViewerImage* tex = params.mTexture;
+
         switch( bump_code )
         {
         case BE_NO_BUMP:
@@ -597,28 +420,33 @@ LLImageGL* LLDrawPoolBump::getBumpMap(const LLTextureEntry* te, LLViewerImage* t
                 if( bump_code < LLStandardBumpmap::sStandardBumpmapCount )
                 {
                         bump = gStandardBumpmapList[bump_code].mImage;
+                        gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize, 1, 1);
                 }
                 break;
         }
 
-        return bump;
+        if (bump)
+        {
+                bump->bind(1);
+                bump->bind(0);
+                return TRUE;
+        }
+        return FALSE;
 }
 
 //static
-void LLDrawPoolBump::beginPass2()
+void LLDrawPoolBump::beginBump()
 {       
+        sVertexMask = VERTEX_MASK_BUMP;
         LLFastTimer t(LLFastTimer::FTM_RENDER_BUMP);
-        // Optional third pass: emboss bump map
+        // Optional second pass: emboss bump map
         stop_glerror();
 
         // TEXTURE UNIT 0
         // Output.rgb = texture at texture coord 0
         glActiveTextureARB(GL_TEXTURE0_ARB);
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
-
-        glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
 
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,  GL_COMBINE_ARB);
         glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,   GL_REPLACE);
@@ -631,14 +459,10 @@ void LLDrawPoolBump::beginPass2()
         glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);
         glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
 
-
         // TEXTURE UNIT 1
         glActiveTextureARB(GL_TEXTURE1_ARB);
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
-        
-        glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
 
         glEnable(GL_TEXTURE_2D); // Texture unit 1
 
@@ -668,68 +492,25 @@ void LLDrawPoolBump::beginPass2()
         //              = dst.rgb + dst.rgb * (bump0 - bump1)
         glBlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
 //      glBlendFunc(GL_ONE, GL_ZERO);  // temp
-
+        glActiveTextureARB(GL_TEXTURE0_ARB);
         stop_glerror();
 }
 
 //static
-S32 LLDrawPoolBump::renderPass2(face_array_t& face_list, const U32* index_array, LLViewerImage* tex)
+void LLDrawPoolBump::renderBump()
 {
-        if (gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) > 0) //everything happens in pass0
-        {
-                return 0;
-        }
-
+        LLFastTimer ftm(LLFastTimer::FTM_RENDER_BUMP);
         LLGLDisable fog(GL_FOG);
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_EQUAL);
         LLGLEnable tex2d(GL_TEXTURE_2D);
         LLGLEnable blend(GL_BLEND);
-        S32 res = 0;
-
-        LLImageGL* last_bump = NULL;
-
-        for (std::vector<LLFace*>::iterator iter = face_list.begin();
-                 iter != face_list.end(); iter++)
-        {
-                LLFace *facep = *iter;
-                if (facep->mSkipRender)
-                {
-                        continue;
-                }
-                LLOverrideFaceColor override_color(facep->getPool(), 1,1,1,1);
-        
-                const LLTextureEntry* te = facep->getTextureEntry();
-                LLImageGL* bump = getBumpMap(te, tex);
-                
-                if( bump )
-                {
-                        if( bump != last_bump )
-                        {
-                                last_bump = bump;
-
-                                // Texture unit 0
-                                bump->bind(0);
-                                stop_glerror();
-
-                                // Texture unit 1
-                                bump->bind(1);
-                                stop_glerror();
-                        }
-
-                        // Draw the geometry
-                        res += facep->renderIndexed(index_array);
-                        stop_glerror();
-                }
-                else
-                {
-//                      llwarns << "Skipping invalid bump code " << (S32) te->getBumpmap() << llendl;
-                }
-        }
-        return res;
+        glColor4f(1,1,1,1);
+        renderBump(LLRenderPass::PASS_BUMP, sVertexMask);
+        renderBumpActive(LLRenderPass::PASS_BUMP, sVertexMask);
 }
 
 //static
-void LLDrawPoolBump::endPass2()
+void LLDrawPoolBump::endBump()
 {
         // Disable texture unit 1
         glActiveTextureARB(GL_TEXTURE1_ARB);
@@ -747,67 +528,6 @@ void LLDrawPoolBump::endPass2()
         glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 }
 
-
-void LLDrawPoolBump::renderForSelect()
-{
-        if (mDrawFace.empty() || !mMemory.count())
-        {
-                return;
-        }
-
-        glEnableClientState ( GL_VERTEX_ARRAY );
-
-        bindGLVertexPointer();
-
-        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-                 iter != mDrawFace.end(); iter++)
-        {
-                LLFace *facep = *iter;
-                if (facep->getDrawable() && !facep->getDrawable()->isDead() && (facep->getViewerObject()->mGLName))
-                {
-                        facep->renderForSelect();
-                }
-        }
-}
-
-
-void LLDrawPoolBump::renderFaceSelected(LLFace *facep, 
-                                                                                LLImageGL *image, 
-                                                                                const LLColor4 &color,
-                                                                                const S32 index_offset, const S32 index_count)
-{
-        facep->renderSelected(image, color, index_offset, index_count);
-}
-
-
-void LLDrawPoolBump::dirtyTexture(const LLViewerImage *texturep)
-{
-        if (mTexturep == texturep)
-        {
-                for (std::vector<LLFace*>::iterator iter = mReferences.begin();
-                         iter != mReferences.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        gPipeline.markTextured(facep->getDrawable());
-                }
-        }
-}
-
-LLViewerImage *LLDrawPoolBump::getTexture()
-{
-        return mTexturep;
-}
-
-LLViewerImage *LLDrawPoolBump::getDebugTexture()
-{
-        return mTexturep;
-}
-
-LLColor3 LLDrawPoolBump::getDebugColor() const
-{
-        return LLColor3(1.f, 1.f, 0.f);
-}
-
 ////////////////////////////////////////////////////////////////
 // List of one-component bump-maps created from other texures.
 
@@ -1131,25 +851,93 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerImage *src_vi, LLIma
         }
 }
 
-S32 LLDrawPoolBump::getMaterialAttribIndex()
+void LLDrawPoolBump::renderBumpActive(U32 type, U32 mask)
 {
-        return gPipeline.mObjectBumpProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
+
+        LLSpatialBridge* last_bridge = NULL;
+        glPushMatrix();
+        
+        for (LLSpatialGroup::sg_vector_t::iterator i = gPipeline.mActiveGroups.begin(); i != gPipeline.mActiveGroups.end(); ++i)
+        {
+                LLSpatialGroup* group = *i;
+                if (!group->isDead() && 
+                        group->mSpatialPartition->mRenderByGroup &&
+                        group->mDrawMap.find(type) != group->mDrawMap.end())
+                {
+                        LLSpatialBridge* bridge = (LLSpatialBridge*) group->mSpatialPartition;
+                        if (bridge != last_bridge)
+                        {
+                                glPopMatrix();
+                                glPushMatrix();
+                                glMultMatrixf((F32*) bridge->mDrawable->getRenderMatrix().mMatrix);
+                                last_bridge = bridge;
+                        }
+
+                        renderGroupBump(group,type,mask);
+                }
+        }
+        
+        glPopMatrix();
 }
 
-// virtual
-void LLDrawPoolBump::enableShade()
-{
-        glDisableClientState(GL_COLOR_ARRAY);
+void LLDrawPoolBump::renderBump(U32 type, U32 mask)
+{       
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(mask);
+#endif
+
+        std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[type];
+
+        for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
+        {
+                LLDrawInfo& params = **i;
+
+                if (LLDrawPoolBump::bindBumpMap(params))
+                {
+                        pushBatch(params, mask, FALSE);
+                }
+        }
 }
 
-// virtual
-void LLDrawPoolBump::disableShade()
-{
-        glEnableClientState(GL_COLOR_ARRAY);
+void LLDrawPoolBump::renderGroupBump(LLSpatialGroup* group, U32 type, U32 mask)
+{                                       
+        const std::vector<LLDrawInfo*>& draw_info = group->mDrawMap[type];
+        
+        for (std::vector<LLDrawInfo*>::const_iterator k = draw_info.begin(); k != draw_info.end(); ++k)
+        {
+                LLDrawInfo& params = **k;
+                
+                if (LLDrawPoolBump::bindBumpMap(params))
+                {
+                        pushBatch(params, mask, FALSE);
+                }
+        }
 }
 
-// virtual
-void LLDrawPoolBump::setShade(F32 shade)
+void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
 {
-        glColor4f(0,0,0,shade);
+        if (params.mTextureMatrix)
+        {
+                glActiveTextureARB(GL_TEXTURE1_ARB);
+                glMatrixMode(GL_TEXTURE);
+                glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
+                glActiveTextureARB(GL_TEXTURE0_ARB);
+                glLoadMatrixf((GLfloat*) params.mTextureMatrix->mMatrix);
+        }
+        params.mVertexBuffer->setBuffer(mask);
+        U32* indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer();
+        glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount,
+                                                GL_UNSIGNED_INT, indices_pointer+params.mOffset);
+        gPipeline.mTrianglesDrawn += params.mCount/3;
+        if (params.mTextureMatrix)
+        {
+                glActiveTextureARB(GL_TEXTURE1_ARB);
+                glLoadIdentity();
+                glActiveTextureARB(GL_TEXTURE0_ARB);
+                glLoadIdentity();
+                glMatrixMode(GL_MODELVIEW);
+        }
 }
diff --git a/linden/indra/newview/lldrawpoolbump.h b/linden/indra/newview/lldrawpoolbump.h
index 4f181bc..bb8de40 100644
--- a/linden/indra/newview/lldrawpoolbump.h
+++ b/linden/indra/newview/lldrawpoolbump.h
@@ -34,57 +34,41 @@
 #include "lluuid.h"
 
 class LLImageRaw;
+class LLSpatialGroup;
+class LLDrawInfo;
 
-class LLDrawPoolBump : public LLDrawPool
+class LLDrawPoolBump : public LLRenderPass
 {
-protected:
-        LLPointer<LLViewerImage> mTexturep;  // The primary texture, not the bump texture
-
 public:
-        LLDrawPoolBump(LLViewerImage *texturep);
+        static U32 sVertexMask;
+
+        virtual U32 getVertexDataMask() { return sVertexMask; }
 
-        /*virtual*/ LLDrawPool *instancePool();
+        LLDrawPoolBump();
 
         /*virtual*/ void render(S32 pass = 0);
         /*virtual*/ void beginRenderPass( S32 pass );
         /*virtual*/ void endRenderPass( S32 pass );
         /*virtual*/ S32  getNumPasses();
-        /*virtual*/ void renderFaceSelected(LLFace *facep, LLImageGL *image, const LLColor4 &color,
-                                                                                const S32 index_offset = 0, const S32 index_count = 0);
         /*virtual*/ void prerender();
-        /*virtual*/ void renderForSelect();
-        /*virtual*/ void dirtyTexture(const LLViewerImage *texturep);
-        /*virtual*/ LLViewerImage *getTexture();
-        /*virtual*/ LLViewerImage *getDebugTexture();
-        /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
-        /*virtual*/ BOOL match(LLFace* last_face, LLFace* facep);
+        /*virtual*/ void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture);
+
+        void renderBump(U32 type, U32 mask);
+        void renderBumpActive(U32 type, U32 mask);
+        void renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture);
+        void renderGroupBump(LLSpatialGroup* group, U32 type, U32 mask);
         
-        virtual S32 getMaterialAttribIndex();
-        static S32 numBumpPasses();
+        S32 numBumpPasses();
         
-        static void beginPass0(LLDrawPool* pool);
-        static S32  renderPass0(LLDrawPool* pool, face_array_t& face_list, const U32* index_array, LLViewerImage* tex);
-        static void endPass0(LLDrawPool* pool);
-
-        static void beginPass1();
-        static S32  renderPass1(face_array_t& face_list, const U32* index_array, LLViewerImage* tex);
-        static void endPass1();
-
-        static void beginPass2();
-        static S32  renderPass2(face_array_t& face_list, const U32* index_array, LLViewerImage* tex);
-        static void endPass2();
-
-        /*virtual*/ void enableShade();
-        /*virtual*/ void disableShade();
-        /*virtual*/ void setShade(F32 shade);
-
-protected:
-        static LLImageGL* getBumpMap(const LLTextureEntry* te, LLViewerImage* tex);
-
-public:
-        static S32 sBumpTex;
-        static S32 sDiffTex;
-        static S32 sEnvTex;
+        void beginShiny();
+        void renderShiny();
+        void endShiny();
+        void renderActive(U32 type, U32 mask, BOOL texture = TRUE);
+
+        void beginBump();
+        void renderBump();
+        void endBump();
+        BOOL bindBumpMap(LLDrawInfo& params);
 };
 
 enum EBumpEffect
diff --git a/linden/indra/newview/lldrawpoolclouds.cpp b/linden/indra/newview/lldrawpoolclouds.cpp
index 7d877ee..83ef2b3 100644
--- a/linden/indra/newview/lldrawpoolclouds.cpp
+++ b/linden/indra/newview/lldrawpoolclouds.cpp
@@ -36,7 +36,7 @@
 #include "pipeline.h"
 
 LLDrawPoolClouds::LLDrawPoolClouds() :
-        LLDrawPool(POOL_CLOUDS, DATA_SIMPLE_IL_MASK, 0)
+        LLDrawPool(POOL_CLOUDS)
 {
 }
 
@@ -45,16 +45,15 @@ LLDrawPool *LLDrawPoolClouds::instancePool()
         return new LLDrawPoolClouds();
 }
 
+BOOL LLDrawPoolClouds::addFace(LLFace* face)
+{
+        llerrs << "WTF?" << llendl;
+        return FALSE;
+}
+
 void LLDrawPoolClouds::enqueue(LLFace *facep)
 {
-        if (facep->isState(LLFace::BACKLIST))
-        {
-                mMoveFace.put(facep);
-        }
-        else
-        {
-                mDrawFace.push_back(facep);
-        }
+        mDrawFace.push_back(facep);
         facep->mDistance = (facep->mCenterAgent - gCamera->getOrigin()) * gCamera->getAtAxis();
 }
 
@@ -90,10 +89,6 @@ void LLDrawPoolClouds::render(S32 pass)
         gPipeline.enableLightsFullbright(LLColor4(1.f,1.f,1.f));
 
         mDrawFace[0]->bindTexture();
-        
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
-        bindGLNormalPointer();
 
         std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater());
 
diff --git a/linden/indra/newview/lldrawpoolclouds.h b/linden/indra/newview/lldrawpoolclouds.h
index e47f66d..795b0a6 100644
--- a/linden/indra/newview/lldrawpoolclouds.h
+++ b/linden/indra/newview/lldrawpoolclouds.h
@@ -33,6 +33,16 @@
 class LLDrawPoolClouds : public LLDrawPool
 {
 public:
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD
+        };
+
+        BOOL addFace(LLFace* face);
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         LLDrawPoolClouds();
 
         /*virtual*/ void prerender();
diff --git a/linden/indra/newview/lldrawpoolground.cpp b/linden/indra/newview/lldrawpoolground.cpp
index f2f2002..bc66757 100644
--- a/linden/indra/newview/lldrawpoolground.cpp
+++ b/linden/indra/newview/lldrawpoolground.cpp
@@ -31,7 +31,6 @@
 
 #include "llviewercontrol.h"
 
-#include "llagparray.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llsky.h"
@@ -39,9 +38,11 @@
 #include "llviewerwindow.h"
 #include "llworld.h"
 #include "pipeline.h"
+#include "llagent.h"
+#include "llviewerregion.h"
 
 LLDrawPoolGround::LLDrawPoolGround() :
-        LLDrawPool(POOL_GROUND, DATA_SIMPLE_IL_MASK, DATA_SIMPLE_NIL_MASK)
+        LLFacePool(POOL_GROUND)
 {
 }
 
@@ -60,42 +61,38 @@ void LLDrawPoolGround::render(S32 pass)
         if (mDrawFace.empty())
         {
                 return;
-        }
-
+        }       
+        
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         glEnableClientState(GL_VERTEX_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
-
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
 
         LLGLSPipelineSkyBox gls_skybox;
+        LLGLDisable tex(GL_TEXTURE_2D);
         LLGLDepthTest gls_depth(GL_FALSE, GL_FALSE);
 
         glMatrixMode( GL_PROJECTION );
-
+                
         glPushMatrix();
-        gViewerWindow->setup3DRender();
+        //gViewerWindow->setup3DRender();
 
         glMatrixMode(GL_MODELVIEW);
 
-        LLGLState tex2d(GL_TEXTURE_2D, (mVertexShaderLevel > 0) ? TRUE : FALSE);
-        LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), 0);
+        F32 water_height = gAgent.getRegion()->getWaterHeight();
+        glPushMatrix();
+        LLVector3 origin = gCamera->getOrigin();
+        glTranslatef(origin.mV[0], origin.mV[1], llmax(origin.mV[2], water_height));
 
         LLFace *facep = mDrawFace[0];
 
-        if (!(mVertexShaderLevel > 0))
-        {
-                gPipeline.disableLights();
-        }
-
-        glColor4fv(facep->getFaceColor().mV);   
+        gPipeline.disableLights();
 
-        facep->renderIndexed(getRawIndices());
+        LLOverrideFaceColor col(this, gSky.mVOSkyp->getGLFogColor());
+        facep->renderIndexed();
         
         glMatrixMode( GL_PROJECTION );
         glPopMatrix();
         glMatrixMode( GL_MODELVIEW );
+        glPopMatrix();
 }
 
 void LLDrawPoolGround::renderForSelect()
diff --git a/linden/indra/newview/lldrawpoolground.h b/linden/indra/newview/lldrawpoolground.h
index 1866746..6bf358e 100644
--- a/linden/indra/newview/lldrawpoolground.h
+++ b/linden/indra/newview/lldrawpoolground.h
@@ -31,9 +31,17 @@
 #include "lldrawpool.h"
 
 
-class LLDrawPoolGround : public LLDrawPool
+class LLDrawPoolGround : public LLFacePool
 {
 public:
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_TEXCOORD
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         LLDrawPoolGround();
 
         /*virtual*/ LLDrawPool *instancePool();
diff --git a/linden/indra/newview/lldrawpoolhud.cpp b/linden/indra/newview/lldrawpoolhud.cpp
deleted file mode 100644
index e2bb1bf..0000000
--- a/linden/indra/newview/lldrawpoolhud.cpp
+++ /dev/null
@@ -1,565 +0,0 @@
-/** 
- * @file lldrawpoolhud.cpp
- * @brief LLDrawPoolHUD class implementation
- *
- * Copyright (c) 2006-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lldrawpoolhud.h"
-
-#include "llagparray.h"
-#include "llagent.h"
-#include "llbbox.h"
-#include "llcubemap.h"
-#include "lldrawable.h"
-#include "lldrawpoolalpha.h"
-#include "lldrawpoolbump.h"
-#include "llface.h"
-#include "llhudtext.h"
-#include "llsky.h"
-#include "lltoolmgr.h"
-#include "llvoavatar.h"
-#include "llviewercamera.h"
-#include "llviewerobjectlist.h"
-#include "llviewerwindow.h"
-#include "pipeline.h"
-
-BOOL LLDrawPoolHUD::sShowHUDAttachments = TRUE;
-
-LLDrawPoolHUD::LLDrawPoolHUD() :
-        LLDrawPool(POOL_HUD,
-                           DATA_BUMP_IL_MASK | DATA_COLORS_MASK, // HUD objects may be bumpmapped
-                           DATA_SIMPLE_NIL_MASK),
-        mRenderMode(POOL_SIMPLE)
-{
-}
-
-LLDrawPool* LLDrawPoolHUD::instancePool()
-{
-        return new LLDrawPoolHUD();
-}
-
-
-void LLDrawPoolHUD::prerender()
-{
-        mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT);
-}
-
-void LLDrawPoolHUD::beginRenderPass(S32 pass)
-{
-}
-
-static BOOL setup_matrices(BOOL for_select)
-{
-        LLVOAvatar* my_avatarp = gAgent.getAvatarObject();
-        if (my_avatarp && my_avatarp->hasHUDAttachment())
-        {
-                if (!for_select)
-                {
-                        // clamp target zoom level to reasonable values
-                        my_avatarp->mHUDTargetZoom = llclamp(my_avatarp->mHUDTargetZoom, 0.1f, 1.f);
-                        // smoothly interpolate current zoom level
-                        my_avatarp->mHUDCurZoom = lerp(my_avatarp->mHUDCurZoom, my_avatarp->mHUDTargetZoom, LLCriticalDamp::getInterpolant(0.03f));
-                }
-
-                F32 zoom_level = my_avatarp->mHUDCurZoom;
-                // clear z buffer and set up transform for hud
-                if (!for_select)
-                {
-                        glClear(GL_DEPTH_BUFFER_BIT);
-                }
-                LLBBox hud_bbox = my_avatarp->getHUDBBox();
-
-                // set up transform to encompass bounding box of HUD
-                glMatrixMode(GL_PROJECTION);
-                glPushMatrix();
-                glLoadIdentity();
-                F32 hud_depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
-                if (for_select)
-                {
-                        //RN: reset viewport to window extents so ortho screen is calculated with proper reference frame
-                        gViewerWindow->setupViewport();
-                }
-                glOrtho(-0.5f * gCamera->getAspect(), 0.5f * gCamera->getAspect(), -0.5f, 0.5f, 0.f, hud_depth);
-
-                // apply camera zoom transform (for high res screenshots)
-                F32 zoom_factor = gCamera->getZoomFactor();
-                S16 sub_region = gCamera->getZoomSubRegion();
-                if (zoom_factor > 1.f)
-                {
-                        float offset = zoom_factor - 1.f;
-                        int pos_y = sub_region / llceil(zoom_factor);
-                        int pos_x = sub_region - (pos_y*llceil(zoom_factor));
-                        glTranslatef(gCamera->getAspect() * 0.5f * (offset - (F32)pos_x * 2.f), 0.5f * (offset - (F32)pos_y * 2.f), 0.f);
-                        glScalef(zoom_factor, zoom_factor, 1.f);
-                }
-
-                glMatrixMode(GL_MODELVIEW);
-                glPushMatrix();
-                glLoadIdentity();
-                glLoadMatrixf(OGL_TO_CFR_ROTATION);             // Load Cory's favorite reference frame
-                glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f);
-                glScalef(zoom_level, zoom_level, zoom_level);
-
-                return TRUE;
-        }
-        else
-        {
-                return FALSE;
-        }
-}
-
-static void restore_matrices()
-{
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-}
-
-
-void LLDrawPoolHUD::render(S32 pass)
-{
-        LLFastTimer ftm(LLFastTimer::FTM_RENDER_HUD);
-        if (!sShowHUDAttachments)
-        {
-                return;
-        }
-
-        if (mDrawFace.empty() && mAlphaFace.empty() && mBumpFaces.empty())
-        {
-                return;
-        }
-
-        if (!setup_matrices(FALSE))
-        {
-                return;
-        }
-
-        const U32* index_array = getRawIndices();
-
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-        bindGLTexCoordPointer();
-
-        S32 diffTex = 0;
-        S32 envTex = -1;
-        // Non alpha faces      
-        if (!mDrawFace.empty())
-        {
-                mRenderMode = POOL_SIMPLE;
-                if (mVertexShaderLevel > 0)
-                {
-                        gPipeline.mObjectSimpleProgram.bind();
-                        S32 scatterTex = gPipeline.mObjectSimpleProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                        LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-                        diffTex = gPipeline.mObjectSimpleProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-                }
-
-                LLGLEnable blend(GL_BLEND); // for invisi-prim hack, I think
-
-                glEnableClientState(GL_VERTEX_ARRAY);
-                glEnableClientState(GL_NORMAL_ARRAY);
-                glActiveTextureARB(GL_TEXTURE0_ARB);
-                glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-                // Render
-                mIndicesDrawn += drawLoopSetTex(mDrawFace, index_array, diffTex);
-
-                if (mVertexShaderLevel > 0)
-                {
-                        gPipeline.mObjectSimpleProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                        gPipeline.mObjectSimpleProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-                }
-        }
-        
-        // Bump Mapped Faces
-        if (!mBumpFaces.empty())
-        {
-                mRenderMode = POOL_BUMP;
-                if (mVertexShaderLevel > 0)
-                {
-                        gPipeline.mObjectBumpProgram.bind();
-                }
-                
-                S32 bump_passes = LLDrawPoolBump::numBumpPasses();
-                if (bump_passes >= 1)
-                {
-                        // Texture unit 0
-                        LLDrawPoolBump::beginPass0(this);
-                        for (bump_face_map_t::iterator iter = mBumpFaces.begin();
-                                 iter != mBumpFaces.end(); iter++)
-                        {
-                                LLViewerImage* tex = iter->first;
-                                face_array_t& faces = iter->second;
-                                mIndicesDrawn += LLDrawPoolBump::renderPass0(this, faces, index_array, tex);
-                        }
-                        LLDrawPoolBump::endPass0(this);
-                }
-                
-                if (bump_passes >= 2)
-                {
-                        LLDrawPoolBump::beginPass1();
-                        for (bump_face_map_t::iterator iter = mBumpFaces.begin();
-                                 iter != mBumpFaces.end(); iter++)
-                        {
-                                LLViewerImage* tex = iter->first;
-                                face_array_t& faces = iter->second;
-                                mIndicesDrawn += LLDrawPoolBump::renderPass1(faces, index_array, tex);
-                        }
-                        LLDrawPoolBump::endPass1();
-                }
-
-                if (bump_passes >= 3)
-                {
-                        bindGLVertexPointer();
-                        // Texture unit 0
-                        glActiveTextureARB(GL_TEXTURE0_ARB);
-                        glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                        bindGLTexCoordPointer();
-                        // Texture unit 1
-                        glActiveTextureARB(GL_TEXTURE1_ARB);
-                        glClientActiveTextureARB(GL_TEXTURE1_ARB);
-                        bindGLTexCoordPointer(1);
-                        LLDrawPoolBump::beginPass2();
-                        for (bump_face_map_t::iterator iter = mBumpFaces.begin();
-                                 iter != mBumpFaces.end(); iter++)
-                        {
-                                LLViewerImage* tex = iter->first;
-                                face_array_t& faces = iter->second;
-                                mIndicesDrawn += LLDrawPoolBump::renderPass2(faces, index_array, tex);
-                        }
-                        LLDrawPoolBump::endPass2();
-                }
-        }
-        
-        // Alpha faces
-        if (!mAlphaFace.empty())
-        {
-                // Sort
-                std::sort(mAlphaFace.begin(), mAlphaFace.end(), LLFace::CompareDistanceGreater());
-
-                // Render
-                mRenderMode = POOL_ALPHA;
-                
-                glEnableClientState(GL_VERTEX_ARRAY);
-                glEnableClientState(GL_NORMAL_ARRAY);
-                glActiveTextureARB(GL_TEXTURE0_ARB);
-                glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-                if (mVertexShaderLevel > 0)
-                {
-                        gPipeline.mObjectAlphaProgram.bind();
-                        envTex = gPipeline.mObjectAlphaProgram.enableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-                        LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-                        if (envTex >= 0 && cube_map)
-                        {
-                                cube_map->bind();
-                                cube_map->setMatrix(1);
-                        }
-
-                        GLint specularIndex = gPipeline.mObjectAlphaProgram.mAttribute[LLPipeline::GLSL_SPECULAR_COLOR];
-                        if (specularIndex > 0)
-                        {
-                                glVertexAttrib4fARB(specularIndex, 0, 0, 0, 0);
-                        }
-                        
-                        S32 scatterTex = gPipeline.mObjectAlphaProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                        LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-                        
-                        diffTex = gPipeline.mObjectAlphaProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-                }
-                
-                LLGLEnable blend(GL_BLEND);
-                LLGLSPipelineAlpha alphastate;
-                mIndicesDrawn += drawLoopSetTex(mAlphaFace, index_array, diffTex);
-                if (mVertexShaderLevel > 0)
-                {
-                        gPipeline.mObjectAlphaProgram.disableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-                        LLCubeMap* cube_map = gSky.mVOSkyp->getCubeMap();
-                        if (envTex >= 0 && cube_map)
-                        {
-                                cube_map->restoreMatrix();
-                        }
-
-                        gPipeline.mObjectAlphaProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                        gPipeline.mObjectAlphaProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-
-                        glClientActiveTextureARB(GL_TEXTURE0_ARB);
-                        glActiveTextureARB(GL_TEXTURE0_ARB);
-                        glEnable(GL_TEXTURE_2D);
-                }
-                
-                if (LLDrawPoolAlpha::sShowDebugAlpha)
-                {
-                        gPipeline.disableLights();
-                        if ((mVertexShaderLevel > 0))
-                        {
-                                gPipeline.mHighlightProgram.bind();
-                                gPipeline.mHighlightProgram.vertexAttrib4f(LLPipeline::GLSL_MATERIAL_COLOR,1,0,0,1);
-                        }
-                        
-                        LLViewerImage::sSmokeImagep->bind();
-                        LLOverrideFaceColor override_color(this, 1.f, 0.f, 0.f, 1.f);
-                        glDisableClientState(GL_COLOR_ARRAY);
-                        
-                        for (std::vector<LLFace*>::iterator iter = mAlphaFace.begin();
-                                 iter != mAlphaFace.end(); iter++)
-                        {
-                                LLFace *facep = *iter;
-                                facep->renderIndexed(index_array);
-                        }
-                
-                        if ((mVertexShaderLevel > 0))
-                        {
-                                gPipeline.mHighlightProgram.unbind();
-                        }
-                }
-        }
-
-        glDisableClientState(GL_NORMAL_ARRAY);
-        glActiveTextureARB(GL_TEXTURE0_ARB);
-        glEnable(GL_TEXTURE_2D);
-        glClientActiveTextureARB(GL_TEXTURE0_ARB);
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-        if ((mVertexShaderLevel > 0))
-        {
-                glUseProgramObjectARB(0);
-        }
-
-        LLHUDText::renderAllHUD();
-        restore_matrices();
-}
-
-void LLDrawPoolHUD::endRenderPass(S32 pass)
-{
-}
-
-void LLDrawPoolHUD::renderForSelect()
-{
-        if (!sShowHUDAttachments)
-        {
-                return;
-        }
-
-        if (!gToolMgr->inEdit() && (gKeyboard->currentMask(TRUE) & MASK_ALT)) 
-        {
-                return;
-        }
-
-        if ((mDrawFace.empty() && mAlphaFace.empty() && mBumpFaces.empty()) || !mMemory.count())
-        {
-                return;
-        }
-
-        if (!setup_matrices(TRUE))
-        {
-                return;
-        }
-        
-        glEnableClientState ( GL_VERTEX_ARRAY );
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-        bindGLVertexPointer();
-
-        LLGLSObjectSelect gls_objectselect;
-        LLGLDepthTest gls_depth(GL_TRUE);
-
-        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-                 iter != mDrawFace.end(); iter++)
-        {
-                LLFace *facep = *iter;
-                LLDrawable *drawable = facep->getDrawable();
-                if (drawable && !drawable->isDead() && facep->getViewerObject() && facep->getViewerObject()->mGLName)
-                {
-                        facep->renderForSelect();
-                }
-        }
-
-        for (bump_face_map_t::iterator iter = mBumpFaces.begin();
-                 iter != mBumpFaces.end(); iter++)
-        {
-                face_array_t& faces = iter->second;
-                for (std::vector<LLFace*>::iterator iter = faces.begin();
-                         iter != faces.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        LLDrawable *drawable = facep->getDrawable();
-                        if (drawable && !drawable->isDead() && facep->getViewerObject() && facep->getViewerObject()->mGLName)
-                        {
-                                facep->renderForSelect();
-                        }
-                }
-        }
-
-        // ALPHA
-        {
-                glEnableClientState (GL_VERTEX_ARRAY);
-                glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-
-                LLGLSObjectSelectAlpha* gls_selectalpha = NULL;
-                if (!LLDrawPoolAlpha::sShowDebugAlpha)
-                {
-                        gls_selectalpha = new LLGLSObjectSelectAlpha;
-                }
-
-                glBlendFunc(GL_ONE, GL_ZERO);
-                glAlphaFunc(gPickTransparent ? GL_GEQUAL : GL_GREATER, 0.0f);
-
-                bindGLVertexPointer();
-                bindGLTexCoordPointer();
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
-                glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_REPLACE);
-                glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB,         GL_MODULATE);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB,           GL_PREVIOUS);
-                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB,          GL_SRC_COLOR);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);
-                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB,         GL_PREVIOUS);
-                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB,        GL_SRC_ALPHA);
-                
-                for (std::vector<LLFace*>::iterator iter = mAlphaFace.begin();
-                         iter != mAlphaFace.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        LLDrawable *drawable = facep->getDrawable();
-                        if (drawable && !drawable->isDead() && facep->getViewerObject() && facep->getViewerObject()->mGLName)
-                        {
-                                facep->bindTexture();
-                                facep->renderForSelect();
-                        }
-                }
-
-                glAlphaFunc(GL_GREATER, 0.01f);
-                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-                glDisableClientState (GL_VERTEX_ARRAY);
-                glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-
-                delete gls_selectalpha;
-        }
-        
-        restore_matrices();
-}
-
-
-void LLDrawPoolHUD::renderFaceSelected(LLFace *facep, LLImageGL *image, const LLColor4 &color,
-                                                                           const S32 index_offset, const S32 index_count)
-{
-        facep->renderSelected(image, color, index_offset, index_count);
-}
-
-void LLDrawPoolHUD::resetDrawOrders()
-{
-        LLDrawPool::resetDrawOrders();
-        mBumpFaces.clear();
-        mAlphaFace.clear();
-}
-
-void LLDrawPoolHUD::dirtyTexture(const LLViewerImage *texturep)
-{
-        for (std::vector<LLFace*>::iterator iter = mReferences.begin();
-                 iter != mReferences.end(); iter++)
-        {       
-                LLFace *facep = *iter;
-                if (facep->getTexture() == texturep)
-                {
-                        gPipeline.markTextured(facep->getDrawable());
-                }
-        }
-}
-
-void LLDrawPoolHUD::enqueue(LLFace *facep)
-{
-        if (facep->isState(LLFace::BACKLIST))
-        {
-                mMoveFace.put(facep);
-        }
-        else
-        {
-                const LLTextureEntry* te = facep->getTextureEntry();
-                LLViewerImage* imagep = facep->getTexture();
-                bool alpha = te->getColor().mV[3] < 0.999f;
-                alpha = alpha || (imagep->getComponents() == 4) || (imagep->getComponents() == 2);
-                if (alpha)
-                {
-                        mAlphaFace.push_back(facep);
-                }
-                else if ((te->getBumpmap() || te->getShiny()))
-                {
-                        mBumpFaces[imagep].push_back(facep);
-                }
-                else
-                {
-                        mDrawFace.push_back(facep);
-                }
-        }
-        facep->mDistance = facep->mCenterAgent[VX];
-}
-
-// virtual
-BOOL LLDrawPoolHUD::addFace(LLFace *facep)
-{
-        facep->setState(LLFace::HUD_RENDER);
-        return LLDrawPool::addFace(facep);
-}
-
-// virtual
-BOOL LLDrawPoolHUD::removeFace(LLFace *facep)
-{
-        facep->clearState(LLFace::HUD_RENDER);  
-        return LLDrawPool::removeFace(facep);
-}
-
-LLColor3 LLDrawPoolHUD::getDebugColor() const
-{
-        return LLColor3(1.f, 0.5f, 0.5f);
-}
-
-S32 LLDrawPoolHUD::getMaterialAttribIndex()
-{
-        switch (mRenderMode)
-        {
-          case POOL_BUMP:
-                return gPipeline.mObjectBumpProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-          case POOL_ALPHA:
-                return gPipeline.mObjectAlphaProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-          case POOL_SIMPLE:
-                return gPipeline.mObjectSimpleProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-          default:
-                return 0;
-                break;
-        }
-}
diff --git a/linden/indra/newview/lldrawpoolhud.h b/linden/indra/newview/lldrawpoolhud.h
deleted file mode 100644
index 3f57bf7..0000000
--- a/linden/indra/newview/lldrawpoolhud.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/** 
- * @file lldrawpoolhud.h
- * @brief LLDrawPoolHUD class definition
- *
- * Copyright (c) 2006-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLDRAWPOOLHUD_H
-#define LL_LLDRAWPOOLHUD_H
-
-#include "lldrawpool.h"
-
-class LLDrawPoolHUD : public LLDrawPool
-{
-public:
-        LLDrawPoolHUD();
-//      /*virtual*/ ~LLDrawPoolHUD();
-
-        /*virtual*/ LLDrawPool *instancePool();
-
-        /*virtual*/ void prerender();
-        /*virtual*/ void beginRenderPass(S32 pass);
-        /*virtual*/ void render(S32 pass = 0);
-        /*virtual*/ void endRenderPass( S32 pass );
-        /*virtual*/ void renderForSelect();
-        /*virtual*/ void renderFaceSelected(LLFace* facep, LLImageGL* image, const LLColor4& color,
-                                                                                const S32 index_offset = 0, const S32 index_count = 0);
-//      /*virtual*/ S32 rebuild();
-        
-//      /*virtual*/ LLViewerImage *getTexture();
-//      /*virtual*/ LLViewerImage *getDebugTexture();
-        /*virtual*/ void dirtyTexture(const LLViewerImage *texturep);
-
-        /*virtual*/ void resetDrawOrders();
-
-        /*virtual*/ void enqueue(LLFace *face);
-        /*virtual*/ BOOL addFace(LLFace *face);
-        /*virtual*/ BOOL removeFace(LLFace *face);
-
-        virtual S32 getMaterialAttribIndex();
-
-//      /*virtual*/ BOOL verify() const;                // Verify that all data in the draw pool is correct!
-        /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
-
-public:
-        static BOOL sShowHUDAttachments;
-
-protected:
-        typedef std::map<LLViewerImage*, face_array_t> bump_face_map_t;
-        bump_face_map_t mBumpFaces;
-        face_array_t mAlphaFace;
-        S32 mRenderMode; // RENDER_TYPE_VOLUME, RENDER_TYPE_BUMP, or RENDER_TYPE_ALPHA
-};
-
-#endif // LL_LLDRAWPOOLHUD_H
diff --git a/linden/indra/newview/lldrawpoolsimple.cpp b/linden/indra/newview/lldrawpoolsimple.cpp
index 031c170..ec8929e 100644
--- a/linden/indra/newview/lldrawpoolsimple.cpp
+++ b/linden/indra/newview/lldrawpoolsimple.cpp
@@ -30,55 +30,45 @@
 #include "lldrawpoolsimple.h"
 
 #include "llagent.h"
-#include "llagparray.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llsky.h"
 #include "pipeline.h"
 
-S32 LLDrawPoolSimple::sDiffTex = 0;
-
-LLDrawPoolSimple::LLDrawPoolSimple(LLViewerImage *texturep) :
-        LLDrawPool(POOL_SIMPLE,
-                           DATA_SIMPLE_IL_MASK | DATA_COLORS_MASK,
-                           DATA_SIMPLE_NIL_MASK),  // ady temp
-        mTexturep(texturep)
+class LLRenderPassGlow : public LLRenderPass
 {
-}
+public:
+        LLRenderPassGlow(): LLRenderPass(LLRenderPass::PASS_GLOW) { }
+        
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_TEXCOORD
+        };
 
-LLDrawPool *LLDrawPoolSimple::instancePool()
-{
-        return new LLDrawPoolSimple(mTexturep);
-}
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
 
-BOOL LLDrawPoolSimple::match(LLFace* last_face, LLFace* facep)  
-{
-        if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_CHAIN_FACES) &&
-                !last_face->isState(LLFace::LIGHT | LLFace::FULLBRIGHT) &&
-                !facep->isState(LLFace::LIGHT | LLFace::FULLBRIGHT) &&
-                facep->getIndicesStart() == last_face->getIndicesStart()+last_face->getIndicesCount() &&
-                facep->getRenderColor() == last_face->getRenderColor())
+        virtual void prerender() { }
+
+        void render(S32 pass = 0)
         {
-                if (facep->isState(LLFace::GLOBAL))
-                {
-                        if (last_face->isState(LLFace::GLOBAL))
-                        {
-                                return TRUE;
-                        }
-                }
-                else
-                {
-                        if (!last_face->isState(LLFace::GLOBAL))
-                        {
-                                if (last_face->getRenderMatrix() == facep->getRenderMatrix())
-                                {
-                                        return TRUE;
-                                }
-                        }
-                }
+                LLGLEnable blend(GL_BLEND);
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                renderTexture(LLRenderPass::PASS_GLOW, getVertexDataMask());
+                renderActive(LLRenderPass::PASS_GLOW, getVertexDataMask());
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }
-        
-        return FALSE;
+
+        void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture = TRUE)
+        {
+                glColor4ubv(params.mGlowColor.mV);
+                LLRenderPass::pushBatch(params, mask, texture);
+        }
+};
+
+LLDrawPoolSimple::LLDrawPoolSimple() :
+        LLRenderPass(POOL_SIMPLE)
+{
 }
 
 void LLDrawPoolSimple::prerender()
@@ -91,156 +81,56 @@ void LLDrawPoolSimple::beginRenderPass(S32 pass)
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
-        if (gPipeline.getLightingDetail() >= 2)
-        {
-                glEnableClientState(GL_COLOR_ARRAY);
-        }
-
-        if (mVertexShaderLevel > 0)
-        {
-                S32 scatterTex = gPipeline.mObjectSimpleProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-                sDiffTex = gPipeline.mObjectSimpleProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-        }
+        glEnableClientState(GL_COLOR_ARRAY);
 }
 
-
 void LLDrawPoolSimple::render(S32 pass)
 {
-        LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
-        if (mDrawFace.empty())
-        {
-                return;
-        }
-
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
-        bindGLNormalPointer();
-        if (gPipeline.getLightingDetail() >= 2)
+        LLGLDisable blend(GL_BLEND);
+        LLGLDisable alpha_test(GL_ALPHA_TEST);
+        
         {
-                bindGLColorPointer();
+                LLFastTimer t(LLFastTimer::FTM_RENDER_SIMPLE);
+                gPipeline.enableLightsDynamic(1.f);
+                renderTexture(LLRenderPass::PASS_SIMPLE, getVertexDataMask());
+                renderActive(LLRenderPass::PASS_SIMPLE, getVertexDataMask());
         }
 
-        LLViewerImage* tex = getTexture();
-        LLGLState alpha_test(GL_ALPHA_TEST, FALSE);
-        LLGLState blend(GL_BLEND, FALSE);
-
-        if (tex)
         {
-                LLViewerImage::bindTexture(tex,sDiffTex);
-                if (tex->getPrimaryFormat() == GL_ALPHA)
-                {
-                        // Enable Invisibility Hack
-                        alpha_test.enable();
-                        blend.enable();
-                }
+                LLFastTimer t(LLFastTimer::FTM_RENDER_GRASS);
+                LLGLEnable blend(GL_BLEND);
+                LLGLEnable alpha_test(GL_ALPHA_TEST);
+                glAlphaFunc(GL_GREATER, 0.5f);
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                //render grass
+                LLRenderPass::renderTexture(LLRenderPass::PASS_GRASS, getVertexDataMask());
+                glAlphaFunc(GL_GREATER, 0.01f);
         }
-        else
+                
         {
-                LLImageGL::unbindTexture(sDiffTex, GL_TEXTURE_2D);
+                LLFastTimer t(LLFastTimer::FTM_RENDER_FULLBRIGHT);
+                U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_COLOR;
+                gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
+                glDisableClientState(GL_NORMAL_ARRAY);
+                renderTexture(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask);
+                renderActive(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask);
         }
 
-        drawLoop();
-}
-
-void LLDrawPoolSimple::endRenderPass(S32 pass)
-{
-        if (mVertexShaderLevel > 0)
-        {
-                gPipeline.mObjectSimpleProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                gPipeline.mObjectSimpleProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-                glActiveTextureARB(GL_TEXTURE0_ARB);
-                glEnable(GL_TEXTURE_2D);
-        }
-        
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
-        if (gPipeline.getLightingDetail() >= 2)
         {
+                LLFastTimer t(LLFastTimer::FTM_RENDER_GLOW);
                 glDisableClientState(GL_COLOR_ARRAY);
+                LLRenderPassGlow glow;
+                glow.render();
         }
-}
-
-void LLDrawPoolSimple::renderForSelect()
-{
-        if (mDrawFace.empty() || !mMemory.count())
-        {
-                return;
-        }
-
-        glEnableClientState ( GL_VERTEX_ARRAY );
-
-        bindGLVertexPointer();
-
-        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-                 iter != mDrawFace.end(); iter++)
-        {
-                LLFace *facep = *iter;
-                LLDrawable *drawable = facep->getDrawable();
-                if (drawable && !drawable->isDead() && (facep->getViewerObject()->mGLName))
-                {
-                        facep->renderForSelect();
-                }
-        }
-}
-
 
-void LLDrawPoolSimple::renderFaceSelected(LLFace *facep, 
-                                                                        LLImageGL *image, 
-                                                                        const LLColor4 &color,
-                                                                        const S32 index_offset, const S32 index_count)
-{
-        facep->renderSelected(image, color, index_offset, index_count);
-}
-
-
-void LLDrawPoolSimple::dirtyTexture(const LLViewerImage *texturep)
-{
-        if (mTexturep == texturep)
         {
-                for (std::vector<LLFace*>::iterator iter = mReferences.begin();
-                         iter != mReferences.end(); iter++)
-                {
-                        LLFace *facep = *iter;
-                        gPipeline.markTextured(facep->getDrawable());
-                }
+                LLFastTimer t(LLFastTimer::FTM_RENDER_INVISIBLE);
+                U32 invisi_mask = LLVertexBuffer::MAP_VERTEX;
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                renderInvisible(invisi_mask);
+                renderActive(LLRenderPass::PASS_INVISIBLE, invisi_mask);
+                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
         }
 }
 
-LLViewerImage *LLDrawPoolSimple::getTexture()
-{
-        return mTexturep;
-}
-
-LLViewerImage *LLDrawPoolSimple::getDebugTexture()
-{
-        return mTexturep;
-}
-
-LLColor3 LLDrawPoolSimple::getDebugColor() const
-{
-        return LLColor3(1.f, 1.f, 1.f);
-}
-
-S32 LLDrawPoolSimple::getMaterialAttribIndex()
-{
-        return gPipeline.mObjectSimpleProgram.mAttribute[LLPipeline::GLSL_MATERIAL_COLOR];
-}
-
-// virtual
-void LLDrawPoolSimple::enableShade()
-{
-        glDisableClientState(GL_COLOR_ARRAY);
-}
-
-// virtual
-void LLDrawPoolSimple::disableShade()
-{
-        glEnableClientState(GL_COLOR_ARRAY);
-}
-
-// virtual
-void LLDrawPoolSimple::setShade(F32 shade)
-{
-        glColor4f(0,0,0,shade);
-}
diff --git a/linden/indra/newview/lldrawpoolsimple.h b/linden/indra/newview/lldrawpoolsimple.h
index 32fd320..85dcacf 100644
--- a/linden/indra/newview/lldrawpoolsimple.h
+++ b/linden/indra/newview/lldrawpoolsimple.h
@@ -30,64 +30,24 @@
 
 #include "lldrawpool.h"
 
-class LLFRInfo
+class LLDrawPoolSimple : public LLRenderPass
 {
 public:
-        U32 mPrimType;
-        U32 mGeomIndex;
-        U32 mGeomIndexEnd;
-        U32 mNumIndices;
-        U32 mIndicesStart;
-
-        LLFRInfo()
-        {
-        }
-
-        LLFRInfo(const U32 pt, const U32 gi, const U32 gc, const U32 ni, const U32 is) :
-                mPrimType(pt),
-                mGeomIndex(gi),
-                mGeomIndexEnd(gi+gc),
-                mNumIndices(ni),
-                mIndicesStart(is)
-        {
-        }
-};
-
-class LLDrawPoolSimple : public LLDrawPool
-{
-        LLPointer<LLViewerImage> mTexturep;
-public:
         enum
         {
-                SHADER_LEVEL_LOCAL_LIGHTS = 2
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD |
+                                                        LLVertexBuffer::MAP_COLOR
         };
-        
-        LLDrawPoolSimple(LLViewerImage *texturep);
-
-        /*virtual*/ LLDrawPool *instancePool();
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
 
+        LLDrawPoolSimple();
+        
         /*virtual*/ void beginRenderPass(S32 pass);
-        /*virtual*/ void endRenderPass(S32 pass);
         /*virtual*/ void render(S32 pass = 0);
-        /*virtual*/ void renderFaceSelected(LLFace *facep, 
-                                                                        LLImageGL *image, 
-                                                                        const LLColor4 &color,
-                                                                        const S32 index_offset = 0, const S32 index_count = 0);
         /*virtual*/ void prerender();
-        /*virtual*/ void renderForSelect();
-        /*virtual*/ void dirtyTexture(const LLViewerImage *texturep);
-        /*virtual*/ LLViewerImage *getTexture();
-        /*virtual*/ LLViewerImage *getDebugTexture();
-        /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
-        /*virtual*/ BOOL match(LLFace* last_face, LLFace* facep);
-
-        /*virtual*/ void enableShade();
-        /*virtual*/ void disableShade();
-        /*virtual*/ void setShade(F32 shade);
-
-        virtual S32 getMaterialAttribIndex();
 
-        static S32 sDiffTex;
 };
 
 #endif // LL_LLDRAWPOOLSIMPLE_H
diff --git a/linden/indra/newview/lldrawpoolsky.cpp b/linden/indra/newview/lldrawpoolsky.cpp
index 52f9f16..8266892 100644
--- a/linden/indra/newview/lldrawpoolsky.cpp
+++ b/linden/indra/newview/lldrawpoolsky.cpp
@@ -31,7 +31,6 @@
 
 #include "imageids.h"
 
-#include "llagparray.h"
 #include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
@@ -45,7 +44,7 @@
 #include "pipeline.h"
 
 LLDrawPoolSky::LLDrawPoolSky() :
-        LLDrawPool(POOL_SKY, DATA_SIMPLE_IL_MASK, DATA_SIMPLE_NIL_MASK)
+        LLFacePool(POOL_SKY)
 {
 }
 
@@ -81,15 +80,17 @@ void LLDrawPoolSky::render(S32 pass)
         glMatrixMode( GL_PROJECTION );
 
         glPushMatrix();
-        gViewerWindow->setup3DRender();
+        //gViewerWindow->setup3DRender();
+
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+        LLVector3 origin = gCamera->getOrigin();
+        glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
 
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         glDisableClientState(GL_NORMAL_ARRAY);
 
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
-
         S32 face_count = (S32)mDrawFace.size();
 
         for (S32 i = 0; i < llmin(6, face_count); ++i)
@@ -97,13 +98,13 @@ void LLDrawPoolSky::render(S32 pass)
                 renderSkyCubeFace(i);
         }
         
-        const LLFace *hbfaces[3];
+        LLFace *hbfaces[3];
         hbfaces[0] = NULL;
         hbfaces[1] = NULL;
         hbfaces[2] = NULL;
         for (S32 curr_face = 0; curr_face < face_count; curr_face++)
         {
-                const LLFace* facep = mDrawFace[curr_face];
+                LLFace* facep = mDrawFace[curr_face];
                 if (voskyp->isSameFace(LLVOSky::FACE_SUN, facep))
                 {
                         hbfaces[0] = facep;
@@ -137,11 +138,12 @@ void LLDrawPoolSky::render(S32 pass)
         glMatrixMode( GL_PROJECTION );
         glPopMatrix();
         glMatrixMode( GL_MODELVIEW );
+        glPopMatrix();
 }
 
 void LLDrawPoolSky::renderSkyCubeFace(U8 side)
 {
-        const LLFace &face = *mDrawFace[LLVOSky::FACE_SIDE0 + side];
+        LLFace &face = *mDrawFace[LLVOSky::FACE_SIDE0 + side];
         if (!face.getGeomCount())
         {
                 return;
@@ -149,20 +151,20 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
 
         mSkyTex[side].bindTexture(TRUE);
         
-        face.renderIndexed(getRawIndices());
+        face.renderIndexed();
 
         if (LLSkyTex::doInterpolate())
         {
                 LLGLEnable blend(GL_BLEND);
                 mSkyTex[side].bindTexture(FALSE);
                 glColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled
-                face.renderIndexed(getRawIndices());
+                face.renderIndexed();
         }
 
         mIndicesDrawn += face.getIndicesCount();
 }
 
-void LLDrawPoolSky::renderHeavenlyBody(U8 hb, const LLFace* face)
+void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face)
 {
         if ( !mHB[hb]->getDraw() ) return;
         if (! face->getGeomCount()) return;
@@ -171,13 +173,13 @@ void LLDrawPoolSky::renderHeavenlyBody(U8 hb, const LLFace* face)
         tex->bind();
         LLColor4 color(mHB[hb]->getInterpColor());
         LLOverrideFaceColor override(this, color);
-        face->renderIndexed(getRawIndices());
+        face->renderIndexed();
         mIndicesDrawn += face->getIndicesCount();
 }
 
 
 
-void LLDrawPoolSky::renderSunHalo(const LLFace* face)
+void LLDrawPoolSky::renderSunHalo(LLFace* face)
 {
         if (! mHB[0]->getDraw()) return;
         if (! face->getGeomCount()) return;
@@ -188,7 +190,7 @@ void LLDrawPoolSky::renderSunHalo(const LLFace* face)
         color.mV[3] = llclamp(mHB[0]->getHaloBrighness(), 0.f, 1.f);
 
         LLOverrideFaceColor override(this, color);
-        face->renderIndexed(getRawIndices());
+        face->renderIndexed();
         mIndicesDrawn += face->getIndicesCount();
 }
 
diff --git a/linden/indra/newview/lldrawpoolsky.h b/linden/indra/newview/lldrawpoolsky.h
index d65fc9f..b9c1dda 100644
--- a/linden/indra/newview/lldrawpoolsky.h
+++ b/linden/indra/newview/lldrawpoolsky.h
@@ -33,13 +33,21 @@
 class LLSkyTex;
 class LLHeavenBody;
 
-class LLDrawPoolSky : public LLDrawPool
+class LLDrawPoolSky : public LLFacePool
 {
 private:
         LLSkyTex                        *mSkyTex;
         LLHeavenBody            *mHB[2]; // Sun and Moon
 
 public:
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_TEXCOORD
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         LLDrawPoolSky();
 
         /*virtual*/ LLDrawPool *instancePool();
@@ -52,8 +60,8 @@ public:
         void setMoon(LLHeavenBody* moon) { mHB[1] = moon; }
 
         void renderSkyCubeFace(U8 side);
-        void renderHeavenlyBody(U8 hb, const LLFace* face);
-        void renderSunHalo(const LLFace* face);
+        void renderHeavenlyBody(U8 hb, LLFace* face);
+        void renderSunHalo(LLFace* face);
 
         virtual S32 getMaterialAttribIndex() { return 0; }
 };
diff --git a/linden/indra/newview/lldrawpoolstars.cpp b/linden/indra/newview/lldrawpoolstars.cpp
index a0eedb8..3d4eebb 100644
--- a/linden/indra/newview/lldrawpoolstars.cpp
+++ b/linden/indra/newview/lldrawpoolstars.cpp
@@ -33,9 +33,10 @@
 #include "llsky.h"
 #include "llvostars.h"
 #include "pipeline.h"
+#include "llviewercamera.h"
 
 LLDrawPoolStars::LLDrawPoolStars() :
-        LLDrawPool(POOL_STARS, DATA_VERTICES_MASK | DATA_COLORS_MASK, 0)
+        LLFacePool(POOL_STARS)
 {
 }
 
@@ -72,28 +73,42 @@ void LLDrawPoolStars::render(S32 pass)
 
         gPipeline.disableLights();
 
-        glPointSize(2.0);
+        GLint viewport[4];
 
-        bindGLVertexPointer();
+        glGetIntegerv(GL_VIEWPORT, viewport);
+
+        if (viewport[2] > 512 && viewport[3] > 512)
+        {
+                glPointSize(2.f);
+        }
+
+        LLVector3 origin = gCamera->getOrigin();
+        glPushMatrix();
+        glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
 
         glEnableClientState(GL_COLOR_ARRAY);
-        bindGLColorPointer();
         
         S32 face_count = (S32)mDrawFace.size();
         for (S32 curr_face = 0; curr_face < face_count; curr_face++)
         {
-                const LLFace* face = mDrawFace[curr_face];
+                LLFace* face = mDrawFace[curr_face];
                 if (!face->getGeomCount())
                 {
                         continue;
                 }
         
                 //  render the stars as a sphere centered at viewer camera 
-
-                face->renderIndexed(getRawIndices());
-                mIndicesDrawn += face->getIndicesCount();
+                if (face->mVertexBuffer.notNull())
+                {
+                        face->mVertexBuffer->setBuffer(getVertexDataMask());
+                        U32* indicesp = (U32*) face->mVertexBuffer->getIndicesPointer();
+                        glDrawElements(GL_POINTS, face->getIndicesCount(), GL_UNSIGNED_INT, indicesp);
+                        mIndicesDrawn += face->getIndicesCount();
+                }
         }
         glDisableClientState(GL_COLOR_ARRAY);
+        glPointSize(1.f);
+        glPopMatrix();
 }
 
 
diff --git a/linden/indra/newview/lldrawpoolstars.h b/linden/indra/newview/lldrawpoolstars.h
index 6343a93..1eade29 100644
--- a/linden/indra/newview/lldrawpoolstars.h
+++ b/linden/indra/newview/lldrawpoolstars.h
@@ -30,9 +30,17 @@
 
 #include "lldrawpool.h"
 
-class LLDrawPoolStars : public LLDrawPool
+class LLDrawPoolStars : public LLFacePool
 {
 public:
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_COLOR
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         LLDrawPoolStars();
 
         /*virtual*/ LLDrawPool *instancePool();
diff --git a/linden/indra/newview/lldrawpoolterrain.cpp b/linden/indra/newview/lldrawpoolterrain.cpp
index 1390fc9..8ac053c 100644
--- a/linden/indra/newview/lldrawpoolterrain.cpp
+++ b/linden/indra/newview/lldrawpoolterrain.cpp
@@ -32,7 +32,6 @@
 #include "llfasttimer.h"
 
 #include "llagent.h"
-#include "llagparray.h"
 #include "llviewercontrol.h"
 #include "lldrawable.h"
 #include "llface.h"
@@ -56,7 +55,7 @@ S32 LLDrawPoolTerrain::sDetailMode = 1;
 F32 LLDrawPoolTerrain::sDetailScale = DETAIL_SCALE;
 
 LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerImage *texturep) :
-        LLDrawPool(POOL_TERRAIN, DATA_SIMPLE_IL_MASK | DATA_COLORS_MASK | DATA_TEX_COORDS1_MASK, DATA_SIMPLE_NIL_MASK),
+        LLFacePool(POOL_TERRAIN),
         mTexturep(texturep)
 {
         // Hack!
@@ -94,6 +93,13 @@ void LLDrawPoolTerrain::prerender()
 #if 0 // 1.9.2
         mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_ENVIRONMENT);
 #endif
+        sDetailMode = gSavedSettings.getS32("RenderTerrainDetail");
+}
+
+//static
+S32 LLDrawPoolTerrain::getDetailMode()
+{
+        return sDetailMode;
 }
 
 void LLDrawPoolTerrain::render(S32 pass)
@@ -105,6 +111,15 @@ void LLDrawPoolTerrain::render(S32 pass)
                 return;
         }
 
+        // Hack! Get the region that this draw pool is rendering from!
+        LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion();
+        LLVLComposition *compp = regionp->getComposition();
+        for (S32 i = 0; i < 4; i++)
+        {
+                compp->mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN);
+                compp->mDetailTextures[i]->addTextureStats(1024.f*1024.f); // assume large pixel area
+        }
+
         if (!gGLManager.mHasMultitexture)
         {
                 // No mulititexture, render simple land.
@@ -171,25 +186,16 @@ void LLDrawPoolTerrain::renderFull4TUShader()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
 
-        bindGLVertexPointer();
-        bindGLNormalPointer();
         if (gPipeline.getLightingDetail() >= 2)
         {
                 glEnableClientState(GL_COLOR_ARRAY);
-                bindGLColorPointer();
         }
-
+        
         glBlendFunc(GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA);
         
         // Hack! Get the region that this draw pool is rendering from!
         LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion();
         LLVLComposition *compp = regionp->getComposition();
-        for (S32 i = 0; i < 4; i++)
-        {
-                compp->mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN);
-                compp->mDetailTextures[i]->addTextureStats(1024.f*1024.f); // assume large pixel area
-        }
-
         LLViewerImage *detail_texture0p = compp->mDetailTextures[0];
         LLViewerImage *detail_texture1p = compp->mDetailTextures[1];
         LLViewerImage *detail_texture2p = compp->mDetailTextures[2];
@@ -219,8 +225,7 @@ void LLDrawPoolTerrain::renderFull4TUShader()
         S32 detailTex0 = gPipeline.mTerrainProgram.enableTexture(LLPipeline::GLSL_TERRAIN_DETAIL0);
         S32 detailTex1 = gPipeline.mTerrainProgram.enableTexture(LLPipeline::GLSL_TERRAIN_DETAIL1);
         S32 rampTex = gPipeline.mTerrainProgram.enableTexture(LLPipeline::GLSL_TERRAIN_ALPHARAMP);
-        S32 scatterTex = gPipeline.mTerrainProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-
+        
         LLViewerImage::bindTexture(detail_texture0p,detailTex0);
 
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
@@ -241,7 +246,6 @@ void LLDrawPoolTerrain::renderFull4TUShader()
 
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         //
         // Stage 2: Interpolate detail1 with existing based on ramp
@@ -258,9 +262,6 @@ void LLDrawPoolTerrain::renderFull4TUShader()
         glTexGenfv(GL_S, GL_OBJECT_PLANE, tp0.mV);
         glTexGenfv(GL_T, GL_OBJECT_PLANE, tp1.mV);
 
-        // Stage 4: Haze
-        LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-
         //
         // Stage 3: Modulate with primary color for lighting
         //
@@ -297,7 +298,6 @@ void LLDrawPoolTerrain::renderFull4TUShader()
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
         glActiveTextureARB(GL_TEXTURE1_ARB);
-        bindGLTexCoordPointer(1);
 
         // Set the texture matrix
         glMatrixMode(GL_TEXTURE);
@@ -329,7 +329,6 @@ void LLDrawPoolTerrain::renderFull4TUShader()
         glClientActiveTextureARB(GL_TEXTURE3_ARB);
         glActiveTextureARB(GL_TEXTURE3_ARB);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         // Set the texture matrix
         glMatrixMode(GL_TEXTURE);
@@ -342,7 +341,6 @@ void LLDrawPoolTerrain::renderFull4TUShader()
         }
 
         // Disable multitexture
-        gPipeline.mTerrainProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
         gPipeline.mTerrainProgram.disableTexture(LLPipeline::GLSL_TERRAIN_ALPHARAMP);
         gPipeline.mTerrainProgram.disableTexture(LLPipeline::GLSL_TERRAIN_DETAIL0);
         gPipeline.mTerrainProgram.disableTexture(LLPipeline::GLSL_TERRAIN_DETAIL1);
@@ -396,18 +394,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
 
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-
         // Hack! Get the region that this draw pool is rendering from!
         LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion();
         LLVLComposition *compp = regionp->getComposition();
-        for (S32 i = 0; i < 4; i++)
-        {
-                compp->mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN);
-                compp->mDetailTextures[i]->addTextureStats(1024.f*1024.f); // assume large pixel area
-        }
-
         LLViewerImage *detail_texture0p = compp->mDetailTextures[0];
         LLViewerImage *detail_texture1p = compp->mDetailTextures[1];
         LLViewerImage *detail_texture2p = compp->mDetailTextures[2];
@@ -430,6 +419,7 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 0: detail texture 0
         //
+        glActiveTextureARB(GL_TEXTURE0_ARB);
         LLViewerImage::bindTexture(detail_texture0p,0);
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
 
@@ -451,12 +441,12 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 1: Generate alpha ramp for detail0/detail1 transition
         //
+        glActiveTextureARB(GL_TEXTURE1_ARB);
         LLViewerImage::bindTexture(m2DAlphaRampImagep,1);
 
         glEnable(GL_TEXTURE_2D); // Texture unit 1
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         // Care about alpha only
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
@@ -471,6 +461,7 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 2: Interpolate detail1 with existing based on ramp
         //
+        glActiveTextureARB(GL_TEXTURE2_ARB);
         LLViewerImage::bindTexture(detail_texture1p,2);
         glEnable(GL_TEXTURE_2D); // Texture unit 2
         glClientActiveTextureARB(GL_TEXTURE2_ARB);
@@ -496,6 +487,7 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 3: Modulate with primary (vertex) color for lighting
         //
+        glActiveTextureARB(GL_TEXTURE3_ARB);
         LLViewerImage::bindTexture(detail_texture1p,3); // bind any texture
         glEnable(GL_TEXTURE_2D); // Texture unit 3
         glClientActiveTextureARB(GL_TEXTURE3_ARB);
@@ -517,6 +509,7 @@ void LLDrawPoolTerrain::renderFull4TU()
 
         // Stage 0: Write detail3 into base
         //
+        glActiveTextureARB(GL_TEXTURE0_ARB);
         LLViewerImage::bindTexture(detail_texture3p,0);
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
 
@@ -538,14 +531,13 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 1: Generate alpha ramp for detail2/detail3 transition
         //
+        glActiveTextureARB(GL_TEXTURE1_ARB);
         LLViewerImage::bindTexture(m2DAlphaRampImagep,1);
 
         glEnable(GL_TEXTURE_2D); // Texture unit 1
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
 
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
-
 
         // Set the texture matrix
         glMatrixMode(GL_TEXTURE);
@@ -566,6 +558,7 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 2: Interpolate detail2 with existing based on ramp
         //
+        glActiveTextureARB(GL_TEXTURE2_ARB);
         LLViewerImage::bindTexture(detail_texture2p,2);
         glEnable(GL_TEXTURE_2D); // Texture unit 2
         glClientActiveTextureARB(GL_TEXTURE2_ARB);
@@ -592,19 +585,19 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 3: Generate alpha ramp for detail1/detail2 transition
         //
+        glActiveTextureARB(GL_TEXTURE3_ARB);
         LLViewerImage::bindTexture(m2DAlphaRampImagep,3);
 
         glEnable(GL_TEXTURE_2D); // Texture unit 3
         glClientActiveTextureARB(GL_TEXTURE3_ARB);
 
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         // Set the texture matrix
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glTranslatef(-1.f, 0.f, 0.f);
-    
+  
         // Set alpha texture and do lighting modulation
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
         glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_MODULATE);
@@ -675,18 +668,9 @@ void LLDrawPoolTerrain::renderFull2TU()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
 
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-
         // Hack! Get the region that this draw pool is rendering from!
         LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion();
         LLVLComposition *compp = regionp->getComposition();
-        for (S32 i = 0; i < 4; i++)
-        {
-                compp->mDetailTextures[i]->setBoostLevel(LLViewerImage::BOOST_TERRAIN);
-                compp->mDetailTextures[i]->addTextureStats(1024.f*1024.f); // assume large pixel area
-        }
-
         LLViewerImage *detail_texture0p = compp->mDetailTextures[0];
         LLViewerImage *detail_texture1p = compp->mDetailTextures[1];
         LLViewerImage *detail_texture2p = compp->mDetailTextures[2];
@@ -743,7 +727,6 @@ void LLDrawPoolTerrain::renderFull2TU()
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         // Care about alpha only
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
@@ -800,7 +783,6 @@ void LLDrawPoolTerrain::renderFull2TU()
         glTranslatef(-1.f, 0.f, 0.f);
 
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         // Care about alpha only
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
@@ -858,7 +840,6 @@ void LLDrawPoolTerrain::renderFull2TU()
         glTranslatef(-2.f, 0.f, 0.f);
 
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        bindGLTexCoordPointer(1);
 
         // Care about alpha only
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
@@ -938,9 +919,6 @@ void LLDrawPoolTerrain::renderSimple()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
 
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-
         LLVector4 tp0, tp1;
 
         //----------------------------------------------------------------------------
@@ -1018,9 +996,6 @@ void LLDrawPoolTerrain::renderOwnership()
         glEnableClientState(GL_VERTEX_ARRAY);
         glDisableClientState(GL_NORMAL_ARRAY);
 
-        bindGLVertexPointer();
-        bindGLTexCoordPointer(0);
-
         LLViewerImage::bindTexture(texturep);
 
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
@@ -1036,12 +1011,12 @@ void LLDrawPoolTerrain::renderOwnership()
         const F32 TEXTURE_FUDGE = 257.f / 256.f;
         glScalef( TEXTURE_FUDGE, TEXTURE_FUDGE, 1.f );
 
-        const U32* index_array = getRawIndices();       
         for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
                  iter != mDrawFace.end(); iter++)
         {
                 LLFace *facep = *iter;
-                facep->renderIndexed(index_array);
+                facep->renderIndexed(LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_TEXCOORD);
         }
 
         glMatrixMode(GL_TEXTURE);
@@ -1055,14 +1030,13 @@ void LLDrawPoolTerrain::renderOwnership()
 
 void LLDrawPoolTerrain::renderForSelect()
 {
-        if (mDrawFace.empty() || !mMemory.count())
+        if (mDrawFace.empty())
         {
                 return;
         }
 
-        glEnableClientState ( GL_VERTEX_ARRAY );
-
-        bindGLVertexPointer();
+        
+        LLImageGL::unbindTexture(0);
 
         for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
                  iter != mDrawFace.end(); iter++)
@@ -1070,14 +1044,14 @@ void LLDrawPoolTerrain::renderForSelect()
                 LLFace *facep = *iter;
                 if (!facep->getDrawable()->isDead() && (facep->getDrawable()->getVObj()->mGLName))
                 {
-                        facep->renderForSelect();
+                        facep->renderForSelect(LLVertexBuffer::MAP_VERTEX);
                 }
         }
 }
 
-void LLDrawPoolTerrain::dirtyTexture(const LLViewerImage *texturep)
+void LLDrawPoolTerrain::dirtyTextures(const std::set<LLViewerImage*>& textures)
 {
-        if (mTexturep == texturep)
+        if (textures.find(mTexturep) != textures.end())
         {
                 for (std::vector<LLFace*>::iterator iter = mReferences.begin();
                          iter != mReferences.end(); iter++)
diff --git a/linden/indra/newview/lldrawpoolterrain.h b/linden/indra/newview/lldrawpoolterrain.h
index b75d7cf..57fab9e 100644
--- a/linden/indra/newview/lldrawpoolterrain.h
+++ b/linden/indra/newview/lldrawpoolterrain.h
@@ -30,10 +30,22 @@
 
 #include "lldrawpool.h"
 
-class LLDrawPoolTerrain : public LLDrawPool
+class LLDrawPoolTerrain : public LLFacePool
 {
         LLPointer<LLViewerImage> mTexturep;
 public:
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD |
+                                                        LLVertexBuffer::MAP_TEXCOORD2 |
+                                                        LLVertexBuffer::MAP_COLOR
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+        static S32 getDetailMode();
+
         LLDrawPoolTerrain(LLViewerImage *texturep);
         virtual ~LLDrawPoolTerrain();
 
@@ -43,7 +55,7 @@ public:
         /*virtual*/ void render(S32 pass = 0);
         /*virtual*/ void prerender();
         /*virtual*/ void renderForSelect();
-        /*virtual*/ void dirtyTexture(const LLViewerImage *texturep);
+        /*virtual*/ void dirtyTextures(const std::set<LLViewerImage*>& textures);
         /*virtual*/ LLViewerImage *getTexture();
         /*virtual*/ LLViewerImage *getDebugTexture();
         /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp
index ad05d9a..36a4393 100644
--- a/linden/indra/newview/lldrawpooltree.cpp
+++ b/linden/indra/newview/lldrawpooltree.cpp
@@ -29,7 +29,6 @@
 
 #include "lldrawpooltree.h"
 
-#include "llagparray.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llsky.h"
@@ -41,7 +40,7 @@
 S32 LLDrawPoolTree::sDiffTex = 0;
 
 LLDrawPoolTree::LLDrawPoolTree(LLViewerImage *texturep) :
-        LLDrawPool(POOL_TREE, DATA_SIMPLE_IL_MASK, 0),
+        LLFacePool(POOL_TREE),
         mTexturep(texturep)
 {
         mTexturep->bind(0);
@@ -55,7 +54,7 @@ LLDrawPool *LLDrawPoolTree::instancePool()
 
 void LLDrawPoolTree::prerender()
 {
-        mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT);
+        mVertexShaderLevel = 0;
 }
 
 void LLDrawPoolTree::beginRenderPass(S32 pass)
@@ -63,13 +62,7 @@ void LLDrawPoolTree::beginRenderPass(S32 pass)
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        
-        if ((mVertexShaderLevel > 0))
-        {
-                S32 scatterTex = gPipeline.mObjectSimpleProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-                sDiffTex = gPipeline.mObjectSimpleProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-        }
+        glAlphaFunc(GL_GREATER, 0.5f);
 }
 
 void LLDrawPoolTree::render(S32 pass)
@@ -83,34 +76,21 @@ void LLDrawPoolTree::render(S32 pass)
 
         gPipeline.enableLightsDynamic(1.f);
         LLGLSPipelineAlpha gls_pipeline_alpha;
-        
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
-        bindGLNormalPointer();
-
         LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
 
         renderTree();
-        
 }
 
 void LLDrawPoolTree::endRenderPass(S32 pass)
 {
-        if ((mVertexShaderLevel > 0))
-        {
-                gPipeline.mObjectSimpleProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-                gPipeline.mObjectSimpleProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-                glActiveTextureARB(GL_TEXTURE0_ARB);
-                glEnable(GL_TEXTURE_2D);
-        }
-
+        glAlphaFunc(GL_GREATER, 0.01f);
         glDisableClientState(GL_NORMAL_ARRAY);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
 void LLDrawPoolTree::renderForSelect()
 {
-        if (mDrawFace.empty() || !mMemory.count())
+        if (mDrawFace.empty())
         {
                 return;
         }
@@ -123,10 +103,7 @@ void LLDrawPoolTree::renderForSelect()
         LLGLSObjectSelectAlpha gls_alpha;
 
         glBlendFunc(GL_ONE, GL_ZERO);
-        glAlphaFunc(gPickTransparent ? GL_GEQUAL : GL_GREATER, 0.f);
-
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
+        glAlphaFunc(GL_GREATER, 0.5f);
 
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
         glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_REPLACE);
@@ -166,6 +143,8 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
                 }
         }
 
+        U32 indices_drawn = 0;
+
         glMatrixMode(GL_MODELVIEW);
         
         for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
@@ -174,11 +153,14 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
                 LLFace *face = *iter;
                 LLDrawable *drawablep = face->getDrawable();
 
-                if (drawablep->isDead())
+                if (drawablep->isDead() || face->mVertexBuffer.isNull())
                 {
                         continue;
                 }
 
+                face->mVertexBuffer->setBuffer(LLDrawPoolTree::VERTEX_DATA_MASK);
+                U32* indicesp = (U32*) face->mVertexBuffer->getIndicesPointer();
+
                 // Render each of the trees
                 LLVOTree *treep = (LLVOTree *)drawablep->getVObj();
 
@@ -236,55 +218,26 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
                                 }
                         } 
 
-                        if (app_angle > (THRESH_ANGLE_FOR_BILLBOARD + BLEND_RANGE_FOR_BILLBOARD))
-                        {
-                                //
-                                //  Draw only the full geometry tree
-                                //
-                                //stop_depth = (app_angle < THRESH_ANGLE_FOR_RECURSION_REDUCTION);
-                                glAlphaFunc(GL_GREATER, 0.5f);
-                                LLDrawPool::LLOverrideFaceColor clr(this, color); 
-                                treep->drawBranchPipeline(this, trunk_LOD, stop_depth, treep->mDepth, treep->mTrunkDepth, 1.0, treep->mTwist, droop, treep->mBranches, alpha);
-                        }
-                        else if (app_angle < (THRESH_ANGLE_FOR_BILLBOARD - BLEND_RANGE_FOR_BILLBOARD))
+                        if (app_angle < (THRESH_ANGLE_FOR_BILLBOARD - BLEND_RANGE_FOR_BILLBOARD))
                         {
                                 //
                                 //  Draw only the billboard 
                                 //
                                 //  Only the billboard, can use closer to normal alpha func.
                                 stop_depth = -1;
-                                glAlphaFunc(GL_GREATER, 0.4f);
-                                LLDrawPool::LLOverrideFaceColor clr(this, color); 
-                                treep->drawBranchPipeline(this, trunk_LOD, stop_depth, treep->mDepth, treep->mTrunkDepth, 1.0, treep->mTwist, droop, treep->mBranches, alpha);
+                                LLFacePool::LLOverrideFaceColor clr(this, color); 
+                                indices_drawn += treep->drawBranchPipeline(indicesp, trunk_LOD, stop_depth, treep->mDepth, treep->mTrunkDepth, 1.0, treep->mTwist, droop, treep->mBranches, alpha);
                         }
-                        else
+                        else // if (app_angle > (THRESH_ANGLE_FOR_BILLBOARD + BLEND_RANGE_FOR_BILLBOARD))
                         {
                                 //
-                                //  Draw a blended version including both billboard and full tree 
-                                // 
-                                alpha = (app_angle - THRESH_ANGLE_FOR_BILLBOARD)/BLEND_RANGE_FOR_BILLBOARD;
-                                BOOL billboard_depth = TRUE; // billboard gets alpha
-                                if (alpha > 0.5f)
-                                {
-                                        billboard_depth = FALSE;
-                                }
-                                alpha = alpha/2.f + 0.5f;
-                                                                
-                                glAlphaFunc(GL_GREATER, alpha*0.5f);
-                                {
-                                        LLGLDepthTest gls_depth(GL_TRUE, billboard_depth ? GL_FALSE : GL_TRUE);
-                                        color.mV[3] = (U8) (llclamp(alpha, 0.0f, 1.0f) * 255);
-                                        LLDrawPool::LLOverrideFaceColor clr(this, color); 
-                                        treep->drawBranchPipeline(this, trunk_LOD, 0, treep->mDepth, treep->mTrunkDepth, 1.0, treep->mTwist, droop, treep->mBranches, alpha);
-                                }
-                                {
-                                        LLGLDepthTest gls_depth(GL_TRUE, billboard_depth ? GL_TRUE : GL_FALSE);
-                                        glAlphaFunc(GL_GREATER, (1.f - alpha)*0.1f);
-                                        color.mV[3] = (U8) (llclamp(1.f-alpha, 0.0f, 1.0f) * 255);
-                                        LLDrawPool::LLOverrideFaceColor clr(this, color); 
-                                        treep->drawBranchPipeline(this, trunk_LOD, -1, treep->mDepth, treep->mTrunkDepth, 1.0, treep->mTwist, droop, treep->mBranches, 1.f - alpha);
-                                }
+                                //  Draw only the full geometry tree
+                                //
+                                //stop_depth = (app_angle < THRESH_ANGLE_FOR_RECURSION_REDUCTION);
+                                LLFacePool::LLOverrideFaceColor clr(this, color); 
+                                indices_drawn += treep->drawBranchPipeline(indicesp, trunk_LOD, stop_depth, treep->mDepth, treep->mTrunkDepth, 1.0, treep->mTwist, droop, treep->mBranches, alpha);
                         }
+                        
                         glPopMatrix();
                 }
         }
@@ -298,45 +251,21 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
                         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                 }
         }
-        glAlphaFunc(GL_GREATER, 0.01f);
-}
-
-
-S32 LLDrawPoolTree::rebuild()
-{
-        mRebuildTime++;
-        if (mRebuildTime >  mRebuildFreq)
-        {
-                // Flush AGP to force an AGP realloc and reduce AGP fragmentation
-                flushAGP();
-                mRebuildTime = 0;
-        }
 
-        return 0;
+        addIndicesDrawn(indices_drawn);
 }
 
 BOOL LLDrawPoolTree::verify() const
 {
-        BOOL ok = TRUE;
-
-        // shared geometry.  Just verify that it's there and correct.
+/*      BOOL ok = TRUE;
 
-        // Verify all indices in the pool are in the right range
-        const U32 *indicesp = getRawIndices();
-        for (U32 i = 0; i < getIndexCount(); i++)
-        {
-                if (indicesp[i] > getVertexCount())
-                {
-                        ok = FALSE;
-                        llinfos << "Bad index in tree pool!" << llendl;
-                }
-        }
-        
         if (!ok)
         {
                 printDebugInfo();
         }
-        return ok;
+        return ok;*/
+
+        return TRUE;
 }
 
 LLViewerImage *LLDrawPoolTree::getTexture()
diff --git a/linden/indra/newview/lldrawpooltree.h b/linden/indra/newview/lldrawpooltree.h
index 5b4eb67..6e00460 100644
--- a/linden/indra/newview/lldrawpooltree.h
+++ b/linden/indra/newview/lldrawpooltree.h
@@ -30,10 +30,19 @@
 
 #include "lldrawpool.h"
 
-class LLDrawPoolTree : public LLDrawPool
+class LLDrawPoolTree : public LLFacePool
 {
         LLPointer<LLViewerImage> mTexturep;
 public:
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD                                                    
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         LLDrawPoolTree(LLViewerImage *texturep);
 
         /*virtual*/ LLDrawPool *instancePool();
@@ -43,7 +52,6 @@ public:
         /*virtual*/ void render(S32 pass = 0);
         /*virtual*/ void endRenderPass( S32 pass );
         /*virtual*/ void renderForSelect();
-        /*virtual*/ S32 rebuild();
         /*virtual*/ BOOL verify() const;
         /*virtual*/ LLViewerImage *getTexture();
         /*virtual*/ LLViewerImage *getDebugTexture();
diff --git a/linden/indra/newview/lldrawpooltreenew.cpp b/linden/indra/newview/lldrawpooltreenew.cpp
deleted file mode 100644
index 326ab5f..0000000
--- a/linden/indra/newview/lldrawpooltreenew.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/** 
- * @file lldrawpooltreenew.cpp
- * @brief LLDrawPoolTreeNew class implementation
- *
- * Copyright (c) 2003-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lldrawpooltreenew.h"
-
-#include "llagparray.h"
-#include "lldrawable.h"
-#include "llface.h"
-#include "llsky.h"
-#include "llvotreenew.h"
-#include "pipeline.h"
-
-LLDrawPoolTreeNew::LLDrawPoolTreeNew(LLViewerImage *texturep) :
-        LLDrawPool(POOL_TREE_NEW,
-                                DATA_VERTICES_MASK | DATA_TEX_COORDS0_MASK | DATA_NORMALS_MASK,
-                                0),
-        mTexturep(texturep)
-{
-}
-
-LLDrawPool *LLDrawPoolTreeNew::instancePool()
-{
-        return new LLDrawPoolTreeNew(mTexturep);
-}
-
-
-void LLDrawPoolTreeNew::prerender()
-{
-        mVertexShaderLevel = gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT);
-}
-
-void LLDrawPoolTreeNew::render( S32 pass )
-{
-        if (mDrawFace.empty())
-        {
-                return;
-        }
-
-        LLGLSPipelineAlpha gls_pipeline_alpha;
-
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        glEnableClientState(GL_NORMAL_ARRAY);
-
-        bindGLVertexPointer();
-        bindGLTexCoordPointer();
-        bindGLNormalPointer();
-
-        LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
-        
-        renderTree();
-}
-
-
-void LLDrawPoolTreeNew::renderForSelect()
-{
-        if (mDrawFace.empty())
-        {
-                return;
-        }
-
-        LLGLSPipelineAlpha gls_pipeline_alpha;
-
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);
-
-        bindGLVertexPointer();
-
-        renderTree(TRUE);
-
-        glDisableClientState(GL_VERTEX_ARRAY);
-
-}
-
-
-
-
-void LLDrawPoolTreeNew::renderTree(BOOL selecting)
-{
-
-        // Bind the texture for this tree.
-        LLViewerImage::bindTexture(mTexturep);
-
-        glMatrixMode(GL_MODELVIEW);
-        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
-                 iter != mDrawFace.end(); iter++)
-        {
-                LLFace *face = *iter;
-                LLDrawable *drawablep = face->getDrawable();
-
-                if (drawablep->isDead())
-                {
-                        continue;
-                }
-                // Render each of the trees
-                LLVOTreeNew *treep = (LLVOTreeNew *)drawablep->getVObj();
-                if (!selecting || treep->mGLName != 0)
-                {
-                        glPushMatrix();
-
-                        // Translate to tree base  HACK - adjustment in Z plants tree underground
-                        const LLVector3 &pos_agent = treep->getPositionAgent();
-                        glTranslatef(pos_agent.mV[VX], pos_agent.mV[VY], pos_agent.mV[VZ] - 0.1f);
-
-                        // Rotate to tree position
-                        F32 angle_radians, x, y, z;
-                        treep->getRotation().getAngleAxis(&angle_radians, &x, &y, &z);
-                        glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
-
-                        //glAlphaFunc(GL_GREATER, 0.5f);
-
-                        treep->drawTree(*this);
-                        glPopMatrix();
-                }
-        }
-
-        glAlphaFunc(GL_GREATER, 0.01f);
-}
-
-
-S32 LLDrawPoolTreeNew::rebuild()
-{
-        mRebuildTime++;
-        if (mRebuildTime > mRebuildFreq)
-        {
-                // Flush AGP to force an AGP realloc and reduce AGP fragmentation
-                flushAGP();
-                mRebuildTime = 0;
-        }
-
-        return 0;
-}
-
-BOOL LLDrawPoolTreeNew::verify() const
-{
-        BOOL ok = TRUE;
-
-        // shared geometry.  Just verify that it's there and correct.
-
-        // Verify all indices in the pool are in the right range
-        const U32 *indicesp = getRawIndices();
-        U32 i;
-        for (i = 0; i < getIndexCount(); i++)
-        {
-                if (indicesp[i] > getVertexCount())
-                {
-                        ok = FALSE;
-                        llinfos << "Bad index in tree pool!" << llendl;
-                }
-        }
-        
-        if (!ok)
-        {
-                printDebugInfo();
-        }
-        return ok;
-}
-
-LLViewerImage *LLDrawPoolTreeNew::getTexture()
-{
-        return mTexturep;
-}
-
-LLViewerImage *LLDrawPoolTreeNew::getDebugTexture()
-{
-        return mTexturep;
-}
-
-
-LLColor3 LLDrawPoolTreeNew::getDebugColor() const
-{
-        return LLColor3(1.f, 0.f, 1.f);
-}
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index e3802a1..cd2a615 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -35,7 +35,6 @@
 #include "m3math.h"
 
 #include "llagent.h"            // for gAgent for getRegion for getWaterHeight
-#include "llagparray.h"
 #include "llcubemap.h"
 #include "lldrawable.h"
 #include "llface.h"
@@ -63,11 +62,11 @@ int nhpo2(int v)
 }
 
 static GLuint sScreenTex = 0;
+BOOL LLDrawPoolWater::sSkipScreenCopy = FALSE;
 
 LLDrawPoolWater::LLDrawPoolWater() :
-        LLDrawPool(POOL_WATER, DATA_SIMPLE_IL_MASK, DATA_SIMPLE_NIL_MASK)
+        LLFacePool(POOL_WATER)
 {
-        mCleanupUnused = TRUE;
         mHBTex[0] = gImageList.getImage(gSunTextureID, TRUE, TRUE);
         mHBTex[0]->bind();
         mHBTex[0]->setClamp(TRUE, TRUE);
@@ -135,11 +134,21 @@ extern LLColor4U MAX_WATER_COLOR;
 void LLDrawPoolWater::render(S32 pass)
 {
         LLFastTimer ftm(LLFastTimer::FTM_RENDER_WATER);
-        if (mDrawFace.empty())
+        if (mDrawFace.empty() || LLDrawable::getCurrentFrame() <= 1)
         {
                 return;
         }
 
+        //do a quick 'n dirty depth sort
+        for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
+                         iter != mDrawFace.end(); iter++)
+        {
+                LLFace* facep = *iter;
+                facep->mDistance = -facep->mCenterLocal.mV[2];
+        }
+
+        std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater());
+
         LLGLSPipelineAlpha alphaState;
 
         if ((mVertexShaderLevel >= SHADER_LEVEL_RIPPLE))
@@ -164,7 +173,7 @@ void LLDrawPoolWater::render(S32 pass)
                 return;
         }
 
-        const LLFace* refl_face = voskyp->getReflFace();
+        LLFace* refl_face = voskyp->getReflFace();
 
         gPipeline.disableLights();
         
@@ -176,10 +185,6 @@ void LLDrawPoolWater::render(S32 pass)
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
         
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-        bindGLTexCoordPointer();
-        
         // Set up second pass first
         glActiveTextureARB(GL_TEXTURE1_ARB);
         mWaterImagep->addTextureStats(1024.f*1024.f);
@@ -246,7 +251,7 @@ void LLDrawPoolWater::render(S32 pass)
                         continue;
                 }
                 face->bindTexture();
-                face->renderIndexed(getRawIndices());
+                face->renderIndexed();
                 mIndicesDrawn += face->getIndicesCount();
         }
 
@@ -307,7 +312,7 @@ void LLDrawPoolWater::render(S32 pass)
 
                         if (face->getGeomCount() > 0)
                         {                                       
-                                face->renderIndexed(getRawIndices());
+                                face->renderIndexed();
                                 mIndicesDrawn += face->getIndicesCount();
                         }
                 }
@@ -354,7 +359,7 @@ void LLDrawPoolWater::renderShaderSimple()
                 return;
         }
 
-        const LLFace* refl_face = voskyp->getReflFace();
+        LLFace* refl_face = voskyp->getReflFace();
 
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 
@@ -364,10 +369,6 @@ void LLDrawPoolWater::renderShaderSimple()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
         
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-        bindGLTexCoordPointer();
-        
         // Set up second pass first
         S32 bumpTex = gPipeline.mWaterProgram.enableTexture(LLPipeline::GLSL_BUMP_MAP);
         mWaterImagep->addTextureStats(1024.f*1024.f);
@@ -432,9 +433,6 @@ void LLDrawPoolWater::renderShaderSimple()
                 glMatrixMode(GL_MODELVIEW);
         }
 
-        S32 scatterTex = gPipeline.mWaterProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-        LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-
         S32 diffTex = gPipeline.mWaterProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
     
         gPipeline.mWaterProgram.bind();
@@ -448,7 +446,7 @@ void LLDrawPoolWater::renderShaderSimple()
                         continue;
                 }
                 face->bindTexture(diffTex);
-                face->renderIndexed(getRawIndices());
+                face->renderIndexed();
                 mIndicesDrawn += face->getIndicesCount();
         }
                 
@@ -469,8 +467,7 @@ void LLDrawPoolWater::renderShaderSimple()
         glDisable(GL_TEXTURE_GEN_T); //texture unit 1
 
         gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
-        gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
-
+        
         // Disable texture coordinate and color arrays
         LLImageGL::unbindTexture(diffTex, GL_TEXTURE_2D);
 
@@ -496,7 +493,7 @@ void LLDrawPoolWater::renderShaderSimple()
         glDisableClientState(GL_NORMAL_ARRAY);
 }
 
-void LLDrawPoolWater::renderReflection(const LLFace* face)
+void LLDrawPoolWater::renderReflection(LLFace* face)
 {
         LLVOSky *voskyp = gSky.mVOSkyp;
 
@@ -524,7 +521,7 @@ void LLDrawPoolWater::renderReflection(const LLFace* face)
         LLViewerImage::bindTexture(mHBTex[dr]);
 
         LLOverrideFaceColor override(this, face->getFaceColor().mV);
-        face->renderIndexed(getRawIndices());
+        face->renderIndexed();
         mIndicesDrawn += face->getIndicesCount();
 
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -532,36 +529,44 @@ void LLDrawPoolWater::renderReflection(const LLFace* face)
 
 void bindScreenToTexture() 
 {
-        GLint viewport[4];
-        glGetIntegerv(GL_VIEWPORT, viewport);
-        GLuint resX = nhpo2(viewport[2]);
-        GLuint resY = nhpo2(viewport[3]);
-
-        glBindTexture(GL_TEXTURE_2D, sScreenTex);
-        GLint cResX;
-        GLint cResY;
-        glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &cResX);
-        glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &cResY);
-
-        if (cResX != (GLint)resX || cResY != (GLint)resY)
+        if (LLDrawPoolWater::sSkipScreenCopy)
         {
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, resX, resY, 0, GL_RGB, GL_FLOAT, NULL);
-                gImageList.updateMaxResidentTexMem(-1, resX*resY*3);
+                glBindTexture(GL_TEXTURE_2D, 0);
         }
+        else
+        {
 
-        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, viewport[0], viewport[1], 0, 0, viewport[2], viewport[3]); 
+                GLint viewport[4];
+                glGetIntegerv(GL_VIEWPORT, viewport);
+                GLuint resX = nhpo2(viewport[2]);
+                GLuint resY = nhpo2(viewport[3]);
 
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                glBindTexture(GL_TEXTURE_2D, sScreenTex);
+                GLint cResX;
+                GLint cResY;
+                glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &cResX);
+                glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &cResY);
+
+                if (cResX != (GLint)resX || cResY != (GLint)resY)
+                {
+                        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, resX, resY, 0, GL_RGB, GL_FLOAT, NULL);
+                        gImageList.updateMaxResidentTexMem(-1, resX*resY*3);
+                }
 
-        float scale[2];
-        scale[0] = (float) viewport[2]/resX;
-        scale[1] = (float) viewport[3]/resY;
-        glUniform2fvARB(gPipeline.mWaterProgram.mUniform[LLPipeline::GLSL_WATER_FBSCALE], 1, scale);
+                glCopyTexSubImage2D(GL_TEXTURE_2D, 0, viewport[0], viewport[1], 0, 0, viewport[2], viewport[3]); 
 
-        LLImageGL::sBoundTextureMemory += resX * resY * 3;
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+                float scale[2];
+                scale[0] = (float) viewport[2]/resX;
+                scale[1] = (float) viewport[3]/resY;
+                glUniform2fvARB(gPipeline.mWaterProgram.mUniform[LLPipeline::GLSL_WATER_FBSCALE], 1, scale);
+
+                LLImageGL::sBoundTextureMemory += resX * resY * 3;
+        }
 }
 
 void LLDrawPoolWater::shade()
@@ -596,9 +601,6 @@ void LLDrawPoolWater::shade()
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
         LLGLDisable blend(GL_BLEND);
-        bindGLVertexPointer();
-        bindGLNormalPointer();
-        bindGLTexCoordPointer();
 
         LLColor3 light_diffuse(0,0,0);
         F32 light_exp = 0.0f;
@@ -649,9 +651,6 @@ void LLDrawPoolWater::shade()
         
         bindScreenToTexture();
         
-        S32 scatterTex = gPipeline.mWaterProgram.enableTexture(LLPipeline::GLSL_SCATTER_MAP);
-        LLViewerImage::bindTexture(gSky.mVOSkyp->getScatterMap(), scatterTex);
-
         S32 diffTex = gPipeline.mWaterProgram.enableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
         
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
@@ -697,7 +696,7 @@ void LLDrawPoolWater::shade()
                         }
 
                         face->bindTexture(diffTex);
-                        face->renderIndexed(getRawIndices());
+                        face->renderIndexed();
                         mIndicesDrawn += face->getIndicesCount();
                 }
         }
@@ -705,7 +704,6 @@ void LLDrawPoolWater::shade()
         gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
         gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_WATER_SCREENTEX);
         gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_BUMP_MAP);
-        gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_SCATTER_MAP);
         gPipeline.mWaterProgram.disableTexture(LLPipeline::GLSL_DIFFUSE_MAP);
 
         glActiveTextureARB(GL_TEXTURE0_ARB);
@@ -714,10 +712,6 @@ void LLDrawPoolWater::shade()
         
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-        /*glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisableClientState(GL_VERTEX_ARRAY);
-        glDisableClientState(GL_NORMAL_ARRAY);*/
 }
 
 void LLDrawPoolWater::renderForSelect()
diff --git a/linden/indra/newview/lldrawpoolwater.h b/linden/indra/newview/lldrawpoolwater.h
index 38bf6cf..2e45868 100644
--- a/linden/indra/newview/lldrawpoolwater.h
+++ b/linden/indra/newview/lldrawpoolwater.h
@@ -35,7 +35,7 @@ class LLFace;
 class LLHeavenBody;
 class LLWaterSurface;
 
-class LLDrawPoolWater: public LLDrawPool
+class LLDrawPoolWater: public LLFacePool
 {
 protected:
         LLPointer<LLViewerImage> mHBTex[2];
@@ -44,6 +44,16 @@ protected:
 
         const LLWaterSurface *mWaterSurface;
 public:
+        static BOOL sSkipScreenCopy;
+        enum
+        {
+                VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
+                                                        LLVertexBuffer::MAP_NORMAL |
+                                                        LLVertexBuffer::MAP_TEXCOORD    
+        };
+
+        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+
         enum
         {
                 SHADER_LEVEL_RIPPLE = 2,
@@ -64,7 +74,7 @@ public:
         /*virtual*/ LLViewerImage *getDebugTexture();
         /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display
 
-        void renderReflection(const LLFace* face);
+        void renderReflection(LLFace* face);
         void shade();
         void renderShaderSimple();
 
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp
index 6111e36..90ebd74 100644
--- a/linden/indra/newview/lldynamictexture.cpp
+++ b/linden/indra/newview/lldynamictexture.cpp
@@ -35,6 +35,8 @@
 #include "llviewercamera.h"
 #include "llviewercontrol.h"
 #include "llviewerimage.h"
+#include "llvertexbuffer.h"
+
 
 // static
 LLLinkedList<LLDynamicTexture> LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ];
@@ -64,6 +66,7 @@ LLDynamicTexture::LLDynamicTexture(S32 width, S32 height, S32 components, EOrder
 //-----------------------------------------------------------------------------
 LLDynamicTexture::~LLDynamicTexture()
 {
+        releaseGLTexture();
         for( S32 order = 0; order < ORDER_COUNT; order++ )
         {
                 LLDynamicTexture::sInstances[order].removeData(this);  // will fail in all but one case.
@@ -71,19 +74,23 @@ LLDynamicTexture::~LLDynamicTexture()
 }
 
 //-----------------------------------------------------------------------------
-// generateGLTexture()
+// releaseGLTexture()
 //-----------------------------------------------------------------------------
-void LLDynamicTexture::generateGLTexture()
+void LLDynamicTexture::releaseGLTexture()
 {
-        if (mComponents < 1 || mComponents > 4)
+        if (mTexture.notNull())
         {
-                llerrs << "Bad number of components in dynamic texture: " << mComponents << llendl;
+//              llinfos << "RELEASING " << (mWidth*mHeight*mComponents)/1024 << "K" << llendl;
+                mTexture = NULL;
         }
+}
 
-        LLPointer<LLImageRaw> raw_image = new LLImageRaw(mWidth, mHeight, mComponents);
-        mTexture = new LLImageGL(mWidth, mHeight, mComponents, FALSE);
-        mTexture->createGLTexture(0, raw_image);
-        mTexture->setClamp(mClamp, mClamp);
+//-----------------------------------------------------------------------------
+// generateGLTexture()
+//-----------------------------------------------------------------------------
+void LLDynamicTexture::generateGLTexture()
+{
+        generateGLTexture(-1, 0, 0, FALSE);
 }
 
 void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes)
@@ -92,10 +99,14 @@ void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum prima
         {
                 llerrs << "Bad number of components in dynamic texture: " << mComponents << llendl;
         }
-
+        releaseGLTexture();
         LLPointer<LLImageRaw> raw_image = new LLImageRaw(mWidth, mHeight, mComponents);
         mTexture = new LLImageGL(mWidth, mHeight, mComponents, FALSE);
-        mTexture->setExplicitFormat(internal_format, primary_format, type_format, swap_bytes);
+        if (internal_format >= 0)
+        {
+                mTexture->setExplicitFormat(internal_format, primary_format, type_format, swap_bytes);
+        }
+//      llinfos << "ALLOCATING " << (mWidth*mHeight*mComponents)/1024 << "K" << llendl;
         mTexture->createGLTexture(0, raw_image);
         mTexture->setClamp(mClamp, mClamp);
 }
@@ -193,6 +204,8 @@ BOOL LLDynamicTexture::updateAllInstances()
                 return TRUE;
         }
 
+        BOOL started = FALSE;
+                
         BOOL result = FALSE;
         for( S32 order = 0; order < ORDER_COUNT; order++ )
         {
@@ -202,11 +215,16 @@ BOOL LLDynamicTexture::updateAllInstances()
                 {
                         if (dynamicTexture->needsRender())
                         {
+                                if (!started)
+                                {
+                                        started = TRUE;
+                                        LLVertexBuffer::startRender();
+                                }
+                                
                                 dynamicTexture->preRender();
                                 if (dynamicTexture->render())
                                 {
                                         result = TRUE;
-                                        gViewerWindow->finishFastFrame();
                                         sNumRenders++;
                                 }
                                 dynamicTexture->postRender(result);
@@ -214,6 +232,11 @@ BOOL LLDynamicTexture::updateAllInstances()
                 }
         }
 
+        if (started)
+        {
+                LLVertexBuffer::stopRender();
+        }
+        
         return result;
 }
 
diff --git a/linden/indra/newview/lldynamictexture.h b/linden/indra/newview/lldynamictexture.h
index fda424c..b11bed3 100644
--- a/linden/indra/newview/lldynamictexture.h
+++ b/linden/indra/newview/lldynamictexture.h
@@ -66,6 +66,7 @@ public:
         static void restoreGL();
 
 protected:
+        void releaseGLTexture();
         void generateGLTexture();
         void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes = FALSE);
 
diff --git a/linden/indra/newview/lleventinfo.cpp b/linden/indra/newview/lleventinfo.cpp
index 02ac3ed..103450e 100644
--- a/linden/indra/newview/lleventinfo.cpp
+++ b/linden/indra/newview/lleventinfo.cpp
@@ -71,7 +71,7 @@ void LLEventInfo::unpack(LLMessageSystem *msg)
         msg->getU32("EventData", "EventID", event_id);
         mID = event_id;
 
-        char buffer[MAX_DESC_LENGTH];
+        char buffer[MAX_DESC_LENGTH]; /*Flawfinder: ignore*/
         msg->getString("EventData", "Name", MAX_DESC_LENGTH, buffer);
         mName = buffer;
 
@@ -106,7 +106,7 @@ void LLEventInfo::unpack(LLMessageSystem *msg)
                 mCover = cover;
         }
 
-        char sim_name[256];
+        char sim_name[256]; /*Flawfinder: ignore*/
         msg->getString("EventData", "SimName", 256, sim_name);
         mSimName.assign(sim_name);
 
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index a6de94b..e46fcd3 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -29,13 +29,13 @@
 
 #include "lldrawable.h" // lldrawable needs to be included before llface
 #include "llface.h"
+#include "llviewertextureanim.h"
 
 #include "llviewercontrol.h"
 #include "llvolume.h"
 #include "m3math.h"
 #include "v3color.h"
 
-#include "llagparray.h"
 #include "lldrawpoolsimple.h"
 #include "lldrawpoolbump.h"
 #include "llgl.h"
@@ -47,8 +47,6 @@
 #include "llvovolume.h"
 #include "pipeline.h"
 
-#include "llagparray.inl"
-
 #define LL_MAX_INDICES_COUNT 1000000
 
 extern BOOL gPickFaces;
@@ -137,25 +135,23 @@ void cylindricalProjection(LLVector2 &tc, const LLVolumeFace::VertexData &vd, co
 
 void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp)
 {
-        mGeneration = DIRTY;
+        mLastUpdateTime = gFrameTimeSeconds;
+        mVSize = 0.f;
+        mPixelArea = 1024.f;
         mState      = GLOBAL;
         mDrawPoolp  = NULL;
+        mPoolType = 0;
         mGeomIndex  = -1;
-        mSkipRender = FALSE;
-        mNextFace = NULL;
         // mCenterLocal
         // mCenterAgent
         mDistance       = 0.f;
 
-        mPrimType               = LLTriangles;
         mGeomCount              = 0;
         mIndicesCount   = 0;
         mIndicesIndex   = -1;
         mTexture                = NULL;
         mTEOffset               = -1;
 
-        mBackupMem = NULL;
-
         setDrawable(drawablep);
         mVObjp = objp;
 
@@ -163,6 +159,12 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp)
         mAlphaFade = 0.f;
 
         mFaceColor = LLColor4(1,0,0,1);
+
+        mLastVertexBuffer = mVertexBuffer;
+        mLastGeomCount = mGeomCount;
+        mLastGeomIndex = mGeomIndex;
+        mLastIndicesCount = mIndicesCount;
+        mLastIndicesIndex = mIndicesIndex;
 }
 
 
@@ -176,11 +178,6 @@ void LLFace::destroy()
                 mDrawPoolp->removeFace(this);
                 mDrawPoolp = NULL;
         }
-
-        // Remove light and blocker list references
-
-        delete[] mBackupMem;
-        mBackupMem = NULL;
 }
 
 
@@ -194,13 +191,7 @@ void LLFace::setWorldMatrix(const LLMatrix4 &mat)
         llerrs << "Faces on this drawable are not independently modifiable\n" << llendl;
 }
 
-
-void LLFace::setDirty()
-{
-        mGeneration = DIRTY;
-}
-
-void LLFace::setPool(LLDrawPool* new_pool, LLViewerImage *texturep)
+void LLFace::setPool(LLFacePool* new_pool, LLViewerImage *texturep)
 {
         LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
         
@@ -215,22 +206,12 @@ void LLFace::setPool(LLDrawPool* new_pool, LLViewerImage *texturep)
                 if (mDrawPoolp)
                 {
                         mDrawPoolp->removeFace(this);
-                        mSkipRender = FALSE;
-                        mNextFace = NULL;
 
-                        // Invalidate geometry (will get rebuilt next frame)
-                        setDirty();
                         if (mDrawablep)
                         {
                                 gPipeline.markRebuild(mDrawablep, LLDrawable::REBUILD_ALL, TRUE);
                         }
                 }
-                if (isState(BACKLIST))
-                {
-                        delete[] mBackupMem;
-                        mBackupMem = NULL;
-                        clearState(BACKLIST);
-                }
                 mGeomIndex = -1;
 
                 // Add to new pool
@@ -239,7 +220,6 @@ void LLFace::setPool(LLDrawPool* new_pool, LLViewerImage *texturep)
                         new_pool->addFace(this);
                 }
                 mDrawPoolp = new_pool;
-
         }
         mTexture = texturep;
 }
@@ -268,91 +248,12 @@ void LLFace::setDrawable(LLDrawable *drawable)
         mXform      = &drawable->mXform;
 }
 
-S32 LLFace::allocBackupMem()
-{
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        S32 size = 0;
-        size += mIndicesCount * 4;
-        size += mGeomCount * mDrawPoolp->getStride();
-
-        if (mDrawPoolp->mDataMaskNIL & LLDrawPool::DATA_VERTEX_WEIGHTS_MASK)
-        {
-                size += mGeomCount * mDrawPoolp->sDataSizes[LLDrawPool::DATA_VERTEX_WEIGHTS];
-        }
-
-        if (mDrawPoolp->mDataMaskNIL & LLDrawPool::DATA_CLOTHING_WEIGHTS_MASK)
-        {
-                size += mGeomCount * mDrawPoolp->sDataSizes[LLDrawPool::DATA_CLOTHING_WEIGHTS];
-        }
-
-        delete[] mBackupMem;
-        mBackupMem = new U8[size];
-        return size;
-}
-
-
 void LLFace::setSize(const S32 num_vertices, const S32 num_indices)
 {
         LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
         
-        if (getState() & SHARED_GEOM)
-        {
-                mGeomCount    = num_vertices;
-                mIndicesCount = num_indices;
-                return; // Shared, don't allocate or do anything with memory
-        }
-        if (num_vertices != (S32)mGeomCount || num_indices != (S32)mIndicesCount)
-        {
-                setDirty();
-
-                delete[] mBackupMem;
-                mBackupMem = NULL;
-                clearState(BACKLIST);
-
-                mGeomCount    = num_vertices;
-                mIndicesCount = num_indices;
-        }
-
-}
-
-BOOL LLFace::reserveIfNeeded()
-{
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        if (getDirty())
-        {
-                if (isState(BACKLIST))
-                {
-                        llwarns << "Reserve on backlisted object!" << llendl;
-                }
-
-                if (0 == mGeomCount)
-                {
-                        //llwarns << "Reserving zero bytes for face!" << llendl;
-                        mGeomCount = 0;
-                        mIndicesCount = 0;
-                        return FALSE;
-                }
-
-                mGeomIndex        = mDrawPoolp->reserveGeom(mGeomCount);
-                // (reserveGeom() always returns a valid index)
-                mIndicesIndex = mDrawPoolp->reserveInd (mIndicesCount);
-                mGeneration   = mDrawPoolp->mGeneration;
-        }
-
-        return TRUE;
-}
-
-void LLFace::unReserve()
-{
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        if (!(isState(SHARED_GEOM)))
-        {
-                mGeomIndex    = mDrawPoolp->unReserveGeom(mGeomIndex, mGeomCount);
-                mIndicesIndex = mDrawPoolp->unReserveInd(mIndicesIndex, mIndicesCount);
-        }
+        mGeomCount    = num_vertices;
+        mIndicesCount = num_indices;
 }
 
 //============================================================================
@@ -366,55 +267,22 @@ S32 LLFace::getGeometryAvatar(
                                                 LLStrider<LLVector4> &clothing_weights)
 {
         LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        if (mGeomCount <= 0)
-        {
-                return -1;
-        }
-        
-        if (isState(BACKLIST))
-        {
-                if (!mBackupMem)
-                {
-                        llerrs << "No backup memory for backlist" << llendl;
-                }
 
-                vertices        = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_VERTICES]);
-                normals         = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_NORMALS]);
-                binormals       = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_BINORMALS]);
-                tex_coords      = (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS0]);
-                clothing_weights = (LLVector4*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_CLOTHING_WEIGHTS]);
-                vertex_weights  = (F32*)(mBackupMem + (4 * mIndicesCount) + (mGeomCount * mDrawPoolp->getStride()));
-                tex_coords.setStride( mDrawPoolp->getStride());
-                vertices.setStride( mDrawPoolp->getStride());
-                normals.setStride( mDrawPoolp->getStride());
-                binormals.setStride( mDrawPoolp->getStride());
-                clothing_weights.setStride( mDrawPoolp->getStride());
-
-                return 0;
+        if (mVertexBuffer.notNull())
+        {
+                mVertexBuffer->getVertexStrider      (vertices, mGeomIndex);
+                mVertexBuffer->getNormalStrider      (normals, mGeomIndex);
+                mVertexBuffer->getBinormalStrider    (binormals, mGeomIndex);
+                mVertexBuffer->getTexCoordStrider    (tex_coords, mGeomIndex);
+                mVertexBuffer->getWeightStrider(vertex_weights, mGeomIndex);
+                mVertexBuffer->getClothWeightStrider(clothing_weights, mGeomIndex);
         }
         else
         {
-                if (!reserveIfNeeded())
-                {
-                        return -1;
-                }
-
-                llassert(mGeomIndex >= 0);
-                llassert(mIndicesIndex >= 0);
-        
-                mDrawPoolp->getVertexStrider      (vertices, mGeomIndex);
-                mDrawPoolp->getNormalStrider      (normals, mGeomIndex);
-                mDrawPoolp->getBinormalStrider    (binormals, mGeomIndex);
-                mDrawPoolp->getTexCoordStrider    (tex_coords, mGeomIndex);
-                mDrawPoolp->getVertexWeightStrider(vertex_weights, mGeomIndex);
-                mDrawPoolp->getClothingWeightStrider(clothing_weights, mGeomIndex);
-
-                mDrawPoolp->setDirty();
-
-                llassert(mGeomIndex >= 0);
-                return mGeomIndex;
+                mGeomIndex = -1;
         }
+
+        return mGeomIndex;
 }
 
 S32 LLFace::getGeometryTerrain(
@@ -423,64 +291,29 @@ S32 LLFace::getGeometryTerrain(
                                                 LLStrider<LLColor4U> &colors,
                                                 LLStrider<LLVector2> &texcoords0,
                                                 LLStrider<LLVector2> &texcoords1,
-                                                U32 *&indicesp)
+                                                LLStrider<U32> &indicesp)
 {
         LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
         
-        if (mGeomCount <= 0)
+        if (mVertexBuffer.notNull())
         {
-                return -1;
-        }
-        
-        if (isState(BACKLIST))
-        {
-                if (!mBackupMem)
-                {
-                        printDebugInfo();
-                        llerrs << "No backup memory for face" << llendl;
-                }
-                vertices  = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_VERTICES]);
-                normals   = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_NORMALS]);
-                colors   =  (LLColor4U*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_COLORS]);
-                texcoords0= (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS0]);
-                texcoords1= (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS1]);
-                texcoords0.setStride(mDrawPoolp->getStride());
-                texcoords1.setStride(mDrawPoolp->getStride());
-                vertices.setStride( mDrawPoolp->getStride());
-                normals.setStride( mDrawPoolp->getStride());
-                colors.setStride( mDrawPoolp->getStride());
-                indicesp    = (U32*)mBackupMem;
-
-                return 0;
+                mVertexBuffer->getVertexStrider(vertices, mGeomIndex);
+                mVertexBuffer->getNormalStrider(normals, mGeomIndex);
+                mVertexBuffer->getColorStrider(colors, mGeomIndex);
+                mVertexBuffer->getTexCoordStrider(texcoords0, mGeomIndex);
+                mVertexBuffer->getTexCoord2Strider(texcoords1, mGeomIndex);
+                mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex);
         }
         else
         {
-                if (!reserveIfNeeded())
-                {
-                        llinfos << "Get geometry failed!" << llendl;
-                        return -1;
-                }
-
-                llassert(mGeomIndex >= 0);
-                llassert(mIndicesIndex >= 0);
-        
-                mDrawPoolp->getVertexStrider(vertices, mGeomIndex);
-                mDrawPoolp->getNormalStrider(normals, mGeomIndex);
-                mDrawPoolp->getColorStrider(colors, mGeomIndex);
-                mDrawPoolp->getTexCoordStrider(texcoords0, mGeomIndex, 0);
-                mDrawPoolp->getTexCoordStrider(texcoords1, mGeomIndex, 1);
-
-                indicesp = mDrawPoolp->getIndices(mIndicesIndex);
-
-                mDrawPoolp->setDirty();
-
-                llassert(mGeomIndex >= 0);
-                return mGeomIndex;
+                mGeomIndex = -1;
         }
+        
+        return mGeomIndex;
 }
 
 S32 LLFace::getGeometry(LLStrider<LLVector3> &vertices, LLStrider<LLVector3> &normals,
-                                            LLStrider<LLVector2> &tex_coords, U32 *&indicesp)
+                                            LLStrider<LLVector2> &tex_coords, LLStrider<U32> &indicesp)
 {
         LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
         
@@ -489,55 +322,31 @@ S32 LLFace::getGeometry(LLStrider<LLVector3> &vertices, LLStrider<LLVector3> &no
                 return -1;
         }
         
-        if (isState(BACKLIST))
+        if (mVertexBuffer.notNull())
         {
-                if (!mBackupMem)
+                mVertexBuffer->getVertexStrider(vertices,   mGeomIndex);
+                if (mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_NORMAL))
+                {
+                        mVertexBuffer->getNormalStrider(normals,    mGeomIndex);
+                }
+                if (mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD))
                 {
-                        printDebugInfo();
-                        llerrs << "No backup memory for face" << llendl;
+                        mVertexBuffer->getTexCoordStrider(tex_coords, mGeomIndex);
                 }
-                vertices  = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_VERTICES]);
-                normals   = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_NORMALS]);
-                tex_coords= (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS0]);
-                tex_coords.setStride(mDrawPoolp->getStride());
-                vertices.setStride( mDrawPoolp->getStride());
-                normals.setStride( mDrawPoolp->getStride());
-                indicesp    = (U32*)mBackupMem;
 
-                return 0;
+                mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex);
         }
         else
         {
-                if (!reserveIfNeeded())
-                {
-                        return -1;
-                }
-
-                llassert(mGeomIndex >= 0);
-                llassert(mIndicesIndex >= 0);
-        
-                mDrawPoolp->getVertexStrider(vertices,   mGeomIndex);
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_NORMALS_MASK)
-                {
-                        mDrawPoolp->getNormalStrider(normals,    mGeomIndex);
-                }
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_TEX_COORDS0_MASK)
-                {
-                        mDrawPoolp->getTexCoordStrider(tex_coords, mGeomIndex);
-                }
-
-                indicesp      =mDrawPoolp->getIndices   (mIndicesIndex);
-
-                mDrawPoolp->setDirty();
-
-                llassert(mGeomIndex >= 0);
-                return mGeomIndex;
+                mGeomIndex = -1;
         }
+        
+        return mGeomIndex;
 }
 
 S32 LLFace::getGeometryColors(LLStrider<LLVector3> &vertices, LLStrider<LLVector3> &normals,
                                                           LLStrider<LLVector2> &tex_coords, LLStrider<LLColor4U> &colors,
-                                                          U32 *&indicesp)
+                                                          LLStrider<U32> &indicesp)
 {
         S32 res = getGeometry(vertices, normals, tex_coords, indicesp);
         if (res >= 0)
@@ -547,95 +356,25 @@ S32 LLFace::getGeometryColors(LLStrider<LLVector3> &vertices, LLStrider<LLVector
         return res;
 }
 
-S32 LLFace::getGeometryMultiTexture(
-        LLStrider<LLVector3> &vertices, 
-        LLStrider<LLVector3> &normals,
-        LLStrider<LLVector3> &binormals,
-        LLStrider<LLVector2> &tex_coords0,
-        LLStrider<LLVector2> &tex_coords1,
-        U32 *&indicesp)
+void LLFace::updateCenterAgent()
 {
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        if (mGeomCount <= 0)
+        if (mDrawablep->isActive())
         {
-                return -1;
-        }
-        
-        if (isState(BACKLIST))
-        {
-                if (!mBackupMem)
-                {
-                        printDebugInfo();
-                        llerrs << "No backup memory for face" << llendl;
-                }
-                vertices        = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_VERTICES]);
-                normals         = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_NORMALS]);
-                tex_coords0     = (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS0]);
-                tex_coords0.setStride(  mDrawPoolp->getStride() );
-                vertices.setStride(             mDrawPoolp->getStride() );
-                normals.setStride(              mDrawPoolp->getStride() );
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_BINORMALS_MASK)
-                {
-                        binormals       = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_BINORMALS]);
-                        binormals.setStride(    mDrawPoolp->getStride() );
-                }
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_TEX_COORDS1_MASK)
-                {
-                        tex_coords1     = (LLVector2*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_TEX_COORDS1]);
-                        tex_coords1.setStride(  mDrawPoolp->getStride() );
-                }
-                indicesp        = (U32*)mBackupMem;
-
-                return 0;
+                mCenterAgent = mCenterLocal * getRenderMatrix();
         }
         else
         {
-                if (!reserveIfNeeded())
-                {
-                        return -1;
-                }
-
-                llassert(mGeomIndex >= 0);
-                llassert(mIndicesIndex >= 0);
-        
-                mDrawPoolp->getVertexStrider(vertices, mGeomIndex);
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_NORMALS_MASK)
-                {
-                        mDrawPoolp->getNormalStrider(normals, mGeomIndex);
-                }
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_TEX_COORDS0_MASK)
-                {
-                        mDrawPoolp->getTexCoordStrider(tex_coords0, mGeomIndex);
-                }
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_BINORMALS_MASK)
-                {
-                        mDrawPoolp->getBinormalStrider(binormals,  mGeomIndex);
-                }
-                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_TEX_COORDS1_MASK)
-                {
-                        mDrawPoolp->getTexCoordStrider(tex_coords1, mGeomIndex, 1);
-                }
-                indicesp = mDrawPoolp->getIndices(mIndicesIndex);
-
-                mDrawPoolp->setDirty();
-
-                llassert(mGeomIndex >= 0);
-                return mGeomIndex;
+                mCenterAgent = mCenterLocal;
         }
 }
 
-void LLFace::updateCenterAgent()
-{
-        mCenterAgent = mCenterLocal * getRenderMatrix();
-}
-
-void LLFace::renderForSelect() const
+void LLFace::renderForSelect(U32 data_mask)
 {
-        if(mGeomIndex < 0 || mDrawablep.isNull())
+        if(mGeomIndex < 0 || mDrawablep.isNull() || mVertexBuffer.isNull())
         {
                 return;
         }
+
         if (mVObjp->mGLName)
         {
                 S32 name = mVObjp->mGLName;
@@ -649,47 +388,25 @@ void LLFace::renderForSelect() const
 #endif
                 glColor4ubv(color.mV);
 
-                if (mVObjp->getPCode() == LL_PCODE_VOLUME)
+                if (!getPool())
                 {
-                        LLVOVolume *volp;
-                        volp = (LLVOVolume *)(LLViewerObject*)mVObjp;
-                        if (volp->getNumFaces() == 1 && !volp->getVolumeChanged())
+                        switch (getPoolType())
                         {
-                                // We need to special case the coalesced face model.
-                                S32 num_vfs = volp->getVolume()->getNumFaces();
-                                S32 offset = 0;
-                                S32 i;
-                                
-                                for (i = 0; i < num_vfs; i++)
-                                {
-                                        if (gPickFaces)
-                                        {
-                                                // mask off high 4 bits (16 total possible faces)
-                                                color.mV[0] &= 0x0f;
-                                                color.mV[0] |= (i & 0x0f) << 4;
-                                                glColor4ubv(color.mV);
-                                        }
-                                        S32 count = volp->getVolume()->getVolumeFace(i).mIndices.size();
-                                        if (isState(GLOBAL))
-                                        {
-                                                glDrawElements(mPrimType, count, GL_UNSIGNED_INT, getRawIndices() + offset); 
-                                        }
-                                        else
-                                        {
-                                                glPushMatrix();
-                                                glMultMatrixf((float*)getRenderMatrix().mMatrix);
-                                                glDrawElements(mPrimType, count, GL_UNSIGNED_INT, getRawIndices() + offset); 
-                                                glPopMatrix();
-                                        }
-                                        offset += count;
-                                }
-                                // We're done, return.
-                                return;
+                        case LLDrawPool::POOL_ALPHA:
+                                getTexture()->bind();
+                                break;
+                        default:
+                                LLImageGL::unbindTexture(0);
+                                break;
                         }
-
-                        // We don't have coalesced faces, do this the normal way.
                 }
 
+                mVertexBuffer->setBuffer(data_mask);
+#if !LL_RELEASE_FOR_DOWNLOAD
+                LLGLState::checkClientArrays(data_mask);
+#endif
+                U32* indicesp = (U32*) mVertexBuffer->getIndicesPointer() + mIndicesIndex;
+
                 if (gPickFaces && mTEOffset != -1)
                 {
                         // mask off high 4 bits (16 total possible faces)
@@ -702,13 +419,13 @@ void LLFace::renderForSelect() const
                 {
                         if (isState(GLOBAL))
                         {
-                                glDrawElements(mPrimType, mIndicesCount, GL_UNSIGNED_INT, getRawIndices()); 
+                                glDrawElements(GL_TRIANGLES, mIndicesCount, GL_UNSIGNED_INT, indicesp); 
                         }
                         else
                         {
                                 glPushMatrix();
                                 glMultMatrixf((float*)getRenderMatrix().mMatrix);
-                                glDrawElements(mPrimType, mIndicesCount, GL_UNSIGNED_INT, getRawIndices()); 
+                                glDrawElements(GL_TRIANGLES, mIndicesCount, GL_UNSIGNED_INT, indicesp); 
                                 glPopMatrix();
                         }
                 }
@@ -716,13 +433,13 @@ void LLFace::renderForSelect() const
                 {
                         if (isState(GLOBAL))
                         {
-                                glDrawArrays(mPrimType, mGeomIndex, mGeomCount); 
+                                glDrawArrays(GL_TRIANGLES, mGeomIndex, mGeomCount); 
                         }
                         else
                         {
                                 glPushMatrix();
                                 glMultMatrixf((float*)getRenderMatrix().mMatrix);
-                                glDrawArrays(mPrimType, mGeomIndex, mGeomCount); 
+                                glDrawArrays(GL_TRIANGLES, mGeomIndex, mGeomCount); 
                                 glPopMatrix();
                         }
                 }
@@ -731,11 +448,12 @@ void LLFace::renderForSelect() const
 
 void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color, const S32 offset, const S32 count)
 {
-        if(mGeomIndex < 0 || mDrawablep.isNull())
+        if(mGeomIndex < 0 || mDrawablep.isNull() || mVertexBuffer.isNull())
         {
                 return;
         }
-        if (mGeomCount > 0)
+
+        if (mGeomCount > 0 && mIndicesCount > 0)
         {
                 LLGLSPipelineAlpha gls_pipeline_alpha;
                 glColor4fv(color.mV);
@@ -748,110 +466,27 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color, const S32
                         glMultMatrixf((float*)getRenderMatrix().mMatrix);
                 }
 
-                if (sSafeRenderSelect)
-                {
-                        glBegin(mPrimType);
-                        if (count)
-                        {
-                                for (S32 i = offset; i < offset + count; i++)
-                                {
-                                        LLVector2 tc = mDrawPoolp->getTexCoord(mDrawPoolp->getIndex(getIndicesStart() + i), 0);
-                                        glTexCoord2fv(tc.mV);
-                                        LLVector3 normal = mDrawPoolp->getNormal(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                        glNormal3fv(normal.mV);
-                                        LLVector3 vertex = mDrawPoolp->getVertex(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                        glVertex3fv(vertex.mV);
-                                }
-                        }
-                        else
-                        {
-                                for (U32 i = 0; i < getIndicesCount(); i++)
-                                {
-                                        LLVector2 tc = mDrawPoolp->getTexCoord(mDrawPoolp->getIndex(getIndicesStart() + i), 0);
-                                        glTexCoord2fv(tc.mV);
-                                        LLVector3 normal = mDrawPoolp->getNormal(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                        glNormal3fv(normal.mV);
-                                        LLVector3 vertex = mDrawPoolp->getVertex(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                        glVertex3fv(vertex.mV);
-                                }
-                        }
-                        glEnd();
-
-                        if( gSavedSettings.getBOOL("ShowTangentBasis") )
-                        {
-                                S32 start;
-                                S32 end;
-                                if (count)
-                                {
-                                        start = offset;
-                                        end = offset + count;
-                                }
-                                else
-                                {
-                                        start = 0;
-                                        end = getIndicesCount();
-                                }
+                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                glEnableClientState(GL_VERTEX_ARRAY);
+                glEnableClientState(GL_NORMAL_ARRAY);
 
-                                LLGLSNoTexture gls_no_texture;
-                                glColor4f(1, 1, 1, 1);
-                                glBegin(GL_LINES);
-                                for (S32 i = start; i < end; i++)
-                                {
-                                        LLVector3 vertex = mDrawPoolp->getVertex(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                        glVertex3fv(vertex.mV);
-                                        LLVector3 normal = mDrawPoolp->getNormal(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                        glVertex3fv( (vertex + normal * 0.1f).mV );
-                                }
-                                glEnd();
+                mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD);
+#if !LL_RELEASE_FOR_DOWNLOAD
+                LLGLState::checkClientArrays(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD);
+#endif
+                U32* indicesp = ((U32*) mVertexBuffer->getIndicesPointer()) + mIndicesIndex;
 
-                                if (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_BINORMALS_MASK)
-                                {
-                                        glColor4f(0, 1, 0, 1);
-                                        glBegin(GL_LINES);
-                                        for (S32 i = start; i < end; i++)
-                                        {
-                                                LLVector3 vertex = mDrawPoolp->getVertex(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                                glVertex3fv(vertex.mV);
-                                                LLVector3 binormal = mDrawPoolp->getBinormal(mDrawPoolp->getIndex(getIndicesStart() + i));
-                                                glVertex3fv( (vertex + binormal * 0.1f).mV );
-                                        }
-                                        glEnd();
-                                }
-                        }
+                if (count)
+                {
+                        glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, indicesp + offset); 
                 }
                 else
                 {
-                        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-                        glEnableClientState(GL_VERTEX_ARRAY);
-                        glEnableClientState(GL_NORMAL_ARRAY);
-                        if (count)
-                        {
-                                if (mIndicesCount > 0)
-                                {
-                                        glDrawElements(mPrimType, count, GL_UNSIGNED_INT, getRawIndices() + offset); 
-                                }
-                                else
-                                {
-                                        llerrs << "Rendering non-indexed volume face!" << llendl;
-                                        glDrawArrays(mPrimType, mGeomIndex, mGeomCount); 
-                                }
-                        }
-                        else
-                        {
-                                if (mIndicesCount > 0)
-                                {
-                                        glDrawElements(mPrimType, mIndicesCount, GL_UNSIGNED_INT, getRawIndices()); 
-                                }
-                                else
-                                {
-                                        glDrawArrays(mPrimType, mGeomIndex, mGeomCount); 
-                                }
-                        }
-                        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-                        glDisableClientState(GL_VERTEX_ARRAY);
-                        glDisableClientState(GL_NORMAL_ARRAY);
+                        glDrawElements(GL_TRIANGLES, mIndicesCount, GL_UNSIGNED_INT, indicesp); 
                 }
-
+                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+                glDisableClientState(GL_NORMAL_ARRAY);
+                
                 if (!isState(GLOBAL))
                 {
                         // Restore the tranform for non-global objects
@@ -862,6 +497,7 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color, const S32
 
 void LLFace::renderSelectedUV(const S32 offset, const S32 count)
 {
+#if 0
         LLUUID uv_img_red_blue_id(gViewerArt.getString("uv_test1.tga"));
         LLUUID uv_img_green_id(gViewerArt.getString("uv_test2.tga"));
         LLViewerImage* red_blue_imagep = gImageList.getImage(uv_img_red_blue_id, TRUE, TRUE);
@@ -911,7 +547,7 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count)
                         glPolygonOffset(factor, bias);
                         if (sSafeRenderSelect)
                         {
-                                glBegin(mPrimType);
+                                glBegin(GL_TRIANGLES);
                                 if (count)
                                 {
                                         for (S32 i = offset; i < offset + count; i++)
@@ -943,7 +579,7 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count)
                                 {
                                         if (mIndicesCount > 0)
                                         {
-                                                glDrawElements(mPrimType, count, GL_UNSIGNED_INT, getRawIndices() + offset); 
+                                                glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, getRawIndices() + offset); 
                                         }
                                         else
                                         {
@@ -955,15 +591,14 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count)
                                 {
                                         if (mIndicesCount > 0)
                                         {
-                                                glDrawElements(mPrimType, mIndicesCount, GL_UNSIGNED_INT, getRawIndices()); 
+                                                glDrawElements(GL_TRIANGLES, mIndicesCount, GL_UNSIGNED_INT, getRawIndices()); 
                                         }
                                         else
                                         {
-                                                glDrawArrays(mPrimType, mGeomIndex, mGeomCount); 
+                                                glDrawArrays(GL_TRIANGLES, mGeomIndex, mGeomCount); 
                                         }
                                 }
                                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-                                glDisableClientState(GL_VERTEX_ARRAY);
                         }
 
                         glDisable(GL_POLYGON_OFFSET_FILL);
@@ -984,12 +619,13 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count)
         
         //restore blend func
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+#endif
 }
 
 
 void LLFace::printDebugInfo() const
 {
-        LLDrawPool *poolp = getPool();
+        LLFacePool *poolp = getPool();
         llinfos << "Object: " << getViewerObject()->mID << llendl;
         if (getDrawable())
         {
@@ -1005,10 +641,6 @@ void LLFace::printDebugInfo() const
         }
 
         llinfos << "Face: " << this << llendl;
-        if (isState(BACKLIST))
-        {
-                llinfos << "Backlisted!" << llendl;
-        }
         llinfos << "State: " << getState() << llendl;
         llinfos << "Geom Index Data:" << llendl;
         llinfos << "--------------------" << llendl;
@@ -1037,7 +669,7 @@ void LLFace::printDebugInfo() const
                 llinfos << "Incorrect number of pool references!" << llendl;
         }
 
-
+#if 0
         llinfos << "Indices:" << llendl;
         llinfos << "--------------------" << llendl;
 
@@ -1058,149 +690,7 @@ void LLFace::printDebugInfo() const
                 llinfos << mGeomIndex + i << ":" << poolp->getVertex(mGeomIndex + i) << llendl;
         }
         llinfos << llendl;
-}
-
-S32 LLFace::backup()
-{
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        if (isState(BACKLIST))
-        {
-                llwarns << "Face is already backed up in LLFace::backup!" << llendl;
-                return mGeomCount;
-        }
-        if (mGeomIndex < 0)
-        {
-                // flexible objects can cause this
-                //llwarns << "No geometry to back-up" << llendl;
-                return 0;
-        }
-        
-        S32 size = 0;
-        if (!mBackupMem)
-        {
-                size = allocBackupMem();
-        }
-        else
-        {
-                llerrs << "Memory already backed up!" << llendl;
-        }
-
-        // Need to flag this, because we can allocate a non-zero backup mem if we have indices and no geometry.
-
-        if (mGeomCount || mIndicesCount)
-        {
-                setState(BACKLIST);
-#if !RELEASE_FOR_DOWNLOAD
-                if (mGeomIndex < 0 || mIndicesIndex < 0)
-                {
-                        llerrs << "LLFace::backup" << llendl;
-                }
 #endif
-                
-                U32 *backup  = (U32*)mBackupMem;
-                S32 stride   = mDrawPoolp->getStride();
-                
-                U32 *index   = mDrawPoolp->getIndices(mIndicesIndex);
-                for (U32 i=0;i<mIndicesCount;i++)
-                {
-                        *backup++ = index[i] - mGeomIndex;
-                        index[i]  = 0;
-                }
-
-                if (!mGeomCount)
-                {
-                        return mGeomCount;
-                }
-                //
-                // Don't change the order of these unles you change the corresponding getGeometry calls that read out of
-                // backup memory, and also the other of the backup/restore pair!
-                //
-                memcpy(backup, (mDrawPoolp->mMemory.getMem() + mGeomIndex * stride), mGeomCount * stride);
-                backup += mGeomCount * stride / 4;
-
-                if (mDrawPoolp->mDataMaskNIL & LLDrawPool::DATA_CLOTHING_WEIGHTS_MASK)
-                {
-                        memcpy(backup, &mDrawPoolp->getClothingWeight(mGeomIndex), mGeomCount * sizeof(LLVector4));
-                        backup += mGeomCount*4;
-                }
-
-                if (mDrawPoolp->mDataMaskNIL & LLDrawPool::DATA_VERTEX_WEIGHTS_MASK)
-                {
-                        memcpy(backup, &mDrawPoolp->getVertexWeight(mGeomIndex), mGeomCount * sizeof(F32));
-                        backup += mGeomCount;
-                }
-
-                llassert((U8*)backup - mBackupMem == size);
-
-                unReserve();
-        }
-        return mGeomCount;
-}
-
-void LLFace::restore()
-{
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-        
-        if (!isState(BACKLIST))
-        {
-                // flexible objects can cause this
-//              printDebugInfo();
-//              llwarns << "not backlisted for restore" << llendl;
-                return;
-        }
-        if (!mGeomCount || !mBackupMem) 
-        {
-                if (!mBackupMem)
-                {
-                        printDebugInfo();
-                        llwarns  << "no backmem for restore" << llendl;
-                }
-
-                clearState(BACKLIST);
-                return;
-        }
-
-        S32 stride     = mDrawPoolp->getStride();
-        mGeomIndex     = mDrawPoolp->reserveGeom(mGeomCount);
-        mIndicesIndex  = mDrawPoolp->reserveInd (mIndicesCount);
-        mGeneration    = mDrawPoolp->mGeneration;
-
-        llassert(mGeomIndex >= 0);
-        llassert(mIndicesIndex >= 0);
-        
-        U32 *backup  = (U32*)mBackupMem;
-        U32 *index   = mDrawPoolp->getIndices(mIndicesIndex);
-
-        for (U32 i=0;i<mIndicesCount;i++)
-        {
-                S32  ind = mGeomIndex + *backup;
-                index[i] = ind;
-                backup++;
-        }
-
-        mDrawPoolp->mMemory.copyToMem(mGeomIndex * stride, (U8 *)backup, mGeomCount * stride);
-        backup += mGeomCount * stride / 4;
-
-        //
-        // Don't change the order of these unles you change the corresponding getGeometry calls that read out of
-        // backup memory, and also the other of the backup/restore pair!
-        //
-        if (mDrawPoolp->mDataMaskNIL & LLDrawPool::DATA_CLOTHING_WEIGHTS_MASK)
-        {
-                mDrawPoolp->mClothingWeights.copyToMem(mGeomIndex, (U8 *)backup, mGeomCount);
-                backup += mGeomCount*4;
-        }
-
-        if (mDrawPoolp->mDataMaskNIL & LLDrawPool::DATA_VERTEX_WEIGHTS_MASK)
-        {
-                mDrawPoolp->mWeights.copyToMem(mGeomIndex, (U8 *)backup, mGeomCount);
-                backup += mGeomCount;
-        }
-
-        delete[] mBackupMem;
-        mBackupMem = NULL;
-        clearState(BACKLIST);
 }
 
 // Transform the texture coordinates for this face.
@@ -1232,48 +722,199 @@ static void xform(LLVector2 &tex_coord, F32 cosAng, F32 sinAng, F32 offS, F32 of
 }
 
 
-BOOL LLFace::genVolumeTriangles(const LLVolume &volume, S32 f,
-                                                                const LLMatrix4& mat, const LLMatrix3& inv_trans_mat, BOOL global_volume)
+BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
+                                                                const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, BOOL global_volume)
+{
+        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
+
+        const LLVolumeFace &face = volume.getVolumeFace(f);
+        
+        //get bounding box
+        if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION))
+        {
+                if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME))
+                { //vertex buffer no longer valid
+                        mVertexBuffer = NULL;
+                        mLastVertexBuffer = NULL;
+                }
+
+                LLVector3 min,max;
+                        
+                min = face.mExtents[0];
+                max = face.mExtents[1];
+
+                //min, max are in volume space, convert to drawable render space
+                LLVector3 center = ((min + max) * 0.5f)*mat_vert;
+                LLVector3 size = ((max-min) * 0.5f);
+                if (!global_volume)
+                {
+                        size.scaleVec(mDrawablep->getVObj()->getScale());
+                }
+                LLQuaternion rotation = LLQuaternion(mat_normal);
+                
+                LLVector3 v[4];
+                //get 4 corners of bounding box
+                v[0] = (size * rotation);
+                v[1] = (LLVector3(-size.mV[0], -size.mV[1], size.mV[2]) * rotation);
+                v[2] = (LLVector3(size.mV[0], -size.mV[1], -size.mV[2]) * rotation);
+                v[3] = (LLVector3(-size.mV[0], size.mV[1], -size.mV[2]) * rotation);
+
+                LLVector3& newMin = mExtents[0];
+                LLVector3& newMax = mExtents[1];
+                
+                newMin = newMax = center;
+                
+                for (U32 i = 0; i < 4; i++)
+                {
+                        for (U32 j = 0; j < 3; j++)
+                        {
+                                F32 delta = fabsf(v[i].mV[j]);
+                                F32 min = center.mV[j] - delta;
+                                F32 max = center.mV[j] + delta;
+                                
+                                if (min < newMin.mV[j])
+                                {
+                                        newMin.mV[j] = min;
+                                }
+                                
+                                if (max > newMax.mV[j])
+                                {
+                                        newMax.mV[j] = max;
+                                }
+                        }
+                }
+
+                mCenterLocal = (newMin+newMax)*0.5f;
+                updateCenterAgent();
+        }
+
+        return TRUE;
+}
+
+
+BOOL LLFace::getGeometryVolume(const LLVolume& volume,
+                                                           S32 f,
+                                                                LLStrider<LLVector3>& vertices, 
+                                                                LLStrider<LLVector3>& normals,
+                                                                LLStrider<LLVector2>& tex_coords,
+                                                                LLStrider<LLVector2>& tex_coords2,
+                                                                LLStrider<LLColor4U>& colors,
+                                                                LLStrider<U32>& indicesp,
+                                                                const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
+                                                                U32& index_offset)
 {
         const LLVolumeFace &vf = volume.getVolumeFace(f);
         S32 num_vertices = (S32)vf.mVertices.size();
         S32 num_indices = (S32)vf.mIndices.size();
-        setSize(num_vertices, num_indices);
         
-        return genVolumeTriangles(volume, f, f, mat, inv_trans_mat, global_volume);
-}
+        LLStrider<LLVector3> old_verts;
+        LLStrider<LLVector2> old_texcoords;
+        LLStrider<LLVector2> old_texcoords2;
+        LLStrider<LLVector3> old_normals;
+        LLStrider<LLColor4U> old_colors;
 
-BOOL LLFace::genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend, 
-                                                                const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, const BOOL global_volume)
-{
-        LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
+        BOOL full_rebuild = mDrawablep->isState(LLDrawable::REBUILD_VOLUME);
+        BOOL moved = TRUE;
 
-        if (!mDrawablep)
+        BOOL global_volume = mDrawablep->getVOVolume()->isVolumeGlobal();
+        LLVector3 scale;
+        if (global_volume)
         {
-                return TRUE;
+                scale.setVec(1,1,1);
+        }
+        else
+        {
+                scale = mVObjp->getScale();
         }
 
-        S32 index_offset;
-        F32 r, os, ot, ms, mt, cos_ang, sin_ang;
-        LLStrider<LLVector3> vertices;
-        LLStrider<LLVector3> normals;
-        LLStrider<LLVector3> binormals;
-        LLStrider<LLVector2> tex_coords;
-        LLStrider<LLVector2> tex_coords2;
-        U32                 *indicesp = NULL;
+        if (!full_rebuild)
+        {   
+                if (mLastVertexBuffer == mVertexBuffer && 
+                        !mVertexBuffer->isEmpty())
+                {       //this face really doesn't need to be regenerated, try real hard not to do so
+                        if (mLastGeomCount == mGeomCount &&
+                                mLastGeomIndex == mGeomIndex &&
+                                mLastIndicesCount == mIndicesCount &&
+                                mLastIndicesIndex == mIndicesIndex)
+                        { //data is in same location in vertex buffer
+                                moved = FALSE;
+                        }
 
-        BOOL bump = mDrawPoolp && (mDrawPoolp->mDataMaskIL & LLDrawPool::DATA_BINORMALS_MASK);
-        BOOL is_static = mDrawablep->isStatic();
-        BOOL is_global = is_static;
-        
-        if (bump)
-        {
-                index_offset = getGeometryMultiTexture(vertices, normals, binormals, tex_coords, tex_coords2, indicesp);
+                        if (!moved && !mDrawablep->isState(LLDrawable::REBUILD_ALL))
+                        { //nothing needs to be done
+                                vertices += mGeomCount;
+                                normals += mGeomCount;
+                                tex_coords += mGeomCount;
+                                colors += mGeomCount;
+                                tex_coords2 += mGeomCount;
+                                index_offset += mGeomCount;
+                                indicesp += mIndicesCount;
+                                return FALSE;
+                        }
+
+                        if (mLastGeomCount == mGeomCount)
+                        {
+                                if (mLastGeomIndex >= mGeomIndex && 
+                                        mLastGeomIndex + mGeomCount+1 < mVertexBuffer->getNumVerts())
+                                {
+                                        //copy from further down the buffer
+                                        mVertexBuffer->getVertexStrider(old_verts, mLastGeomIndex);
+                                        mVertexBuffer->getTexCoordStrider(old_texcoords, mLastGeomIndex);
+                                        mVertexBuffer->getTexCoord2Strider(old_texcoords2, mLastGeomIndex);
+                                        mVertexBuffer->getNormalStrider(old_normals, mLastGeomIndex);
+                                        mVertexBuffer->getColorStrider(old_colors, mLastGeomIndex);
+
+                                        if (!mDrawablep->isState(LLDrawable::REBUILD_ALL))
+                                        {
+                                                //quick copy
+                                                for (S32 i = 0; i < mGeomCount; i++)
+                                                {
+                                                        *vertices++ = *old_verts++;
+                                                        *tex_coords++ = *old_texcoords++;
+                                                        *tex_coords2++ = *old_texcoords2++;
+                                                        *colors++ = *old_colors++;
+                                                        *normals++ = *old_normals++;
+                                                }
+
+                                                for (U32 i = 0; i < mIndicesCount; i++)
+                                                {
+                                                        *indicesp++ = vf.mIndices[i] + index_offset;
+                                                }
+
+                                                index_offset += mGeomCount;
+                                                mLastGeomIndex = mGeomIndex;
+                                                mLastIndicesCount = mIndicesCount;
+                                                mLastIndicesIndex = mIndicesIndex;
+
+                                                return TRUE;
+                                        }
+                                }
+                                else
+                                {
+                                        full_rebuild = TRUE;
+                                }
+                        }
+                }
+                else
+                {
+                        full_rebuild = TRUE;
+                }
         }
         else
         {
-                index_offset = getGeometry(vertices, normals, tex_coords, indicesp);
+                mLastUpdateTime = gFrameTimeSeconds;
         }
+
+
+        BOOL rebuild_pos = full_rebuild || mDrawablep->isState(LLDrawable::REBUILD_POSITION);
+        BOOL rebuild_color = full_rebuild || mDrawablep->isState(LLDrawable::REBUILD_COLOR);
+        BOOL rebuild_tcoord = full_rebuild || mDrawablep->isState(LLDrawable::REBUILD_TCOORD);
+
+        F32 r = 0, os = 0, ot = 0, ms = 0, mt = 0, cos_ang = 0, sin_ang = 0;
+        
+        BOOL is_static = mDrawablep->isStatic();
+        BOOL is_global = is_static;
+
         if (-1 == index_offset)
         {
                 return TRUE;
@@ -1281,16 +922,6 @@ BOOL LLFace::genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend,
         
         LLVector3 center_sum(0.f, 0.f, 0.f);
         
-        LLVector3 render_pos;
-        
-        if (mDrawablep->isState(LLDrawable::REBUILD_TCOORD) &&
-                global_volume)
-        {
-                render_pos = mVObjp->getRenderPosition();
-        }
-        
-        setPrimType(LLTriangles);
-        
         if (is_global)
         {
                 setState(GLOBAL);
@@ -1299,26 +930,16 @@ BOOL LLFace::genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend,
         {
                 clearState(GLOBAL);
         }
-        
-        LLVector3 min, max;
+
         LLVector2 tmin, tmax;
         
-        BOOL grab_first_vert = TRUE;
-        BOOL grab_first_tcoord = TRUE;
-        
-        for (S32 vol_face = fstart; vol_face <= fend; vol_face++)
+        const LLTextureEntry *tep = mVObjp->getTE(f);
+        U8  bump_code = tep ? bump_code = tep->getBumpmap() : 0;
+
+        if (rebuild_tcoord)
         {
-                const LLVolumeFace &vf = volume.getVolumeFace(vol_face);
-                S32 num_vertices = (S32)vf.mVertices.size();
-                S32 num_indices = (S32)vf.mIndices.size();
-                llassert(num_indices > 0);
-                
-                U8  bump_code;          
-                const LLTextureEntry *tep = mVObjp->getTE(vol_face);
-                
                 if (tep)
                 {
-                        bump_code = tep->getBumpmap();
                         r  = tep->getRotation();
                         os = tep->mOffsetS;
                         ot = tep->mOffsetT;
@@ -1329,7 +950,6 @@ BOOL LLFace::genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend,
                 }
                 else
                 {
-                        bump_code = 0;
                         cos_ang = 1.0f;
                         sin_ang = 0.0f;
                         os = 0.0f;
@@ -1337,209 +957,235 @@ BOOL LLFace::genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend,
                         ms = 1.0f;
                         mt = 1.0f;
                 }
+        }
 
-                if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME))
+        if (isState(TEXTURE_ANIM))
+        {
+                LLVOVolume* vobj = (LLVOVolume*) (LLViewerObject*) mVObjp;
+                U8 mode = vobj->mTexAnimMode;
+                if (!mode)
                 {
-                        // VERTICES & NORMALS                   
-                        for (S32 i = 0; i < num_vertices; i++)
+                        clearState(TEXTURE_ANIM);
+                }
+                else
+                {
+                        //if (mode & LLViewerTextureAnim::TRANSLATE)
                         {
-                                LLVector3 v;
-                                v = vf.mVertices[i].mPosition * mat_vert;
-
-                                LLVector3 normal = vf.mVertices[i].mNormal * mat_normal;
-                                normal.normVec();
-                                *normals++ = normal;
-                                
-                                *vertices++ = v;
-                                
-                                if (grab_first_vert)
-                                {
-                                        grab_first_vert = FALSE;
-                                        min = max = v;
-                                }
-                                else
-                                {
-                                        for (U32 j = 0; j < 3; j++)
-                                        {
-                                                if (v.mV[j] < min.mV[j])
-                                                {
-                                                        min.mV[j] = v.mV[j];
-                                                }
-                                                if (v.mV[j] > max.mV[j])
-                                                {
-                                                        max.mV[j] = v.mV[j];
-                                                }
-                                        }
-                                }
+                                os = ot = 0.f;
                         }
-                        for (S32 i = 0; i < num_indices; i++)
+                        //if (mode & LLViewerTextureAnim::ROTATE)
                         {
-                                S32 index = vf.mIndices[i] + index_offset;
-                                llassert(index >= 0 && (i != 1 || *(indicesp-1)!=(U32)index));
-                                *indicesp++ = index;
+                                r = 0.f;
+                                cos_ang = 1.f;
+                                sin_ang = 0.f;
+                        }
+                        //if (mode & LLViewerTextureAnim::SCALE)
+                        {
+                                ms = mt = 1.f;
                         }
                 }
+        }
+
+        LLColor4U color = tep->getColor();
 
-                if ((mDrawablep->isState(LLDrawable::REBUILD_TCOORD)) ||
-                        ((bump || getTextureEntry()->getTexGen() != 0) && mDrawablep->isState(LLDrawable::REBUILD_VOLUME)))
+        if (rebuild_color)
+        {
+                GLfloat alpha[4] =
                 {
-                        // TEX COORDS AND BINORMALS
-                        LLVector3 binormal_dir( -sin_ang, cos_ang, 0 );
-                        LLVector3 bump_s_primary_light_ray;
-                        LLVector3 bump_t_primary_light_ray;
-                        if (bump)
-                        {
-                                F32 offset_multiple; 
-                                switch( bump_code )
-                                {
-                                  case BE_NO_BUMP:
-                                        offset_multiple = 0.f;
-                                        break;
-                                  case BE_BRIGHTNESS:
-                                  case BE_DARKNESS:
-                                        if( mTexture.notNull() && mTexture->getHasGLTexture())
-                                        {
-                                                // Offset by approximately one texel
-                                                S32 cur_discard = mTexture->getDiscardLevel();
-                                                S32 max_size = llmax( mTexture->getWidth(), mTexture->getHeight() );
-                                                max_size <<= cur_discard;
-                                                const F32 ARTIFICIAL_OFFSET = 2.f;
-                                                offset_multiple = ARTIFICIAL_OFFSET / (F32)max_size;
-                                        }
-                                        else
-                                        {
-                                                offset_multiple = 1.f/256;
-                                        }
-                                        break;
+                        0.00f,
+                        0.25f,
+                        0.5f,
+                        0.75f
+                };
 
-                                  default:  // Standard bumpmap textures.  Assumed to be 256x256
-                                        offset_multiple = 1.f / 256;
-                                        break;
-                                }
+                if (gPipeline.getPoolTypeFromTE(tep, getTexture()) == LLDrawPool::POOL_BUMP)
+                {
+                        color.mV[3] = U8 (alpha[tep->getShiny()] * 255);
+                }
+        }
 
-                                F32 s_scale = 1.f;
-                                F32 t_scale = 1.f;
-                                if( tep )
-                                {
-                                        tep->getScale( &s_scale, &t_scale );
-                                }
-                                LLVector3   sun_ray  = gSky.getSunDirection();
-                                LLVector3   moon_ray = gSky.getMoonDirection();
-                                LLVector3& primary_light_ray = (sun_ray.mV[VZ] > 0) ? sun_ray : moon_ray;
-                                bump_s_primary_light_ray = offset_multiple * s_scale * primary_light_ray;
-                                bump_t_primary_light_ray = offset_multiple * t_scale * primary_light_ray;
+    // INDICES
+        if (full_rebuild || moved)
+        {
+                for (S32 i = 0; i < num_indices; i++)
+                {
+                        *indicesp++ = vf.mIndices[i] + index_offset;
+                }
+        }
+        else
+        {
+                indicesp += num_indices;
+        }
+        
+        //bump setup
+        LLVector3 binormal_dir( -sin_ang, cos_ang, 0 );
+        LLVector3 bump_s_primary_light_ray;
+        LLVector3 bump_t_primary_light_ray;
+        
+        if (bump_code)
+        {
+                F32 offset_multiple; 
+                switch( bump_code )
+                {
+                        case BE_NO_BUMP:
+                        offset_multiple = 0.f;
+                        break;
+                        case BE_BRIGHTNESS:
+                        case BE_DARKNESS:
+                        if( mTexture.notNull() && mTexture->getHasGLTexture())
+                        {
+                                // Offset by approximately one texel
+                                S32 cur_discard = mTexture->getDiscardLevel();
+                                S32 max_size = llmax( mTexture->getWidth(), mTexture->getHeight() );
+                                max_size <<= cur_discard;
+                                const F32 ARTIFICIAL_OFFSET = 2.f;
+                                offset_multiple = ARTIFICIAL_OFFSET / (F32)max_size;
                         }
-                        
-                        for (S32 i = 0; i < num_vertices; i++)
+                        else
                         {
-                                LLVector2 tc = vf.mVertices[i].mTexCoord;
+                                offset_multiple = 1.f/256;
+                        }
+                        break;
 
-                                U8 texgen = getTextureEntry()->getTexGen();
-                                if (texgen != LLTextureEntry::TEX_GEN_DEFAULT)
-                                {
+                        default:  // Standard bumpmap textures.  Assumed to be 256x256
+                        offset_multiple = 1.f / 256;
+                        break;
+                }
 
-                                        LLVector3 vec = vf.mVertices[i].mPosition; //-vf.mCenter;
-                                        
-                                        if (global_volume)
-                                        {       
-                                                vec -= render_pos;
-                                        }
-                                        else
-                                        {
-                                                vec.scaleVec(mVObjp->getScale());
-                                        }
+                F32 s_scale = 1.f;
+                F32 t_scale = 1.f;
+                if( tep )
+                {
+                        tep->getScale( &s_scale, &t_scale );
+                }
+                LLVector3   sun_ray  = gSky.getSunDirection();
+                LLVector3   moon_ray = gSky.getMoonDirection();
+                LLVector3& primary_light_ray = (sun_ray.mV[VZ] > 0) ? sun_ray : moon_ray;
+                bump_s_primary_light_ray = offset_multiple * s_scale * primary_light_ray;
+                bump_t_primary_light_ray = offset_multiple * t_scale * primary_light_ray;
+        }
+                
+        U8 texgen = getTextureEntry()->getTexGen();
 
-                                        switch (texgen)
-                                        {
-                                                case LLTextureEntry::TEX_GEN_PLANAR:
-                                                        planarProjection(tc, vf.mVertices[i], vf.mCenter, vec);
-                                                        break;
-                                                case LLTextureEntry::TEX_GEN_SPHERICAL:
-                                                        sphericalProjection(tc, vf.mVertices[i], vf.mCenter, vec);
-                                                        break;
-                                                case LLTextureEntry::TEX_GEN_CYLINDRICAL:
-                                                        cylindricalProjection(tc, vf.mVertices[i], vf.mCenter, vec);
-                                                        break;
-                                                default:
-                                                        break;
-                                        }               
-                                }
-                                xform(tc, cos_ang, sin_ang, os, ot, ms, mt);
-                                *tex_coords++ = tc;
-                                if (grab_first_tcoord)
-                                {
-                                        grab_first_tcoord = FALSE;
-                                        tmin = tmax = tc;
-                                }
-                                else
-                                {
-                                        for (U32 j = 0; j < 2; j++)
-                                        {
-                                                if (tmin.mV[j] > tc.mV[j])
-                                                {
-                                                        tmin.mV[j] = tc.mV[j];
-                                                }
-                                                else if (tmax.mV[j] < tc.mV[j])
-                                                {
-                                                        tmax.mV[j] = tc.mV[j];
-                                                }
-                                        }
-                                }
-                                if (bump)
+        for (S32 i = 0; i < num_vertices; i++)
+        {
+                if (rebuild_tcoord)
+                {
+                        LLVector2 tc = vf.mVertices[i].mTexCoord;
+                
+                        if (texgen != LLTextureEntry::TEX_GEN_DEFAULT)
+                        {
+                                LLVector3 vec = vf.mVertices[i].mPosition; 
+                        
+                                vec.scaleVec(scale);
+
+                                switch (texgen)
                                 {
-                                        LLVector3 tangent = vf.mVertices[i].mBinormal % vf.mVertices[i].mNormal;
-                                        LLMatrix3 tangent_to_object;
-                                        tangent_to_object.setRows(tangent, vf.mVertices[i].mBinormal, vf.mVertices[i].mNormal);
-                                        LLVector3 binormal = binormal_dir * tangent_to_object;
+                                        case LLTextureEntry::TEX_GEN_PLANAR:
+                                                planarProjection(tc, vf.mVertices[i], vf.mCenter, vec);
+                                                break;
+                                        case LLTextureEntry::TEX_GEN_SPHERICAL:
+                                                sphericalProjection(tc, vf.mVertices[i], vf.mCenter, vec);
+                                                break;
+                                        case LLTextureEntry::TEX_GEN_CYLINDRICAL:
+                                                cylindricalProjection(tc, vf.mVertices[i], vf.mCenter, vec);
+                                                break;
+                                        default:
+                                                break;
+                                }               
+                        }
 
-                                        if (!global_volume)
-                                        {
-                                                binormal = binormal * mat_normal;
-                                        }
-                                        binormal.normVec();
-                                        tangent.normVec();
-                                        
-                                        tc += LLVector2( bump_s_primary_light_ray * tangent, bump_t_primary_light_ray * binormal );
-                                        *tex_coords2++ = tc;
+                        xform(tc, cos_ang, sin_ang, os, ot, ms, mt);
+                        *tex_coords++ = tc;
+                
+                        if (bump_code)
+                        {
+                                LLVector3 tangent = vf.mVertices[i].mBinormal % vf.mVertices[i].mNormal;
+                                LLMatrix3 tangent_to_object;
+                                tangent_to_object.setRows(tangent, vf.mVertices[i].mBinormal, vf.mVertices[i].mNormal);
+                                LLVector3 binormal = binormal_dir * tangent_to_object;
 
-                                        *binormals++ = binormal;
-                                }
+                                binormal = binormal * mat_normal;
+                                binormal.normVec();
+
+                                tc += LLVector2( bump_s_primary_light_ray * tangent, bump_t_primary_light_ray * binormal );
+                                *tex_coords2++ = tc;
+                        }       
+                }
+                else if (moved)
+                {
+                        *tex_coords++ = *old_texcoords++;
+                        if (bump_code)
+                        {
+                                *tex_coords2++ = *old_texcoords2++;
                         }
                 }
+                        
+                if (rebuild_pos)
+                {
+                        *vertices++ = vf.mVertices[i].mPosition * mat_vert;
 
-                index_offset += num_vertices;
+                        LLVector3 normal = vf.mVertices[i].mNormal * mat_normal;
+                        normal.normVec();
+                        
+                        *normals++ = normal;
+                }
+                else if (moved)
+                {
+                        *normals++ = *old_normals++;
+                        *vertices++ = *old_verts++;
+                }
 
-                center_sum += vf.mCenter * mat_vert;
+                if (rebuild_color)
+                {
+                        *colors++ = color;              
+                }
+                else if (moved)
+                {
+                        *colors++ = *old_colors++;
+                }
         }
-        
-        center_sum /= (F32)(fend-fstart+1);
-        
-        if (is_static)
+
+        if (!rebuild_pos && !moved)
         {
-                mCenterAgent = center_sum;
-                mCenterLocal = mCenterAgent - mDrawablep->getPositionAgent();
+                vertices += num_vertices;
         }
-        else
+
+        if (!rebuild_tcoord && !moved)
         {
-                mCenterLocal = center_sum;
-                updateCenterAgent();
+                tex_coords2 += num_vertices;
+                tex_coords += num_vertices;
         }
-        
-        if (!grab_first_vert && mDrawablep->isState(LLDrawable::REBUILD_VOLUME))
+        else if (!bump_code)
         {
-                mExtents[0] = min;
-                mExtents[1] = max;
+                tex_coords2 += num_vertices;
         }
-        
-        if (!grab_first_tcoord && mDrawablep->isState(LLDrawable::REBUILD_TCOORD))
+
+        if (!rebuild_color && !moved)
         {
-                mTexExtents[0] = tmin;
-                mTexExtents[1] = tmax;
+                colors += num_vertices;
         }
-        
+
+        if (rebuild_tcoord)
+        {
+                mTexExtents[0].setVec(0,0);
+                mTexExtents[1].setVec(1,1);
+                xform(mTexExtents[0], cos_ang, sin_ang, os, ot, ms, mt);
+                xform(mTexExtents[1], cos_ang, sin_ang, os, ot, ms, mt);                
+        }
+
+        index_offset += num_vertices;
+
+        mLastVertexBuffer = mVertexBuffer;
+        mLastGeomCount = mGeomCount;
+        mLastGeomIndex = mGeomIndex;
+        mLastIndicesCount = mIndicesCount;
+        mLastIndicesIndex = mIndicesIndex;
+
         return TRUE;
 }
 
+#if 0
 BOOL LLFace::genLighting(const LLVolume* volume, const LLDrawable* drawablep, S32 fstart, S32 fend, 
                                                  const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, BOOL do_lighting)
 {
@@ -1662,21 +1308,20 @@ BOOL LLFace::genShadows(const LLVolume* volume, const LLDrawable* drawablep, S32
         }
         return TRUE;
 }
+#endif
 
 BOOL LLFace::verify(const U32* indices_array) const
 {
         BOOL ok = TRUE;
         // First, check whether the face data fits within the pool's range.
-        if ((mGeomIndex < 0) || (mGeomIndex + mGeomCount) > (S32)getPool()->getVertexCount())
+        if ((mGeomIndex < 0) || (mGeomIndex + mGeomCount) > mVertexBuffer->getNumVerts())
         {
                 ok = FALSE;
                 llinfos << "Face not within pool range!" << llendl;
         }
 
         S32 indices_count = (S32)getIndicesCount();
-        S32 geom_start = getGeomStart();
-        S32 geom_count = mGeomCount;
-
+        
         if (!indices_count)
         {
                 return TRUE;
@@ -1688,6 +1333,10 @@ BOOL LLFace::verify(const U32* indices_array) const
                 llinfos << "Face has bogus indices count" << llendl;
         }
         
+#if 0
+        S32 geom_start = getGeomStart();
+        S32 geom_count = mGeomCount;
+
         const U32 *indicesp = indices_array ? indices_array + mIndicesIndex : getRawIndices();
 
         for (S32 i = 0; i < indices_count; i++)
@@ -1706,6 +1355,7 @@ BOOL LLFace::verify(const U32* indices_array) const
                         ok = FALSE;
                 }
         }
+#endif
 
         if (!ok)
         {
@@ -1756,7 +1406,7 @@ const LLColor4& LLFace::getRenderColor() const
         
 void LLFace::renderSetColor() const
 {
-        if (!LLDrawPool::LLOverrideFaceColor::sOverrideFaceColor)
+        if (!LLFacePool::LLOverrideFaceColor::sOverrideFaceColor)
         {
                 const LLColor4* color = &(getRenderColor());
                 
@@ -1773,61 +1423,21 @@ void LLFace::renderSetColor() const
 
 S32 LLFace::pushVertices(const U32* index_array) const
 {
-        U32 indices_count = mIndicesCount;
-        S32 ret = 0;
-#if ENABLE_FACE_LINKING
-        LLFace* next = mNextFace;
-#endif
-        
-        if (mGeomCount < gGLManager.mGLMaxVertexRange && (S32) indices_count < gGLManager.mGLMaxIndexRange)
+        if (mIndicesCount)
         {
-                LLFace* current = (LLFace*) this;
-                S32 geom_count = mGeomCount;
-#if ENABLE_FACE_LINKING
-                while (current)
+                if (mGeomCount <= gGLManager.mGLMaxVertexRange && 
+                        mIndicesCount <= (U32) gGLManager.mGLMaxIndexRange)
                 {
-                        //chop up batch into implementation recommended sizes
-                        while (next &&
-                                   (current == next ||
-                                        ((S32) (indices_count + next->mIndicesCount) < gGLManager.mGLMaxIndexRange &&
-                                         geom_count + next->mGeomCount < gGLManager.mGLMaxVertexRange)))
-                        {
-                                indices_count += next->mIndicesCount;
-                                geom_count += next->mGeomCount;
-                                next = next->mNextFace;
-                        }
-#endif
-                        if (indices_count)
-                        {
-                                glDrawRangeElements(mPrimType, current->mGeomIndex, current->mGeomIndex + geom_count, indices_count, 
-                                                                                GL_UNSIGNED_INT, index_array + current->mIndicesIndex); 
-                        }
-                        ret += (S32) indices_count;
-                        indices_count = 0;
-                        geom_count = 0;
-#if ENABLE_FACE_LINKING
-                        current = next;
+                        glDrawRangeElements(GL_TRIANGLES, mGeomIndex, mGeomIndex + mGeomCount-1, mIndicesCount, 
+                                                                        GL_UNSIGNED_INT, index_array + mIndicesIndex); 
                 }
-#endif
-        }
-        else
-        {
-#if ENABLE_FACE_LINKING
-                while (next)
-                {
-                        indices_count += next->mIndicesCount;
-                        next = next->mNextFace;
-                }
-#endif
-                if (indices_count)
+                else
                 {
-                        glDrawElements(mPrimType, indices_count, GL_UNSIGNED_INT, index_array + mIndicesIndex); 
+                        glDrawElements(GL_TRIANGLES, mIndicesCount, GL_UNSIGNED_INT, index_array+mIndicesIndex);
                 }
-                ret += (S32) indices_count;
         }
         
-        return ret;
-
+        return mIndicesCount;
 }
 
 const LLMatrix4& LLFace::getRenderMatrix() const
@@ -1854,19 +1464,25 @@ S32 LLFace::renderElements(const U32 *index_array) const
         return ret;
 }
 
-S32 LLFace::renderIndexed(const U32 *index_array) const
+S32 LLFace::renderIndexed()
 {
-        if (mSkipRender)
+        if(mGeomIndex < 0 || mDrawablep.isNull() || mDrawPoolp == NULL)
         {
                 return 0;
         }
+        
+        return renderIndexed(mDrawPoolp->getVertexDataMask());
+}
 
-        if(mGeomIndex < 0 || mDrawablep.isNull())
+S32 LLFace::renderIndexed(U32 mask)
+{
+        if (mVertexBuffer.isNull())
         {
                 return 0;
         }
-        
-        renderSetColor();
+
+        mVertexBuffer->setBuffer(mask);
+        U32* index_array = (U32*) mVertexBuffer->getIndicesPointer();
         return renderElements(index_array);
 }
 
@@ -1879,26 +1495,13 @@ S32 LLFace::getVertices(LLStrider<LLVector3> &vertices)
         {
                 return -1;
         }
-        if (isState(BACKLIST))
-        {
-                if (!mBackupMem)
-                {
-                        printDebugInfo();
-                        llerrs << "No backup memory for face" << llendl;
-                }
-                vertices = (LLVector3*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_VERTICES]);
-                vertices.setStride( mDrawPoolp->getStride());
-                return 0;
-        }
-        else
+        
+        if (mGeomIndex >= 0) // flexible objects may not have geometry
         {
-                if (mGeomIndex >= 0) // flexible objects may not have geometry
-                {
-                        mDrawPoolp->getVertexStrider(vertices, mGeomIndex);
-                        mDrawPoolp->setDirty();
-                }
-                return mGeomIndex;
+                mVertexBuffer->getVertexStrider(vertices, mGeomIndex);
+                
         }
+        return mGeomIndex;
 }
 
 S32 LLFace::getColors(LLStrider<LLColor4U> &colors)
@@ -1907,42 +1510,17 @@ S32 LLFace::getColors(LLStrider<LLColor4U> &colors)
         {
                 return -1;
         }
-        if (isState(BACKLIST))
-        {
-                llassert(mBackupMem);
-                colors   = (LLColor4U*)(mBackupMem + (4 * mIndicesCount) + mDrawPoolp->mDataOffsets[LLDrawPool::DATA_COLORS]);
-                colors.setStride( mDrawPoolp->getStride());
-                return 0;
-        }
-        else
-        {
-                llassert(mGeomIndex >= 0);
-                mDrawPoolp->getColorStrider(colors, mGeomIndex);
-                return mGeomIndex;
-        }
-}
-
-S32     LLFace::getIndices(U32*  &indicesp)
-{
-        if (isState(BACKLIST))
-        {
-                indicesp = (U32*)mBackupMem;
-                return 0;
-        }
-        else
-        {
-                indicesp = mDrawPoolp->getIndices(mIndicesIndex);
-                llassert(mGeomIndex >= 0 && indicesp[0] != indicesp[1]);
-                return mGeomIndex;
-        }
+        
+        llassert(mGeomIndex >= 0);
+        mVertexBuffer->getColorStrider(colors, mGeomIndex);
+        return mGeomIndex;
 }
 
-void LLFace::link(LLFace* facep)
+S32     LLFace::getIndices(LLStrider<U32> &indicesp)
 {
-#if ENABLE_FACE_LINKING
-        mNextFace = facep;
-        facep->mSkipRender = TRUE;
-#endif
+        mVertexBuffer->getIndexStrider(indicesp, mIndicesIndex);
+        llassert(mGeomIndex >= 0 && indicesp[0] != indicesp[1]);
+        return mIndicesIndex;
 }
 
 LLVector3 LLFace::getPositionAgent() const
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index cb3b705..b265b3a 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -38,18 +38,19 @@
 #include "llquaternion.h"
 #include "xform.h"
 #include "lldarrayptr.h"
+#include "llvertexbuffer.h"
+#include "llviewerimage.h"
 #include "llpagemem.h"
 #include "llstat.h"
 #include "lldrawable.h"
 
-#define ENABLE_FACE_LINKING 1 // Causes problems with snapshot rendering
-
-class LLDrawPool;
+class LLFacePool;
 class LLVolume;
 class LLViewerImage;
 class LLTextureEntry;
 class LLVertexProgram;
 class LLViewerImage;
+class LLGeometryManager;
 
 class LLFace
 {
@@ -57,26 +58,12 @@ public:
 
         enum EMasks
         {
-                SHARED_GEOM      = 0x0001,
-                LIGHT            = 0x0002,
-                REBUILD          = 0x0004,      
-                GLOBAL           = 0x0008,
-                VISIBLE          = 0x0010,
-                BACKLIST         = 0x0020,
-                INTERP           = 0x0040,
-                FULLBRIGHT       = 0x0080,
-                HUD_RENDER       = 0x0100,
-                USE_FACE_COLOR   = 0x0200,
-
-                POINT_SPRITE = 0x10000,
-                BOARD_SPRITE = 0x20000,
-                FIXED_SPRITE = 0x40000,
-                DEPTH_SPRITE = 0x80000
-        };
-
-        enum EDirty
-        {
-                DIRTY = -2
+                LIGHT                   = 0x0001,
+                GLOBAL                  = 0x0002,
+                FULLBRIGHT              = 0x0004,
+                HUD_RENDER              = 0x0008,
+                USE_FACE_COLOR  = 0x0010,
+                TEXTURE_ANIM    = 0x0020, 
         };
 
         static void initClass();
@@ -93,54 +80,64 @@ public:
         const S32               getGeomIndex()          const   { return mGeomIndex; }          // index into draw pool
         const U32               getGeomStart()          const   { return mGeomIndex; }          // index into draw pool
         LLViewerImage*  getTexture()            const   { return mTexture; }
+        void                    setTexture(LLViewerImage* tex) { mTexture = tex; }
         LLXformMatrix*  getXform()                      const   { return mXform; }
         BOOL                    hasGeometry()           const   { return mGeomCount > 0; }
         LLVector3               getPositionAgent()      const;
-        void                    setPrimType(U32 primType)       { mPrimType = primType; }
-        const U32               getPrimType()           const   { return mPrimType; }
-
+        
         U32                             getState()                      const   { return mState; }
         void                    setState(U32 state)                     { mState |= state; }
         void                    clearState(U32 state)           { mState &= ~state; }
-        BOOL                    isState(U32 state)      const   { return ((mState & state) != 0); }
-
+        BOOL                    isState(U32 state)      const   { return ((mState & state) != 0) ? TRUE : FALSE; }
+        void                    setVirtualSize(F32 size) { mVSize = size; }
+        void                    setPixelArea(F32 area)  { mPixelArea = area; }
+        F32                             getVirtualSize() const { return mVSize; }
+        F32                             getPixelArea() const { return mPixelArea; }
         void                    bindTexture(S32 stage = 0)              const   { LLViewerImage::bindTexture(mTexture, stage); }
 
         void                    enableLights() const;
         void                    renderSetColor() const;
         S32                             renderElements(const U32 *index_array) const;
-        S32                             renderIndexed (const U32 *index_array) const;
+        S32                             renderIndexed ();
+        S32                             renderIndexed (U32 mask);
         S32                             pushVertices(const U32* index_array) const;
         
         void                    setWorldMatrix(const LLMatrix4& mat);
         const LLTextureEntry* getTextureEntry() const { return mVObjp->getTE(mTEOffset); }
 
-        LLDrawPool*             getPool()                       const   { return mDrawPoolp; }
-        S32                             getStride()                     const   { return mDrawPoolp->getStride(); }
-        const U32*              getRawIndices()         const   { return &mDrawPoolp->mIndices[mIndicesIndex]; }
+        LLFacePool*             getPool()                       const   { return mDrawPoolp; }
+        U32                             getPoolType()           const   { return mPoolType; }
         LLDrawable*             getDrawable()           const   { return mDrawablep; }
         LLViewerObject* getViewerObject()       const   { return mVObjp; }
-
-        void                    clearDirty() { mGeneration = mDrawPoolp->mGeneration; };
-
-        S32                             backup();
-        void                    restore();
+        S32                             getLOD()                        const   { return mVObjp.notNull() ? mVObjp->getLOD() : 0; }
+        LLVertexBuffer* getVertexBuffer()       const   { return mVertexBuffer; }
+        void                    setPoolType(U32 type)           { mPoolType = type; }
+        S32                             getTEOffset()                           { return mTEOffset; }
 
         void                    setViewerObject(LLViewerObject* object);
-        void                    setPool(LLDrawPool *pool, LLViewerImage *texturep);
+        void                    setPool(LLFacePool *pool, LLViewerImage *texturep);
+        
         void                    setDrawable(LLDrawable *drawable);
         void                    setTEOffset(const S32 te_offset);
-        S32                             getTEOffset() { return mTEOffset; }
+        
 
         void                    setFaceColor(const LLColor4& color); // override material color
         void                    unsetFaceColor(); // switch back to material color
         const LLColor4& getFaceColor() const { return mFaceColor; } 
         const LLColor4& getRenderColor() const;
         
-        void unReserve();               // Set Removed from pool
-        
-        BOOL reserveIfNeeded(); // Reserves data if dirty.
-        
+        //for volumes
+        S32 getGeometryVolume(const LLVolume& volume,
+                                                S32 f,
+                                                LLStrider<LLVector3>& vertices, 
+                                                LLStrider<LLVector3>& normals,
+                                                LLStrider<LLVector2>& texcoords,
+                                                LLStrider<LLVector2>& texcoords2,
+                                                LLStrider<LLColor4U>& colors,
+                                                LLStrider<U32>& indices,
+                                                const LLMatrix4& mat_vert, const LLMatrix3& mat_normal,
+                                                U32& index_offset);
+
         // For avatar
         S32                              getGeometryAvatar(
                                                                         LLStrider<LLVector3> &vertices,
@@ -156,69 +153,51 @@ public:
                                                                            LLStrider<LLColor4U> &colors,
                                                                            LLStrider<LLVector2> &texCoords0,
                                                                            LLStrider<LLVector2> &texCoords1,
-                                                                           U32* &indices);
+                                                                           LLStrider<U32> &indices);
 
         // For volumes, etc.
         S32                             getGeometry(LLStrider<LLVector3> &vertices,  
                                                                 LLStrider<LLVector3> &normals,
                                                                 LLStrider<LLVector2> &texCoords, 
-                                                                U32*  &indices);
+                                                                LLStrider<U32>  &indices);
 
         S32                             getGeometryColors(LLStrider<LLVector3> &vertices,  
                                                                           LLStrider<LLVector3> &normals,
                                                                           LLStrider<LLVector2> &texCoords, 
                                                                           LLStrider<LLColor4U> &colors, 
-                                                                          U32*  &indices);
+                                                                          LLStrider<U32>  &indices);
         
-        S32                             getGeometryMultiTexture(LLStrider<LLVector3> &vertices,  
-                                                                                        LLStrider<LLVector3> &normals,
-                                                                                        LLStrider<LLVector3> &binormals,
-                                                                                        LLStrider<LLVector2> &texCoords0, 
-                                                                                        LLStrider<LLVector2> &texCoords1, 
-                                                                                        U32*  &indices);
-
-
-        S32                     getVertices       (LLStrider<LLVector3> &vertices);
-        S32                     getColors         (LLStrider<LLColor4U> &colors);
-        S32                     getIndices        (U32*  &indices);
+        S32 getVertices(LLStrider<LLVector3> &vertices);
+        S32 getColors(LLStrider<LLColor4U> &colors);
+        S32 getIndices(LLStrider<U32> &indices);
 
         void            setSize(const S32 numVertices, const S32 num_indices = 0);
-        BOOL            getDirty() const { return (mGeneration != mDrawPoolp->mGeneration); }
-
-        BOOL            genVolumeTriangles(const LLVolume &volume, S32 f,
-                                                                   const LLMatrix4& mat, const LLMatrix3& inv_trans_mat, BOOL global_volume = FALSE);
-        BOOL            genVolumeTriangles(const LLVolume &volume, S32 fstart, S32 fend,
+        
+        BOOL            genVolumeBBoxes(const LLVolume &volume, S32 f,
                                                                    const LLMatrix4& mat, const LLMatrix3& inv_trans_mat, BOOL global_volume = FALSE);
-        BOOL            genLighting(const LLVolume* volume, const LLDrawable* drawablep, S32 fstart, S32 fend, 
-                                                        const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, BOOL do_lighting);
-
-        BOOL            genShadows(const LLVolume* volume, const LLDrawable* drawablep, S32 fstart, S32 fend, 
-                                                        const LLMatrix4& mat_vert, const LLMatrix3& mat_normal, BOOL use_shadow_factor);
-
+        
         void            init(LLDrawable* drawablep, LLViewerObject* objp);
         void            destroy();
         void            update();
 
         void            updateCenterAgent(); // Update center when xform has changed.
-        void renderSelectedUV(const S32 offset = 0, const S32 count = 0);
+        void            renderSelectedUV(const S32 offset = 0, const S32 count = 0);
 
-        void            renderForSelect() const;
+        void            renderForSelect(U32 data_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
         void            renderSelected(LLImageGL *image, const LLColor4 &color, const S32 offset = 0, const S32 count = 0);
 
         F32                     getKey()                                        const   { return mDistance; }
 
-        S32                     getGeneration()                         const   { return mGeneration; }
         S32                     getReferenceIndex()             const   { return mReferenceIndex; }
         void            setReferenceIndex(const S32 index)      { mReferenceIndex = index; }
 
         BOOL            verify(const U32* indices_array = NULL) const;
         void            printDebugInfo() const;
 
-        void            link(LLFace* facep);
+        void            setGeomIndex(S32 idx) { mGeomIndex = idx; }
+        void            setIndicesIndex(S32 idx) { mIndicesIndex = idx; }
         
 protected:
-        S32                     allocBackupMem();       // Allocate backup memory based on the draw pool information.
-        void            setDirty();
 
 public:
         LLVector3               mCenterLocal;
@@ -227,30 +206,40 @@ public:
         LLVector2               mTexExtents[2];
         F32                             mDistance;
         F32                             mAlphaFade;
-        LLFace*                 mNextFace;
-        BOOL                    mSkipRender;
-        
+        LLPointer<LLVertexBuffer> mVertexBuffer;
+        LLPointer<LLVertexBuffer> mLastVertexBuffer;
+        F32                     mLastUpdateTime;
+        LLMatrix4       mTextureMatrix;
+
 protected:
-        S32                     mGeneration;
+        friend class LLGeometryManager;
+        friend class LLVolumeGeometryManager;
+
         U32                     mState;
-        LLDrawPool*     mDrawPoolp;
-        S32                     mGeomIndex;                     // index into draw pool
+        LLFacePool*     mDrawPoolp;
+        U32                     mPoolType;
         LLColor4        mFaceColor;                     // overrides material color if state |= USE_FACE_COLOR
         
-        U32                     mPrimType;
         S32                     mGeomCount;                     // vertex count for this face
+        S32                     mGeomIndex;                     // index into draw pool
         U32                     mIndicesCount;
         S32                     mIndicesIndex;          // index into draw pool for indices (yeah, I know!)
-        LLXformMatrix* mXform;
-        LLPointer<LLViewerImage> mTexture;
 
-        U8                              *mBackupMem;
+        //previous rebuild's geometry info
+        S32                     mLastGeomCount;
+        S32                     mLastGeomIndex;
+        U32                     mLastIndicesCount;
+        S32                     mLastIndicesIndex;
 
+        LLXformMatrix* mXform;
+        LLPointer<LLViewerImage> mTexture;
         LLPointer<LLDrawable> mDrawablep;
         LLPointer<LLViewerObject> mVObjp;
         S32                     mTEOffset;
 
         S32                     mReferenceIndex;
+        F32                     mVSize;
+        F32                     mPixelArea;
         
 protected:
         static BOOL     sSafeRenderSelect;
@@ -264,6 +253,43 @@ public:
                 }
         };
         
+        struct CompareTexture
+        {
+                bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+                {
+                        return lhs->getTexture() < rhs->getTexture();
+                }
+        };
+
+        struct CompareTextureAndGeomCount
+        {
+                bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+                {
+                        return lhs->getTexture() == rhs->getTexture() ? 
+                                lhs->getGeomCount() < rhs->getGeomCount() :
+                                lhs->getTexture() > rhs->getTexture();
+                }
+        };
+
+        struct CompareTextureAndLOD
+        {
+                bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+                {
+                        return lhs->getTexture() == rhs->getTexture() ? 
+                                lhs->getLOD() < rhs->getLOD() :
+                                lhs->getTexture() < rhs->getTexture();
+                }
+        };
+
+        struct CompareTextureAndTime
+        {
+                bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
+                {
+                        return lhs->getTexture() == rhs->getTexture() ? 
+                                lhs->mLastUpdateTime < rhs->mLastUpdateTime :
+                                lhs->getTexture() < rhs->getTexture();
+                }
+        };
 };
 
 #endif // LL_LLFACE_H
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index e147e3f..5038ed9 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -86,31 +86,41 @@ static struct ft_display_info ft_display_table[] =
         { LLFastTimer::FTM_RESET_DRAWORDER,             "  ResetDrawOrder",             &LLColor4::pink1, 0 },
         { LLFastTimer::FTM_WORLD_UPDATE,                "  World Update",               &LLColor4::blue1, 1 },
         { LLFastTimer::FTM_UPDATE_MOVE,                 "   Move Objects",              &LLColor4::pink2, 0 },
-        { LLFastTimer::FTM_OCTREE_BALANCE,              "    Octree Balance",   &LLColor4::red3, 0 },
-        { LLFastTimer::FTM_CULL,                                "   Object Cull",       &LLColor4::blue2, 0 },
-        { LLFastTimer::FTM_CULL_REBOUND,                "    Rebound",          &LLColor4::blue3, 0 },
+        { LLFastTimer::FTM_OCTREE_BALANCE,              "    Octree Balance", &LLColor4::red3, 0 },
+//      { LLFastTimer::FTM_TEMP1,                               "   Blur",                      &LLColor4::red1, 0 },
+        { LLFastTimer::FTM_CULL,                                "   Object Cull",       &LLColor4::blue2, 1 },
+    { LLFastTimer::FTM_CULL_REBOUND,            "    Rebound",          &LLColor4::blue3, 0 },
+        { LLFastTimer::FTM_FRUSTUM_CULL,                "    Frustum Cull",     &LLColor4::blue4, 0 },
+        { LLFastTimer::FTM_OCCLUSION,                   "    Object Occlude", &LLColor4::pink1, 0 },
+        { LLFastTimer::FTM_OCCLUSION_READBACK,  "    Occlusion Read", &LLColor4::red2, 0 },
         { LLFastTimer::FTM_HUD_EFFECTS,                 "   HUD Effects",       &LLColor4::orange1, 0 },
         { LLFastTimer::FTM_HUD_UPDATE,                  "   HUD Update",        &LLColor4::orange2, 0 },
-        { LLFastTimer::FTM_OCCLUSION,                   "   Object Occlude",&LLColor4::pink1, 0 },
-        { LLFastTimer::FTM_OCCLUSION_READBACK,  "   Occlusion Read",&LLColor4::red2, 0 },
         { LLFastTimer::FTM_GEO_UPDATE,                  "   Geo Update",        &LLColor4::blue3, 0 },
         { LLFastTimer::FTM_UPDATE_PRIMITIVES,   "    Volumes",          &LLColor4::blue4, 0 },
         { LLFastTimer::FTM_GEN_VOLUME,                  "     Gen Volume",      &LLColor4::yellow3, 0 },
         { LLFastTimer::FTM_GEN_FLEX,                    "     Flexible",        &LLColor4::yellow4, 0 },
         { LLFastTimer::FTM_GEN_TRIANGLES,               "     Triangles",       &LLColor4::yellow5, 0 },
+        { LLFastTimer::FTM_UPDATE_AVATAR,               "    Avatar",           &LLColor4::yellow1, 0 },
+        { LLFastTimer::FTM_UPDATE_TREE,                 "    Tree",                     &LLColor4::yellow2, 0 },
+        { LLFastTimer::FTM_UPDATE_TERRAIN,              "    Terrain",          &LLColor4::yellow6, 0 },
+        { LLFastTimer::FTM_UPDATE_CLOUDS,               "    Clouds",           &LLColor4::yellow7, 0 },
+        { LLFastTimer::FTM_UPDATE_GRASS,                "    Grass",            &LLColor4::yellow8, 0 },
+        { LLFastTimer::FTM_UPDATE_WATER,                "    Water",            &LLColor4::yellow9, 0 },
         { LLFastTimer::FTM_GEO_LIGHT,                   "    Lighting",         &LLColor4::yellow1, 0 },
         { LLFastTimer::FTM_GEO_SHADOW,                  "    Shadow",           &LLColor4::black, 0 },
         { LLFastTimer::FTM_UPDATE_PARTICLES,    "    Particles",        &LLColor4::blue5, 0 },
+        { LLFastTimer::FTM_SIMULATE_PARTICLES,  "    Particle Sim",     &LLColor4::blue4, 0 },
         { LLFastTimer::FTM_GEO_RESERVE,                 "    Reserve",          &LLColor4::blue6, 0 },
         { LLFastTimer::FTM_UPDATE_LIGHTS,               "    Lights",           &LLColor4::yellow2, 0 },
         { LLFastTimer::FTM_UPDATE_SKY,                  "  Sky Update",         &LLColor4::cyan1, 0 },
-        { LLFastTimer::FTM_OBJECTLIST_UPDATE,   "  Object Update",      &LLColor4::purple1, 1 },
+        { LLFastTimer::FTM_OBJECTLIST_UPDATE,   "  Object Update",      &LLColor4::purple1, 0 },
         { LLFastTimer::FTM_AVATAR_UPDATE,               "   Avatars",           &LLColor4::purple2, 0 },
         { LLFastTimer::FTM_JOINT_UPDATE,                "    Joints",           &LLColor4::purple3, 0 },
         { LLFastTimer::FTM_ATTACHMENT_UPDATE,   "    Attachments",      &LLColor4::purple4, 0 },
         { LLFastTimer::FTM_UPDATE_ANIMATION,    "    Animation",        &LLColor4::purple5, 0 },
         { LLFastTimer::FTM_FLEXIBLE_UPDATE,             "   Flex Update",       &LLColor4::pink2, 0 },
         { LLFastTimer::FTM_LOD_UPDATE,                  "   LOD Update",        &LLColor4::magenta1, 0 },
+//      { LLFastTimer::FTM_TEMP5,                               "    Check",    &LLColor4::red1, 1},
         { LLFastTimer::FTM_REGION_UPDATE,               "  Region Update",      &LLColor4::cyan2, 0 },
         { LLFastTimer::FTM_NETWORK,                             "  Network",            &LLColor4::orange1, 1 },
         { LLFastTimer::FTM_IDLE_NETWORK,                "   Decode Msgs",       &LLColor4::orange2, 0 },
@@ -125,17 +135,36 @@ static struct ft_display_info ft_display_table[] =
         { LLFastTimer::FTM_IMAGE_UPDATE,                "  Image Update",       &LLColor4::yellow4, 1 },
         { LLFastTimer::FTM_IMAGE_CREATE,                "   Image CreateGL",&LLColor4::yellow5, 0 },
         { LLFastTimer::FTM_IMAGE_DECODE,                "   Image Decode",      &LLColor4::yellow6, 0 },
+        { LLFastTimer::FTM_IMAGE_MARK_DIRTY,    "   Dirty Textures",&LLColor4::red1, 0 },
         { LLFastTimer::FTM_VFILE_WAIT,                  "  VFile Wait",         &LLColor4::cyan6, 0 },
 //      { LLFastTimer::FTM_IDLE_CB,                             "  Callbacks",          &LLColor4::pink1, 0 },
-        { LLFastTimer::FTM_RENDER,                              " Render",                      &green0, 0 },
+        { LLFastTimer::FTM_RENDER,                              " Render",                      &green0, 1 },
         { LLFastTimer::FTM_REBUILD,                             "  Rebuild",            &LLColor4::green1, 1 },
         { LLFastTimer::FTM_STATESORT,                   "   State Sort",        &LLColor4::orange1, 1 },
+        { LLFastTimer::FTM_STATESORT_DRAWABLE,  "    Drawable",         &LLColor4::orange2, 0 },
+        { LLFastTimer::FTM_STATESORT_POSTSORT,  "    Post Sort",        &LLColor4::orange3, 0 },
+        { LLFastTimer::FTM_REBUILD_OCCLUSION_VB,"     Occlusion",               &LLColor4::cyan5, 0 },
+        { LLFastTimer::FTM_REBUILD_VBO,                 "     VBO Rebuild",     &LLColor4::red4, 0 },
+        { LLFastTimer::FTM_REBUILD_VOLUME_VB,   "      Volume",         &LLColor4::blue1, 0 },
+        { LLFastTimer::FTM_REBUILD_NONE_VB,             "       Unknown",       &LLColor4::cyan5, 0 },
+        { LLFastTimer::FTM_REBUILD_BRIDGE_VB,   "      Bridge",         &LLColor4::blue2, 0 },
+        { LLFastTimer::FTM_REBUILD_HUD_VB,              "      HUD",                    &LLColor4::blue3, 0 },
+        { LLFastTimer::FTM_REBUILD_TERRAIN_VB,  "      Terrain",                &LLColor4::blue4, 0 },
+        { LLFastTimer::FTM_REBUILD_WATER_VB,    "      Water",          &LLColor4::blue5, 0 },
+        { LLFastTimer::FTM_REBUILD_TREE_VB,             "      Tree",           &LLColor4::cyan1, 0 },
+        { LLFastTimer::FTM_REBUILD_PARTICLE_VB, "      Particle",       &LLColor4::cyan2, 0 },
+        { LLFastTimer::FTM_REBUILD_CLOUD_VB,    "      Cloud",          &LLColor4::cyan3, 0 },
+        { LLFastTimer::FTM_REBUILD_GRASS_VB,    "      Grass",          &LLColor4::cyan4, 0 },
         { LLFastTimer::FTM_RENDER_GEOMETRY,             "  Geometry",           &LLColor4::green2, 1 },
-        { LLFastTimer::FTM_POOLS,                               "   Pools",                     &LLColor4::green3, 0 },
-        { LLFastTimer::FTM_POOLRENDER,                  "    RenderPool",       &LLColor4::green4, 0 },
+        { LLFastTimer::FTM_POOLS,                               "   Pools",                     &LLColor4::green3, 1 },
+        { LLFastTimer::FTM_POOLRENDER,                  "    RenderPool",       &LLColor4::green4, 1 },
         { LLFastTimer::FTM_RENDER_TERRAIN,              "     Terrain",         &LLColor4::green6, 0 },
         { LLFastTimer::FTM_RENDER_CHARACTERS,   "     Avatars",         &LLColor4::yellow1, 0 },
         { LLFastTimer::FTM_RENDER_SIMPLE,               "     Simple",          &LLColor4::yellow2, 0 },
+        { LLFastTimer::FTM_RENDER_FULLBRIGHT,   "     Fullbright",      &LLColor4::yellow5, 0 },
+        { LLFastTimer::FTM_RENDER_GLOW,                 "     Glow",            &LLColor4::orange1, 0 },
+        { LLFastTimer::FTM_RENDER_GRASS,                "     Grass",           &LLColor4::yellow6, 0 },
+        { LLFastTimer::FTM_RENDER_INVISIBLE,    "     Invisible",       &LLColor4::red2, 0 },
         { LLFastTimer::FTM_RENDER_SHINY,                "     Shiny",           &LLColor4::yellow3, 0 },
         { LLFastTimer::FTM_RENDER_BUMP,                 "     Bump",            &LLColor4::yellow4, 0 },
         { LLFastTimer::FTM_RENDER_TREES,                "     Trees",           &LLColor4::yellow8, 0 },
@@ -149,15 +178,16 @@ static struct ft_display_info ft_display_table[] =
 //      { LLFastTimer::FTM_RENDER_FONTS,                "   Fonts",                     &LLColor4::pink1, 0 },
 //      { LLFastTimer::FTM_UPDATE_TEXTURES,             "  Textures",           &LLColor4::pink2, 0 },
         { LLFastTimer::FTM_SWAP,                                "  Swap",                       &LLColor4::pink1, 0 },
+        { LLFastTimer::FTM_CLIENT_COPY,                 "  Client Copy",        &LLColor4::red1, 1},
         
-//      { LLFastTimer::FTM_TEMP1,                               "  Temp1",                      &LLColor4::red1, 0 },
-//      { LLFastTimer::FTM_TEMP2,                               "  Temp2",                      &LLColor4::magenta1, 0 },
-//      { LLFastTimer::FTM_TEMP3,                               "  Temp3",                      &LLColor4::red2, 0 },
-//      { LLFastTimer::FTM_TEMP4,                               "  Temp4",                      &LLColor4::magenta2, 0 },
-//      { LLFastTimer::FTM_TEMP5,                               "  Temp5",                      &LLColor4::red3, 0 },
-//      { LLFastTimer::FTM_TEMP6,                               "  Temp6",                      &LLColor4::magenta3, 0 },
-//      { LLFastTimer::FTM_TEMP7,                               "  Temp7",                      &LLColor4::red4, 0 },
-//      { LLFastTimer::FTM_TEMP8,                               "  Temp8",                      &LLColor4::magenta4, 0 },
+//      { LLFastTimer::FTM_TEMP1,                               " Temp1",                       &LLColor4::red1, 0 },
+//      { LLFastTimer::FTM_TEMP2,                               " Temp2",                       &LLColor4::magenta1, 0 },
+//      { LLFastTimer::FTM_TEMP3,                               " Temp3",                       &LLColor4::red2, 0 },
+//      { LLFastTimer::FTM_TEMP4,                               " Temp4",                       &LLColor4::magenta2, 0 },
+//      { LLFastTimer::FTM_TEMP5,                               " Temp5",                       &LLColor4::red3, 0 },
+//      { LLFastTimer::FTM_TEMP6,                               " Temp6",                       &LLColor4::magenta3, 0 },
+//      { LLFastTimer::FTM_TEMP7,                               " Temp7",                       &LLColor4::red4, 0 },
+//      { LLFastTimer::FTM_TEMP8,                               " Temp8",                       &LLColor4::magenta4, 0 },
 
         { LLFastTimer::FTM_OTHER,                               " Other",                       &red0 }
 };
@@ -167,7 +197,7 @@ static const int FTV_DISPLAY_NUM  = (sizeof(ft_display_table)/sizeof(ft_display_
 S32 ft_display_idx[FTV_DISPLAY_NUM]; // line of table entry for display purposes (for collapse)
 
 LLFastTimerView::LLFastTimerView(const std::string& name, const LLRect& rect)
-:       LLView(name, rect, TRUE)
+        :       LLFloater(name, rect, "Fast Timers")
 {
         setVisible(FALSE);
         mDisplayMode = 0;
@@ -910,7 +940,10 @@ void LLFastTimerView::draw()
                         F32 ms = (F32)((F64)max_ticks * iclock_freq);
                         
                         //display y-axis range
-                        LLString tdesc = llformat("%4.2f ms", ms);
+                        LLString tdesc = mDisplayCalls ? 
+                                                        llformat("%d calls", max_ticks) :
+                                                        llformat("%4.2f ms", ms);
+                                                        
                         x = graph_rect.mRight - LLFontGL::sMonospace->getWidth(tdesc)-5;
                         y = graph_rect.mTop - ((S32)LLFontGL::sMonospace->getLineHeight());
  
@@ -976,6 +1009,13 @@ void LLFastTimerView::draw()
                                 for (U32 j = 0; j < LLFastTimer::FTM_HISTORY_NUM; j++)
                                 {
                                         U64 ticks = ticks_sum[j+1][idx];
+                                        if (mDisplayCalls)
+                                        {
+                                                S32 tidx = ft_display_table[idx].timer;
+                                                S32 hidx = (LLFastTimer::sLastFrameIndex + j) % LLFastTimer::FTM_HISTORY_NUM;
+                                                ticks = (S32)LLFastTimer::sCallHistory[hidx][tidx];
+                                        }
+                                        
                                         if (alpha == 1.f)
                                         { //normalize to highlighted timer
                                                 cur_max = llmax(cur_max, ticks);
diff --git a/linden/indra/newview/llfasttimerview.h b/linden/indra/newview/llfasttimerview.h
index b20c8eb..11a8887 100644
--- a/linden/indra/newview/llfasttimerview.h
+++ b/linden/indra/newview/llfasttimerview.h
@@ -28,10 +28,10 @@
 #ifndef LL_LLFASTTIMERVIEW_H
 #define LL_LLFASTTIMERVIEW_H
 
-#include "llview.h"
+#include "llfloater.h"
 #include "llframetimer.h"
 
-class LLFastTimerView : public LLView
+class LLFastTimerView : public LLFloater
 {
 public:
         LLFastTimerView(const std::string& name, const LLRect& rect);
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 061b343..c0fd96b 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -156,7 +156,7 @@ BOOL LLFeatureList::maskList(LLFeatureList &mask)
         }
 
 #if 0 && !LL_RELEASE_FOR_DOWNLOAD
-        llinfos << "After appling mask " << mask.mName << llendl;
+        llinfos << "After applying mask " << mask.mName << llendl;
         dump();
 #endif
         return TRUE;
@@ -208,12 +208,12 @@ BOOL LLFeatureManager::loadFeatureTables()
         data_path += FEATURE_TABLE_FILENAME;
 
 
-        char    name[MAX_STRING+1];
+        char    name[MAX_STRING+1];      /*Flawfinder: ignore*/
 
         llifstream file;
         U32             version;
         
-        file.open(data_path.c_str()); 
+        file.open(data_path.c_str());    /*Flawfinder: ignore*/
 
         if (!file)
         {
@@ -235,12 +235,12 @@ BOOL LLFeatureManager::loadFeatureTables()
         LLFeatureList *flp = NULL;
         while (!file.eof())
         {
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
                 name[0] = 0;
 
                 file >> name;
                 
-                if (strlen(name) >= 2 && 
+                if (strlen(name) >= 2 &&         /*Flawfinder: ignore*/
                         name[0] == '/' && 
                         name[1] == '/')
                 {
@@ -249,7 +249,7 @@ BOOL LLFeatureManager::loadFeatureTables()
                         continue;
                 }
 
-                if (strlen(name) == 0)
+                if (strlen(name) == 0)           /*Flawfinder: ignore*/
                 {
                         // This is a blank line
                         file.getline(buffer, MAX_STRING);
@@ -295,7 +295,6 @@ BOOL LLFeatureManager::loadFeatureTables()
                 }
         }
         file.close();
-        //flp->dump();
 
         return TRUE;
 }
@@ -314,7 +313,7 @@ void LLFeatureManager::loadGPUClass()
         
         llifstream file;
                 
-        file.open(data_path.c_str()); 
+        file.open(data_path.c_str());            /*Flawfinder: ignore*/
 
         if (!file)
         {
@@ -330,12 +329,12 @@ void LLFeatureManager::loadGPUClass()
         
         while (!file.eof())
         {
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
                 buffer[0] = 0;
 
                 file.getline(buffer, MAX_STRING);
                 
-                if (strlen(buffer) >= 2 && 
+                if (strlen(buffer) >= 2 &&       /*Flawfinder: ignore*/
                         buffer[0] == '/' && 
                         buffer[1] == '/')
                 {
@@ -343,7 +342,7 @@ void LLFeatureManager::loadGPUClass()
                         continue;
                 }
 
-                if (strlen(buffer) == 0)
+                if (strlen(buffer) == 0)         /*Flawfinder: ignore*/
                 {
                         // This is a blank line
                         continue;
@@ -360,7 +359,7 @@ void LLFeatureManager::loadGPUClass()
                         continue;
                 }
         
-                for (U32 i = 0; i < strlen(expr); i++)
+                for (U32 i = 0; i < strlen(expr); i++)   /*Flawfinder: ignore*/
                 {
                         expr[i] = tolower(expr[i]);
                 }
@@ -380,10 +379,11 @@ void LLFeatureManager::loadGPUClass()
                         llinfos << "GPU is " << label << llendl;
                         mGPUString = label;
                         mGPUClass = (S32) strtol(cls, NULL, 10);        
+                        file.close();
+                        return;
                 }
         }
         file.close();
-        //flp->dump();
 
         llwarns << "Couldn't match GPU to a class: " << gGLManager.getRawGLString() << llendl;
 }
@@ -401,11 +401,7 @@ void LLFeatureManager::initCPUFeatureMasks()
         {
                 maskFeatures("RAM256MB");
         }
-        else if (gSysMemory.getPhysicalMemory() <= 512*1024*1024)
-        {
-                //maskFeatures("RAM512MB");
-        }
-
+        
         if (gSysCPU.getMhz() < 1100)
         {
                 maskFeatures("CPUSlow");
@@ -468,7 +464,11 @@ void LLFeatureManager::initGraphicsFeatureMasks()
         }
         if (gGLManager.mIsIntel)
         {
-                maskFeatures("Brookdale");
+                maskFeatures("Intel");
+        }
+        if (gGLManager.mGLVersion < 1.5f)
+        {
+                maskFeatures("OpenGLPre15");
         }
 
         if (gGLManager.mIsMobilityRadeon9000)
@@ -483,303 +483,6 @@ void LLFeatureManager::initGraphicsFeatureMasks()
 
 extern LLOSInfo gSysOS;
 
-
-BOOL bad_hardware_dialog(const LLString &info_str, const LLString &url)
-{
-        if (!gSavedSettings.getWarning("AboutBadPCI"))
-        {
-                return FALSE;
-        }
-
-        // XUI:translate
-        std::string msg = llformat(
-                        "[SECOND_LIFE] has detected that there may be a problem with.\n"
-                        "hardware or drivers on your computer.  Often resolving these\n"
-                        "issues can result in enhanced stability and performance.\n"
-                        " \n"
-                        "%s\n"
-                        " \n"
-                        "Would you like to view a web page with more detailed\n"
-                        "information on this problem?\n", info_str.c_str());
-
-        // Warn them that runnin without DirectX 9 will
-        // not allow us to tell them about driver issues
-        S32 button = OSMessageBox(msg.c_str(),
-                                                          "Warning",
-                                                          OSMB_YESNO);
-        if (OSBTN_YES== button)
-        {
-                llinfos << "User quitting after detecting bad drivers" << llendl;
-                spawn_web_browser(url.c_str());
-                return TRUE;
-        }
-        else
-        {
-                // Don't warn about bad PCI stuff again, they've clicked past it.
-                gSavedSettings.setWarning("AboutBadPCI", FALSE);
-        }
-        return FALSE;
-}
-
-BOOL LLFeatureManager::initPCIFeatureMasks()
-{
-#if LL_WINDOWS
-        BOOL exit_after_bad = FALSE;
-
-        BOOL is_2000 = FALSE;
-        BOOL is_xp = FALSE;
-
-        if (gSysOS.mMajorVer != 5)
-        {
-                // Unknown windows version number, exit!"
-                llwarns << "Unknown Windows major version " << gSysOS.mMajorVer << ", aborting detection!" << llendl;
-                return FALSE;
-        }
-        if (gSysOS.mMinorVer == 0)
-        {
-                is_2000 = TRUE;
-        }
-        else if (gSysOS.mMinorVer == 1)
-        {
-                is_xp = TRUE;
-        }
-        else
-        {
-                llwarns << "Unknown Windows minor version " << gSysOS.mMinorVer << ", aborting detection!" << llendl;
-                return FALSE;
-        }
-
-        // This only works on Win32, as it relies on DX9 hardware detection
-        // The PCI masks are actually the inverse of the normal masks
-        // We actually look through the masks,and see if any hardware matches it.
-        // This is because the masks encode logic about
-
-        // Check for the broken AMD AGP controllers (751, 761, 762)
-
-        // Horrible cruddy fixed lookup table.
-        // Figure out what OS we're on, the version numbers are different.  Sigh...
-
-        LLDXDriverFile *dfilep = NULL;
-        LLDXDevice *devp = NULL;
-
-        // AMD(1022) AGP controllers
-        // 7007         AMD-751 AGP Controller
-        // 700F         AMD-761 AGP Controller
-        // 700D         AMD-762 AGP Controller
-        devp = gDXHardware.findDevice("VEN_1022", "DEV_7007|DEV_700F|DEV_700D");
-        if (devp)
-        {
-                // We're just pretty much screwed here, there are big problems with this hardware
-                // We've got trouble with the most recent nVidia drivers.  Check for this and warn.
-
-                // Note:  Need to detect that we're running with older nVidia hardware, probably
-                exit_after_bad |= bad_hardware_dialog("AMD AGP Controller",
-                                                                                          AMD_AGP_URL);
-        }
-
-        // VIA(1106) AGP Controllers
-        // These need upgrading on both Win2K and WinXP
-        //
-        // 8305         VT8363/8365                     CPU to AGP - Apollo KT133/KM133
-        // 8598         VT82C598MVP/694X        CPU to AGP - Apollo MVP3/Pro133A
-        // 8605         VT8605                          CPU to AGP - Apollo PM133
-        // B091         VT8633                          CPU to AGP - Apollo Pro 266
-        // B099         VT8366/A/T                      CPU to AGP - Apollo KT266/A/333
-        // B168         VT8235                          CPU to AGP (AGP 2.0/3.0) - ProSavageDDR P4X333 chipset
-        // B188         VT8237                          CPU to AGP (AGP 2.0/3.0) - K8T800
-        // B198         VT8237                          CPU to AGP (AGP 2.0/3.0) - ProSavageDDR P4X600 chipset
-
-        devp = gDXHardware.findDevice("VEN_1106",
-                                                                  "DEV_8305|DEV_8598|DEV_8605|DEV_B091|"
-                                                                  "DEV_B099|DEV_B168|DEV_B188|DEV_B198");
-        if (devp)
-        {
-                BOOL out_of_date = FALSE;
-                // Wanted driver: VIAAGP1.SYS
-                // Version Format: M.mm.0000.vvvv
-                //              M.mm - Major/minor OS version (5.0 for Win2000, 5.1 for WinXP)
-                //              vvvv - driver version number
-                //
-                // Notes:
-                // 3442 is most recent as of 2/25/04, probably want at least 3430 (seems to be a common version)
-
-                // These are DELIBERATE assignments inside if statements, blech.
-                if (dfilep = devp->findDriver("pci.sys"))
-                {
-                        // Old driver: pci.sys
-                        // Version: 5.01.2600.xxxx
-                        //
-                        // Notes:
-                        // Default WinXP driver for B168, B198?
-
-                        // Old driver: pci.sys
-                        // Version: 5.01.2195.xxxx
-                        //
-                        // Notes:
-                        // Default Win2K driver for 8305?
-
-                        llwarns << "Detected pci.sys" << llendl;
-                        write_debug("Old driver (pci.sys) for VIA detected!");
-                        out_of_date = TRUE;
-                }
-                else if (dfilep = devp->findDriver("VIAAGP.SYS"))
-                {
-                        // Old driver: VIAAGP.SYS
-                        // Version: 5.01.2600.xxxx
-                        //
-                        // Notes:
-                        // Default WinXP driver for B09x?
-
-                        llwarns << "Detected VIAAGP.SYS" << llendl;
-                        write_debug("Old driver (VIAAGP.SYS) for VIA detected!");
-                        out_of_date = TRUE;
-                }
-                else if (dfilep = devp->findDriver("VIAAGP1.SYS"))
-                {
-                        if (dfilep->mVersion.getField(3) < 3430)
-                        {
-                                // They're using a pretty old version of the VIA AGP drivers
-                                // Maybe they want to upgrade?
-                            llwarns << "Detected VIAAGP1.SYS" << llendl;
-                            write_debug("Old driver (VIAAGP1.SYS) for VIA detected!");
-                                out_of_date = TRUE;
-                        }
-                }
-                if (out_of_date)
-                {
-                        exit_after_bad |= bad_hardware_dialog("Out of date VIA AGP chipset driver",
-                                                                                                  VIA_URL);
-                }
-        }
-
-        // Intel(8086) AGP controllers (Win2K)
-        // These particular controllers only may need drivers on Win2K
-        //
-        // 1A31         82845[MP|MZ] Processor to AGP Controller
-        // 2532         82850/860 Processor to AGP Controller
-        if (is_2000)
-        {
-                devp = gDXHardware.findDevice("VEN_8086",
-                                                                          "DEV_1A31");
-                if (devp)
-                {
-                        if (dfilep = devp->findDriver("pci.sys"))
-                        {
-                                // Old driver: pci.sys
-                                // Version 5.01.21[9|6]5.xxxx
-                                //
-                                // Notes:
-                                // Default driver for Win2K?  Not sure what the "correct" driver is -
-                                // maybe some variant of AGP440.SYS?
-                                llwarns << "Detected pci.sys" << llendl;
-                                write_debug("Old driver (pci.sys) for Intel 82845/850 on Win2K detected!");
-                                exit_after_bad |= bad_hardware_dialog("Out of date Intel chipset driver",
-                                                                                                          INTEL_CHIPSET_URL);
-                        }
-                }
-        }
-
-        /* Removed 4/3/2006 by JC
-           After talking with Doug, we don't know what the proper driver
-           and/or version number should be for Intel 865.  Regardless, this
-           code would _always_ complain if you had that chipset.
-
-        // Intel(8086) AGP controllers (All)
-        // These particular controllers may need drivers on both Win2K and WinXP
-        //
-        // 2561         82845G/GL/GE/PE/GV Processor to AGP Controller
-        // 2571         82865G/PE/P/GV/28248P Processor to AGP Controller
-        devp = gDXHardware.findDevice("VEN_8086",
-                                                                  "DEV_2571");
-        if (devp)
-        {
-                // Wanted driver: AGP440.SYS(?)
-                //
-                // Notes:
-                // Not sure, need to verify with an actual 82865/75 (Dell 8300?)
-                
-                // Old driver: pci.sys
-                // Version 5.01.21[9|6]5.xxxx
-                //
-                // Notes:
-                // Default driver for Win2K?  Not sure what the "correct" driver is -
-                // maybe some variant of AGP440.SYS?
-                exit_after_bad |= bad_hardware_dialog("Out of date Intel chipset driver",
-                                                                                          INTEL_CHIPSET_URL);
-        }
-        */
-
-
-        // SiS(1039) AGP controllers (All)
-        // These particular controllers may need drivers on both Win2K and WinXP
-        //
-        // 0001         SiS 530
-        // 0002         SiS SG86C202(???)
-        // 0003         SiS 648FX
-        devp = gDXHardware.findDevice("VEN_1039",
-                                                                  "DEV_0001|DEV_0002|DEV_0003");
-        if (devp)
-        {
-                BOOL out_of_date = FALSE;
-                // Wanted driver: SISAGPX.SYS
-                //
-                // Notes:
-                // Not sure, need to verify with an actual 82865/75 (Dell 8300?)
-                
-                // Old driver: pci.sys
-                // Version 5.01.21[9|6]5.xxxx
-                //
-                // Notes:
-                // Default driver for Win2K?  Not sure what the "correct" driver is -
-                // maybe some variant of AGP440.SYS?
-                if (dfilep = devp->findDriver("pci.sys"))
-                {
-                        // Old driver: pci.sys
-                        // Version 5.01.21[9|6]5.xxxx
-                        //
-                        llwarns << "Detected pci.sys" << llendl;
-                        write_debug("Old driver (pci.sys) for SiS detected!");
-                        out_of_date = TRUE;
-                }
-
-                if (dfilep = devp->findDriver("sisagp.sys"))
-                {
-                        // Old driver: pci.sys
-                        // Version 5.01.21[9|6]5.xxxx
-                        //
-                        llwarns << "Detected sisagp.sys" << llendl;
-                        write_debug("Old driver (sisagp.sys) for SiS detected!");
-                        out_of_date = TRUE;
-                }
-
-                if (dfilep = devp->findDriver("sisagpx.sys"))
-                {
-                        // Old driver: pci.sys
-                        // Version 7.02.0000.xxxx
-                        //
-                        // Notes:
-                        // Default driver for Win2K?  Not sure what the "correct" driver is -
-                        // maybe some variant of AGP440.SYS?
-                        if (dfilep->mVersion.getField(3) < 1160)
-                        {
-                                out_of_date = TRUE;
-                                llwarns << "Detected sisagpx.sys" << llendl;
-                                write_debug("Old driver (sisagpx.sys) for SiS detected!");
-                        }
-                }
-                if (out_of_date)
-                {
-                        exit_after_bad |= bad_hardware_dialog("Out of date SiS chipset driver",
-                                                                                                  SIS_CHIPSET_URL);
-                }
-        }
-
-        return exit_after_bad;
-#else
-        return TRUE;
-#endif
-}
-
 void LLFeatureManager::applyRecommendedFeatures()
 {
         // see featuretable.txt
@@ -789,14 +492,14 @@ void LLFeatureManager::applyRecommendedFeatures()
         dump();
 #endif
         
-        // Enabling AGP
-        if (getRecommendedLevel("RenderAGP"))
+        // Enabling VBO
+        if (getRecommendedLevel("RenderVBO"))
         {
-                gSavedSettings.setBOOL("RenderUseAGP", TRUE);
+                gSavedSettings.setBOOL("RenderVBOEnable", TRUE);
         }
         else
         {
-                gSavedSettings.setBOOL("RenderUseAGP", FALSE);
+                gSavedSettings.setBOOL("RenderVBOEnable", FALSE);
         }
 
         // Anisotropic rendering
diff --git a/linden/indra/newview/llfeaturemanager.h b/linden/indra/newview/llfeaturemanager.h
index a24f06f..a3800da 100644
--- a/linden/indra/newview/llfeaturemanager.h
+++ b/linden/indra/newview/llfeaturemanager.h
@@ -100,8 +100,7 @@ public:
 
         void initCPUFeatureMasks();
         void initGraphicsFeatureMasks();
-        BOOL initPCIFeatureMasks();
-
+        
         void applyRecommendedFeatures();
 
 protected:
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 6b56df6..d3938e0 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -36,6 +36,10 @@
 #include "lldir.h"
 #include "llframetimer.h"
 
+#if LL_SDL
+#include "llwindowsdl.h" // for some X/GTK utils to help with filepickers
+#endif // LL_SDL
+
 //
 // Globals
 //
@@ -164,7 +168,7 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
         if (success)
         {
                 LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-                memcpy(mFiles, tstr.c_str(), tstr.size()+1);
+                memcpy(mFiles, tstr.c_str(), tstr.size()+1); /*Flawfinder: ignore*/
                 mCurrentFile = mFiles;
         }
         send_agent_resume();
@@ -204,12 +208,12 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
                 // The getopenfilename api doesn't tell us if we got more than
                 // one file, so we have to test manually by checking string
                 // lengths.
-                if( wcslen(mOFN.lpstrFile) > mOFN.nFileOffset )
+                if( wcslen(mOFN.lpstrFile) > mOFN.nFileOffset ) /*Flawfinder: ignore*/
                 {
                         mMultiFile = FALSE;
                         mCurrentFile = mFiles;
                         LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-                        memcpy(mFiles, tstr.c_str(), tstr.size()+1);
+                        memcpy(mFiles, tstr.c_str(), tstr.size()+1); /*Flawfinder: ignore*/
                 }
                 else
                 {
@@ -252,7 +256,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         if (filename)
         {
                 llutf16string tstring = utf8str_to_utf16str(filename);
-                wcsncpy(mFilesW, tstring.c_str(), FILENAME_BUFFER_SIZE);        }
+                wcsncpy(mFilesW, tstring.c_str(), FILENAME_BUFFER_SIZE);        }       /*Flawfinder: ignore*/
         else
         {
                 mFilesW[0] = '\0';
@@ -272,7 +276,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_WAV:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.wav", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.wav", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"wav";
                         L"WAV Sounds (*.wav)\0*.wav\0" \
@@ -281,7 +285,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_TGA:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.tga", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.tga", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"tga";
                 mOFN.lpstrFilter =
@@ -291,7 +295,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_BMP:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.bmp", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.bmp", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"bmp";
                 mOFN.lpstrFilter =
@@ -301,7 +305,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_AVI:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.avi", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.avi", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"avi";
                 mOFN.lpstrFilter =
@@ -311,7 +315,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_ANIM:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.xaf", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.xaf", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"xaf";
                 mOFN.lpstrFilter =
@@ -322,7 +326,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_GEOMETRY:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.slg", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.slg", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"slg";
                 mOFN.lpstrFilter =
@@ -333,7 +337,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_XML:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.xml", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.xml", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
 
                 mOFN.lpstrDefExt = L"xml";
@@ -344,7 +348,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_COLLADA:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.collada", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.collada", FILENAME_BUFFER_SIZE);    /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"collada";
                 mOFN.lpstrFilter =
@@ -354,12 +358,22 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
         case FFSAVE_RAW:
                 if (!filename)
                 {
-                        wcsncpy( mFilesW,L"untitled.raw", FILENAME_BUFFER_SIZE);
+                        wcsncpy( mFilesW,L"untitled.raw", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
                 }
                 mOFN.lpstrDefExt = L"raw";
                 mOFN.lpstrFilter =      RAW_FILTER \
                                                         L"\0";
                 break;
+        case FFSAVE_J2C:
+                if (!filename)
+                {
+                        wcsncpy( mFilesW,L"untitled.j2c", FILENAME_BUFFER_SIZE);
+                }
+                mOFN.lpstrDefExt = L"j2c";
+                mOFN.lpstrFilter =
+                        L"Compressed Images (*.j2c)\0*.j2c\0" \
+                        L"\0";
+                break;
         default:
                 return FALSE;
         }
@@ -376,7 +390,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const char* filename)
                 if (success)
                 {
                         LLString tstr = utf16str_to_utf8str(llutf16string(mFilesW));
-                        memcpy(mFiles, tstr.c_str(), tstr.size()+1);
+                        memcpy(mFiles, tstr.c_str(), tstr.size()+1);  /*Flawfinder: ignore*/
                         mCurrentFile = mFiles;
                 }
                 gKeyboard->resetKeys();
@@ -402,7 +416,7 @@ const char* LLFilePicker::getNextFile()
 {
         if(mMultiFile)
         {
-                mCurrentFile += strlen(mCurrentFile) + 1;
+                mCurrentFile += strlen(mCurrentFile) + 1;       /*Flawfinder: ignore*/
                 if( '\0' != mCurrentFile[0] )
                 {
                         buildFilename();
@@ -435,11 +449,11 @@ void LLFilePicker::reset()
 
 void LLFilePicker::buildFilename( void )
 {
-        strncpy( mFilename, mFiles, LL_MAX_PATH );
-        S32 len = strlen( mFilename );
+        strncpy( mFilename, mFiles, LL_MAX_PATH );      /*Flawfinder: ignore*/
+        S32 len = strlen( mFilename );  /*Flawfinder: ignore*/
 
-        strcat(mFilename,gDirUtilp->getDirDelimiter().c_str());
-        len += strlen(gDirUtilp->getDirDelimiter().c_str());
+        strncat(mFilename,gDirUtilp->getDirDelimiter().c_str(), sizeof(mFilename)-len+1);               /*Flawfinder: ignore*/
+        len += strlen(gDirUtilp->getDirDelimiter().c_str());    /*Flawfinder: ignore*/
 
 //      mFilename[len++] = '\\';
         LLString::copy( mFilename + len, mCurrentFile, LL_MAX_PATH - len );
@@ -601,7 +615,7 @@ OSStatus	LLFilePicker::doNavChooseDialog(ELoadFilter filter)
                         AEKeyword       theAEKeyword;
                         DescType        typeCode;
                         Size            actualSize = 0;
-                        char            path[MAX_PATH];
+                        char            path[MAX_PATH]; /*Flawfinder: ignore*/
                         
                         memset(&fsRef, 0, sizeof(fsRef));
                         error = AEGetNthPtr(&navReply.selection, index, typeFSRef, &theAEKeyword, &typeCode, &fsRef, sizeof(fsRef), &actualSize);
@@ -675,6 +689,12 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
                         extension = CFSTR(".raw");
                         break;
 
+                case FFSAVE_J2C:
+                        type = '\?\?\?\?';
+                        creator = 'prvw';
+                        extension = CFSTR(".j2c");
+                        break;
+                
                 case FFSAVE_ALL:
                 default:
                         type = '\?\?\?\?';
@@ -750,8 +770,8 @@ OSStatus	LLFilePicker::doNavSaveDialog(ESaveFilter filter, const char* filename)
                         
                         if (error == noErr)
                         {
-                                char    path[PATH_MAX];
-                                char    newFileName[SINGLE_FILENAME_BUFFER_SIZE];
+                                char    path[PATH_MAX];         /*Flawfinder: ignore*/
+                                char    newFileName[SINGLE_FILENAME_BUFFER_SIZE];       /*Flawfinder: ignore*/
                                 
                                 error = FSRefMakePath(&fsRef, (UInt8*)path, PATH_MAX);
                                 if (error == noErr)
@@ -836,7 +856,7 @@ void LLFilePicker::getFilePath(SInt32 index)
 {
         mFiles[0] = 0;
         if (mFileVector.size())
-                strcpy(mFiles, mFileVector[index].c_str());
+                strncpy(mFiles, mFileVector[index].c_str(), sizeof(mFiles));    /*Flawfinder: ignore*/  
 }
 
 void LLFilePicker::getFileName(SInt32 index)
@@ -846,7 +866,7 @@ void LLFilePicker::getFileName(SInt32 index)
         {
                 char    *start = strrchr(mFileVector[index].c_str(), '/');
                 if (start && ((start + 1 - mFileVector[index].c_str()) < (mFileVector[index].size())))
-                        strcpy(mFilename, start + 1);
+                        strncpy(mFilename, start + 1, sizeof(mFilename));               /*Flawfinder: ignore*/
         }
 }
 
@@ -973,8 +993,7 @@ static void store_filenames(GtkWidget *widget, gpointer user_data) {
 
 GtkWindow* LLFilePicker::buildFilePicker(void)
 {
-        gtk_disable_setlocale();
-        if (gtk_init_check(NULL, NULL) &&
+        if (ll_try_gtk_init() &&
             ! gViewerWindow->getWindow()->getFullscreen())
         {
                 GtkWidget *win = NULL;
@@ -986,18 +1005,17 @@ GtkWindow* LLFilePicker::buildFilePicker(void)
                 // Make GTK tell the window manager to associate this
                 // dialog with our non-GTK raw X11 window, which should try
                 // to keep it on top etc.
-                Window *XWindowID_ptr = (Window*) gViewerWindow->
-                        getWindow()->getPlatformWindow();
-                if (XWindowID_ptr && None != *XWindowID_ptr)
+                Window XWindowID = get_SDL_XWindowID();
+                if (None != XWindowID)
                 {
                         gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin
-                        GdkWindow *gdkwin = gdk_window_foreign_new(*XWindowID_ptr);
+                        GdkWindow *gdkwin = gdk_window_foreign_new(XWindowID);
                         gdk_window_set_transient_for(GTK_WIDGET(win)->window,
                                                      gdkwin);
                 }
                 else
                 {
-                        llwarns << "Hmm, couldn't get xwid from LLWindow." << llendl;
+                        llwarns << "Hmm, couldn't get xwid to use for transient." << llendl;
                 }
 #  endif //LL_X11
 
@@ -1080,6 +1098,10 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const char* filename )
                         caption += "RAW File (*.raw)";
                         suggest_ext += ".raw";
                         break;
+                case FFSAVE_J2C:
+                        caption += "Compressed Images (*.j2c)";
+                        suggest_ext += ".j2c";
+                        break;
                 default:;
                         break;
                 }
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index 88530f6..c284a42 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -106,6 +106,7 @@ public:
                 FFSAVE_XML = 9,
                 FFSAVE_COLLADA = 10,
                 FFSAVE_RAW = 11,
+                FFSAVE_J2C = 12,
         };
 
         // open the dialog. This is a modal operation
@@ -169,8 +170,8 @@ private:
         U32 mNextFileIndex;
 #endif
 
-        char mFiles[FILENAME_BUFFER_SIZE];
-        char mFilename[LL_MAX_PATH];
+        char mFiles[FILENAME_BUFFER_SIZE];      /*Flawfinder: ignore*/
+        char mFilename[LL_MAX_PATH];    /*Flawfinder: ignore*/
         char* mCurrentFile;
         BOOL mLocked;
         BOOL mMultiFile;
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 7e37c4c..4ce1614 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -44,11 +44,6 @@
 #include "llviewerregion.h"
 #include "llworld.h"
 
-/*static*/ LLVolumeImplFlexible::lodset_t LLVolumeImplFlexible::sLODBins[ FLEXIBLE_OBJECT_MAX_LOD ];
-/*static*/ U64 LLVolumeImplFlexible::sCurrentUpdateFrame = 0;
-/*static*/ U32 LLVolumeImplFlexible::sDebugInserted = 0;
-/*static*/ U32 LLVolumeImplFlexible::sDebugVisible = 0;
-
 /*static*/ F32 LLVolumeImplFlexible::sUpdateFactor = 1.0f;
 
 // LLFlexibleObjectData::pack/unpack now in llprimitive.cpp
@@ -59,14 +54,13 @@
 LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject* vo, LLFlexibleObjectData* attributes) :
                 mVO(vo), mAttributes(attributes)
 {
+        static U32 seed = 0;
+        mID = seed++;
         mInitialized = FALSE;
         mUpdated = FALSE;
-        mJustShifted = FALSE;
         mInitializedRes = -1;
         mSimulateRes = 0;
         mFrameNum = 0;
-        mLastUpdate = 0;
-
 }//-----------------------------------------------
 
 LLVector3 LLVolumeImplFlexible::getFramePosition() const
@@ -94,7 +88,6 @@ void LLVolumeImplFlexible::onShift(const LLVector3 &shift_vector)
         {
                 mSection[section].mPosition += shift_vector;    
         }
-        mVO->getVolume()->mBounds[0] += shift_vector;
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -107,7 +100,7 @@ void LLVolumeImplFlexible::setParentPositionAndRotationDirectly( LLVector3 p, LL
 
 void LLVolumeImplFlexible::remapSections(LLFlexibleObjectSection *source, S32 source_sections,
                                                                                  LLFlexibleObjectSection *dest, S32 dest_sections)
-{
+{       
         S32 num_output_sections = 1<<dest_sections;
         LLVector3 scale = mVO->mDrawable->getScale();
         F32 source_section_length = scale.mV[VZ] / (F32)(1<<source_sections);
@@ -228,6 +221,7 @@ void LLVolumeImplFlexible::setAttributesOfAllSections()
 
         F32 t_inc = 1.f/F32(num_sections);
         F32 t = t_inc;
+
         for ( int i=1; i<= num_sections; i++)
         {
                 mSection[i].mAxisRotation.setQuat(lerp(begin_rot,end_rot,t),0,0,1);
@@ -236,18 +230,17 @@ void LLVolumeImplFlexible::setAttributesOfAllSections()
                         scale.mV[VY] * lerp(bottom_scale.mV[1], top_scale.mV[1], t));
                 t += t_inc;
         }
-        mLastUpdate = 0;
 }//-----------------------------------------------------------------------------------
 
 
 void LLVolumeImplFlexible::onSetVolume(const LLVolumeParams &volume_params, const S32 detail)
 {
-        doIdleUpdate(gAgent, *gWorldp, 0.0);
+        /*doIdleUpdate(gAgent, *gWorldp, 0.0);
         if (mVO && mVO->mDrawable.notNull())
         {
                 gPipeline.markRebuild(mVO->mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
                 gPipeline.markMoved(mVO->mDrawable);
-        }
+        }*/
 }
 
 //---------------------------------------------------------------------------------
@@ -257,6 +250,13 @@ void LLVolumeImplFlexible::onSetVolume(const LLVolumeParams &volume_params, cons
 //---------------------------------------------------------------------------------
 BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
+        if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
+        {
+                return TRUE;
+        }
+
+        LLFastTimer ftm(LLFastTimer::FTM_FLEXIBLE_UPDATE);
+
         if (mVO->mDrawable.isNull())
         {
                 // Don't do anything until we have a drawable
@@ -267,46 +267,17 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
         mVO->mDrawable->mQuietCount = 0;
         if (!mVO->mDrawable->isRoot())
         {
-                mVO->mDrawable->getParent()->mQuietCount = 0;
+                LLViewerObject* parent = (LLViewerObject*) mVO->getParent();
+                parent->mDrawable->mQuietCount = 0;
         }
-        
-        if (((LLVOVolume*)mVO)->mLODChanged || 
-                mVO->mDrawable->isState(LLDrawable::IN_REBUILD_Q1))
-        {
-                mLastUpdate = 0; // Force an immediate update
-        }
-        // Relegate invisible objects to the lowest priority bin
-        S32 lod = 0;
-        F32 app_angle = mVO->getAppAngle()*DEG_TO_RAD/gCamera->getView();
-        if (mVO->mDrawable->isVisible())
-        {
-                sDebugVisible++;
-                if (mVO->isSelected())
-                {
-                        // Force selected objects to update *every* frame
-                        lod = FLEXIBLE_OBJECT_MAX_LOD-1;
-                }
-                else
-                {
-                        if (app_angle > 0)
-                        {
-                                lod = 5 - (S32)(1.0f/sqrtf(app_angle));
-                                if (lod < 1)
-                                {
-                                        lod = 1;
-                                }
-                        }
+                
+        S32 new_res = mAttributes->getSimulateLOD();
 
-                        if (mVO->isAttachment())
-                        {
-                                lod += 3;
-                        }
-                }
-        }
+        //number of segments only cares about z axis
+        F32 app_angle = llround((F32) atan2( mVO->getScale().mV[2]*2.f, mVO->mDrawable->mDistanceWRTCamera) * RAD_TO_DEG, 0.01f);
 
-        S32 new_res = mAttributes->getSimulateLOD();
         // Rendering sections increases with visible angle on the screen
-        mRenderRes = (S32)(FLEXIBLE_OBJECT_MAX_SECTIONS*4*app_angle);
+        mRenderRes = (S32)(FLEXIBLE_OBJECT_MAX_SECTIONS*4*app_angle*DEG_TO_RAD/gCamera->getView());
         if (mRenderRes > FLEXIBLE_OBJECT_MAX_SECTIONS)
         {
                 mRenderRes = FLEXIBLE_OBJECT_MAX_SECTIONS;
@@ -329,22 +300,32 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
                 mInitialized = TRUE;
         }
 
-        sLODBins[lod].insert(this);
-        sDebugInserted++;
-        return TRUE;
-}
-
-// static
-void LLVolumeImplFlexible::resetUpdateBins()
-{
-        U32 lod;
-        for (lod=0; lod<FLEXIBLE_OBJECT_MAX_LOD; ++lod)
+        if (mVO->mDrawable->isVisible() &&
+                !mVO->mDrawable->isState(LLDrawable::IN_REBUILD_Q1) &&
+                mVO->getPixelArea() > 256.f)
         {
-                sLODBins[lod].clear();
+                U32 id;
+                F32 pixel_area = mVO->getPixelArea();
+
+                if (mVO->isRootEdit())
+                {
+                        id = mID;
+                }
+                else
+                {
+                        LLVOVolume* parent = (LLVOVolume*) mVO->getParent();
+                        id = parent->getVolumeInterfaceID();
+                }
+
+                U32 update_period = (U32) (gCamera->getScreenPixelArea()*0.01f/(pixel_area*(sUpdateFactor+1.f)))+1;
+
+                if ((LLDrawable::getCurrentFrame()+id)%update_period == 0)
+                {
+                        gPipeline.markRebuild(mVO->mDrawable, LLDrawable::REBUILD_POSITION, FALSE);
+                }
         }
-        ++sCurrentUpdateFrame;
-        sDebugInserted = 0;
-        sDebugVisible = 0;
+        
+        return TRUE;
 }
 
 inline S32 log2(S32 x)
@@ -358,80 +339,15 @@ inline S32 log2(S32 x)
         return ret;
 }
 
-// static
-void LLVolumeImplFlexible::doFlexibleUpdateBins()
-{
-        U32 lod;
-        U32 updated = 0;
-        U32 regen = 0;
-        U32 newflexies = 0;
-        F32 time_alloc[FLEXIBLE_OBJECT_MAX_LOD];
-        F32 total_time_alloc = 0;
-
-        bool new_objects_only = false;
-
-        if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
-        {
-                new_objects_only = true;
-        }
-
-        for (lod=0; lod<FLEXIBLE_OBJECT_MAX_LOD; ++lod)
-        {
-                int count = sLODBins[lod].size();
-                if (count > 0)
-                {
-                        time_alloc[lod] = (F32)((lod+1)*(log2(count)));
-                }
-                else
-                {
-                        time_alloc[lod] = 0;
-                }
-                total_time_alloc += time_alloc[lod];
-        }
-        total_time_alloc = FLEXIBLE_OBJECT_TIMESLICE * (sUpdateFactor+0.01f) / total_time_alloc;
-
-        {
-                LLFastTimer t(LLFastTimer::FTM_FLEXIBLE_UPDATE);
-                LLTimer timer;
-                for (lod=0; lod<FLEXIBLE_OBJECT_MAX_LOD; ++lod)
-                {
-                        LLVolumeImplFlexible::lodset_t::iterator itor = sLODBins[lod].begin();
-                        int bin_count = 0;
-                        if (!new_objects_only)
-                        {
-                                timer.reset();
-                                double end_time = time_alloc[lod] * total_time_alloc;
-                                for (; itor!=sLODBins[lod].end(); ++itor)
-                                {
-
-                                        (*itor)->doFlexibleUpdate();
-                                        ++updated;
-                                        (*itor)->doFlexibleRebuild();
-                                        ++bin_count;
-                                        ++regen;
-                                        if (timer.getElapsedTimeF64() > end_time)
-                                        {
-                                                break;
-                                        }
-                                }
-                        }
-                        for (; itor != sLODBins[lod].end(); ++itor)
-                        {
-                                if ((*itor)->getLastUpdate() == 0)
-                                {
-                                        // *Always* update newly-created objects, or objects which have changed LOD
-                                        (*itor)->doFlexibleUpdate();
-                                        (*itor)->doFlexibleRebuild();
-                                        ++newflexies;
-                                }
-                        }
-                }
-        }
-}
-
 void LLVolumeImplFlexible::doFlexibleUpdate()
 {
         LLPath *path = &mVO->getVolume()->getPath();
+        if (mSimulateRes == 0)
+        {
+                mVO->markForUpdate(TRUE);
+                doIdleUpdate(gAgent, *gWorldp, 0.0);
+        }
+        
         S32 num_sections = 1 << mSimulateRes;
 
     F32 secondsThisFrame = mTimer.getElapsedTimeAndResetF32();
@@ -603,6 +519,10 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
                 // calculate velocity
                 //------------------------------------------------------------------------------------------
                 mSection[i].mVelocity = mSection[i].mPosition - lastPosition;
+                if (mSection[i].mVelocity.magVecSquared() > 1.f)
+                {
+                        mSection[i].mVelocity.normVec();
+                }
         }
 
         // Calculate derivatives (not necessary until normals are automagically generated)
@@ -643,11 +563,38 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
         LLFlexibleObjectSection newSection[ (1<<FLEXIBLE_OBJECT_MAX_SECTIONS)+1 ];
         remapSections(mSection, mSimulateRes, newSection, mRenderRes);
 
+        //generate transform from global to prim space
+        LLVector3 delta_scale = LLVector3(1,1,1);
+        LLVector3 delta_pos;
+        LLQuaternion delta_rot;
+
+        delta_rot = ~getFrameRotation();
+        delta_pos = -getFramePosition()*delta_rot;
+                
+        // Vertex transform (4x4)
+        LLVector3 x_axis = LLVector3(delta_scale.mV[VX], 0.f, 0.f) * delta_rot;
+        LLVector3 y_axis = LLVector3(0.f, delta_scale.mV[VY], 0.f) * delta_rot;
+        LLVector3 z_axis = LLVector3(0.f, 0.f, delta_scale.mV[VZ]) * delta_rot;
+
+        LLMatrix4 rel_xform;
+        rel_xform.initRows(LLVector4(x_axis, 0.f),
+                                                                LLVector4(y_axis, 0.f),
+                                                                LLVector4(z_axis, 0.f),
+                                                                LLVector4(delta_pos, 1.f));
+                        
         for (i=0; i<=num_render_sections; ++i)
         {
                 new_point = &path->mPath[i];
-                new_point->mPos = newSection[i].mPosition;
-                new_point->mRot = mSection[i].mAxisRotation * newSection[i].mRotation;
+                LLVector3 pos = newSection[i].mPosition * rel_xform;
+                LLQuaternion rot = mSection[i].mAxisRotation * newSection[i].mRotation * delta_rot;
+                
+                if (!mUpdated || (new_point->mPos-pos).magVecSquared() > 0.000001f)
+                {
+                        new_point->mPos = newSection[i].mPosition * rel_xform;
+                        mUpdated = FALSE;
+                }
+
+                new_point->mRot = rot;
                 new_point->mScale = newSection[i].mScale;
                 new_point->mTexT = ((F32)i)/(num_render_sections);
         }
@@ -658,13 +605,10 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 void LLVolumeImplFlexible::doFlexibleRebuild()
 {
         mVO->getVolume()->regen();
-
-        mVO->markForUpdate(TRUE);
-
         mUpdated = TRUE;
+}
 
-        mLastUpdate = sCurrentUpdateFrame;
-}//------------------------------------------------------------------
+//------------------------------------------------------------------
 
 void LLVolumeImplFlexible::onSetScale(const LLVector3& scale, BOOL damped)
 {
@@ -673,8 +617,6 @@ void LLVolumeImplFlexible::onSetScale(const LLVector3& scale, BOOL damped)
 
 BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
 {
-        BOOL compiled = FALSE;
-
         LLVOVolume *volume = (LLVOVolume*)mVO;
 
         if (volume->mDrawable.isNull()) // Not sure why this is happening, but it is...
@@ -682,60 +624,36 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable)
                 return TRUE; // No update to complete
         }
 
-        volume->calcAllTEsSame();
-
-        if (volume->mVolumeChanged || volume->mFaceMappingChanged)
+        if (volume->mLODChanged)
         {
-                compiled = TRUE;
-                volume->regenFaces();
-        }
-        else if (volume->mLODChanged)
-        {
-                LLPointer<LLVolume> old_volumep, new_volumep;
-                F32 old_lod, new_lod;
-
-                old_volumep = volume->getVolume();
-                old_lod = old_volumep->getDetail();
-
-                LLVolumeParams volume_params = volume->getVolume()->getParams();
+                LLVolumeParams volume_params = volume->getVolume()->getParams();
                 volume->setVolume(volume_params, 0);
-                doFlexibleUpdate();
-                volume->getVolume()->regen();
-                
-                new_volumep = volume->getVolume();
-                new_lod = new_volumep->getDetail();
-
-                if (new_lod != old_lod)
-                {
-                        compiled = TRUE;
-                        if (new_volumep->getNumFaces() != old_volumep->getNumFaces())
-                        {
-                                volume->regenFaces();
-                        }
-                }
+                mUpdated = FALSE;
         }
 
-        if (mUpdated)
+        volume->updateRelativeXform();
+        doFlexibleUpdate();
+        
+        if (volume->mLODChanged || volume->mFaceMappingChanged ||
+                volume->mVolumeChanged)
         {
-                compiled = TRUE;
-                mUpdated = FALSE;
+                volume->regenFaces();
+                volume->mDrawable->setState(LLDrawable::REBUILD_VOLUME);
         }
 
-        if(compiled)
+        if (!mUpdated || volume->mFaceMappingChanged || volume->mVolumeChanged)
         {
-                volume->updateRelativeXform(isVolumeGlobal());
-                volume->genTriangles(isVolumeGlobal());
-                LLPipeline::sCompiles++;
+                doFlexibleRebuild();
+                volume->genBBoxes(isVolumeGlobal());
         }
-        
+                        
         volume->mVolumeChanged = FALSE;
         volume->mLODChanged = FALSE;
         volume->mFaceMappingChanged = FALSE;
 
+
         // clear UV flag
         drawable->clearState(LLDrawable::UV);
-
-        drawable->movePartition();
         
         return TRUE;
 }
@@ -811,42 +729,32 @@ LLQuaternion LLVolumeImplFlexible::getEndRotation()
 }//------------------------------------------------------------------
 
 
-void LLVolumeImplFlexible::updateRelativeXform(BOOL global_volume)
+void LLVolumeImplFlexible::updateRelativeXform()
 {
-        LLVOVolume* vo = (LLVOVolume*) mVO;
-        
-        LLVector3 delta_scale = LLVector3(1,1,1);
-        LLVector3 delta_pos;
         LLQuaternion delta_rot;
+        LLVector3 delta_pos, delta_scale;
+        LLVOVolume* vo = (LLVOVolume*) mVO;
+
+        //matrix from local space to parent relative/global space
+        delta_rot = vo->mDrawable->isSpatialRoot() ? LLQuaternion() : vo->mDrawable->getRotation();
+        delta_pos = vo->mDrawable->isSpatialRoot() ? LLVector3(0,0,0) : vo->mDrawable->getPosition();
+        delta_scale = LLVector3(1,1,1);
 
-        if (!mVO->mDrawable->isRoot())
-        {       //global to parent relative
-                LLViewerObject* parent = (LLViewerObject*) vo->getParent();
-                delta_rot = ~parent->getRenderRotation();
-                delta_pos = -parent->getRenderPosition()*delta_rot;
-        }
-        else
-        {       //global to local
-                delta_rot = ~getFrameRotation();
-                delta_pos = -getFramePosition()*delta_rot;
-        }
-        
         // Vertex transform (4x4)
         LLVector3 x_axis = LLVector3(delta_scale.mV[VX], 0.f, 0.f) * delta_rot;
         LLVector3 y_axis = LLVector3(0.f, delta_scale.mV[VY], 0.f) * delta_rot;
         LLVector3 z_axis = LLVector3(0.f, 0.f, delta_scale.mV[VZ]) * delta_rot;
 
         vo->mRelativeXform.initRows(LLVector4(x_axis, 0.f),
-                                                                LLVector4(y_axis, 0.f),
-                                                                LLVector4(z_axis, 0.f),
-                                                                LLVector4(delta_pos, 1.f));
+                                                        LLVector4(y_axis, 0.f),
+                                                        LLVector4(z_axis, 0.f),
+                                                        LLVector4(delta_pos, 1.f));
                         
         x_axis.normVec();
         y_axis.normVec();
         z_axis.normVec();
         
         vo->mRelativeXformInvTrans.setRows(x_axis, y_axis, z_axis);
-
 }
 
 const LLMatrix4& LLVolumeImplFlexible::getWorldMatrix(LLXformMatrix* xform) const
diff --git a/linden/indra/newview/llflexibleobject.h b/linden/indra/newview/llflexibleobject.h
index c028adb..9772c57 100644
--- a/linden/indra/newview/llflexibleobject.h
+++ b/linden/indra/newview/llflexibleobject.h
@@ -76,6 +76,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface
                 LLVolumeImplFlexible(LLViewerObject* volume, LLFlexibleObjectData* attributes);
 
                 // Implements LLVolumeInterface
+                U32 getID() const { return mID; }
                 LLVector3 getFramePosition() const;
                 LLQuaternion getFrameRotation() const;
                 LLVolumeInterfaceType getInterfaceType() const          { return INTERFACE_FLEXIBLE; }
@@ -90,12 +91,10 @@ class LLVolumeImplFlexible : public LLVolumeInterface
                 bool isVolumeGlobal() const { return true; }
                 bool isActive() const { return true; }
                 const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const;
-                void updateRelativeXform(BOOL global_volume = FALSE);
+                void updateRelativeXform();
                 void doFlexibleUpdate(); // Called to update the simulation
                 void doFlexibleRebuild(); // Called to rebuild the geometry
-                static void resetUpdateBins();
-                static void doFlexibleUpdateBins();
-
+                
                 //void                          setAttributes( LLFlexibleObjectData );
                 void                            setParentPositionAndRotationDirectly( LLVector3 p, LLQuaternion r );
                 void                            setUsingCollisionSphere( bool u );
@@ -128,10 +127,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface
                 U32                                                     mFrameNum;
                 LLVector3                                       mCollisionSpherePosition;
                 F32                                                     mCollisionSphereRadius;
-                
-                U64                                                     mLastUpdate;
-
-                BOOL                                            mJustShifted;
+                U32                                                     mID;
 
                 //--------------------------------------
                 // private methods
@@ -140,29 +136,7 @@ class LLVolumeImplFlexible : public LLVolumeInterface
 
                 void remapSections(LLFlexibleObjectSection *source, S32 source_sections,
                                                                                  LLFlexibleObjectSection *dest, S32 dest_sections);
-
-                U64 getLastUpdate() const       { return mLastUpdate; }
-
-                // LOD Bins
-                struct FlexCompare
-                {
-                        bool operator()(LLVolumeImplFlexible* a, LLVolumeImplFlexible* b) const
-                        {
-                                U64 a_update = a->getLastUpdate();
-                                U64 b_update = b->getLastUpdate();
-                                if (a_update == b_update)
-                                {
-                                        return a < b; // compare pointers
-                                }
-                                return a_update < b_update;
-                        }
-                };
-                typedef std::set<LLVolumeImplFlexible*, FlexCompare> lodset_t;
-                static lodset_t sLODBins[ FLEXIBLE_OBJECT_MAX_LOD ];
-                static U64                                      sCurrentUpdateFrame;
-                static U32                                      sDebugInserted;
-                static U32                                      sDebugVisible;
-
+                
 public:
                 // Global setting for update rate
                 static F32                                      sUpdateFactor;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 54168dc..cbac9f3 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -45,7 +45,10 @@
 #include "llvieweruictrlfactory.h"
 #include "viewer.h"     // for gViewerDigest
 
+#if LL_LIBXUL_ENABLED
 #include "llmozlib.h"
+#endif // LL_LIBXUL_ENABLED
+
 #include "llglheaders.h"
 
 extern LLCPUInfo gSysCPU;
@@ -98,7 +101,7 @@ LLFloaterAbout::LLFloaterAbout()
                                 gAgent.getRegion()->getName().c_str());
                 support.append(region_text);
 
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                 gAgent.getRegion()->getHost().getHostName(buffer, MAX_STRING);
                 support.append(buffer);
                 support.append(" (");
@@ -154,7 +157,7 @@ LLFloaterAbout::LLFloaterAbout()
 
         // MD5 digest of executable
         support.append("Viewer Digest: ");
-        char viewer_digest_string[UUID_STR_LENGTH];
+        char viewer_digest_string[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
         gViewerDigest.toString( viewer_digest_string );
         support.append(viewer_digest_string);
 
@@ -182,5 +185,5 @@ void LLFloaterAbout::show(void*)
                 sInstance = new LLFloaterAbout();
         }
 
-        sInstance->open();
+        sInstance->open();       /*Flawfinder: ignore*/
 }
diff --git a/linden/indra/newview/llfloateraccounthistory.cpp b/linden/indra/newview/llfloateraccounthistory.cpp
deleted file mode 100644
index a28c4c3..0000000
--- a/linden/indra/newview/llfloateraccounthistory.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/** 
- * @file llfloateraccounthistory.cpp
- * @brief LLFloaterAccountHistory class implementation
- *
- * Copyright (c) 2003-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-/**
- * The user's account history, including all Linden$ transactions from
- * the transaction table.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloateraccounthistory.h"
-
-#include "llfontgl.h"
-#include "message.h"
-#include "llsecondlifeurls.h"
-#include "lltransactiontypes.h"
-
-#include "llagent.h"
-#include "llalertdialog.h"
-#include "llpanel.h"
-#include "llbutton.h"
-#include "llviewercontrol.h"
-#include "llviewertexteditor.h"
-#include "lluiconstants.h"
-#include "llresizehandle.h"
-#include "llstatusbar.h"
-#include "lltabcontainervertical.h"
-#include "llvieweruictrlfactory.h"
-#include "llviewerwindow.h"
-#include "llweb.h"
-
-static const char MONEY_HX_TITLE[]  = "Account History";
-static const S32 MONEY_HX_WIDTH  = 500;
-static const S32 MONEY_HX_HEIGHT = 350;
-static const S32 INSET = 4;
-
-
-LLMap<LLUUID, LLFloaterAccountHistory*> LLFloaterAccountHistory::sInstances;
-
-
-
-
-//---------------------------------------------------------------------------
-// LLFloaterAccountHistory
-// The container panel for all the panel views.
-//---------------------------------------------------------------------------
-// private
-LLFloaterAccountHistory::LLFloaterAccountHistory()
-:       LLFloater("money history floater")
-{
-        // Unique ID for transactions
-        mFloaterID.generate();
-
-        // Instance management
-        LLFloaterAccountHistory::sInstances.addData(mFloaterID, this);
-
-        // User interface construction
-        gUICtrlFactory->buildFloater(this, "floater_account_history.xml");
-        center();
-
-        // Put resize handle on top
-        removeChild(mResizeHandle[0]);
-        addChild(mResizeHandle[0]);
-
-        LLTabContainerCommon* tab = LLUICtrlFactory::getTabContainerByName(this, "tab");
-        if (tab)
-        {
-                mPlanningPanel = new LLPanelAccountPlanning(mFloaterID);
-                tab->addTabPanel( mPlanningPanel, "Planning" );
-
-                mDetailsPanel = new LLPanelAccountDetails(mFloaterID);
-                tab->addTabPanel( mDetailsPanel, "Details" );
-
-                mTransactionsPanel = new LLPanelAccountTransactions(mFloaterID);
-                tab->addTabPanel( mTransactionsPanel, "Sales/Gifts" );
-
-                tab->selectFirstTab();
-        }
-
-        LLButton* btn = LLUICtrlFactory::getButtonByName(this, "details_btn");
-        if (btn) btn->setClickedCallback(onClickDetails, this);
-}
-
-
-// private virtual
-LLFloaterAccountHistory::~LLFloaterAccountHistory()
-{
-        LLFloaterAccountHistory::sInstances.removeData(mFloaterID);
-}
-
-
-// public static
-void LLFloaterAccountHistory::show(void*)
-{
-        // Make sure the mouse is available for clicking
-        if( gAgent.cameraMouselook() )
-        {
-                gAgent.changeCameraToDefault();
-        }
-
-        // Create the dialog and center on screen
-        // This will show a default "computing..." message
-        new LLFloaterAccountHistory();
-}
-
-// static 
-void LLFloaterAccountHistory::processMoneySummaryReply(LLMessageSystem* msg, void** data)
-{
-        LLUUID agent_id;
-        LLUUID floater_id;
-
-        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
-        msg->getUUIDFast(_PREHASH_MoneyData, _PREHASH_RequestID, floater_id );
-
-        if (agent_id != gAgent.getID())
-        {
-                llwarns << "Received money summary for wrong agent " << agent_id << llendl;
-                return;
-        }
-
-        LLFloaterAccountHistory* floater = LLFloaterAccountHistory::sInstances.getIfThere(floater_id);
-        if (!floater)
-        {
-                llwarns << "Received money summary for unknown window " << floater_id << llendl;
-                return;
-        }
-
-        floater->open();
-        floater->mPlanningPanel->processReply(msg, data);
-}
-
-// static 
-void LLFloaterAccountHistory::processMoneyDetailsReply(LLMessageSystem* msg, void** data)
-{
-        LLUUID agent_id;
-        LLUUID floater_id;
-
-        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
-        msg->getUUIDFast(_PREHASH_MoneyData, _PREHASH_RequestID, floater_id );
-
-        if (agent_id != gAgent.getID())
-        {
-                llwarns << "Received money details for wrong agent " << agent_id << llendl;
-                return;
-        }
-
-        LLFloaterAccountHistory* floater = LLFloaterAccountHistory::sInstances.getIfThere(floater_id);
-        if (!floater)
-        {
-                llwarns << "Received money details for unknown window " << floater_id << llendl;
-                return;
-        }
-
-        floater->open();
-
-        floater->mDetailsPanel->processReply(msg, data);
-}
-
-// static 
-void LLFloaterAccountHistory::processMoneyTransactionsReply(LLMessageSystem* msg, void** data)
-{
-        LLUUID agent_id;
-        LLUUID floater_id;
-
-        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
-        msg->getUUIDFast(_PREHASH_MoneyData, _PREHASH_RequestID, floater_id );
-
-        if (agent_id != gAgent.getID())
-        {
-                llwarns << "Received money transactions for wrong agent " << agent_id << llendl;
-                return;
-        }
-
-        LLFloaterAccountHistory* floater = LLFloaterAccountHistory::sInstances.getIfThere(floater_id);
-        if (!floater)
-        {
-                llwarns << "Received money transactions for unknown window " << floater_id << llendl;
-                return;
-        }
-
-        floater->open();
-        floater->mTransactionsPanel->processReply(msg, data);
-}
-
-void callback_load_url_account_transactions(S32 option, void*)
-{
-        if (option == 0)
-        {
-                LLWeb::loadURL(ACCOUNT_TRANSACTIONS_URL);
-        }
-}
-
-// static
-void LLFloaterAccountHistory::onClickDetails(void*)
-{
-        std::map<std::string,std::string> args;
-        args["[URL]"] = ACCOUNT_TRANSACTIONS_URL;
-        gViewerWindow->alertXml("LoadAccountTransactions", args, 
-                callback_load_url_account_transactions, NULL);
-}
diff --git a/linden/indra/newview/llfloateraccounthistory.h b/linden/indra/newview/llfloateraccounthistory.h
deleted file mode 100644
index ae4ae24..0000000
--- a/linden/indra/newview/llfloateraccounthistory.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/** 
- * @file llfloateraccounthistory.h
- * @brief LLFloaterAccountHistory class definition
- *
- * Copyright (c) 2003-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-/**
- * The user's account history, including all Linden$ transactions from
- * the transaction table.
- */
-
-#ifndef LL_LLFLOATERACCOUNTHISTORY_H
-#define LL_LLFLOATERACCOUNTHISTORY_H
-
-#include "llfloater.h"
-#include "llmap.h"
-#include "lluuid.h"
-#include "llpanelmoney.h"
-
-class LLMessageSystem;
-class LLTabContainer;
-class LLTabContainerVertical;
-class LLTextEditor;
-class LLButton;
-
-class LLFloaterAccountHistory
-:       public LLFloater
-{
-public:
-        static void show(void*);
-
-        // Message system callbacks
-        static void processMoneySummaryReply(LLMessageSystem* msg, void**);
-        static void processMoneyDetailsReply(LLMessageSystem* msg, void**);
-        static void processMoneyTransactionsReply(LLMessageSystem* msg, void**);
-
-private:
-        // Must construct by calling show().
-        LLFloaterAccountHistory();
-        virtual ~LLFloaterAccountHistory();
-
-        static void onClickDetails(void*);
-
-private:
-        // Each money history window has its own id, which it uses
-        // for transactions and to allow more than one window to
-        // be open.
-        LLUUID                          mFloaterID;
-
-        // The actual information is encoded in panels in this
-        // tab container.
-        LLTabContainerVertical*         mTab;
-
-        LLPanelAccountPlanning*         mPlanningPanel;
-        LLPanelAccountDetails*          mDetailsPanel;
-        LLPanelAccountTransactions*     mTransactionsPanel;
-        LLButton* mBtnDetails;
-
-        static LLMap<LLUUID, LLFloaterAccountHistory*> sInstances;
-};
-
-#endif
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index ced7a0e..3661ea2 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -280,8 +280,8 @@ BOOL LLFloaterAnimPreview::postBuild()
                         childSetValue("ease_in_time", LLSD(motionp->getEaseInDuration()));
                         childSetValue("ease_out_time", LLSD(motionp->getEaseOutDuration()));
                         mEnabled = TRUE;
-                        char seconds_string[128];
-                        sprintf(seconds_string, " - %.2f seconds", motionp->getDuration());
+                        char seconds_string[128];               /*Flawfinder: ignore*/
+                        snprintf(seconds_string, sizeof(seconds_string), " - %.2f seconds", motionp->getDuration());            /*Flawfinder: ignore*/
 
                         setTitle(mFilename + LLString(seconds_string));
                 }
@@ -301,9 +301,9 @@ BOOL LLFloaterAnimPreview::postBuild()
                 {
                         if (loaderp->getDuration() > MAX_ANIM_DURATION)
                         {
-                                char output_str[256];
+                                char output_str[256];   /*Flawfinder: ignore*/
 
-                                sprintf(output_str, "Animation file is %.1f seconds in length.\n\nMaximum animation length is %.1f seconds.\n",
+                                snprintf(output_str, sizeof(output_str), "Animation file is %.1f seconds in length.\n\nMaximum animation length is %.1f seconds.\n",                    /*Flawfinder: ignore*/
                                         loaderp->getDuration(), MAX_ANIM_DURATION);
                                 childSetValue("bad_animation_text", LLSD(output_str));
                         }
@@ -1016,7 +1016,7 @@ LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLDynamicTexture
         mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
         mDummyAvatar->startMotion(ANIM_AGENT_STAND, 5.f);
         mDummyAvatar->mSkirtLOD.setVisible(FALSE, TRUE);
-        gPipeline.markVisible(mDummyAvatar->mDrawable);
+        gPipeline.markVisible(mDummyAvatar->mDrawable, *gCamera);
 
         // stop extraneous animations
         mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE );
@@ -1092,6 +1092,10 @@ BOOL	LLPreviewAnimation::render()
                 avatarp->updateMotion();
         }
         
+        LLVertexBuffer::stopRender();
+        avatarp->updateLOD();
+        LLVertexBuffer::startRender();
+
         avatarp->mRoot.updateWorldMatrixChildren();
 
         stop_glerror();
@@ -1101,13 +1105,7 @@ BOOL	LLPreviewAnimation::render()
         if (avatarp->mDrawable.notNull())
         {
                 LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool();
-                gPipeline.unbindAGP();
-                avatarPoolp->syncAGP();
-                if (avatarPoolp->canUseAGP() && gPipeline.usingAGP())
-                {
-                        gPipeline.bindAGP();
-                }
-                avatarPoolp->renderAvatars(avatarp, TRUE);  // renders only one avatar (no shaders)
+                avatarPoolp->renderAvatars(avatarp);  // renders only one avatar
         }
         
         return TRUE;
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index db169a8..8e7124a 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -102,26 +102,27 @@ void LLFloaterAuction::show()
                 sInstance->setFocus(TRUE);
         }
         sInstance->initialize();
-        sInstance->open();
+        sInstance->open();      /*Flawfinder: ignore*/
 }
 
 void LLFloaterAuction::initialize()
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        mParcelp = gParcelMgr->getParcelSelection();
         LLViewerRegion* region = gParcelMgr->getSelectionRegion();
-        if(parcel && region && !parcel->getForSale())
+        LLParcel* parcelp = mParcelp->getParcel();
+        if(parcelp && region && !parcelp->getForSale())
         {
                 mParcelHost = region->getHost();
-                mParcelID = parcel->getLocalID();
+                mParcelID = parcelp->getLocalID();
 
-                childSetText("parcel_text", parcel->getName());
+                childSetText("parcel_text", parcelp->getName());
                 childEnable("snapshot_btn");
                 childEnable("ok_btn");
         }
         else
         {
                 mParcelHost.invalidate();
-                if(parcel && parcel->getForSale())
+                if(parcelp && parcelp->getForSale())
                 {
                         childSetText("parcel_text", childGetText("already for sale"));
                 }
diff --git a/linden/indra/newview/llfloaterauction.h b/linden/indra/newview/llfloaterauction.h
index e9d9c65..7ff932f 100644
--- a/linden/indra/newview/llfloaterauction.h
+++ b/linden/indra/newview/llfloaterauction.h
@@ -39,6 +39,7 @@
 //
 // Class which holds the functionality to start auctions.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class LLParcelSelection;
 
 class LLFloaterAuction : public LLFloater
 {
@@ -64,6 +65,7 @@ private:
         LLTransactionID mTransactionID;
         LLAssetID mImageID;
         LLPointer<LLImageGL> mImage;
+        LLHandle<LLParcelSelection> mParcelp;
         S32 mParcelID;
         LLHost mParcelHost;
 };
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 959967a..ef34542 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -104,17 +104,8 @@ void*	LLFloaterAvatarInfo::createPanelAvatar(void*	data)
 //----------------------------------------------------------------------------
 
 
-// static
-void LLFloaterAvatarInfo::onCommitNotes(LLUICtrl*, void* userdata)
-{
-        LLFloaterAvatarInfo* self = (LLFloaterAvatarInfo*)userdata;
-
-        self->mPanelAvatarp->sendAvatarNotesUpdate();
-}
-
 BOOL    LLFloaterAvatarInfo::postBuild()
 {
-
         return TRUE;
 }
 
@@ -164,7 +155,9 @@ void LLFloaterAvatarInfo::resetGroupList()
 
 // Open profile to a certian tab.
 // static
-void LLFloaterAvatarInfo::showFromObject(const LLUUID &avatar_id, std::string tab_name)
+void LLFloaterAvatarInfo::showFromObject(
+        const LLUUID& avatar_id,
+        std::string tab_name)
 {
         if(avatar_id.isNull())
         {
@@ -185,9 +178,8 @@ void LLFloaterAvatarInfo::showFromObject(const LLUUID &avatar_id, std::string ta
                 floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
                 
         }
-
         floater->mPanelAvatarp->selectTabByName(tab_name);
-        floater->open();
+        floater->open(); /*Flawfinder: ignore*/
 }
 
 // static
@@ -203,7 +195,7 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
         {
                 // ...bring that window to front
                 floater = gAvatarInfoInstances.getData(avatar_id);
-                floater->open();
+                floater->open();                /*Flawfinder: ignore*/
         }
         else
         {
@@ -211,7 +203,7 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
                         avatar_id);
                 floater->center();
                 floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
-                floater->open();
+                floater->open();        /*Flawfinder: ignore*/
         }
         if(floater)
         {
@@ -227,14 +219,14 @@ void LLFloaterAvatarInfo::showFromAvatar(LLViewerObject *avatar)
         {
                 // ...bring that window to front
                 LLFloaterAvatarInfo *f = gAvatarInfoInstances.getData(avatar->getID());
-                f->open();
+                f->open();      /*Flawfinder: ignore*/
         }
         else
         {
                 LLFloaterAvatarInfo *floater =  new LLFloaterAvatarInfo("avatarinfo", FAI_RECT, 
                         avatar->getID() );
                 floater->center();
-                floater->open();
+                floater->open();        /*Flawfinder: ignore*/
         }
 }
 
@@ -250,7 +242,7 @@ void LLFloaterAvatarInfo::showFromFriend(const LLUUID& agent_id, BOOL online)
         {
                 // ...bring that window to front
                 LLFloaterAvatarInfo *f = gAvatarInfoInstances.getData( agent_id );
-                f->open();
+                f->open();      /*Flawfinder: ignore*/
         }
         else
         {
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h
index ee7cebb..4879309 100644
--- a/linden/indra/newview/llfloateravatarinfo.h
+++ b/linden/indra/newview/llfloateravatarinfo.h
@@ -62,8 +62,6 @@ public:
         static  void*   createPanelAvatar(void* data);
 
         virtual BOOL    postBuild();
-        static  void    onCommitNotes(LLUICtrl*, void* userdata);
-
 
         LLFloaterAvatarInfo(const std::string& name, const LLRect &rect, const LLUUID &avatar_id );
         /*virtual*/ ~LLFloaterAvatarInfo();
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index c95ac6b..cb9af67 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -61,13 +61,13 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(callback_t callback,
                 sInstance->mCallbackUserdata = userdata;
                 sInstance->mCloseOnSelect = FALSE;
 
-                sInstance->open();
+                sInstance->open();      /* Flawfinder: ignore */
                 sInstance->center();
                 sInstance->setAllowMultiple(allow_multiple);
         }
         else
         {
-                sInstance->open();
+                sInstance->open();      /*Flawfinder: ignore*/
                 sInstance->mCallback = callback;
                 sInstance->mCallbackUserdata = userdata;
                 sInstance->setAllowMultiple(allow_multiple);
@@ -285,8 +285,8 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
         LLUUID  agent_id;
         LLUUID  query_id;
         LLUUID  avatar_id;
-        char    first_name[DB_FIRST_NAME_BUF_SIZE];
-        char    last_name[DB_LAST_NAME_BUF_SIZE];
+        char    first_name[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+        char    last_name[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
 
         msg->getUUID("AgentData", "AgentID", agent_id);
         msg->getUUID("AgentData", "QueryID", query_id);
diff --git a/linden/indra/newview/llfloateravatartextures.cpp b/linden/indra/newview/llfloateravatartextures.cpp
index 8ff65ab..d7d7dfc 100644
--- a/linden/indra/newview/llfloateravatartextures.cpp
+++ b/linden/indra/newview/llfloateravatartextures.cpp
@@ -54,7 +54,7 @@ LLFloaterAvatarTextures* LLFloaterAvatarTextures::show(const LLUUID &id)
         gUICtrlFactory->buildFloater(floaterp, "floater_avatar_textures.xml");
 
         gFloaterView->addChild(floaterp);
-        floaterp->open();
+        floaterp->open();       /*Flawfinder: ignore*/
 
         gFloaterView->adjustToFitScreen(floaterp, FALSE);
 
@@ -110,7 +110,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp,
         else
         {
                 ctrl->setImageAssetID(id);
-                ctrl->setToolTip(id.getString());
+                ctrl->setToolTip(id.asString());
         }
 }
 
@@ -138,8 +138,8 @@ void LLFloaterAvatarTextures::refresh()
         LLVOAvatar *avatarp = find_avatar(mID);
         if (avatarp)
         {
-                char firstname[DB_FIRST_NAME_BUF_SIZE];
-                char lastname[DB_LAST_NAME_BUF_SIZE];
+                char firstname[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+                char lastname[DB_LAST_NAME_BUF_SIZE];           /*Flawfinder: ignore*/
                 if (gCacheName->getName(avatarp->getID(), firstname, lastname))
                 {
                         LLString name;
@@ -175,7 +175,7 @@ void LLFloaterAvatarTextures::refresh()
         }
         else
         {
-                setTitle(mTitle + ": INVALID AVATAR (" + mID.getString() + ")");
+                setTitle(mTitle + ": INVALID AVATAR (" + mID.asString() + ")");
         }
 #endif
 }
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index f93483a..be5cd4e 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -69,14 +69,14 @@ void LLFloaterBuildOptions::show(void*)
 {
         if (sInstance)
         {
-                sInstance->open();
+                sInstance->open();      /*Flawfinder: ignore*/
         }
         else
         {
                 LLFloaterBuildOptions* floater = new LLFloaterBuildOptions();
 
                 gUICtrlFactory->buildFloater(floater, "floater_build_options.xml");
-                floater->open();
+                floater->open();        /*Flawfinder: ignore*/
         }
 }
 
diff --git a/linden/indra/newview/llfloaterbump.cpp b/linden/indra/newview/llfloaterbump.cpp
index 265970f..ead50e8 100644
--- a/linden/indra/newview/llfloaterbump.cpp
+++ b/linden/indra/newview/llfloaterbump.cpp
@@ -96,7 +96,7 @@ void LLFloaterBump::show(void *contents)
                 }
         }
         
-        sInstance->open();
+        sInstance->open();      /*Flawfinder: ignore*/
 }
 
 void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index 04b56bf..2266845 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -63,8 +63,6 @@ LLFloaterBuy::LLFloaterBuy()
 
 LLFloaterBuy::~LLFloaterBuy()
 {
-        gSelectMgr->deselectAll();
-
         sInstance = NULL;
 }
 
@@ -80,7 +78,9 @@ void LLFloaterBuy::reset()
 // static
 void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 {
-        if (gSelectMgr->getRootObjectCount() != 1)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
+        if (selection->getRootObjectCount() != 1)
         {
                 gViewerWindow->alertXml("BuyOneObjectOnly");
                 return;
@@ -97,9 +97,10 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
                 sInstance = new LLFloaterBuy();
         }
         
-        sInstance->open();
+        sInstance->open(); /*Flawfinder: ignore*/
         sInstance->setFocus(TRUE);
         sInstance->mSaleInfo = sale_info;
+        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
 
         // Always center the dialog.  User can change the size,
         // but purchases are important and should be center screen.
@@ -107,7 +108,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         // mid-session and the saved rect is off-center.
         sInstance->center();
 
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = selection->getFirstRootNode();
         if (!node) return;
 
         // Set title based on sale type
@@ -181,7 +182,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         // Must do this after the floater is created, because
         // sometimes the inventory is already there and 
         // the callback is called immediately.
-        LLViewerObject* obj = gSelectMgr->getFirstRootObject();
+        LLViewerObject* obj = selection->getFirstRootObject();
         sInstance->registerVOInventoryListener(obj,NULL);
         sInstance->requestVOInventory();
 }
diff --git a/linden/indra/newview/llfloaterbuy.h b/linden/indra/newview/llfloaterbuy.h
index fd1ffd2..1642aaa 100644
--- a/linden/indra/newview/llfloaterbuy.h
+++ b/linden/indra/newview/llfloaterbuy.h
@@ -41,6 +41,7 @@
 
 class LLViewerObject;
 class LLSaleInfo;
+class LLObjectSelection;
 
 class LLFloaterBuy
 : public LLFloater, public LLVOInventoryListener
@@ -66,6 +67,7 @@ protected:
 private:
         static LLFloaterBuy* sInstance;
 
+        LLHandle<LLObjectSelection>     mObjectSelection;
         LLSaleInfo mSaleInfo;
 };
 
diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index 4f6f52e..1deb1ab 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -68,8 +68,6 @@ LLFloaterBuyContents::LLFloaterBuyContents()
 
 LLFloaterBuyContents::~LLFloaterBuyContents()
 {
-        gSelectMgr->deselectAll();
-
         sInstance = NULL;
 }
 
@@ -77,7 +75,9 @@ LLFloaterBuyContents::~LLFloaterBuyContents()
 // static
 void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
 {
-        if (gSelectMgr->getRootObjectCount() != 1)
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
+        if (selection->getRootObjectCount() != 1)
         {
                 gViewerWindow->alertXml("BuyContentsOneOnly");
                 return;
@@ -94,8 +94,9 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
                 sInstance = new LLFloaterBuyContents();
         }
 
-        sInstance->open();
+        sInstance->open(); /*Flawfinder: ignore*/
         sInstance->setFocus(TRUE);
+        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
 
         // Always center the dialog.  User can change the size,
         // but purchases are important and should be center screen.
@@ -115,11 +116,11 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
         sInstance->mSaleInfo = sale_info;
 
         // Update the display
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = selection->getFirstRootNode();
         if (!node) return;
         if(node->mPermissions->isGroupOwned())
         {
-                char group_name[MAX_STRING];
+                char group_name[MAX_STRING];    /*Flawfinder: ignore*/
                 gCacheName->getGroupName(owner_id, group_name);
                 owner_name.assign(group_name);
         }
@@ -131,7 +132,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
         // Must do this after the floater is created, because
         // sometimes the inventory is already there and 
         // the callback is called immediately.
-        LLViewerObject* obj = gSelectMgr->getFirstRootObject();
+        LLViewerObject* obj = selection->getFirstRootObject();
         sInstance->registerVOInventoryListener(obj,NULL);
         sInstance->requestVOInventory();
 }
diff --git a/linden/indra/newview/llfloaterbuycontents.h b/linden/indra/newview/llfloaterbuycontents.h
index 2c643f5..a30de0e 100644
--- a/linden/indra/newview/llfloaterbuycontents.h
+++ b/linden/indra/newview/llfloaterbuycontents.h
@@ -39,6 +39,7 @@
 #include "llinventory.h"
 
 class LLViewerObject;
+class LLObjectSelection;
 
 class LLFloaterBuyContents
 : public LLFloater, public LLVOInventoryListener
@@ -62,6 +63,7 @@ protected:
 protected:
         static LLFloaterBuyContents* sInstance;
 
+        LLHandle<LLObjectSelection> mObjectSelection;
         LLSaleInfo mSaleInfo;
 };
 
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp
index 3ecffd5..388a8aa 100644
--- a/linden/indra/newview/llfloaterbuycurrency.cpp
+++ b/linden/indra/newview/llfloaterbuycurrency.cpp
@@ -185,7 +185,7 @@ BOOL LLFloaterBuyCurrencyUI::canClose()
 void LLFloaterBuyCurrencyUI::onClose(bool app_quitting)
 {
         LLFloater::onClose(app_quitting);
-        delete this;
+        destroy();
 }
 
 void LLFloaterBuyCurrencyUI::updateUI()
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index ca5f677..1b72d4e 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -75,7 +75,7 @@ private:
         virtual ~LLFloaterBuyLandUI();
 
         LLViewerRegion* mRegion;
-        LLParcel*               mParcel;
+        LLParcelSelectionHandle mParcel;
         bool                    mIsClaim;
         bool                    mIsForGroup;
 
@@ -146,7 +146,7 @@ public:
         static LLFloaterBuyLandUI* soleInstance(bool createIfNeeded);
 
         void setForGroup(bool is_for_group);
-        void setParcel(LLViewerRegion* region, LLParcel* parcel);
+        void setParcel(LLViewerRegion* region, LLParcelSelectionHandle parcel);
                 
         void updateAgentInfo();
         void updateParcelInfo();
@@ -205,7 +205,7 @@ static void cacheNameUpdateRefreshesBuyLand(const LLUUID&,
 
 // static
 void LLFloaterBuyLand::buyLand(
-        LLViewerRegion* region, LLParcel* parcel, bool is_for_group)
+        LLViewerRegion* region, LLParcelSelectionHandle parcel, bool is_for_group)
 {
         if(is_for_group && !gAgent.hasPowerInActiveGroup(GP_LAND_DEED))
         {
@@ -216,7 +216,7 @@ void LLFloaterBuyLand::buyLand(
         LLFloaterBuyLandUI* ui = LLFloaterBuyLandUI::soleInstance(true);
         ui->setForGroup(is_for_group);
         ui->setParcel(region, parcel);
-        ui->open();
+        ui->open();     /*Flawfinder: ignore*/
 }
 
 // static
@@ -350,7 +350,7 @@ void LLFloaterBuyLandUI::SelectionObserver::changed()
                 else {
                         ui->setParcel(
                                 gParcelMgr->getSelectionRegion(),
-                                gParcelMgr->getSelectedParcel());
+                                gParcelMgr->getParcelSelection());
                 }
         }
 }
@@ -368,7 +368,8 @@ void LLFloaterBuyLandUI::updateAgentInfo()
 
 void LLFloaterBuyLandUI::updateParcelInfo()
 {
-        mParcelValid = mParcel && mRegion;
+        LLParcel* parcel = mParcel->getParcel();
+        mParcelValid = parcel && mRegion;
         mParcelIsForSale = false;
         mParcelIsFirstLand = false;
         mParcelIsGroupLand = false;
@@ -391,50 +392,61 @@ void LLFloaterBuyLandUI::updateParcelInfo()
                 return;
         }
         
-        if (gParcelMgr->getMultipleOwners())
+        if (mParcel->getMultipleOwners())
         {
                 mCannotBuyReason = childGetText("multiple_parcels_selected");
                 return;
         }
 
+        const LLUUID& parcelOwner = parcel->getOwnerID();
         
-        const LLUUID& parcelOwner = mParcel->getOwnerID();
-        
-        mIsClaim = mParcel->isPublic();
+        mIsClaim = parcel->isPublic();
         if (!mIsClaim)
         {
-                mParcelActualArea = mParcel->getArea();
-                mParcelIsForSale = mParcel->getForSale();
-                mParcelIsFirstLand = mParcel->getReservedForNewbie();
-                mParcelIsGroupLand = mParcel->getIsGroupOwned();
-                mParcelPrice = mParcelIsForSale ? mParcel->getSalePrice() : 0;
+                mParcelActualArea = parcel->getArea();
+                mParcelIsForSale = parcel->getForSale();
+                mParcelIsFirstLand = parcel->getReservedForNewbie();
+                mParcelIsGroupLand = parcel->getIsGroupOwned();
+                mParcelPrice = mParcelIsForSale ? parcel->getSalePrice() : 0;
                 
                 if (mParcelIsGroupLand)
                 {
-                        LLUUID group_id = mParcel->getGroupID();
+                        LLUUID group_id = parcel->getGroupID();
                         mParcelGroupContribution = gAgent.getGroupContribution(group_id);
                 }
         }
         else
         {
-                mParcelActualArea = gParcelMgr->getClaimableArea();
+                mParcelActualArea = mParcel->getClaimableArea();
                 mParcelIsForSale = true;
-                mParcelPrice = mParcelActualArea * mParcel->getClaimPricePerMeter();
+                mParcelPrice = mParcelActualArea * parcel->getClaimPricePerMeter();
         }
 
         mParcelBillableArea =
                 llround(mRegion->getBillableFactor() * mParcelActualArea);
 
-        mParcelSupportedObjects = mParcel->getMaxPrimCapacity();
-        mParcelSoldWithObjects = mParcel->getSellWithObjects();
+        mParcelSupportedObjects = llround(
+                parcel->getMaxPrimCapacity() * parcel->getParcelPrimBonus()); 
+        // Can't have more than region max tasks, regardless of parcel 
+        // object bonus factor. 
+        LLViewerRegion* region = gParcelMgr->getSelectionRegion(); 
+        if(region) 
+        { 
+                S32 max_tasks_per_region = (S32)region->getMaxTasks(); 
+                mParcelSupportedObjects = llmin(
+                        mParcelSupportedObjects, max_tasks_per_region); 
+        } 
+
+        mParcelSoldWithObjects = parcel->getSellWithObjects();
+
         
-        LLVector3 center = mParcel->getCenterpoint();
+        LLVector3 center = parcel->getCenterpoint();
         mParcelLocation = llformat("%s %d,%d",
                                 mRegion->getName().c_str(),
                                 (int)center[VX], (int)center[VY]
                                 );
         
-        mParcelSnapshot = mParcel->getSnapshotID();
+        mParcelSnapshot = parcel->getSnapshotID();
         
         updateNames();
         
@@ -453,7 +465,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 
         if (!mIsClaim)
         {
-                const LLUUID& authorizedBuyer = mParcel->getAuthorizedBuyerID();
+                const LLUUID& authorizedBuyer = parcel->getAuthorizedBuyerID();
                 const LLUUID buyer = gAgent.getID();
                 const LLUUID newOwner = mIsForGroup ? gAgent.getGroupID() : buyer;
 
@@ -492,7 +504,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
                         return;
                 }
 
-                if (gParcelMgr->hasOthersSelected())
+                if (mParcel->hasOthersSelected())
                 {
                         // Policy: Must not have someone else's land selected
                         mCannotBuyReason = childGetText("not_owned_by_you");
@@ -511,7 +523,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
         }
         */
         
-        if (mParcel->getReservedForNewbie())
+        if (parcel->getReservedForNewbie())
         {
                 if (mIsForGroup)
                 {
@@ -684,9 +696,10 @@ void LLFloaterBuyLandUI::updateWebSiteInfo()
 #endif
         
         LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-        keywordArgs.appendString("agentId", gAgent.getID().getString());
-        keywordArgs.appendString("secureSessionId",
-                gAgent.getSecureSessionID().getString());
+        keywordArgs.appendString("agentId", gAgent.getID().asString());
+        keywordArgs.appendString(
+                "secureSessionId",
+                gAgent.getSecureSessionID().asString());
         keywordArgs.appendInt("billableArea", mPreflightAskBillableArea);
         keywordArgs.appendInt("currencyBuy", mPreflightAskCurrencyBuy);
         
@@ -771,9 +784,10 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password)
         }
         
         LLXMLRPCValue keywordArgs = LLXMLRPCValue::createStruct();
-        keywordArgs.appendString("agentId", gAgent.getID().getString());
-        keywordArgs.appendString("secureSessionId",
-                gAgent.getSecureSessionID().getString());
+        keywordArgs.appendString("agentId", gAgent.getID().asString());
+        keywordArgs.appendString(
+                "secureSessionId",
+                gAgent.getSecureSessionID().asString());
         keywordArgs.appendString("levelId", newLevel);
         keywordArgs.appendInt("billableArea",
                 mIsForGroup ? 0 : mParcelBillableArea);
@@ -820,7 +834,9 @@ void LLFloaterBuyLandUI::sendBuyLand()
 
 void LLFloaterBuyLandUI::updateNames()
 {
-        if (!mParcelValid)
+        LLParcel* parcelp = mParcel->getParcel();
+
+        if (!parcelp)
         {
                 mParcelSellerName = "";
                 return;
@@ -830,19 +846,19 @@ void LLFloaterBuyLandUI::updateNames()
         {
                 mParcelSellerName = "Linden Lab";
         }
-        else if (mParcel->getIsGroupOwned())
+        else if (parcelp->getIsGroupOwned())
         {
-                char groupName[DB_LAST_NAME_BUF_SIZE];
+                char groupName[DB_LAST_NAME_BUF_SIZE];  /*Flawfinder: ignore*/
                 
-                gCacheName->getGroupName(mParcel->getGroupID(), &groupName[0]);
+                gCacheName->getGroupName(parcelp->getGroupID(), &groupName[0]);
                 mParcelSellerName = groupName;
         }
         else
         {
-                char firstName[DB_LAST_NAME_BUF_SIZE];
-                char lastName[DB_LAST_NAME_BUF_SIZE];
+                char firstName[DB_LAST_NAME_BUF_SIZE];          /*Flawfinder: ignore*/
+                char lastName[DB_LAST_NAME_BUF_SIZE];           /*Flawfinder: ignore*/
                 
-                gCacheName->getName(mParcel->getOwnerID(), firstName, lastName);
+                gCacheName->getName(parcelp->getOwnerID(), firstName, lastName);
                 mParcelSellerName = llformat("%s %s", firstName, lastName);
         }
 }
@@ -939,7 +955,7 @@ BOOL LLFloaterBuyLandUI::postBuild()
         return TRUE;
 }
 
-void LLFloaterBuyLandUI::setParcel(LLViewerRegion* region, LLParcel* parcel)
+void LLFloaterBuyLandUI::setParcel(LLViewerRegion* region, LLParcelSelectionHandle parcel)
 {
         if (mTransaction &&  mTransactionType == TransactionBuy)
         {
@@ -996,7 +1012,7 @@ BOOL LLFloaterBuyLandUI::canClose()
 void LLFloaterBuyLandUI::onClose(bool app_quitting)
 {
         LLFloater::onClose(app_quitting);
-        delete this;
+        destroy();
 }
 
 
diff --git a/linden/indra/newview/llfloaterbuyland.h b/linden/indra/newview/llfloaterbuyland.h
index 016c1ec..a91c6d6 100644
--- a/linden/indra/newview/llfloaterbuyland.h
+++ b/linden/indra/newview/llfloaterbuyland.h
@@ -28,15 +28,15 @@
 #ifndef LL_LLFLOATERBUYLAND_H
 #define LL_LLFLOATERBUYLAND_H
 
-class LLParcel;
 class LLViewerRegion;
 class LLViewerTextEditor;
+class LLParcelSelection;
 
 class LLFloaterBuyLand
 {
 public:
         static void buyLand(LLViewerRegion* region,
-                                                LLParcel* parcel,
+                                                LLHandle<LLParcelSelection> parcel,
                                                 bool is_for_group);
         static void updateCovenantText(const std::string& string, const LLUUID& asset_id);
         static void updateEstateName(const std::string& name);
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 0ffc518..2b27d15 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -135,7 +135,7 @@ void LLFloaterChat::onClose(bool app_quitting)
 // public
 void LLFloaterChat::show()
 {
-        open();
+        open();         /*Flawfinder: ignore*/
 }
 
 void add_timestamped_line(LLViewerTextEditor* edit, const LLString& line, const LLColor4& color)
diff --git a/linden/indra/newview/llfloatercolorpicker.cpp b/linden/indra/newview/llfloatercolorpicker.cpp
index f8d5cd4..84df754 100644
--- a/linden/indra/newview/llfloatercolorpicker.cpp
+++ b/linden/indra/newview/llfloatercolorpicker.cpp
@@ -181,7 +181,7 @@ showUI ()
 {
         setVisible ( TRUE );
         setFocus ( TRUE );
-        open();
+        open();         /*Flawfinder: ignore*/
 
         // HACK: if system color picker is required - close the SL one we made and use default system dialog
         if ( gSavedSettings.getBOOL ( "UseDefaultColorPicker" ) )
@@ -635,7 +635,7 @@ void LLFloaterColorPicker::draw()
         }
 
         mPipetteBtn->setEnabled(gToolMgr != NULL);
-        mPipetteBtn->setToggleState(gToolMgr && gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolPipette);
+        mPipetteBtn->setToggleState(gToolMgr && gToolMgr->getCurrentTool() == gToolPipette);
         mApplyImmediateCheck->setEnabled(mActive && mCanApplyImmediately);
         mSelectBtn->setEnabled(mActive);
 
@@ -1272,7 +1272,7 @@ void LLFloaterColorPicker::setActive(BOOL active)
 
 void LLFloaterColorPicker::stopUsingPipette()
 {
-        if (gToolMgr && gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolPipette)
+        if (gToolMgr && gToolMgr->getCurrentTool() == gToolPipette)
         {
                 gToolMgr->clearTransientTool();
         }
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index f564dad..7ac50ae 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -2162,6 +2162,8 @@ void LLFloaterCustomize::onTabChanged( void* userdata, bool from_click )
 
 void LLFloaterCustomize::onClose(bool app_quitting)
 {
+        // since this window is potentially staying open, push to back to let next window take focus
+        gFloaterView->sendChildToBack(this);
         handle_reset_view();  // Calls askToSaveAllIfDirty
 }
 
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index ab2e873..846a2fb 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -379,7 +379,7 @@ void LLFloaterDirectory::show(void *)
                 sInstance =  new LLFloaterDirectory("directory");
         }
 
-        sInstance->open();
+        sInstance->open();      /*Flawfinder: ignore*/
         sInstance->focusCurrentPanel();
 }
 
@@ -415,7 +415,7 @@ void LLFloaterDirectory::toggleFind(void*)
         BOOL panel_visible = sInstance->getVisible();
         if (!panel_visible)
         {
-                sInstance->open();
+                sInstance->open(); /*Flawfinder: ignore*/
                 sInstance->focusCurrentPanel();
         }
         else
@@ -436,7 +436,7 @@ void LLFloaterDirectory::toggleEvents(void*)
         BOOL panel_visible = sInstance->getVisible();
         if (!panel_visible)
         {
-                sInstance->open();
+                sInstance->open();      /*Flawfinder: ignore*/
                 sInstance->showEvents(0);
         }
         else
diff --git a/linden/indra/newview/llfloatereditui.cpp b/linden/indra/newview/llfloatereditui.cpp
index 21580d3..3af5741 100644
--- a/linden/indra/newview/llfloatereditui.cpp
+++ b/linden/indra/newview/llfloatereditui.cpp
@@ -319,7 +319,7 @@ void LLFloaterEditUI::show(void*)
 {
         LLFloaterEditUI* self = new LLFloaterEditUI();
         self->center();
-        self->open();
+        self->open();           /*Flawfinder: ignore*/
 }
 
 // static
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 207454b..8a36620 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -113,12 +113,12 @@ void LLFloaterFriends::show(void*)
 {
         if(sInstance)
         {
-                sInstance->open();
+                sInstance->open();      /*Flawfinder: ignore*/
         }
         else
         {
                 LLFloaterFriends* self = new LLFloaterFriends;
-                self->open();
+                self->open(); /*Flawfinder: ignore*/
         }
 }
 
@@ -505,12 +505,12 @@ void LLFloaterFriends::onClickIM(void* user_data)
                 {
                         LLUUID agent_id = ids[0];
                         const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(agent_id);
-                        char first[DB_FIRST_NAME_BUF_SIZE];
-                        char last[DB_LAST_NAME_BUF_SIZE];
+                        char first[DB_FIRST_NAME_BUF_SIZE];     /* Flawfinder: ignore */
+                        char last[DB_LAST_NAME_BUF_SIZE];       /* Flawfinder: ignore */
                         if(info && gCacheName->getName(agent_id, first, last))
                         {
-                                char buffer[MAX_STRING];
-                                snprintf(buffer, MAX_STRING, "%s %s", first, last);
+                                char buffer[MAX_STRING];        /* Flawfinder: ignore */
+                                snprintf(buffer, MAX_STRING, "%s %s", first, last);     /* Flawfinder: ignore */
                                 gIMView->setFloaterOpen(TRUE);
                                 gIMView->addSession(
                                         buffer,
@@ -537,8 +537,7 @@ void LLFloaterFriends::requestFriendship(const LLUUID& target_id, const LLString
 {
         // HACK: folder id stored as "message"
         LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-        std::string message = calling_card_folder_id.getString();
-
+        std::string message = calling_card_folder_id.asString();
         send_improved_im(target_id,
                                          target_name.c_str(),
                                          message.c_str(),
@@ -598,8 +597,8 @@ void LLFloaterFriends::onClickRemove(void* user_data)
                 if(ids.size() == 1)
                 {
                         LLUUID agent_id = ids[0];
-                        char first[DB_FIRST_NAME_BUF_SIZE];
-                        char last[DB_LAST_NAME_BUF_SIZE];
+                        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+                        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
                         if(gCacheName->getName(agent_id, first, last))
                         {
                                 args["[FIRST_NAME]"] = first;
@@ -671,8 +670,8 @@ void LLFloaterFriends::onClickModifyStatus(LLUICtrl* ctrl, void* user_data)
                 if(ids.size() == 1)
                 {
                         LLUUID agent_id = ids[0];
-                        char first[DB_FIRST_NAME_BUF_SIZE];
-                        char last[DB_LAST_NAME_BUF_SIZE];
+                        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+                        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
                         if(gCacheName->getName(agent_id, first, last))
                         {
                                 args["[FIRST_NAME]"] = first;
diff --git a/linden/indra/newview/llfloatergesture.cpp b/linden/indra/newview/llfloatergesture.cpp
index e4425d1..313dccf 100644
--- a/linden/indra/newview/llfloatergesture.cpp
+++ b/linden/indra/newview/llfloatergesture.cpp
@@ -133,7 +133,7 @@ void LLFloaterGesture::show()
 {
         if (sInstance)
         {
-                sInstance->open();
+                sInstance->open();              /*Flawfinder: ignore*/
                 return;
         }
 
@@ -158,7 +158,7 @@ void LLFloaterGesture::show()
 
         // Update button labels
         onCommitList(NULL, self);
-        self->open();
+        self->open();   /*Flawfinder: ignore*/
 }
 
 // static
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index d2ce3fd..e1d12d2 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -86,7 +86,7 @@ LLFloaterGodTools* LLFloaterGodTools::instance()
         if (!sGodTools)
         {
                 sGodTools = new LLFloaterGodTools();
-                sGodTools->open();
+                sGodTools->open();      /*Flawfinder: ignore*/
                 sGodTools->center();
                 sGodTools->setFocus(TRUE);
         }
@@ -223,7 +223,7 @@ void LLFloaterGodTools::show(void *)
 void LLFloaterGodTools::showPanel(const LLString& panel_name)
 {
         childShowTab("GodTools Tabs", panel_name);
-        open();
+        open(); /*Flawfinder: ignore*/
         LLPanel *panel = childGetVisibleTab("GodTools Tabs");
         if (panel) panel->setFocus(TRUE);
 }
@@ -254,7 +254,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
         U32 region_flags;
         U8 sim_access;
         U8 agent_limit;
-        char sim_name[MAX_STRING];
+        char sim_name[MAX_STRING];              /*Flawfinder: ignore*/
         U32 estate_id;
         U32 parent_estate_id;
         F32 water_height;
@@ -990,7 +990,7 @@ void LLPanelGridTools::flushMapVisibilityCachesConfirm(S32 option, void* data)
         msg->addString("Method", "refreshmapvisibility");
         msg->addUUID("Invoice", LLUUID::null);
         msg->nextBlock("ParamList");
-        msg->addString("Parameter", gAgent.getID().getString());
+        msg->addString("Parameter", gAgent.getID().asString());
         gAgent.sendReliableMessage();
 }
 
@@ -1256,8 +1256,8 @@ void LLPanelObjectTools::onClickSetBySelection(void* data)
         LLPanelObjectTools* panelp = (LLPanelObjectTools*) data;
         if (!panelp) return;
 
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
-        if (!node) node = gSelectMgr->getFirstNode();
+        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+        if (!node) node = gSelectMgr->getSelection()->getFirstNode();
         if (!node) return;
 
         LLString owner_name;
diff --git a/linden/indra/newview/llfloatergroupinfo.cpp b/linden/indra/newview/llfloatergroupinfo.cpp
index 5fc999e..a807774 100644
--- a/linden/indra/newview/llfloatergroupinfo.cpp
+++ b/linden/indra/newview/llfloatergroupinfo.cpp
@@ -172,7 +172,7 @@ void LLFloaterGroupInfo::showFromUUID(const LLUUID& group_id,
         fgi->selectTabByName(tab_name);
         
         fgi->center();
-        fgi->open();
+        fgi->open();    /*Flawfinder: ignore*/
 }
 
 // static 
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index a727f22..0c8b526 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -132,6 +132,6 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id)
         }
         
         fgi->center();
-        fgi->open();
+        fgi->open();    /*Flawfinder: ignore*/
         fgi->mImpl->mInvitePanelp->update();
 }
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 05a6927..11b58d5 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -93,7 +93,7 @@ LLFloaterGroups* LLFloaterGroups::show(const LLUUID& id, EGroupDialog type)
                 else
                 {
                         // Move the existing view to the front
-                        instance->open();
+                        instance->open();       /* Flawfinder: ignore */
                 }
         }
 
@@ -119,7 +119,7 @@ LLFloaterGroups* LLFloaterGroups::show(const LLUUID& id, EGroupDialog type)
                                 break;
                         }
                         instance->center();
-                        instance->open();
+                        instance->open();       /*Flawfinder: ignore*/
                 }
         }
         return instance;
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index c741bdb..9c68ca8 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -179,7 +179,6 @@ void	LLFloaterImagePreview::onPreviewTypeCommit(LLUICtrl* ctrl, void* userdata)
                 break;
         }
         fp->mAvatarPreview->refresh();
-        //gViewerWindow->requestFastFrame(fp);
 }
 
 //-----------------------------------------------------------------------------
@@ -489,7 +488,6 @@ BOOL LLFloaterImagePreview::handleHover(S32 x, S32 y, MASK mask)
                 }
 
                 LLUI::setCursorPositionLocal(this, mLastMouseX, mLastMouseY);
-                //gViewerWindow->requestFastFrame(this);
         }
 
         if (!mPreviewRect.pointInRect(x, y) || !mAvatarPreview)
@@ -521,7 +519,6 @@ BOOL LLFloaterImagePreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
         {
                 mAvatarPreview->zoom((F32)clicks * -0.2f);
                 mAvatarPreview->refresh();
-                //gViewerWindow->requestFastFrame(this);
         }
 
         return TRUE;
@@ -557,7 +554,7 @@ LLImagePreviewAvatar::LLImagePreviewAvatar(S32 width, S32 height) : LLDynamicTex
         mDummyAvatar->slamPosition();
         mDummyAvatar->updateJointLODs();
         mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-        gPipeline.markVisible(mDummyAvatar->mDrawable);
+        gPipeline.markVisible(mDummyAvatar->mDrawable, *gCamera);
 
         mTextureName = 0;
 }
@@ -645,6 +642,10 @@ BOOL	LLImagePreviewAvatar::render()
         gCamera->setView(gCamera->getDefaultFOV() / mCameraZoom);
         gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
 
+        LLVertexBuffer::stopRender();
+        avatarp->updateLOD();
+        LLVertexBuffer::startRender();
+
         if (avatarp->mDrawable.notNull())
         {
                 LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);
@@ -653,13 +654,7 @@ BOOL	LLImagePreviewAvatar::render()
 
                 LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool();
                 
-                gPipeline.unbindAGP();
-                avatarPoolp->syncAGP();
-                if (avatarPoolp->canUseAGP() && gPipeline.usingAGP())
-                {
-                        gPipeline.bindAGP();
-                }
-                avatarPoolp->renderAvatars(avatarp, TRUE);  // renders only one avatar (no shaders)
+                avatarPoolp->renderAvatars(avatarp);  // renders only one avatar
         }
 
         return TRUE;
diff --git a/linden/indra/newview/llfloaterimport.cpp b/linden/indra/newview/llfloaterimport.cpp
index b7255db..478b5d7 100644
--- a/linden/indra/newview/llfloaterimport.cpp
+++ b/linden/indra/newview/llfloaterimport.cpp
@@ -76,8 +76,9 @@ LLFloaterImport::LLFloaterImport(const std::string filename)
 {
         mFilenameAndPath = filename;
 
-        char file_path[256];
-        strcpy(file_path, mFilenameAndPath.c_str());
+        char file_path[256];    /*Flawfinder: ignore*/
+        strncpy(file_path, mFilenameAndPath.c_str(), sizeof(file_path) -1);             /*Flawfinder: ignore*/
+        file_path[sizeof(file_path) -1] = '\0';
         char *file_name = strrchr( file_path, gDirUtilp->getDirDelimiter()[0]);
         file_name[0] = 0;
 
@@ -104,7 +105,7 @@ BOOL LLFloaterImport::postBuild()
         char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
         if( !end_p )
         {
-                end_p = asset_name_str + strlen( asset_name_str );
+                end_p = asset_name_str + strlen( asset_name_str );                      /*Flawfinder: ignore*/
         }
                 
         S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
@@ -182,8 +183,8 @@ BOOL LLFloaterImport::postBuild()
                                                 LLScrollListItem *new_item = new LLScrollListItem(TRUE, task);
                                                 new_item->addColumn("OBJECT", default_font, 60);
                                                 LLString output_line;
-                                                char buffer[20];
-                                                sprintf(buffer, "%d", (S32)tasks_list.size());
+                                                char buffer[20];                /*Flawfinder: ignore*/
+                                                snprintf(buffer, sizeof(buffer), "%d", (S32)tasks_list.size());         /*Flawfinder: ignore*/
                                                 output_line.append(buffer);
                                                 output_line.append(" prims");
                                                 new_item->addColumn(output_line, default_font, 80);
@@ -257,9 +258,9 @@ BOOL LLFloaterImport::postBuild()
 
                                         llinfos << "Getting hash for " << image_path << llendl;
 
-                                        char md5_hash_string[33];
-                                        strcpy(md5_hash_string, "00000000000000000000000000000000");
-                                        FILE *fCheck = LLFile::fopen(image_path.c_str(), "rb");
+                                        char md5_hash_string[33];       /*Flawfinder: ignore*/
+                                        strcpy(md5_hash_string, "00000000000000000000000000000000");                    /*Flawfinder: ignore*/
+                                        FILE* fCheck = LLFile::fopen(image_path.c_str(), "rb"); /*Flawfinder: ignore*/
                                         if (fCheck)
                                         {
                                                 LLMD5 my_md5_hash(fCheck);
@@ -458,7 +459,7 @@ void LLFloaterImport::finishImport(ImportAssetInfo *info)
         {
                 // Copy file into a local directory
                 LLString new_file = "TEMP";
-                new_file.append(new_file_id.getString());
+                new_file.append(new_file_id.asString());
                 new_file.append(".slobject");
 
                 S32 length;
@@ -509,7 +510,7 @@ void LLFloaterImport::asset_uploaded_callback(const LLUUID& uuid, void* user_dat
         LLResourceData *resource_data = (LLResourceData*)user_data;
         ImportAssetInfo *info = (ImportAssetInfo*)resource_data->mUserData;
 
-        info->NewImageIDList.push_back(resource_data->mAssetInfo.mUuid.getString());
+        info->NewImageIDList.push_back(resource_data->mAssetInfo.mUuid.asString());
 
         LLUploadDialog::modalUploadFinished();
         if (info->ImageFileQueue.size() == 0)
@@ -553,7 +554,7 @@ void LLFloaterImport::onBtnOK(void*userdata)
                         LLString *image_id = (LLString *)(*itor)->getUserdata();
                         if (image_id)
                         {
-                                asset_info->OldImageIDList.push_back(id.getString());
+                                asset_info->OldImageIDList.push_back(id.asString());
                                 LLString image_file = fp->mInventoryPath;
                                 image_file.append(gDirUtilp->getDirDelimiter());
                                 image_file.append(*image_id);
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 40132ce..8bb73e3 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -1,221 +1,221 @@
-#include "llviewerprecompiledheaders.h"

-#include "llfloateravatarinfo.h"

-#include "llfloaterinspect.h"

-#include "llfloatertools.h"

-#include "llcachename.h"

-#include "llscrolllistctrl.h"

-#include "llselectmgr.h"

-#include "lltoolcomp.h"

-#include "lltoolmgr.h"

-#include "llviewercontrol.h"

-#include "llviewerobject.h"

-#include "llvieweruictrlfactory.h"

-

-LLFloaterInspect* LLFloaterInspect::sInstance = NULL;

-

-LLFloaterInspect::LLFloaterInspect(void) :

-        LLFloater("Inspect Object"),

-        mDirty(FALSE)

-{

-        sInstance = this;

-        gUICtrlFactory->buildFloater(this, "floater_inspect.xml");

-}

-

-LLFloaterInspect::~LLFloaterInspect(void)

-{

-        if(!gFloaterTools->getVisible())

-        {

-                if(gToolMgr->getCurrentTool(MASK_NONE) == gToolInspect)

-                {

-                        select_tool(gToolNull);

-                }

-                gSelectMgr->deselectAll();

-                // Switch back to basic toolset

-                gCurrentToolset = gBasicToolset;

-                gBasicToolset->selectFirstTool();

-                gToolMgr->useSelectedTool( gBasicToolset );

-        }

-        else

-        {

-                gFloaterTools->setFocus(TRUE);

-        }

-        sInstance = NULL;

-}

-

-BOOL LLFloaterInspect::isVisible()

-{

-        return (!!sInstance);

-}

-

-void LLFloaterInspect::show(void* ignored)

-{

-        if(sInstance)

-        {

-                sInstance->open();

-        }

-        else

-        {

-                LLFloaterInspect* self = new LLFloaterInspect;

-                self->open();

-        }

-        select_tool(gToolInspect);

-}

-

-void LLFloaterInspect::onClickCreatorProfile(void* ctrl)

-{

-        if(sInstance->mObjectList->getAllSelected().size() == 0) return;

-        LLSelectNode* obj = gSelectMgr->getFirstNode();

-        LLUUID obj_id, creator_id;

-        obj_id = sInstance->mObjectList->getFirstSelected()->getUUID();

-        while(obj)

-        {

-                if(obj_id == obj->getObject()->getID())

-                {

-                        creator_id = obj->mPermissions->getCreator();

-                        break;

-                }

-                obj = gSelectMgr->getNextNode();

-        }

-        if(obj)

-        {

-                LLFloaterAvatarInfo::showFromDirectory(creator_id);

-        }

-}

-

-void LLFloaterInspect::onClickOwnerProfile(void* ctrl)

-{

-        if(sInstance->mObjectList->getAllSelected().size() == 0) return;

-        LLSelectNode* obj = gSelectMgr->getFirstNode();

-        LLUUID obj_id, owner_id;

-        obj_id = sInstance->mObjectList->getFirstSelected()->getUUID();

-        while(obj)

-        {

-                if(obj_id == obj->getObject()->getID())

-                {

-                        owner_id = obj->mPermissions->getOwner();

-                        break;

-                }

-                obj = gSelectMgr->getNextNode();

-        }

-        if(obj)

-        {

-                LLFloaterAvatarInfo::showFromDirectory(owner_id);

-        }

-}

-

-BOOL LLFloaterInspect::postBuild()

-{

-        mObjectList = LLUICtrlFactory::getScrollListByName(this, "object_list");

-        childSetAction("button owner",onClickOwnerProfile, this);

-        childSetAction("button creator",onClickCreatorProfile, this);

-        childSetCommitCallback("object_list", onSelectObject);

-        refresh();

-        return TRUE;

-}

-

-void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)

-{

-        if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)

-        {

-                sInstance->childSetEnabled("button owner", true);

-                sInstance->childSetEnabled("button creator", true);

-        }

-}

-

-LLUUID LLFloaterInspect::getSelectedUUID()

-{

-        if(sInstance)

-        {

-                if(sInstance->mObjectList->getAllSelected().size() > 0) return sInstance->mObjectList->getFirstSelected()->getUUID();

-        }

-        return LLUUID::null;

-}

-

-void LLFloaterInspect::refresh()

-{

-        LLUUID creator_id;

-        LLString creator_name;

-        S32 pos = mObjectList->getScrollPos();

-        childSetEnabled("button owner", false);

-        childSetEnabled("button creator", false);

-        LLUUID selected_uuid;

-        S32 selected_index = mObjectList->getFirstSelectedIndex();

-        if(selected_index > -1) selected_uuid = mObjectList->getFirstSelected()->getUUID();

-        mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);

-        //List all transient objects, then all linked objects

-        LLSelectNode* obj = gSelectMgr->getFirstNode();

-        LLSD row;

-        while(obj)

-        {

-                char owner_first_name[MAX_STRING], owner_last_name[MAX_STRING];

-                char creator_first_name[MAX_STRING], creator_last_name[MAX_STRING];

-                char time[MAX_STRING];

-                std::ostringstream owner_name, creator_name, date;

-                time_t timestamp = (time_t) (obj->mCreationDate/1000000);

-                LLString::copy(time, ctime(&timestamp), MAX_STRING);

-                time[24] = '\0';

-                date << obj->mCreationDate;

-                gCacheName->getName(obj->mPermissions->getOwner(), owner_first_name, owner_last_name);

-                owner_name << owner_first_name << " " << owner_last_name;

-                gCacheName->getName(obj->mPermissions->getCreator(), creator_first_name, creator_last_name);

-                creator_name << creator_first_name << " " << creator_last_name;

-                row["id"] = obj->getObject()->getID();

-                row["columns"][0]["column"] = "object_name";

-                row["columns"][0]["type"] = "text";

-                // make sure we're either at the top of the link chain

-                // or top of the editable chain, for attachments

-                if(!(obj->getObject()->isRoot() || obj->getObject()->isRootEdit()))

-                {

-                        row["columns"][0]["value"] = LLString("   ") + obj->mName;

-                }

-                else

-                {

-                        row["columns"][0]["value"] = obj->mName;

-                }

-                row["columns"][1]["column"] = "owner_name";

-                row["columns"][1]["type"] = "text";

-                row["columns"][1]["value"] = owner_name.str().c_str();

-                row["columns"][2]["column"] = "creator_name";

-                row["columns"][2]["type"] = "text";

-                row["columns"][2]["value"] = creator_name.str().c_str();

-                row["columns"][3]["column"] = "creation_date";

-                row["columns"][3]["type"] = "text";

-                row["columns"][3]["value"] = time;

-                mObjectList->addElement(row, ADD_TOP);

-                obj = gSelectMgr->getNextNode();

-        }

-        if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)

-        {

-                mObjectList->selectNthItem(selected_index);

-        }

-        else

-        {

-                mObjectList->selectNthItem(0);

-        }

-        onSelectObject(this, NULL);

-        mObjectList->setScrollPos(pos);

-}

-

-void LLFloaterInspect::onFocusReceived()

-{

-        select_tool(gToolInspect);

-}

-

-void LLFloaterInspect::dirty()

-{

-        if(sInstance)

-        {

-                sInstance->setDirty();

-        }

-}

-

-void LLFloaterInspect::draw()

-{

-        if (mDirty)

-        {

-                refresh();

-                mDirty = FALSE;

-        }

-

-        LLFloater::draw();

-}
\ No newline at end of file
+#include "llviewerprecompiledheaders.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterinspect.h"
+#include "llfloatertools.h"
+#include "llcachename.h"
+#include "llscrolllistctrl.h"
+#include "llselectmgr.h"
+#include "lltoolcomp.h"
+#include "lltoolmgr.h"
+#include "llviewercontrol.h"
+#include "llviewerobject.h"
+#include "llvieweruictrlfactory.h"
+
+LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
+
+LLFloaterInspect::LLFloaterInspect(void) :
+        LLFloater("Inspect Object"),
+        mDirty(FALSE)
+{
+        sInstance = this;
+        gUICtrlFactory->buildFloater(this, "floater_inspect.xml");
+}
+
+LLFloaterInspect::~LLFloaterInspect(void)
+{
+        if(!gFloaterTools->getVisible())
+        {
+                if(gToolMgr->getBaseTool() == gToolInspect)
+                {
+                        select_tool(gToolNull);
+                }
+                // Switch back to basic toolset
+                gToolMgr->setCurrentToolset(gBasicToolset);
+        }
+        else
+        {
+                gFloaterTools->setFocus(TRUE);
+        }
+        sInstance = NULL;
+}
+
+BOOL LLFloaterInspect::isVisible()
+{
+        return (!!sInstance);
+}
+
+void LLFloaterInspect::show(void* ignored)
+{
+        if(sInstance)
+        {
+                sInstance->open();
+        }
+        else
+        {
+                LLFloaterInspect* self = new LLFloaterInspect;
+                self->open();
+        }
+
+        sInstance->mObjectSelection = gSelectMgr->getSelection();
+        select_tool(gToolInspect);
+        sInstance->refresh();
+}
+
+void LLFloaterInspect::onClickCreatorProfile(void* ctrl)
+{
+        if(sInstance->mObjectList->getAllSelected().size() == 0) return;
+        LLSelectNode* obj = sInstance->mObjectSelection->getFirstNode();
+        LLUUID obj_id, creator_id;
+        obj_id = sInstance->mObjectList->getFirstSelected()->getUUID();
+        while(obj)
+        {
+                if(obj_id == obj->getObject()->getID())
+                {
+                        creator_id = obj->mPermissions->getCreator();
+                        break;
+                }
+                obj = sInstance->mObjectSelection->getNextNode();
+        }
+        if(obj)
+        {
+                LLFloaterAvatarInfo::showFromDirectory(creator_id);
+        }
+}
+
+void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
+{
+        if(sInstance->mObjectList->getAllSelected().size() == 0) return;
+        LLSelectNode* obj = sInstance->mObjectSelection->getFirstNode();
+        LLUUID obj_id, owner_id;
+        obj_id = sInstance->mObjectList->getFirstSelected()->getUUID();
+        while(obj)
+        {
+                if(obj_id == obj->getObject()->getID())
+                {
+                        owner_id = obj->mPermissions->getOwner();
+                        break;
+                }
+                obj = sInstance->mObjectSelection->getNextNode();
+        }
+        if(obj)
+        {
+                LLFloaterAvatarInfo::showFromDirectory(owner_id);
+        }
+}
+
+BOOL LLFloaterInspect::postBuild()
+{
+        mObjectList = LLUICtrlFactory::getScrollListByName(this, "object_list");
+        childSetAction("button owner",onClickOwnerProfile, this);
+        childSetAction("button creator",onClickCreatorProfile, this);
+        childSetCommitCallback("object_list", onSelectObject);
+        return TRUE;
+}
+
+void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)
+{
+        if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)
+        {
+                sInstance->childSetEnabled("button owner", true);
+                sInstance->childSetEnabled("button creator", true);
+        }
+}
+
+LLUUID LLFloaterInspect::getSelectedUUID()
+{
+        if(sInstance)
+        {
+                if(sInstance->mObjectList->getAllSelected().size() > 0) return sInstance->mObjectList->getFirstSelected()->getUUID();
+        }
+        return LLUUID::null;
+}
+
+void LLFloaterInspect::refresh()
+{
+        LLUUID creator_id;
+        LLString creator_name;
+        S32 pos = mObjectList->getScrollPos();
+        childSetEnabled("button owner", false);
+        childSetEnabled("button creator", false);
+        LLUUID selected_uuid;
+        S32 selected_index = mObjectList->getFirstSelectedIndex();
+        if(selected_index > -1) selected_uuid = mObjectList->getFirstSelected()->getUUID();
+        mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
+        //List all transient objects, then all linked objects
+        LLSelectNode* obj = mObjectSelection->getFirstNode();
+        LLSD row;
+        while(obj)
+        {
+                char owner_first_name[MAX_STRING], owner_last_name[MAX_STRING];
+                char creator_first_name[MAX_STRING], creator_last_name[MAX_STRING];
+                char time[MAX_STRING];
+                std::ostringstream owner_name, creator_name, date;
+                time_t timestamp = (time_t) (obj->mCreationDate/1000000);
+                LLString::copy(time, ctime(&timestamp), MAX_STRING);
+                time[24] = '\0';
+                date << obj->mCreationDate;
+                gCacheName->getName(obj->mPermissions->getOwner(), owner_first_name, owner_last_name);
+                owner_name << owner_first_name << " " << owner_last_name;
+                gCacheName->getName(obj->mPermissions->getCreator(), creator_first_name, creator_last_name);
+                creator_name << creator_first_name << " " << creator_last_name;
+                row["id"] = obj->getObject()->getID();
+                row["columns"][0]["column"] = "object_name";
+                row["columns"][0]["type"] = "text";
+                // make sure we're either at the top of the link chain
+                // or top of the editable chain, for attachments
+                if(!(obj->getObject()->isRoot() || obj->getObject()->isRootEdit()))
+                {
+                        row["columns"][0]["value"] = LLString("   ") + obj->mName;
+                }
+                else
+                {
+                        row["columns"][0]["value"] = obj->mName;
+                }
+                row["columns"][1]["column"] = "owner_name";
+                row["columns"][1]["type"] = "text";
+                row["columns"][1]["value"] = owner_name.str().c_str();
+                row["columns"][2]["column"] = "creator_name";
+                row["columns"][2]["type"] = "text";
+                row["columns"][2]["value"] = creator_name.str().c_str();
+                row["columns"][3]["column"] = "creation_date";
+                row["columns"][3]["type"] = "text";
+                row["columns"][3]["value"] = time;
+                mObjectList->addElement(row, ADD_TOP);
+                obj = mObjectSelection->getNextNode();
+        }
+        if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)
+        {
+                mObjectList->selectNthItem(selected_index);
+        }
+        else
+        {
+                mObjectList->selectNthItem(0);
+        }
+        onSelectObject(this, NULL);
+        mObjectList->setScrollPos(pos);
+}
+
+void LLFloaterInspect::onFocusReceived()
+{
+        select_tool(gToolInspect);
+}
+
+void LLFloaterInspect::dirty()
+{
+        if(sInstance)
+        {
+                sInstance->setDirty();
+        }
+}
+
+void LLFloaterInspect::draw()
+{
+        if (mDirty)
+        {
+                refresh();
+                mDirty = FALSE;
+        }
+
+        LLFloater::draw();
+}
+
diff --git a/linden/indra/newview/llfloaterinspect.h b/linden/indra/newview/llfloaterinspect.h
index 2075204..51549ad 100644
--- a/linden/indra/newview/llfloaterinspect.h
+++ b/linden/indra/newview/llfloaterinspect.h
@@ -1,10 +1,10 @@
-/** 

-* @file llfloaterfriends.h

-* @author Cube

-* @date 2006-12-16

-* @brief Declaration of class for displaying object attributes

-*

-* Copyright (c) 2005-2007, Linden Research, Inc.

+/** 
+* @file llfloaterfriends.h
+* @author Cube
+* @date 2006-12-16
+* @brief Declaration of class for displaying object attributes
+*
+* Copyright (c) 2005-2007, Linden Research, Inc.
 * 
  * 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
@@ -24,43 +24,46 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

-*/

-

-#ifndef LL_LLFLOATERINSPECT_H

-#define LL_LLFLOATERINSPECT_H

-

-#include "llfloater.h"

-

-//class LLTool;

-class LLScrollListCtrl;

-class LLUICtrl;

-

-class LLFloaterInspect : public LLFloater

-{

-public:

-        virtual ~LLFloaterInspect(void);

-        static void show(void* ignored = NULL);

-        virtual BOOL postBuild();

-        static void dirty();

-        static LLUUID getSelectedUUID();

-        virtual void draw();

-        virtual void refresh();

-        static BOOL isVisible();

-        virtual void onFocusReceived();

-        static void onClickCreatorProfile(void* ctrl);

-        static void onClickOwnerProfile(void* ctrl);

-        static void onSelectObject(LLUICtrl* ctrl, void* user_data);

-        LLScrollListCtrl* mObjectList;

-protected:

-        // protected members

-        LLFloaterInspect();

-        void setDirty() { mDirty = TRUE; }

-        bool mDirty;

-

-private:

-        // static data

-        static LLFloaterInspect* sInstance;

-};

-

-#endif //LL_LLFLOATERINSPECT_H
\ No newline at end of file
+ * COMPLETENESS OR PERFORMANCE.
+*/
+
+#ifndef LL_LLFLOATERINSPECT_H
+#define LL_LLFLOATERINSPECT_H
+
+#include "llfloater.h"
+
+//class LLTool;
+class LLObjectSelection;
+class LLScrollListCtrl;
+class LLUICtrl;
+
+class LLFloaterInspect : public LLFloater
+{
+public:
+        virtual ~LLFloaterInspect(void);
+        static void show(void* ignored = NULL);
+        virtual BOOL postBuild();
+        static void dirty();
+        static LLUUID getSelectedUUID();
+        virtual void draw();
+        virtual void refresh();
+        static BOOL isVisible();
+        virtual void onFocusReceived();
+        static void onClickCreatorProfile(void* ctrl);
+        static void onClickOwnerProfile(void* ctrl);
+        static void onSelectObject(LLUICtrl* ctrl, void* user_data);
+        LLScrollListCtrl* mObjectList;
+protected:
+        // protected members
+        LLFloaterInspect();
+        void setDirty() { mDirty = TRUE; }
+        bool mDirty;
+
+private:
+        // static data
+        static LLFloaterInspect* sInstance;
+
+        LLHandle<LLObjectSelection> mObjectSelection;
+};
+
+#endif //LL_LLFLOATERINSPECT_H
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index f19baa9..6bb6aff 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -113,7 +113,7 @@ static const BOOL BUY_PERSONAL_LAND = FALSE;
 LLFloaterLand* LLFloaterLand::sInstance = NULL;
 LLParcelSelectionObserver* LLFloaterLand::sObserver = NULL;
 S32 LLFloaterLand::sLastTab = 0;
-BOOL LLFloaterLand::sRequestReplyOnUpdate = TRUE;
+
 LLViewHandle LLPanelLandGeneral::sBuyPassDialogHandle;
 
 // Local classes
@@ -185,7 +185,7 @@ void LLFloaterLand::show()
                 gParcelMgr->addObserver( sObserver );
         }
 
-        sInstance->open();
+        sInstance->open();      /*Flawfinder: ignore*/
 
         // Done automatically when the selected parcel's properties arrive
         // (and hence we have the local id).
@@ -193,13 +193,11 @@ void LLFloaterLand::show()
 
         // If we've already got the parcel data, fill the
         // floater with it.
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
-        if (parcel)
+        sInstance->mParcel = gParcelMgr->getFloatingParcelSelection();
+        if (sInstance->mParcel->getParcel())
         {
                 sInstance->refresh();
         }
-
-        sRequestReplyOnUpdate = TRUE;
 }
 
 //static
@@ -233,19 +231,6 @@ void LLFloaterLand::refreshAll()
         }
 }
 
-
-// virtual
-BOOL LLFloaterLand::canClose()
-{
-        // canClose is checked as the first step of attempting to close
-        // the window, before focus is released from controls.  Since we're
-        // closing the window and deselecting the land, we
-        // don't want replies to the upstream messages that get sent
-        // (because the reply will cause the land to be selected again).
-        sRequestReplyOnUpdate = FALSE;
-        return TRUE;
-}
-
 // virtual
 void LLFloaterLand::onClose(bool app_quitting)
 {
@@ -253,10 +238,6 @@ void LLFloaterLand::onClose(bool app_quitting)
         delete sObserver;
         sObserver = NULL;
 
-        // Must do this after removing observer, otherwise
-        // infinite loops notifying and closing.
-        gParcelMgr->deselectLand();
-
         // Might have been showing owned objects
         gSelectMgr->unhighlightAll();
 
@@ -321,7 +302,7 @@ void LLFloaterLand::refresh()
 void* LLFloaterLand::createPanelLandGeneral(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelGeneral = new LLPanelLandGeneral();
+        self->mPanelGeneral = new LLPanelLandGeneral(self->mParcel);
         return self->mPanelGeneral;
 }
 
@@ -331,7 +312,7 @@ void* LLFloaterLand::createPanelLandGeneral(void* data)
 void* LLFloaterLand::createPanelLandCovenant(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelCovenant = new LLPanelLandCovenant();
+        self->mPanelCovenant = new LLPanelLandCovenant(self->mParcel);
         return self->mPanelCovenant;
 }
 
@@ -340,7 +321,7 @@ void* LLFloaterLand::createPanelLandCovenant(void* data)
 void* LLFloaterLand::createPanelLandObjects(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelObjects = new LLPanelLandObjects();
+        self->mPanelObjects = new LLPanelLandObjects(self->mParcel);
         return self->mPanelObjects;
 }
 
@@ -348,7 +329,7 @@ void* LLFloaterLand::createPanelLandObjects(void* data)
 void* LLFloaterLand::createPanelLandOptions(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelOptions = new LLPanelLandOptions();
+        self->mPanelOptions = new LLPanelLandOptions(self->mParcel);
         return self->mPanelOptions;
 }
 
@@ -356,7 +337,7 @@ void* LLFloaterLand::createPanelLandOptions(void* data)
 void* LLFloaterLand::createPanelLandMedia(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelMedia = new LLPanelLandMedia();
+        self->mPanelMedia = new LLPanelLandMedia(self->mParcel);
         return self->mPanelMedia;
 }
 
@@ -364,7 +345,7 @@ void* LLFloaterLand::createPanelLandMedia(void* data)
 void* LLFloaterLand::createPanelLandAccess(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelAccess = new LLPanelLandAccess();
+        self->mPanelAccess = new LLPanelLandAccess(self->mParcel);
         return self->mPanelAccess;
 }
 
@@ -372,7 +353,7 @@ void* LLFloaterLand::createPanelLandAccess(void* data)
 void* LLFloaterLand::createPanelLandBan(void* data)
 {
         LLFloaterLand* self = (LLFloaterLand*)data;
-        self->mPanelBan = new LLPanelLandBan();
+        self->mPanelBan = new LLPanelLandBan(self->mParcel);
         return self->mPanelBan;
 }
 
@@ -382,9 +363,10 @@ void* LLFloaterLand::createPanelLandBan(void* data)
 //---------------------------------------------------------------------------
 
 
-LLPanelLandGeneral::LLPanelLandGeneral()
+LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
 :       LLPanel("land_general_panel"),
-        mUncheckedSell(FALSE)
+        mUncheckedSell(FALSE),
+        mParcel(parcel)
 {
 }
 
@@ -471,9 +453,8 @@ BOOL LLPanelLandGeneral::postBuild()
         mBtnBuyGroupLand->setClickedCallback(onClickBuyLand, (void*)&BUY_GROUP_LAND);
         
         
-        static BOOL deselect_when_done = FALSE;
         mBtnBuyPass = LLUICtrlFactory::getButtonByName(this, "Buy Pass...");
-        mBtnBuyPass->setClickedCallback(onClickBuyPass, &deselect_when_done);
+        mBtnBuyPass->setClickedCallback(onClickBuyPass, this);
 
         mBtnReleaseLand = LLUICtrlFactory::getButtonByName(this, "Abandon Land...");
         mBtnReleaseLand->setClickedCallback(onClickRelease, NULL);
@@ -498,7 +479,7 @@ void LLPanelLandGeneral::refresh()
 {
         mBtnStartAuction->setVisible(gAgent.isGodlike());
 
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
         bool region_owner = false;
         LLViewerRegion* regionp = gParcelMgr->getSelectionRegion();
         if(regionp && (regionp->getOwner() == gAgent.getID()))
@@ -607,8 +588,8 @@ void LLPanelLandGeneral::refresh()
                         }
                         else if(parcel->getAuctionID())
                         {
-                                char auction_str[MAX_STRING];
-                                sprintf(auction_str, "Auction ID: %u", parcel->getAuctionID());
+                                char auction_str[MAX_STRING];           /*Flawfinder: ignore*/
+                                snprintf(auction_str, sizeof(auction_str), "Auction ID: %u", parcel->getAuctionID());   /*Flawfinder: ignore*/
                                 mTextSalePending->setText(auction_str);
                                 mTextSalePending->setEnabled(TRUE);
                         }
@@ -645,7 +626,7 @@ void LLPanelLandGeneral::refresh()
 
                         // Display claim date
                         time_t claim_date = parcel->getClaimDate();
-                        char time_buf[TIME_STR_LENGTH];
+                        char time_buf[TIME_STR_LENGTH];         /*Flawfinder: ignore*/
                         mTextClaimDate->setText(formatted_time(claim_date, time_buf));
                         mTextClaimDate->setEnabled(is_leased);
 
@@ -735,7 +716,7 @@ void LLPanelLandGeneral::refresh()
                         gParcelMgr->canAgentBuyParcel(parcel, true));
 
                 // show pricing information
-                char price[64]; 
+                char price[64];         /*Flawfinder: ignore*/
                 const char* label = NULL;
                 S32 area;
                 S32 claim_price;
@@ -748,13 +729,13 @@ void LLPanelLandGeneral::refresh()
                                                                    &dwell);
 
                 // Area
-                sprintf(price, "%d sq. m.", area);
+                snprintf(price, sizeof(price), "%d sq. m.", area);              /*Flawfinder: ignore*/
                 label = AREA;
                 
                 mTextPriceLabel->setText(label);
                 mTextPrice->setText(price);
                 
-                sprintf(price, "%.0f", dwell);
+                snprintf(price, sizeof(price), "%.0f", dwell);          /*Flawfinder: ignore*/
                 mTextDwell->setText(price);
 
                 if(region_owner)
@@ -780,31 +761,31 @@ void LLPanelLandGeneral::refresh()
 // public
 void LLPanelLandGeneral::refreshNames()
 {
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
         if (!parcel)
         {
                 mTextOwner->setText("");
                 return;
         }
 
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
         if (parcel->getIsGroupOwned())
         {
                 buffer[0] = '\0';
-                strcat(buffer, "(Group Owned)");
+                strcat(buffer, "(Group Owned)");        /*Flawfinder: ignore*/
         }
         else
         {
                 // Figure out the owner's name
-                char owner_first[MAX_STRING];
-                char owner_last[MAX_STRING];
+                char owner_first[MAX_STRING];   /*Flawfinder: ignore*/
+                char owner_last[MAX_STRING];    /*Flawfinder: ignore*/
                 gCacheName->getName(parcel->getOwnerID(), owner_first, owner_last);
-                sprintf(buffer, "%s %s", owner_first, owner_last);
+                snprintf(buffer, sizeof(buffer), "%s %s", owner_first, owner_last);     /*Flawfinder: ignore*/
         }
 
         if(LLParcel::OS_LEASE_PENDING == parcel->getOwnershipStatus())
         {
-                strcat(buffer, " (Sale Pending)");
+                strcat(buffer, " (Sale Pending)");      /*Flawfinder: ignore*/
         }
         mTextOwner->setText(buffer);
 
@@ -822,8 +803,8 @@ void LLPanelLandGeneral::refreshNames()
         if(auth_buyer_id.notNull())
         {
                 LLString name;
-                char firstname[MAX_STRING];
-                char lastname[MAX_STRING];
+                char firstname[MAX_STRING];             /*Flawfinder: ignore*/
+                char lastname[MAX_STRING];              /*Flawfinder: ignore*/
                 gCacheName->getName(auth_buyer_id, firstname, lastname);
                 name.assign(firstname);
                 name.append(" ");
@@ -860,7 +841,8 @@ void LLPanelLandGeneral::onClickSetGroup(void* userdata)
 // static
 void LLPanelLandGeneral::onClickProfile(void* data)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+        LLParcel* parcel = panelp->mParcel->getParcel();
         if (!parcel) return;
 
         if (parcel->getIsGroupOwned())
@@ -885,7 +867,7 @@ void LLPanelLandGeneral::cbGroupID(LLUUID group_id, void* userdata)
 // public
 void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = mParcel->getParcel();
         if (!parcel) return;
 
         // Set parcel properties and send message
@@ -894,7 +876,7 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
         //mTextGroup->setText(group_name);
 
         // Send update
-        gParcelMgr->sendParcelPropertiesUpdate(parcel, LLFloaterLand::sRequestReplyOnUpdate);
+        gParcelMgr->sendParcelPropertiesUpdate(parcel);
 
         // Update UI
         refresh();
@@ -907,16 +889,17 @@ void LLPanelLandGeneral::onClickBuyLand(void* data)
         gParcelMgr->startBuyLand(*for_group);
 }
 
-BOOL LLPanelLandGeneral::enableDeedToGroup(void*)
+BOOL LLPanelLandGeneral::enableDeedToGroup(void* data)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+        LLParcel* parcel = panelp->mParcel->getParcel();
         return (parcel != NULL) && (parcel->getParcelFlag(PF_ALLOW_DEED_TO_GROUP));
 }
 
 // static
 void LLPanelLandGeneral::onClickDeed(void*)
 {
-        //LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        //LLParcel* parcel = mParcel->getParcel();
         //if (parcel)
         //{
         gParcelMgr->startDeedLandToGroup();
@@ -937,39 +920,43 @@ void LLPanelLandGeneral::onClickReclaim(void*)
 }
 
 // static
-BOOL LLPanelLandGeneral::enableBuyPass(void*)
+BOOL LLPanelLandGeneral::enableBuyPass(void* data)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+        LLParcel* parcel = panelp != NULL ? panelp->mParcel->getParcel() : gParcelMgr->getParcelSelection()->getParcel();
         return (parcel != NULL) && (parcel->getParcelFlag(PF_USE_PASS_LIST) && !gParcelMgr->isCollisionBanned());
 }
 
 
 // static
-void LLPanelLandGeneral::onClickBuyPass(void* deselect_when_done)
+void LLPanelLandGeneral::onClickBuyPass(void* data)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+        LLParcel* parcel = panelp != NULL ? panelp->mParcel->getParcel() : gParcelMgr->getParcelSelection()->getParcel();
+
         if (!parcel) return;
 
         S32 pass_price = parcel->getPassPrice();
         const char* parcel_name = parcel->getName();
         F32 pass_hours = parcel->getPassHours();
 
-        char cost[256], time[256];
-        sprintf(cost, "%d", pass_price);
-        sprintf(time, "%.2f", pass_hours);
+        char cost[256], time[256];              /*Flawfinder: ignore*/
+        snprintf(cost, sizeof(cost), "%d", pass_price); /*Flawfinder: ignore*/
+        snprintf(time, sizeof(time), "%.2f", pass_hours);               /*Flawfinder: ignore*/
 
         LLStringBase<char>::format_map_t args;
         args["[COST]"] = cost;
         args["[PARCEL_NAME]"] = parcel_name;
         args["[TIME]"] = time;
         
-        sBuyPassDialogHandle = gViewerWindow->alertXml("LandBuyPass", args, cbBuyPass, deselect_when_done)->getHandle();
+        sBuyPassDialogHandle = gViewerWindow->alertXml("LandBuyPass", args, cbBuyPass)->getHandle();
 }
 
 // static
-void LLPanelLandGeneral::onClickStartAuction(void*)
+void LLPanelLandGeneral::onClickStartAuction(void* data)
 {
-        LLParcel* parcelp = gParcelMgr->getSelectedParcel();
+        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+        LLParcel* parcelp = panelp->mParcel->getParcel();
         if(parcelp)
         {
                 if(parcelp->getForSale())
@@ -986,18 +973,11 @@ void LLPanelLandGeneral::onClickStartAuction(void*)
 // static
 void LLPanelLandGeneral::cbBuyPass(S32 option, void* data)
 {
-        BOOL deselect_when_done = (BOOL)(intptr_t)data;
-
         if (0 == option)
         {
                 // User clicked OK
                 gParcelMgr->buyPass();
         }
-
-        if (deselect_when_done)
-        {
-                gParcelMgr->deselectLand();
-        }
 }
 
 //static 
@@ -1011,7 +991,7 @@ void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata)
 {
         LLPanelLandGeneral *panelp = (LLPanelLandGeneral *)userdata;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = panelp->mParcel->getParcel();
         if (!parcel)
         {
                 return;
@@ -1034,7 +1014,7 @@ void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata)
         parcel->setContributeWithDeed(contribute_with_deed);
 
         // Send update to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
 
         // Might have changed properties, so let's redraw!
         panelp->refresh();
@@ -1049,20 +1029,21 @@ void LLPanelLandGeneral::onClickSellLand(void* data)
 // static
 void LLPanelLandGeneral::onClickStopSellLand(void* data)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
+        LLParcel* parcel = panelp->mParcel->getParcel();
 
         parcel->setParcelFlag(PF_FOR_SALE, FALSE);
         parcel->setSalePrice(0);
         parcel->setAuthorizedBuyerID(LLUUID::null);
 
-        gParcelMgr->sendParcelPropertiesUpdate(parcel, LLFloaterLand::sRequestReplyOnUpdate);
+        gParcelMgr->sendParcelPropertiesUpdate(parcel);
 }
 
 //---------------------------------------------------------------------------
 // LLPanelLandObjects
 //---------------------------------------------------------------------------
-LLPanelLandObjects::LLPanelLandObjects()
-:       LLPanel("land_objects_panel")
+LLPanelLandObjects::LLPanelLandObjects(LLParcelSelectionHandle& parcel)
+:       LLPanel("land_objects_panel"), mParcel(parcel)
 {
 }
 
@@ -1230,7 +1211,7 @@ void LLPanelLandObjects::onDoubleClickOwner(void *userdata)
 // public
 void LLPanelLandObjects::refresh()
 {
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
 
         mBtnShowOwnerObjects->setEnabled(FALSE);
         mBtnShowGroupObjects->setEnabled(FALSE);
@@ -1258,16 +1239,16 @@ void LLPanelLandObjects::refresh()
         }
         else
         {
-                char count[MAX_STRING];
-                S32 sw_max;
-                S32 sw_total;
-                S32 max;
-                S32 total;
-                S32 owned;
-                S32 group;
-                S32 other;
-                S32 selected;
-                F32 parcel_object_bonus;
+                char count[MAX_STRING];         /*Flawfinder: ignore*/
+                S32 sw_max = 0;
+                S32 sw_total = 0;
+                S32 max = 0;
+                S32 total = 0;
+                S32 owned = 0;
+                S32 group = 0;
+                S32 other = 0;
+                S32 selected = 0;
+                F32 parcel_object_bonus = 0.f;
 
                 gParcelMgr->getPrimInfo(sw_max, sw_total, 
                                                                   max, total, owned, group, other, selected,
@@ -1285,7 +1266,7 @@ void LLPanelLandObjects::refresh()
 
                 if (parcel_object_bonus != 1.0f)
                 {
-                        sprintf(count, "Region Object Bonus Factor: %.2f", 
+                        snprintf(count, sizeof(count), "Region Object Bonus Factor: %.2f",              /*Flawfinder: ignore*/
                                         parcel_object_bonus);
                         mParcelObjectBonus->setText(count);
                 }
@@ -1296,35 +1277,35 @@ void LLPanelLandObjects::refresh()
 
                 if (sw_total > sw_max)
                 {
-                        sprintf(count, "%d out of %d (%d will be deleted)", 
+                        snprintf(count, sizeof(count), "%d out of %d (%d will be deleted)",             /*Flawfinder: ignore*/
                                         sw_total, sw_max, sw_total - sw_max);
                 }
                 else
                 {
-                        sprintf(count, "%d out of %d (%d available)", 
+                        snprintf(count, sizeof(count), "%d out of %d (%d available)",                   /*Flawfinder: ignore*/
                                         sw_total, sw_max, sw_max - sw_total);
                 }
                 mSWTotalObjects->setText(count);
 
-                sprintf(count, "%d", max);
+                snprintf(count, sizeof(count),  "%d", max);             /*Flawfinder: ignore*/
                 mObjectContribution->setText(count);
 
-                sprintf(count, "%d", total);
+                snprintf(count, sizeof(count), "%d", total);            /*Flawfinder: ignore*/
                 mTotalObjects->setText(count);
 
-                sprintf(count, "%d", owned);
+                snprintf(count, sizeof(count), "%d", owned);    /*Flawfinder: ignore*/
                 mOwnerObjects->setText(count);
 
-                sprintf(count, "%d", group);
+                snprintf(count, sizeof(count), "%d", group);            /*Flawfinder: ignore*/
                 mGroupObjects->setText(count);
 
-                sprintf(count, "%d", other);
+                snprintf(count, sizeof(count), "%d", other);            /*Flawfinder: ignore*/
                 mOtherObjects->setText(count);
 
-                sprintf(count, "%d", selected);
+                snprintf(count, sizeof(count), "%d", selected); /*Flawfinder: ignore*/
                 mSelectedObjects->setText(count);
 
-                sprintf(count, "%d", mOtherTime);
+                snprintf(count, sizeof(count), "%d", mOtherTime);                       /*Flawfinder: ignore*/
                 mCleanOtherObjectsTime->setText(count);
 
                 BOOL can_return_owned = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_RETURN_GROUP_OWNED);
@@ -1425,7 +1406,7 @@ void send_return_objects_message(S32 parcel_local_id, S32 return_type,
 void LLPanelLandObjects::callbackReturnOwnerObjects(S32 option, void* userdata)
 {
         LLPanelLandObjects      *lop = (LLPanelLandObjects *)userdata;
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = lop->mParcel->getParcel();
         if (0 == option)
         {
                 if (parcel)
@@ -1438,8 +1419,8 @@ void LLPanelLandObjects::callbackReturnOwnerObjects(S32 option, void* userdata)
                         }
                         else
                         {
-                                char first[DB_FIRST_NAME_BUF_SIZE];
-                                char last[DB_LAST_NAME_BUF_SIZE];
+                                char first[DB_FIRST_NAME_BUF_SIZE];     /*Flawfinder: ignore*/
+                                char last[DB_LAST_NAME_BUF_SIZE];       /*Flawfinder: ignore*/
                                 gCacheName->getName(owner_id, first, last);
                                 args["[FIRST]"] = first;
                                 args["[LAST]"] = last;
@@ -1450,7 +1431,7 @@ void LLPanelLandObjects::callbackReturnOwnerObjects(S32 option, void* userdata)
         }
 
         gSelectMgr->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
         lop->refresh();
 }
 
@@ -1458,12 +1439,12 @@ void LLPanelLandObjects::callbackReturnOwnerObjects(S32 option, void* userdata)
 void LLPanelLandObjects::callbackReturnGroupObjects(S32 option, void* userdata)
 {
         LLPanelLandObjects      *lop = (LLPanelLandObjects *)userdata;
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = lop->mParcel->getParcel();
         if (0 == option)
         {
                 if (parcel)
                 {
-                        char group_name[MAX_STRING];
+                        char group_name[MAX_STRING];            /*Flawfinder: ignore*/
                         gCacheName->getGroupName(parcel->getGroupID(), group_name);
                         LLString::format_map_t args;
                         args["[GROUPNAME]"] = group_name;
@@ -1472,7 +1453,7 @@ void LLPanelLandObjects::callbackReturnGroupObjects(S32 option, void* userdata)
                 }
         }
         gSelectMgr->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
         lop->refresh();
 }
 
@@ -1480,7 +1461,7 @@ void LLPanelLandObjects::callbackReturnGroupObjects(S32 option, void* userdata)
 void LLPanelLandObjects::callbackReturnOtherObjects(S32 option, void* userdata)
 {
         LLPanelLandObjects      *lop = (LLPanelLandObjects *)userdata;
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = lop->mParcel->getParcel();
         if (0 == option)
         {
                 if (parcel)
@@ -1490,7 +1471,7 @@ void LLPanelLandObjects::callbackReturnOtherObjects(S32 option, void* userdata)
                 }
         }
         gSelectMgr->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
         lop->refresh();
 }
 
@@ -1498,7 +1479,7 @@ void LLPanelLandObjects::callbackReturnOtherObjects(S32 option, void* userdata)
 void LLPanelLandObjects::callbackReturnOwnerList(S32 option, void* userdata)
 {
         LLPanelLandObjects      *self = (LLPanelLandObjects *)userdata;
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = self->mParcel->getParcel();
         if (0 == option)
         {
                 if (parcel)
@@ -1525,7 +1506,7 @@ void LLPanelLandObjects::callbackReturnOwnerList(S32 option, void* userdata)
                 }
         }
         gSelectMgr->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
         self->refresh();
 }
 
@@ -1543,7 +1524,7 @@ void LLPanelLandObjects::onClickReturnOwnerList(void* userdata)
 
         gParcelMgr->getPrimInfo(sw_max, sw_total, max, total, owned, group, other, selected, parcel_object_bonus, other_time);
 
-        LLParcel* parcelp = gParcelMgr->getSelectedParcel();
+        LLParcel* parcelp = self->mParcel->getParcel();
         if (!parcelp) return;
 
         // Make sure we have something selected.
@@ -1577,7 +1558,7 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
 
         LLMessageSystem *msg = gMessageSystem;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel) return;
 
         LLViewerRegion* region = gParcelMgr->getSelectionRegion();
@@ -1614,7 +1595,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
         BOOL    is_group_owned;
         S32             object_count;
         BOOL    is_online;
-        char object_count_str[MAX_STRING];
+        char object_count_str[MAX_STRING];      /*Flawfinder: ignore*/
         //BOOL b_need_refresh = FALSE;
 
         // If we were waiting for the first reply, clear the "Searching..." text.
@@ -1655,7 +1636,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
                 // Placeholder for name.
                 row->addColumn("", FONT, self->mColWidth[2]);
 
-                sprintf(object_count_str, "%d", object_count);
+                snprintf(object_count_str, sizeof(object_count_str), "%d", object_count);       /*Flawfinder: ignore*/
                 row->addColumn(object_count_str, FONT, self->mColWidth[3]);
 
                 if (is_group_owned)
@@ -1730,7 +1711,7 @@ void LLPanelLandObjects::onCommitList(LLUICtrl* ctrl, void* data)
                 self->mBtnReturnOwnerList->setEnabled(TRUE);
 
                 // Highlight this user's objects
-                clickShowCore(RT_LIST, &(self->mSelectedOwners));
+                clickShowCore(self, RT_LIST, &(self->mSelectedOwners));
         }
 }
 
@@ -1757,30 +1738,30 @@ void LLPanelLandObjects::onClickName(void* userdata)
 }
 
 // static
-void LLPanelLandObjects::clickShowCore(S32 return_type, uuid_list_t* list)
+void LLPanelLandObjects::clickShowCore(LLPanelLandObjects* self, S32 return_type, uuid_list_t* list)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel) return;
 
         send_parcel_select_objects(parcel->getLocalID(), return_type, list);
 }
 
 // static
-void LLPanelLandObjects::onClickShowOwnerObjects(void*)
+void LLPanelLandObjects::onClickShowOwnerObjects(void* userdata)
 {
-        clickShowCore(RT_OWNER);
+        clickShowCore((LLPanelLandObjects*)userdata, RT_OWNER);
 }
 
 // static
-void LLPanelLandObjects::onClickShowGroupObjects(void*)
+void LLPanelLandObjects::onClickShowGroupObjects(void* userdata)
 {
-        clickShowCore(RT_GROUP);
+        clickShowCore((LLPanelLandObjects*)userdata, (RT_GROUP));
 }
 
 // static
-void LLPanelLandObjects::onClickShowOtherObjects(void*)
+void LLPanelLandObjects::onClickShowOtherObjects(void* userdata)
 {
-        clickShowCore(RT_OTHER);
+        clickShowCore((LLPanelLandObjects*)userdata, RT_OTHER);
 }
 
 // static
@@ -1794,7 +1775,8 @@ void LLPanelLandObjects::onClickReturnOwnerObjects(void* userdata)
 
         gParcelMgr->getPrimInfo(sw_max, sw_total, max, total, owned, group, other, selected, parcel_object_bonus, other_time);
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandObjects* panelp = (LLPanelLandObjects*)userdata;
+        LLParcel* parcel = panelp->mParcel->getParcel();
         if (!parcel) return;
 
         send_parcel_select_objects(parcel->getLocalID(), RT_OWNER);
@@ -1810,8 +1792,8 @@ void LLPanelLandObjects::onClickReturnOwnerObjects(void* userdata)
         }
         else
         {
-                char first[DB_FIRST_NAME_BUF_SIZE];
-                char last[DB_LAST_NAME_BUF_SIZE];
+                char first[DB_FIRST_NAME_BUF_SIZE];     /*Flawfinder: ignore*/
+                char last[DB_LAST_NAME_BUF_SIZE];       /*Flawfinder: ignore*/
                 gCacheName->getName(owner_id, first, last);
                 std::string name = first;
                 name += " ";
@@ -1832,12 +1814,13 @@ void LLPanelLandObjects::onClickReturnGroupObjects(void* userdata)
         
         gParcelMgr->getPrimInfo(sw_max, sw_total, max, total, owned, group, other, selected, parcel_object_bonus, other_time);
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandObjects* panelp = (LLPanelLandObjects*)userdata;
+        LLParcel* parcel = panelp->mParcel->getParcel();
         if (!parcel) return;
 
         send_parcel_select_objects(parcel->getLocalID(), RT_GROUP);
 
-        char group_name[MAX_STRING];
+        char group_name[MAX_STRING];    /*Flawfinder: ignore*/
         gCacheName->getGroupName(parcel->getGroupID(), group_name);
         
         LLStringBase<char>::format_map_t args;
@@ -1859,7 +1842,8 @@ void LLPanelLandObjects::onClickReturnOtherObjects(void* userdata)
 
         gParcelMgr->getPrimInfo(sw_max, sw_total, max, total, owned, group, other, selected, parcel_object_bonus, other_time);
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLPanelLandObjects* panelp = (LLPanelLandObjects*)userdata;
+        LLParcel* parcel = panelp->mParcel->getParcel();
         if (!parcel) return;
 
         send_parcel_select_objects(parcel->getLocalID(), RT_OTHER);
@@ -1869,7 +1853,7 @@ void LLPanelLandObjects::onClickReturnOtherObjects(void* userdata)
         
         if (parcel->getIsGroupOwned())
         {
-                char group_name[MAX_STRING];
+                char group_name[MAX_STRING];    /*Flawfinder: ignore*/
                 gCacheName->getGroupName(parcel->getGroupID(), group_name);
                 args["[NAME]"] = group_name;
 
@@ -1885,8 +1869,8 @@ void LLPanelLandObjects::onClickReturnOtherObjects(void* userdata)
                 }
                 else
                 {
-                        char first[DB_FIRST_NAME_BUF_SIZE];
-                        char last[DB_LAST_NAME_BUF_SIZE];
+                        char first[DB_FIRST_NAME_BUF_SIZE];     /*Flawfinder: ignore*/
+                        char last[DB_LAST_NAME_BUF_SIZE];       /*Flawfinder: ignore*/
                         gCacheName->getName(owner_id, first, last);
                         std::string name;
                         name += first;
@@ -1903,7 +1887,7 @@ void LLPanelLandObjects::onClickReturnOtherObjects(void* userdata)
 void LLPanelLandObjects::onLostFocus(LLLineEditor *caller, void* user_data)
 {
         LLPanelLandObjects      *lop = (LLPanelLandObjects *)user_data;
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = lop->mParcel->getParcel();
         if (parcel)
         {
                 lop->mOtherTime = atoi(lop->mCleanOtherObjectsTime->getText().c_str());
@@ -1918,7 +1902,7 @@ void LLPanelLandObjects::onLostFocus(LLLineEditor *caller, void* user_data)
 // LLPanelLandOptions
 //---------------------------------------------------------------------------
 
-LLPanelLandOptions::LLPanelLandOptions()
+LLPanelLandOptions::LLPanelLandOptions(LLParcelSelectionHandle& parcel)
 :       LLPanel("land_options_panel"),
         mCheckEditObjects(NULL),
         mCheckEditGroupObjects(NULL),
@@ -1940,7 +1924,8 @@ LLPanelLandOptions::LLPanelLandOptions()
         mAllowPublishCtrl(NULL),
         mMatureCtrl(NULL),
         mPushRestrictionCtrl(NULL),
-        mPublishHelpButton(NULL)
+        mPublishHelpButton(NULL),
+        mParcel(parcel)
 {
 
 }
@@ -2073,7 +2058,7 @@ LLPanelLandOptions::~LLPanelLandOptions()
 // public
 void LLPanelLandOptions::refresh()
 {
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
         
         if (!parcel)
         {
@@ -2208,8 +2193,8 @@ void LLPanelLandOptions::refresh()
                 }
                 else
                 {
-                        char buffer[256];
-                        sprintf(buffer, "Landing Point: %d, %d, %d",
+                        char buffer[256];       /*Flawfinder: ignore*/
+                        snprintf(buffer, sizeof(buffer), "Landing Point: %d, %d, %d",   /*Flawfinder: ignore*/
                                         llround(pos.mV[VX]),
                                         llround(pos.mV[VY]),
                                         llround(pos.mV[VZ]));
@@ -2244,7 +2229,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
 {
         LLPanelLandOptions *self = (LLPanelLandOptions *)userdata;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel)
         {
                 return;
@@ -2298,7 +2283,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
         parcel->setSnapshotID(snapshot_id);
 
         // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
 
         // Might have changed properties, so let's redraw!
         self->refresh();
@@ -2310,7 +2295,7 @@ void LLPanelLandOptions::onClickSet(void* userdata)
 {
         LLPanelLandOptions* self = (LLPanelLandOptions*)userdata;
 
-        LLParcel* selected_parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* selected_parcel = self->mParcel->getParcel();
         if (!selected_parcel) return;
 
         LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
@@ -2326,7 +2311,7 @@ void LLPanelLandOptions::onClickSet(void* userdata)
         selected_parcel->setUserLocation(pos_region);
         selected_parcel->setUserLookAt(gAgent.getFrameAgent().getAtAxis());
 
-        gParcelMgr->sendParcelPropertiesUpdate(selected_parcel, LLFloaterLand::sRequestReplyOnUpdate);
+        gParcelMgr->sendParcelPropertiesUpdate(selected_parcel);
 
         self->refresh();
 }
@@ -2335,7 +2320,7 @@ void LLPanelLandOptions::onClickClear(void* userdata)
 {
         LLPanelLandOptions* self = (LLPanelLandOptions*)userdata;
 
-        LLParcel* selected_parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* selected_parcel = self->mParcel->getParcel();
         if (!selected_parcel) return;
 
         // yes, this magic number of 0,0,0 means that it is clear
@@ -2343,7 +2328,7 @@ void LLPanelLandOptions::onClickClear(void* userdata)
         selected_parcel->setUserLocation(zero_vec);
         selected_parcel->setUserLookAt(zero_vec);
 
-        gParcelMgr->sendParcelPropertiesUpdate(selected_parcel, LLFloaterLand::sRequestReplyOnUpdate);
+        gParcelMgr->sendParcelPropertiesUpdate(selected_parcel);
 
         self->refresh();
 }
@@ -2358,8 +2343,8 @@ void LLPanelLandOptions::onClickPublishHelp(void*)
 // LLPanelLandMedia
 //---------------------------------------------------------------------------
 
-LLPanelLandMedia::LLPanelLandMedia()
-:       LLPanel("land_media_panel")
+LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
+:       LLPanel("land_media_panel"), mParcel(parcel)
 {
 }
 
@@ -2401,7 +2386,7 @@ LLPanelLandMedia::~LLPanelLandMedia()
 // public
 void LLPanelLandMedia::refresh()
 {
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
 
         if (!parcel)
         {
@@ -2486,7 +2471,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl *ctrl, void *userdata)
 {
         LLPanelLandMedia *self = (LLPanelLandMedia *)userdata;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel)
         {
                 return;
@@ -2507,7 +2492,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl *ctrl, void *userdata)
         parcel->setMediaAutoScale ( media_auto_scale );
 
         // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
 
         // Might have changed properties, so let's redraw!
         self->refresh();
@@ -2531,8 +2516,8 @@ void LLPanelLandMedia::onClickStartMedia ( void* data )
 // LLPanelLandAccess
 //---------------------------------------------------------------------------
 
-LLPanelLandAccess::LLPanelLandAccess()
-:       LLPanel("land_access_panel")
+LLPanelLandAccess::LLPanelLandAccess(LLParcelSelectionHandle& parcel)
+:       LLPanel("land_access_panel"), mParcel(parcel)
 {
 }
 
@@ -2574,32 +2559,33 @@ BOOL LLPanelLandAccess::postBuild()
 
 
 LLPanelLandAccess::~LLPanelLandAccess()
-{ }
+{ 
+}
 
 void LLPanelLandAccess::refresh()
 {
         mListAccess->deleteAllItems();
 
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
 
         if (parcel)
         {
-                char label[256];
+                char label[256];        /*Flawfinder: ignore*/
 
                 // Display options
                 BOOL use_group = parcel->getParcelFlag(PF_USE_ACCESS_GROUP);
                 mCheckGroup->set( use_group );
 
-                char group_name[MAX_STRING];
+                char group_name[MAX_STRING];    /*Flawfinder: ignore*/
                 gCacheName->getGroupName(parcel->getGroupID(), group_name);
-                sprintf(label, "Group: %s", group_name);
+                snprintf(label, sizeof(label), "Group: %s", group_name);        /*Flawfinder: ignore*/
                 mCheckGroup->setLabel( label );
 
                 S32 count = parcel->mAccessList.size();
 
                 BOOL use_list = parcel->getParcelFlag(PF_USE_ACCESS_LIST);
                 mCheckAccess->set( use_list );
-                sprintf(label, "Avatars: (%d listed, %d max)",
+                snprintf(label, sizeof(label), "Avatars: (%d listed, %d max)",  /*Flawfinder: ignore*/
                                 count, PARCEL_MAX_ACCESS_LIST);
                 mCheckAccess->setLabel( label );
 
@@ -2618,8 +2604,8 @@ void LLPanelLandAccess::refresh()
                                 suffix.assign(" (");
                                 if (seconds >= 120)
                                 {
-                                        char buf[30];
-                                        sprintf(buf, "%d minutes", (seconds/60));
+                                        char buf[30];   /*Flawfinder: ignore*/
+                                        snprintf(buf, sizeof(buf), "%d minutes", (seconds/60)); /*Flawfinder: ignore*/
                                         suffix.append(buf);
                                 }
                                 else if (seconds >= 60)
@@ -2628,8 +2614,8 @@ void LLPanelLandAccess::refresh()
                                 }
                                 else
                                 {
-                                        char buf[30];
-                                        sprintf(buf, "%d seconds", seconds);
+                                        char buf[30];           /*Flawfinder: ignore*/
+                                        snprintf(buf, sizeof(buf), "%d seconds", seconds);      /*Flawfinder: ignore*/
                                         suffix.append(buf);
                                 }
                                 suffix.append(" remaining)");
@@ -2686,15 +2672,15 @@ void LLPanelLandAccess::refresh()
 // public
 void LLPanelLandAccess::refreshNames()
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        LLParcel* parcel = mParcel->getParcel();
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
         group_name[0] = '\0';
         if(parcel)
         {
                 gCacheName->getGroupName(parcel->getGroupID(), group_name);
         }
-        char label[MAX_STRING];
-        snprintf(label, MAX_STRING, "Group: %s", group_name);
+        char label[MAX_STRING];         /*Flawfinder: ignore*/
+        snprintf(label, sizeof(label), "Group: %s", group_name);        /*Flawfinder: ignore*/
         mCheckGroup->setLabel(label);
 }
 
@@ -2717,7 +2703,7 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
 {
         LLPanelLandAccess *self = (LLPanelLandAccess *)userdata;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel)
         {
                 return;
@@ -2750,7 +2736,7 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
         parcel->setPassHours( pass_hours );
 
         // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
 
         // Might have changed properties, so let's redraw!
         self->refresh();
@@ -2774,7 +2760,7 @@ void LLPanelLandAccess::callbackAvatarID(const std::vector<std::string>& names,
 
 void LLPanelLandAccess::addAvatar(LLUUID id)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = mParcel->getParcel();
         if (!parcel) return;
 
         parcel->addToAccessList(id, 0);
@@ -2794,7 +2780,7 @@ void LLPanelLandAccess::onClickRemove(void* data)
         LLScrollListItem* item = self->mListAccess->getFirstSelected();
         if (!item) return;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel) return;
 
         const LLUUID& agent_id = item->getUUID();
@@ -2811,8 +2797,8 @@ void LLPanelLandAccess::onClickRemove(void* data)
 //---------------------------------------------------------------------------
 // LLPanelLandBan
 //---------------------------------------------------------------------------
-LLPanelLandBan::LLPanelLandBan()
-:       LLPanel("land_ban_panel")
+LLPanelLandBan::LLPanelLandBan(LLParcelSelectionHandle& parcel)
+:       LLPanel("land_ban_panel"), mParcel(parcel)
 {
 
 }
@@ -2856,11 +2842,11 @@ void LLPanelLandBan::refresh()
 {
         mList->deleteAllItems();
 
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = mParcel->getParcel();
 
         if (parcel)
         {
-                char label[256];
+                char label[256];        /*Flawfinder: ignore*/
 
                 // Display options
 
@@ -2869,7 +2855,7 @@ void LLPanelLandBan::refresh()
                 BOOL use_ban = parcel->getParcelFlag(PF_USE_BAN_LIST);
                 mCheck->set( use_ban );
 
-                sprintf(label, "Ban these avatars: (%d listed, %d max)",
+                snprintf(label, sizeof(label), "Ban these avatars: (%d listed, %d max)",        /*Flawfinder: ignore*/
                                 count, PARCEL_MAX_ACCESS_LIST);
                 mCheck->setLabel( label );
 
@@ -2887,8 +2873,8 @@ void LLPanelLandBan::refresh()
                                 suffix.assign(" (");
                                 if (seconds >= 120)
                                 {
-                                        char buf[30];
-                                        sprintf(buf, "%d minutes", (seconds/60));
+                                        char buf[30];           /*Flawfinder: ignore*/
+                                        snprintf(buf, sizeof(buf), "%d minutes", (seconds/60)); /*Flawfinder: ignore*/
                                         suffix.append(buf);
                                 }
                                 else if (seconds >= 60)
@@ -2897,8 +2883,8 @@ void LLPanelLandBan::refresh()
                                 }
                                 else
                                 {
-                                        char buf[30];
-                                        sprintf(buf, "%d seconds", seconds);
+                                        char buf[30];   /*Flawfinder: ignore*/
+                                        snprintf(buf, sizeof(buf), "%d seconds", seconds);      /*Flawfinder: ignore*/
                                         suffix.append(buf);
                                 }
                                 suffix.append(" remaining)");
@@ -2968,7 +2954,7 @@ void LLPanelLandBan::onCommitAny(LLUICtrl *ctrl, void *userdata)
 {
         LLPanelLandBan *self = (LLPanelLandBan*)userdata;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel)
         {
                 return;
@@ -2987,7 +2973,7 @@ void LLPanelLandBan::onCommitAny(LLUICtrl *ctrl, void *userdata)
         parcel->setParcelFlag(PF_DENY_TRANSACTED, deny_access_transacted);
 
         // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
 
         // Might have changed properties, so let's redraw!
         self->refresh();
@@ -3011,7 +2997,7 @@ void LLPanelLandBan::callbackAvatarID(const std::vector<std::string>& names, con
 
 void LLPanelLandBan::addAvatar(LLUUID id)
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = mParcel->getParcel();
         if (!parcel) return;
 
         parcel->addToBanList(id, 0);
@@ -3031,7 +3017,7 @@ void LLPanelLandBan::onClickRemove(void* data)
         LLScrollListItem* item = self->mList->getFirstSelected();
         if (!item) return;
 
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = self->mParcel->getParcel();
         if (!parcel) return;
 
         const LLUUID& agent_id = item->getUUID();
@@ -3046,8 +3032,8 @@ void LLPanelLandBan::onClickRemove(void* data)
 //---------------------------------------------------------------------------
 // LLPanelLandRenters
 //---------------------------------------------------------------------------
-LLPanelLandRenters::LLPanelLandRenters()
-:       LLPanel("landrenters", LLRect(0,500,500,0))
+LLPanelLandRenters::LLPanelLandRenters(LLParcelSelectionHandle& parcel)
+:       LLPanel("landrenters", LLRect(0,500,500,0)), mParcel(parcel)
 {
         const S32 BTN_WIDTH = 64;
 
@@ -3122,8 +3108,8 @@ void LLPanelLandRenters::onClickRemove(void*)
 //---------------------------------------------------------------------------
 // LLPanelLandCovenant
 //---------------------------------------------------------------------------
-LLPanelLandCovenant::LLPanelLandCovenant()
-:       LLPanel("land_covenant_panel")
+LLPanelLandCovenant::LLPanelLandCovenant(LLParcelSelectionHandle& parcel)
+:       LLPanel("land_covenant_panel"), mParcel(parcel)
 {       
 }
 
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index ba92c96..4301306 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -50,6 +50,7 @@ class LLParcelSelectionObserver;
 class LLTabContainer;
 class LLTextureCtrl;
 class LLViewerTextEditor;
+class LLParcelSelection;
 
 class LLPanelLandGeneral;
 class LLPanelLandObjects;
@@ -73,9 +74,6 @@ public:
         static LLPanelLandObjects* getCurrentPanelLandObjects();
         static LLPanelLandCovenant* getCurrentPanelLandCovenant();
 
-        // Returns TRUE, but does some early prep work for closing the window.
-        virtual BOOL canClose();
-
         // Destroys itself on close.
         virtual void onClose(bool app_quitting);
 
@@ -112,6 +110,8 @@ protected:
         LLPanelLandCovenant*    mPanelCovenant;
         LLPanelLandRenters*             mPanelRenters;
 
+        LLHandle<LLParcelSelection>     mParcel;
+
 public:
         // When closing the dialog, we want to deselect the land.  But when
         // we send an update to the simulator, it usually replies with the
@@ -125,7 +125,7 @@ class LLPanelLandGeneral
 :       public LLPanel
 {
 public:
-        LLPanelLandGeneral();
+        LLPanelLandGeneral(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandGeneral();
         void refresh();
         void refreshNames();
@@ -217,6 +217,8 @@ protected:
         LLButton*               mBtnBuyPass;
         LLButton* mBtnStartAuction;
 
+        LLHandle<LLParcelSelection>&    mParcel;
+
         static LLViewHandle sBuyPassDialogHandle;
 };
 
@@ -224,7 +226,7 @@ class LLPanelLandObjects
 :       public LLPanel
 {
 public:
-        LLPanelLandObjects();
+        LLPanelLandObjects(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandObjects();
         void refresh();
         virtual void draw();
@@ -234,7 +236,7 @@ public:
         static void callbackReturnOtherObjects(S32, void*);
         static void callbackReturnOwnerList(S32, void*);
 
-        static void clickShowCore(S32 return_type, uuid_list_t* list = 0);
+        static void clickShowCore(LLPanelLandObjects* panelp, S32 return_type, uuid_list_t* list = 0);
         static void onClickShowOwnerObjects(void*);
         static void onClickShowGroupObjects(void*);
         static void onClickShowOtherObjects(void*);
@@ -314,6 +316,8 @@ protected:
         LLString                mSelectedName;
         S32                             mSelectedCount;
         BOOL                    mSelectedIsGroup;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -321,7 +325,7 @@ class LLPanelLandOptions
 :       public LLPanel
 {
 public:
-        LLPanelLandOptions();
+        LLPanelLandOptions(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandOptions();
         void refresh();
 
@@ -359,6 +363,8 @@ protected:
         LLCheckBoxCtrl          *mMatureCtrl;
         LLCheckBoxCtrl          *mPushRestrictionCtrl;
         LLButton                        *mPublishHelpButton;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -366,7 +372,7 @@ class LLPanelLandMedia
 :       public LLPanel
 {
 public:
-        LLPanelLandMedia();
+        LLPanelLandMedia(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandMedia();
         void refresh();
 
@@ -384,6 +390,8 @@ protected:
         LLCheckBoxCtrl* mMediaAutoScaleCheck;
         //LLButton*             mMediaStopButton;
         //LLButton*             mMediaStartButton;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -392,7 +400,7 @@ class LLPanelLandAccess
 :       public LLPanel
 {
 public:
-        LLPanelLandAccess();
+        LLPanelLandAccess(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandAccess();
         void refresh();
         void refreshNames();
@@ -426,6 +434,7 @@ protected:
         LLCheckBoxCtrl*         mCheckTransacted;
         LLRadioGroup*           mCheckStatusLevel;
 
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -433,7 +442,7 @@ class LLPanelLandBan
 :       public LLPanel
 {
 public:
-        LLPanelLandBan();
+        LLPanelLandBan(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandBan();
         void refresh();
 
@@ -456,6 +465,8 @@ protected:
         LLCheckBoxCtrl*         mCheckDenyAnonymous;
         LLCheckBoxCtrl*         mCheckDenyIdentified;
         LLCheckBoxCtrl*         mCheckDenyTransacted;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 
@@ -463,7 +474,7 @@ class LLPanelLandRenters
 :       public LLPanel
 {
 public:
-        LLPanelLandRenters();
+        LLPanelLandRenters(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandRenters();
         void refresh();
 
@@ -475,13 +486,15 @@ protected:
         LLNameListCtrl*         mListRenters;
         LLButton*                       mBtnAddRenter;
         LLButton*                       mBtnRemoveRenter;
+
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 class LLPanelLandCovenant
 :       public LLPanel
 {
 public:
-        LLPanelLandCovenant();
+        LLPanelLandCovenant(LLHandle<LLParcelSelection>& parcelp);
         virtual ~LLPanelLandCovenant();
         virtual BOOL postBuild();
         void refresh();
@@ -489,6 +502,9 @@ public:
         static void updateEstateName(const std::string& name);
         static void updateLastModified(const std::string& text);
         static void updateEstateOwnerName(const std::string& name);
+
+protected:
+        LLHandle<LLParcelSelection>&    mParcel;
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterlandholdings.cpp b/linden/indra/newview/llfloaterlandholdings.cpp
index c9569d0..e34e84c 100644
--- a/linden/indra/newview/llfloaterlandholdings.cpp
+++ b/linden/indra/newview/llfloaterlandholdings.cpp
@@ -72,7 +72,7 @@ void LLFloaterLandHoldings::show(void*)
                                           "");
 
         // TODO: request updated money balance?
-        floater->open();
+        floater->open();                /* Flawfinder: ignore */
 }
 
 
@@ -177,14 +177,14 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
         }
 
         LLUUID  owner_id;
-        char    name[MAX_STRING];
-        char    desc[MAX_STRING];
+        char    name[MAX_STRING];               /* Flawfinder: ignore */
+        char    desc[MAX_STRING];               /* Flawfinder: ignore */
         S32             actual_area;
         S32             billable_area;
         U8              flags;
         F32             global_x;
         F32             global_y;
-        char    sim_name[MAX_STRING];
+        char    sim_name[MAX_STRING];           /* Flawfinder: ignore */
 
         S32 i;
         S32 count = msg->getNumberOfBlocks("QueryData");
@@ -206,21 +206,21 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
                 S32 region_x = llround(global_x) % REGION_WIDTH_UNITS;
                 S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
 
-                char location[MAX_STRING];
-                sprintf(location, "%s (%d, %d)", sim_name, region_x, region_y);
+                char location[MAX_STRING];              /* Flawfinder: ignore */
+                snprintf(location, MAX_STRING, "%s (%d, %d)", sim_name, region_x, region_y);            /* Flawfinder: ignore */
 
-                char area[MAX_STRING];
+                char area[MAX_STRING];          /* Flawfinder: ignore */
                 if(billable_area == actual_area)
                 {
-                        sprintf(area, "%d", billable_area);
+                        snprintf(area, MAX_STRING, "%d", billable_area);                /* Flawfinder: ignore */
                 }
                 else
                 {
-                        sprintf(area, "%d / %d", billable_area, actual_area);
+                        snprintf(area, MAX_STRING, "%d / %d", billable_area, actual_area);              /* Flawfinder: ignore */
                 }
 
-                char hidden[MAX_STRING];
-                sprintf(hidden, "%f %f", global_x, global_y);
+                char hidden[MAX_STRING];                /* Flawfinder: ignore */
+                snprintf(hidden, MAX_STRING, "%f %f", global_x, global_y);              /* Flawfinder: ignore */
 
                 LLSD element;
                 element["columns"][0]["column"] = "name";
@@ -311,14 +311,14 @@ void LLFloaterLandHoldings::refreshAggregates()
         S32 current_area = gStatusBar->getSquareMetersCommitted();
         S32 available_area = gStatusBar->getSquareMetersLeft();
 
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
 
-        sprintf(buffer, "%d sq. meters", allowed_area);
+        snprintf(buffer, MAX_STRING, "%d sq. meters", allowed_area);            /* Flawfinder: ignore */
         childSetValue("allowed_text", LLSD(buffer));
 
-        sprintf(buffer, "%d sq. meters", current_area);
+        snprintf(buffer, MAX_STRING, "%d sq. meters", current_area);            /* Flawfinder: ignore */
         childSetValue("current_text", LLSD(buffer));
 
-        sprintf(buffer, "%d sq. meters", available_area);
+        snprintf(buffer, MAX_STRING, "%d sq. meters", available_area);          /* Flawfinder: ignore */
         childSetValue("available_text", LLSD(buffer));
 }
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 29c4f08..2d549db 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -212,7 +212,7 @@ void LLFloaterMap::toggle(void*)
                 }
                 else
                 {
-                        gFloaterMap->open();
+                        gFloaterMap->open();            /* Flawfinder: ignore */
                 }
         }
 }
diff --git a/linden/indra/newview/llfloatermute.cpp b/linden/indra/newview/llfloatermute.cpp
index a78a616..f71b58f 100644
--- a/linden/indra/newview/llfloatermute.cpp
+++ b/linden/indra/newview/llfloatermute.cpp
@@ -106,7 +106,7 @@ LLFloaterMute::~LLFloaterMute()
 void LLFloaterMute::show()
 {
         // Make sure we make a noise.
-        open();
+        open();         /* Flawfinder: ignore */
 }
 
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index 8d84f94..b39a2eb 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -83,7 +83,7 @@ BOOL LLFloaterNameDesc::postBuild()
         char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
         if( !end_p )
         {
-                end_p = asset_name_str + strlen( asset_name_str );
+                end_p = asset_name_str + strlen( asset_name_str );              /* Flawfinder: ignore */
         }
         else
         if( !stricmp( end_p, ".wav") )
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index 3199eef..4288209 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -117,9 +117,9 @@ void LLFloaterNewIM::addTarget(const LLUUID& uuid, const std::string& name,
 void LLFloaterNewIM::addAgent(const LLUUID& uuid, void* data, BOOL online)
 {
         LLScrollListItem* item = new LLScrollListItem(TRUE, data, uuid);
-        char first[DB_FIRST_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /* Flawfinder: ignore */
         first[0] = '\0';
-        char last[DB_LAST_NAME_BUF_SIZE];
+        char last[DB_LAST_NAME_BUF_SIZE];               /* Flawfinder: ignore */
         last[0] = '\0';
         gCacheName->getName(uuid, first, last);
         LLUIString fullname = sNameFormat;
@@ -228,7 +228,6 @@ void LLFloaterNewIM::close(bool app_quitting)
         }
         else
         {
-                // this shouldn't be called, because we are always hosted
                 LLFloater::close(app_quitting);
         }
 }
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index 1f0cd5d..22b4292 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -68,7 +68,6 @@ LLFloaterOpenObject::LLFloaterOpenObject()
 
 LLFloaterOpenObject::~LLFloaterOpenObject()
 {
-        gSelectMgr->deselectAll();
         sInstance = NULL;
 }
 
@@ -76,7 +75,7 @@ void LLFloaterOpenObject::refresh()
 {
         mPanelInventory->refresh();
 
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = mObjectSelection->getFirstRootNode();
         if (node)
         {
                 std::string name = node->mName;
@@ -103,7 +102,8 @@ void LLFloaterOpenObject::dirty()
 // static
 void LLFloaterOpenObject::show()
 {
-        if (gSelectMgr->getRootObjectCount() != 1)
+        LLObjectSelectionHandle object_selection = gSelectMgr->getSelection();
+        if (object_selection->getRootObjectCount() != 1)
         {
                 gViewerWindow->alertXml("UnableToViewContentsMoreThanOne");
                 return;
@@ -116,21 +116,22 @@ void LLFloaterOpenObject::show()
                 sInstance->center();
         }
 
-        sInstance->open();
+        sInstance->open();              /* Flawfinder: ignore */
         sInstance->setFocus(TRUE);
+
+        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
 }
 
 
-// static
 void LLFloaterOpenObject::moveToInventory(bool wear)
 {
-        if (gSelectMgr->getRootObjectCount() != 1)
+        if (mObjectSelection->getRootObjectCount() != 1)
         {
                 gViewerWindow->alertXml("OnlyCopyContentsOfSingleItem");
                 return;
         }
 
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = mObjectSelection->getFirstRootNode();
         if (!node) return;
         LLViewerObject* object = node->getObject();
         if (!object) return;
@@ -194,7 +195,7 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
 void LLFloaterOpenObject::onClickMoveToInventory(void* data)
 {
         LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-        moveToInventory(false);
+        self->moveToInventory(false);
         self->close();
 }
 
@@ -202,7 +203,7 @@ void LLFloaterOpenObject::onClickMoveToInventory(void* data)
 void LLFloaterOpenObject::onClickMoveAndWear(void* data)
 {
         LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-        moveToInventory(true);
+        self->moveToInventory(true);
         self->close();
 }
 
diff --git a/linden/indra/newview/llfloateropenobject.h b/linden/indra/newview/llfloateropenobject.h
index aae3876..4772982 100644
--- a/linden/indra/newview/llfloateropenobject.h
+++ b/linden/indra/newview/llfloateropenobject.h
@@ -35,8 +35,7 @@
 
 #include "llfloater.h"
 
-
-
+class LLObjectSelection;
 class LLPanelInventory;
 
 class LLFloaterOpenObject
@@ -59,9 +58,10 @@ protected:
         void refresh();
         void draw();
 
+        void moveToInventory(bool wear);
+
         static void onClickMoveToInventory(void* data);
         static void onClickMoveAndWear(void* data);
-        static void moveToInventory(bool wear);
         static void callbackMoveInventory(S32 result, void* data);
         static void* createPanelInventory(void* data);
 
@@ -69,6 +69,7 @@ protected:
         static LLFloaterOpenObject* sInstance;
 
         LLPanelInventory*       mPanelInventory;
+        LLHandle<LLObjectSelection> mObjectSelection;
         BOOL mDirty;
 };
 
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.cpp b/linden/indra/newview/llfloaterpermissionsmgr.cpp
index 05945d9..1c13cf2 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.cpp
+++ b/linden/indra/newview/llfloaterpermissionsmgr.cpp
@@ -53,12 +53,12 @@ LLFloaterPermissionsMgr* LLFloaterPermissionsMgr::show()
         {
                 sInstance = new LLFloaterPermissionsMgr();
 
-                sInstance->open();
+                sInstance->open();      /* Flawfinder: ignore */
                 gFloaterView->adjustToFitScreen(sInstance, TRUE);
         }
         else
         {
-                sInstance->open();
+                sInstance->open();              /* Flawfinder: ignore */
         }
 
         return sInstance;
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index d6c66e3..036ce38 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -58,6 +58,8 @@
 #include "llvfs.h"
 #include "viewer.h"
 
+#include "llassetuploadresponders.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -70,8 +72,8 @@ LLLinkedList<LLFloaterPostcard> LLFloaterPostcard::sInstances;
 
 LLFloaterPostcard::LLFloaterPostcard(LLImageJPEG* jpeg, LLImageGL *img, const LLVector2& img_scale, const LLVector3d& pos_taken_global)
 :       LLFloater("Postcard Floater"),
-        mViewerImage(img),
         mJPEGImage(jpeg),
+        mViewerImage(img),
         mImageScale(img_scale),
         mPosTakenGlobal(pos_taken_global)
 {
@@ -157,7 +159,7 @@ LLFloaterPostcard* LLFloaterPostcard::showFromSnapshot(LLImageJPEG *jpeg, LLImag
         gFloaterView->getNewFloaterPosition(&left, &top);
         instance->setOrigin(left, top - instance->getRect().getHeight());
         
-        instance->open();
+        instance->open();               /*Flawfinder: ignore*/
 
         return instance;
 }
@@ -225,6 +227,23 @@ void LLFloaterPostcard::onClickCancel(void* data)
         }
 }
 
+class LLSendPostcardResponder : public LLAssetUploadResponder
+{
+public:
+        LLSendPostcardResponder(const LLSD &post_data,
+                                                        const LLUUID& vfile_id,
+                                                        LLAssetType::EType asset_type):
+            LLAssetUploadResponder(post_data, vfile_id, asset_type)
+        {       
+        }
+        // *TODO define custom uploadFailed here so it's not such a generic message
+        void LLSendPostcardResponder::uploadComplete(const LLSD& content)
+        {
+                // we don't care about what the server returns from this post, just clean up the UI
+                LLUploadDialog::modalUploadFinished();
+        }
+};
+
 // static
 void LLFloaterPostcard::onClickSend(void* data)
 {
@@ -249,12 +268,31 @@ void LLFloaterPostcard::onClickSend(void* data)
 
                 if (self->mJPEGImage.notNull())
                 {
-                        // upload the image
                         self->mTransactionID.generate();
                         self->mAssetID = self->mTransactionID.makeAssetID(gAgent.getSecureSessionID());
                         LLVFile::writeFile(self->mJPEGImage->getData(), self->mJPEGImage->getDataSize(), gVFS, self->mAssetID, LLAssetType::AT_IMAGE_JPEG);
-                        
-                        gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_IMAGE_JPEG, &uploadCallback, (void *)self, FALSE);
+
+                        // upload the image
+                        std::string url = gAgent.getRegion()->getCapability("SendPostcard");
+                        if(!url.empty())
+                        {
+                                llinfos << "Send Postcard via capability" << llendl;
+                                LLSD body = LLSD::emptyMap();
+                                // the capability already encodes: agent ID, region ID
+                                body["pos-global"] = self->mPosTakenGlobal.getValue();
+                                body["to"] = self->childGetValue("to_form").asString();
+                                body["from"] = self->childGetValue("from_form").asString();
+                                body["name"] = self->childGetValue("name_form").asString();
+                                body["subject"] = self->childGetValue("subject_form").asString();
+                                body["msg"] = self->childGetValue("msg_form").asString();
+                                body["allow-publish"] = self->childGetValue("allow_publish_check").asBoolean();
+                                body["mature-publish"] = self->childGetValue("mature_check").asBoolean();
+                                LLHTTPClient::post(url, body, new LLSendPostcardResponder(body, self->mAssetID, LLAssetType::AT_IMAGE_JPEG));
+                        } 
+                        else
+                        {
+                                gAssetStorage->storeAssetData(self->mTransactionID, LLAssetType::AT_IMAGE_JPEG, &uploadCallback, (void *)self, FALSE);
+                        }
 
                         LLUploadDialog::modalUploadDialog("Uploading...\n\nPostcard");
 
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 5dbfc78..ad1990e 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -283,7 +283,7 @@ void LLFloaterPreference::show(void*)
                 sInstance->center();
         }
 
-        sInstance->open();
+        sInstance->open();              /* Flawfinder: ignore */
 
         if(!gAgent.getID().isNull())
         {
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 8be2ce5..0beea67 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -126,7 +126,7 @@ LLFloaterProperties* LLFloaterProperties::show(const LLUUID& item_id,
                 }
 
                 instance->refresh();
-                instance->open();
+                instance->open();               /* Flawfinder: ignore */
         }
         return instance;
 }
@@ -233,7 +233,7 @@ void LLFloaterProperties::refresh()
                         "RadioSaleType",
                         "EditPrice"
                 };
-                for(int t=0;t<sizeof(enableNames)/sizeof(char*);t++)
+                for(size_t t=0; t<sizeof(enableNames)/sizeof(char*); ++t)
                 {
                         childSetEnabled(enableNames[t],false);
                 }
@@ -244,7 +244,7 @@ void LLFloaterProperties::refresh()
                         "EveryoneMaskDebug",
                         "NextMaskDebug"
                 };
-                for(int t=0;t<sizeof(hideNames)/sizeof(char*);t++)
+                for(size_t t=0; t<sizeof(hideNames)/sizeof(char*); ++t)
                 {
                         childSetVisible(hideNames[t],false);
                 }
@@ -298,7 +298,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 
         childSetEnabled("LabelItemNameTitle",TRUE);
         childSetEnabled("LabelItemName",is_modifiable);
-        const char EMPTY_STRING[1] = "";
+        const char EMPTY_STRING[1] = "";                /* Flawfinder: ignore */
         const char* txt = EMPTY_STRING;
         if(!item->getName().empty())
         {
@@ -318,8 +318,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
         //////////////////
         // CREATOR NAME //
         //////////////////
-        char first_name[DB_FIRST_NAME_BUF_SIZE];
-        char last_name[DB_LAST_NAME_BUF_SIZE];
+        char first_name[DB_FIRST_NAME_BUF_SIZE];                /* Flawfinder: ignore */
+        char last_name[DB_LAST_NAME_BUF_SIZE];          /* Flawfinder: ignore */
         if(!gCacheName) return;
         if(!gAgent.getRegion()) return;
 
@@ -351,7 +351,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
                 LLString name;
                 if (perm.isGroupOwned())
                 {
-                        char group_name[DB_GROUP_NAME_BUF_SIZE];
+                        char group_name[DB_GROUP_NAME_BUF_SIZE];                /* Flawfinder: ignore */
                         gCacheName->getGroupName(perm.getGroup(), group_name);
                         name.assign(group_name);
                 }
@@ -432,29 +432,29 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
                         overwrite_group         = flags & LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
                 }
                 
-                char perm_string[11];
+                char perm_string[11];           /* Flawfinder: ignore */
 
-                sprintf(perm_string, "B: ");
+                snprintf(perm_string, sizeof(perm_string), "B: ");              /* Flawfinder: ignore */
                 mask_to_string(base_mask, perm_string+3);
                 childSetText("BaseMaskDebug",perm_string);
                 childSetVisible("BaseMaskDebug",TRUE);
                 
-                sprintf(perm_string, "O: ");
+                snprintf(perm_string, sizeof(perm_string), "O: ");              /* Flawfinder: ignore */
                 mask_to_string(owner_mask, perm_string+3);
                 childSetText("OwnerMaskDebug",perm_string);
                 childSetVisible("OwnerMaskDebug",TRUE);
                 
-                sprintf(perm_string, "G%s: ", overwrite_group ? "*" : "");
+                snprintf(perm_string, sizeof(perm_string), "G%s: ", overwrite_group ? "*" : "");                /* Flawfinder: ignore */
                 mask_to_string(group_mask, perm_string + (overwrite_group ? 4 : 3));
                 childSetText("GroupMaskDebug",perm_string);
                 childSetVisible("GroupMaskDebug",TRUE);
                 
-                sprintf(perm_string, "E%s: ", overwrite_everyone ? "*" : "");
+                snprintf(perm_string, sizeof(perm_string), "E%s: ", overwrite_everyone ? "*" : "");             /* Flawfinder: ignore */
                 mask_to_string(everyone_mask, perm_string + (overwrite_everyone ? 4 : 3));
                 childSetText("EveryoneMaskDebug",perm_string);
                 childSetVisible("EveryoneMaskDebug",TRUE);
                 
-                sprintf(perm_string, "N%s: ", slam_perm ? "*" : "");
+                snprintf(perm_string, sizeof(perm_string), "N%s: ", slam_perm ? "*" : "");              /* Flawfinder: ignore */
                 mask_to_string(next_owner_mask, perm_string + (slam_perm ? 4 : 3));
                 childSetText("NextMaskDebug",perm_string);
                 childSetVisible("NextMaskDebug",TRUE);
@@ -567,8 +567,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
         if (is_for_sale)
         {
                 radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
-                char numerical_price[MAX_STRING];
-                sprintf(numerical_price, "%d", sale_info.getSalePrice());
+                char numerical_price[MAX_STRING];               /* Flawfinder: ignore */
+                snprintf(numerical_price, MAX_STRING, "%d", sale_info.getSalePrice());          /* Flawfinder: ignore */
                 childSetText("EditPrice",numerical_price);
         }
         else
diff --git a/linden/indra/newview/llfloaterrate.cpp b/linden/indra/newview/llfloaterrate.cpp
index 128d1e6..a057374 100644
--- a/linden/indra/newview/llfloaterrate.cpp
+++ b/linden/indra/newview/llfloaterrate.cpp
@@ -68,6 +68,8 @@ LLFloaterRate::LLFloaterRate(const std::string& name, const LLUUID &id)
 
         childSetAction("OK", onClickOK, this);
         childSetAction("Cancel", onClickCancel, this);
+
+        mObjectSelection = gSelectMgr->getEditSelection();
 }
 
 
@@ -82,8 +84,8 @@ void LLFloaterRate::draw()
         LLString name;
 
         // Construct the name, if possible
-        char firstname[MAX_STRING];
-        char lastname[MAX_STRING];
+        char firstname[MAX_STRING];             /* Flawfinder: ignore */
+        char lastname[MAX_STRING];              /* Flawfinder: ignore */
         gCacheName->getName(mAvatarID, firstname, lastname);
         name.assign(firstname);
         name.append(" ");
@@ -127,7 +129,7 @@ void LLFloaterRate::show(const LLUUID &avatar_id)
         if (iter != sInstanceMap.end())
         {
                 iter->second->setFocus(TRUE);
-                iter->second->open();
+                iter->second->open();           /* Flawfinder: ignore */
         }
         else if (avatar_id != LLUUID::null)
         {
@@ -136,7 +138,7 @@ void LLFloaterRate::show(const LLUUID &avatar_id)
                 f->center();
                 f->setFocus(TRUE);
                 f->sendReputationIndividualRequest(avatar_id);
-                f->open();
+                f->open();              /* Flawfinder: ignore */
         }
 }
 
@@ -166,10 +168,6 @@ void LLFloaterRate::show(ERateSelection which)
         {
                 gViewerWindow->alertXml("SelectSingleRate");
         }
-
-
-        // Clean up selection
-        gSelectMgr->deselectTransient();
 }
 
 
diff --git a/linden/indra/newview/llfloaterrate.h b/linden/indra/newview/llfloaterrate.h
index 591fb96..1b24383 100644
--- a/linden/indra/newview/llfloaterrate.h
+++ b/linden/indra/newview/llfloaterrate.h
@@ -40,6 +40,7 @@ class LLRadioGroup;
 class LLButton;
 class LLMessageSystem;
 class LLLineEditor;
+class LLObjectSelection;
 
 class LLFloaterRate
 : public LLFloater
@@ -81,6 +82,7 @@ protected:
         F32                             mLastAppearance;
         F32                             mLastBuilding;
         BOOL                    mReputationRequested;
+        LLHandle<LLObjectSelection> mObjectSelection;
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 7fe6148..b758777 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -221,7 +221,7 @@ void LLFloaterRegionInfo::show(LLViewerRegion* region)
                         "EstateOwnerMessage", 
                         &processEstateOwnerRequest);
         }
-        sInstance->open();
+        sInstance->open();              /* Flawfinder: ignore*/
         sInstance->refreshFromRegion(region);
 
         // Must allow anyone to request the RegionInfo data
@@ -291,7 +291,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
         if(!tab) return;
 
         // extract message
-        char sim_name[MAX_STRING];
+        char sim_name[MAX_STRING];              /* Flawfinder: ignore*/
         U32 region_flags;
         U8 agent_limit;
         F32 object_bonus_factor;
@@ -324,12 +324,20 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
         panel->childSetValue("restrict_pushobject", (region_flags & REGION_FLAGS_RESTRICT_PUSHOBJECT) ? TRUE : FALSE );
         panel->childSetValue("allow_land_resell_check", (region_flags & REGION_FLAGS_BLOCK_LAND_RESELL) ? FALSE : TRUE );
         panel->childSetValue("allow_parcel_changes_check", (region_flags & REGION_FLAGS_ALLOW_PARCEL_CHANGES) ? TRUE : FALSE );
-
         panel->childSetValue("agent_limit_spin", LLSD((F32)agent_limit) );
         panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) );
-
         panel->childSetValue("access_combo", LLSD(LLViewerRegion::accessToString(sim_access)) );
 
+
+        // detect teen grid for maturity
+        LLViewerRegion* region = gAgent.getRegion();
+
+        U32 parent_estate_id;
+        msg->getU32("RegionInfo", "ParentEstateID", parent_estate_id);
+        BOOL teen_grid = (parent_estate_id == 5);  // *TODO add field to estate table and test that
+        panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid));
+        
+
         // DEBUG PANEL
         panel = LLUICtrlFactory::getPanelByName(tab, "Debug");
         if(!panel) return;
@@ -349,7 +357,6 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
         panel->childSetValue("terrain_lower_spin", LLSD(terrain_lower_limit));
         panel->childSetValue("use_estate_sun_check", LLSD(use_estate_sun));
 
-        LLViewerRegion* region = gAgent.getRegion();
         BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
         panel->childSetValue("fixed_sun_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SUN_FIXED)));
         panel->childSetEnabled("fixed_sun_check", allow_modify && !use_estate_sun);
@@ -525,7 +532,8 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
         setCtrlsEnabled(allow_modify);
         childDisable("apply_btn");
         childSetEnabled("access_text", allow_modify);
-        childSetEnabled("access_combo", allow_modify);
+        // childSetEnabled("access_combo", allow_modify);
+        // now set in processRegionInfo for teen grid detection
         childSetEnabled("kick_btn", allow_modify);
         childSetEnabled("kick_all_btn", allow_modify);
         childSetEnabled("im_btn", allow_modify);
@@ -591,7 +599,7 @@ void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& name
                 strings_t strings;
                 // [0] = our agent id
                 // [1] = target agent id
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];                /* Flawfinder: ignore*/
                 gAgent.getID().toString(buffer);
                 strings.push_back(buffer);
 
@@ -619,7 +627,7 @@ void LLPanelRegionGeneralInfo::onKickAllCommit(S32 option, void* userdata)
                 if(!self) return;
                 strings_t strings;
                 // [0] = our agent id
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];                /* Flawfinder: ignore*/
                 gAgent.getID().toString(buffer);
                 strings.push_back(buffer);
 
@@ -654,7 +662,7 @@ void LLPanelRegionGeneralInfo::onMessageCommit(S32 option, const LLString& text,
         // [4] message
         strings.push_back("-1");
         strings.push_back("-1");
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore*/
         gAgent.getID().toString(buffer);
         strings.push_back(buffer);
         std::string name;
@@ -688,35 +696,35 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
         llinfos << "LLPanelRegionGeneralInfo::sendUpdate()" << llendl;
         strings_t strings;
         //integers_t integers;
-        char buffer[MAX_STRING];
-        sprintf(buffer, "%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));
+        char buffer[MAX_STRING];                /* Flawfinder: ignore*/
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));           /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
         
-        sprintf(buffer, "%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));         /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
 
-        sprintf(buffer, "%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));              /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
 
-        sprintf(buffer, "%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));         /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
 
         F32 value = (F32)childGetValue("agent_limit_spin").asReal();
-        sprintf(buffer, "%f", value);
+        snprintf(buffer, MAX_STRING, "%f", value);              /* Flawfinder: ignore*/
         strings.push_back(strings_t::value_type(buffer));
 
         value = (F32)childGetValue("object_bonus_spin").asReal();
-        sprintf(buffer, "%f", value);
+        snprintf(buffer, MAX_STRING, "%f", value);              /* Flawfinder: ignore*/
         strings.push_back(strings_t::value_type(buffer));
 
         U8 access = LLViewerRegion::stringToAccess(childGetValue("access_combo").asString().c_str());
-        sprintf(buffer, "%d", (S32)access);
+        snprintf(buffer, MAX_STRING, "%d", (S32)access);                /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
 
-        sprintf(buffer, "%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));             /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
 
-        sprintf(buffer, "%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));              /* Flawfinder: ignore */
         strings.push_back(strings_t::value_type(buffer));
 
         LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
@@ -724,7 +732,7 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 
         LLViewerRegion* region = gAgent.getRegion();
         if (region
-                && access != region->getSimAccess() )
+                && access != region->getSimAccess() )           /* Flawfinder: ignore */
         {
                 gViewerWindow->alertXml("RegionMaturityChange");
         }
@@ -783,15 +791,15 @@ BOOL LLPanelRegionDebugInfo::sendUpdate()
 {
         llinfos << "LLPanelRegionDebugInfo::sendUpdate" << llendl;
         strings_t strings;
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
 
-        sprintf(buffer, "%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));           /* Flawfinder: ignore */
         strings.push_back(buffer);
 
-        sprintf(buffer, "%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));                /* Flawfinder: ignore */
         strings.push_back(buffer);
 
-        sprintf(buffer, "%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));           /* Flawfinder: ignore */
         strings.push_back(buffer);
 
         LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
@@ -946,10 +954,10 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
 
         LLVLComposition* compp = region->getComposition();
         LLTextureCtrl* texture_ctrl;
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
         {
-                sprintf(buffer, "texture_detail_%d", i);
+                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);           /* Flawfinder: ignore */
                 texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, buffer);
                 if(texture_ctrl)
                 {
@@ -962,9 +970,9 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
 
         for(S32 i = 0; i < CORNER_COUNT; ++i)
     {
-                sprintf(buffer, "height_start_spin_%d", i);
+                snprintf(buffer, MAX_STRING, "height_start_spin_%d", i);                /* Flawfinder: ignore */
                 childSetValue(buffer, LLSD(compp->getStartHeight(i)));
-                sprintf(buffer, "height_range_spin_%d", i);
+                snprintf(buffer, MAX_STRING, "height_range_spin_%d", i);        /* Flawfinder: ignore */
                 childSetValue(buffer, LLSD(compp->getHeightRange(i)));
         }
 
@@ -976,18 +984,18 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
 BOOL LLPanelRegionTextureInfo::postBuild()
 {
         LLPanelRegionInfo::postBuild();
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
         {
-                sprintf(buffer, "texture_detail_%d", i);
+                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);           /* Flawfinder: ignore */
                 initCtrl(buffer);
         }
 
         for(S32 i = 0; i < CORNER_COUNT; ++i)
         {
-                sprintf(buffer, "height_start_spin_%d", i);
+                snprintf(buffer, MAX_STRING, "height_start_spin_%d", i);                /* Flawfinder: ignore */
                 initCtrl(buffer);
-                sprintf(buffer, "height_range_spin_%d", i);
+                snprintf(buffer, MAX_STRING, "height_range_spin_%d", i);                /* Flawfinder: ignore */
                 initCtrl(buffer);
         }
 
@@ -1017,9 +1025,9 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
         }
 
         LLTextureCtrl* texture_ctrl;
-        char buffer[MAX_STRING];
-        char buffer2[MAX_STRING];
-        char id_str[UUID_STR_LENGTH];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
+        char buffer2[MAX_STRING];               /* Flawfinder: ignore */
+        char id_str[UUID_STR_LENGTH];   /* Flawfinder: ignore */
         LLMessageSystem* msg = gMessageSystem;
         strings_t strings;
 
@@ -1027,13 +1035,13 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
         
         for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
         {
-                sprintf(buffer, "texture_detail_%d", i);
+                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);           /* Flawfinder: ignore */
                 texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, buffer);
                 if(texture_ctrl)
                 {
                         LLUUID tmp_id(texture_ctrl->getImageAssetID());
                         tmp_id.toString(id_str);
-                        sprintf(buffer, "%d %s", i, id_str);
+                        snprintf(buffer, MAX_STRING, "%d %s", i, id_str);               /* Flawfinder: ignore */                
                         strings.push_back(strings_t::value_type(buffer));
                 }
         }
@@ -1041,9 +1049,9 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
         strings.clear();
         for(S32 i = 0; i < CORNER_COUNT; ++i)
         {
-                sprintf(buffer, "height_start_spin_%d", i);
-                sprintf(buffer2, "height_range_spin_%d", i);
-                sprintf(buffer, "%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());
+                snprintf(buffer, MAX_STRING, "height_start_spin_%d", i);                /* Flawfinder: ignore */
+                snprintf(buffer2, MAX_STRING, "height_range_spin_%d", i);               /* Flawfinder: ignore */
+                snprintf(buffer, MAX_STRING, "%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());         /* Flawfinder: ignore */
                 strings.push_back(strings_t::value_type(buffer));
         }
         sendEstateOwnerMessage(msg, "textureheights", invoice, strings);
@@ -1056,8 +1064,8 @@ BOOL LLPanelRegionTextureInfo::validateTextureSizes()
 {
         for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
         {
-                char buffer[MAX_STRING];
-                sprintf(buffer, "texture_detail_%d", i);
+                char buffer[MAX_STRING];                /* Flawfinder: ignore */
+                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);           /* Flawfinder: ignore */
                 LLTextureCtrl* texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, buffer);
                 if (!texture_ctrl) continue;
 
@@ -1158,21 +1166,21 @@ bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
 BOOL LLPanelRegionTerrainInfo::sendUpdate()
 {
         llinfos << "LLPanelRegionTerrainInfo::sendUpdate" << llendl;
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         strings_t strings;
         LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
 
-        sprintf(buffer, "%f", (F32)childGetValue("water_height_spin").asReal());
+        snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("water_height_spin").asReal());           /* Flawfinder: ignore */
         strings.push_back(buffer);
-        sprintf(buffer, "%f", (F32)childGetValue("terrain_raise_spin").asReal());
+        snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("terrain_raise_spin").asReal());          /* Flawfinder: ignore */
         strings.push_back(buffer);
-        sprintf(buffer, "%f", (F32)childGetValue("terrain_lower_spin").asReal());
+        snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("terrain_lower_spin").asReal());          /* Flawfinder: ignore */
         strings.push_back(buffer);
-        sprintf(buffer, "%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));            /* Flawfinder: ignore*/         
         strings.push_back(buffer);
-        sprintf(buffer, "%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));
+        snprintf(buffer, MAX_STRING, "%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));         /* Flawfinder: ignore*/
         strings.push_back(buffer);
-        sprintf(buffer, "%f", (F32)childGetValue("sun_hour_slider").asReal() );
+        snprintf(buffer, MAX_STRING, "%f", (F32)childGetValue("sun_hour_slider").asReal() );            /* Flawfinder: ignore*/ 
         strings.push_back(buffer);
 
         // Grab estate information in case the user decided to set the
@@ -1198,11 +1206,11 @@ BOOL LLPanelRegionTerrainInfo::sendUpdate()
                 estate_sun_hour = panel->getSunHour();
         }
 
-        sprintf(buffer, "%s", (estate_global_time ? "Y" : "N") );
+        snprintf(buffer, MAX_STRING, "%s", (estate_global_time ? "Y" : "N") );          /* Flawfinder: ignore*/
         strings.push_back(buffer);
-        sprintf(buffer, "%s", (estate_fixed_sun ? "Y" : "N") );
+        snprintf(buffer, MAX_STRING, "%s", (estate_fixed_sun ? "Y" : "N") );            /* Flawfinder: ignore*/
         strings.push_back(buffer);
-        sprintf(buffer, "%f", estate_sun_hour);
+        snprintf(buffer, MAX_STRING, "%f", estate_sun_hour);            /* Flawfinder: ignore*/
         strings.push_back(buffer);
 
         sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);
@@ -1531,7 +1539,7 @@ void LLPanelEstateInfo::kickUserConfirm(S32 option, void* userdata)
 
         LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
         strings_t strings;
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore*/
 
         switch(option)
         {
@@ -1814,12 +1822,12 @@ void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_
         msg->addString("Method", "estateaccessdelta");
         msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
 
-        char buf[MAX_STRING];
+        char buf[MAX_STRING];           /* Flawfinder: ignore*/
         gAgent.getID().toString(buf);
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buf);
 
-        sprintf(buf, "%u", flags);
+        snprintf(buf, MAX_STRING, "%u", flags);         /* Flawfinder: ignore*/
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buf);
 
@@ -2075,8 +2083,8 @@ void LLPanelEstateInfo::commitEstateInfo()
         msg->nextBlock("ParamList");
         msg->addString("Parameter", getEstateName());
 
-        char buf[MAX_STRING];
-        sprintf(buf, "%u", computeEstateFlags());
+        char buf[MAX_STRING];           /* Flawfinder: ignore*/
+        snprintf(buf, MAX_STRING, "%u", computeEstateFlags());          /* Flawfinder: ignore*/
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buf);
 
@@ -2086,7 +2094,7 @@ void LLPanelEstateInfo::commitEstateInfo()
                 sun_hour = 0.f; // 0 = global time
         }
 
-        sprintf(buf, "%d", (S32)(sun_hour*1024.0f));
+        snprintf(buf, MAX_STRING, "%d", (S32)(sun_hour*1024.0f));               /* Flawfinder: ignore*/
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buf);
 
@@ -2560,8 +2568,13 @@ void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
                         S32 file_length = file.getSize();
 
                         char* buffer = new char[file_length+1];
-                        file.read((U8*)buffer, file_length);
+                        if (buffer == NULL)
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return;
+                        }
 
+                        file.read((U8*)buffer, file_length);            /* Flawfinder: ignore */
                         // put a EOS at the end
                         buffer[file_length] = 0;
 
@@ -2633,7 +2646,7 @@ void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)
                 msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
 
                 msg->nextBlock("ParamList");
-                msg->addString("Parameter", getCovenantID().getString().c_str());
+                msg->addString("Parameter", getCovenantID().asString());
                 gAgent.sendReliableMessage();
         }
 }
@@ -2879,7 +2892,7 @@ bool LLDispatchSetEstateAccess::operator()(
                         for (S32 i = 0; i < num_allowed_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
                         {
                                 LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);
+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
                                 allowed_agent_name_list->addNameItem(id);
                         }
                         panel->childSetEnabled("remove_allowed_avatar_btn", allowed_agent_name_list->getFirstSelected() ? TRUE : FALSE);
@@ -2903,7 +2916,7 @@ bool LLDispatchSetEstateAccess::operator()(
                         for (S32 i = 0; i < num_allowed_groups && i < ESTATE_MAX_GROUP_IDS; i++)
                         {
                                 LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);
+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
                                 allowed_group_name_list->addGroupNameItem(id);
                         }
                         panel->childSetEnabled("remove_allowed_group_btn", allowed_group_name_list->getFirstSelected() ? TRUE : FALSE);
@@ -2935,7 +2948,7 @@ bool LLDispatchSetEstateAccess::operator()(
                         for (S32 i = 0; i < num_banned_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
                         {
                                 LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);
+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
                                 banned_agent_name_list->addNameItem(id);
                         }
                         panel->childSetEnabled("remove_banned_avatar_btn", banned_agent_name_list->getFirstSelected() ? TRUE : FALSE);
@@ -2958,7 +2971,7 @@ bool LLDispatchSetEstateAccess::operator()(
                         for (S32 i = 0; i < num_estate_managers && i < ESTATE_MAX_MANAGERS; i++)
                         {
                                 LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);
+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
                                 estate_manager_name_list->addNameItem(id);
                         }
                         panel->childSetEnabled("remove_estate_manager_btn", estate_manager_name_list->getFirstSelected() ? TRUE : FALSE);
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 116b338..0337dd0 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -63,6 +63,7 @@
 #include "lltooldraganddrop.h"
 #include "llfloatermap.h"
 #include "lluiconstants.h"
+#include "lluploaddialog.h"
 #include "llcallingcard.h"
 #include "llviewerobjectlist.h"
 #include "llagent.h"
@@ -80,6 +81,7 @@
 #include "llvieweruictrlfactory.h"
 #include "viewer.h"
 
+#include "llassetuploadresponders.h"
 
 const U32 INCLUDE_SCREENSHOT  = 0x01 << 0;
 
@@ -115,7 +117,8 @@ LLFloaterReporter::LLFloaterReporter(
         mDeselectOnClose( FALSE ),
         mPicking( FALSE), 
         mPosition(),
-        mCopyrightWarningSeen( FALSE )
+        mCopyrightWarningSeen( FALSE ),
+        mResourceDatap(new LLResourceData())
 {
         if (report_type == BUG_REPORT)
         {
@@ -166,9 +169,9 @@ LLFloaterReporter::LLFloaterReporter(
 
         gReporterInstances.addData(report_type, this);
 
-        // Upload a screenshot, but don't draw this floater.
+        // Take a screenshot, but don't draw this floater.
         setVisible(FALSE);
-        uploadScreenshot();
+        takeScreenshot();
         setVisible(TRUE);
 
         // Default text to be blank
@@ -230,11 +233,7 @@ LLFloaterReporter::~LLFloaterReporter()
         std::for_each(mMCDList.begin(), mMCDList.end(), DeletePointer() );
         mMCDList.clear();
 
-        if (gSelectMgr)
-        {
-                gSelectMgr->deselectTransient();
-        }
-
+        delete mResourceDatap;
         gDialogVisible = FALSE;
 }
 
@@ -368,7 +367,7 @@ void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names,
         if ( self->mReportType != BUG_REPORT )
         {
                 self->childSetText("abuser_name_edit", names[0] );
-
+                
                 self->mAbuserID = ids[0];
 
                 self->refresh();
@@ -379,31 +378,59 @@ void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names,
 void LLFloaterReporter::onClickSend(void *userdata)
 {
         LLFloaterReporter *self = (LLFloaterReporter *)userdata;
+        
+        if (self->mPicking)
+        {
+                closePickTool(self);
+        }
 
-        // only do this for abuse reports
-        if ( self->mReportType != BUG_REPORT )
+        if(self->validateReport())
         {
-                if ( ! self->mCopyrightWarningSeen )
+                // only show copyright alert for abuse reports
+                if ( self->mReportType != BUG_REPORT )
                 {
-                        LLString details_lc = self->childGetText("details_edit");
-                        LLString::toLower( details_lc );
-                        LLString summary_lc = self->childGetText("summary_edit");
-                        LLString::toLower( summary_lc );
-                        if ( details_lc.find( "copyright" ) != std::string::npos ||
-                                summary_lc.find( "copyright" ) != std::string::npos )
+                        if ( ! self->mCopyrightWarningSeen )
                         {
-                                gViewerWindow->alertXml("HelpReportAbuseContainsCopyright");
-                                self->mCopyrightWarningSeen = TRUE;
-                                return;
+                                LLString details_lc = self->childGetText("details_edit");
+                                LLString::toLower( details_lc );
+                                LLString summary_lc = self->childGetText("summary_edit");
+                                LLString::toLower( summary_lc );
+                                if ( details_lc.find( "copyright" ) != std::string::npos ||
+                                        summary_lc.find( "copyright" ) != std::string::npos )
+                                {
+                                        gViewerWindow->alertXml("HelpReportAbuseContainsCopyright");
+                                        self->mCopyrightWarningSeen = TRUE;
+                                        return;
+                                };
                         };
                 };
-        };
 
-        if (self->mPicking)
-        {
-                closePickTool(self);
+                LLUploadDialog::modalUploadDialog("Uploading...\n\nReport");
+                // *TODO don't upload image if checkbox isn't checked
+                std::string url = gAgent.getRegion()->getCapability("SendUserReport");
+                std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot");
+                if(!url.empty() || !sshot_url.empty())
+                {
+                        self->sendReportViaCaps(url, sshot_url, self->gatherReport());
+                        self->close();
+                }
+                else
+                {
+                        if(self->childGetValue("screen_check"))
+                        {
+                                self->childDisable("send_btn");
+                                self->childDisable("cancel_btn");
+                                // the callback from uploading the image calls sendReportViaLegacy()
+                                self->uploadImage();
+                        }
+                        else
+                        {
+                                self->sendReportViaLegacy(self->gatherReport());
+                                LLUploadDialog::modalUploadFinished();
+                                self->close();
+                        }
+                }
         }
-        self->sendReport();
 }
 
 
@@ -459,7 +486,7 @@ void LLFloaterReporter::showFromMenu(EReportType report_type)
         {
                 // ...bring that window to front
                 LLFloaterReporter *f = gReporterInstances.getData(report_type);
-                f->open();
+                f->open();              /* Flawfinder: ignore */
         }
         else
         {
@@ -515,7 +542,7 @@ void LLFloaterReporter::showFromObject(const LLUUID& object_id)
         // Need to deselect on close
         f->mDeselectOnClose = TRUE;
 
-        f->open();
+        f->open();              /* Flawfinder: ignore */
 }
 
 
@@ -556,10 +583,9 @@ void LLFloaterReporter::setPickedObjectProperties(const char *object_name, const
         childSetText("owner_name", owner_name);
 }
 
-void LLFloaterReporter::sendReport()
+
+bool LLFloaterReporter::validateReport()
 {
-        LLViewerRegion *regionp = gAgent.getRegion();
-        if (!regionp) return;
         // Ensure user selected a category from the list
         LLSD category_sd = childGetValue("category_combo");
         U8 category = (U8)category_sd.asInteger();
@@ -573,7 +599,7 @@ void LLFloaterReporter::sendReport()
                 {
                         gViewerWindow->alertXml("HelpReportBugSelectCategory");
                 }
-                return;
+                return false;
         }
 
         if ( mReportType != BUG_REPORT )
@@ -581,13 +607,13 @@ void LLFloaterReporter::sendReport()
           if ( childGetText("abuser_name_edit").empty() )
           {
                   gViewerWindow->alertXml("HelpReportAbuseAbuserNameEmpty");
-                  return;
+                  return false;
           };
   
           if ( childGetText("abuse_location_edit").empty() )
           {
                   gViewerWindow->alertXml("HelpReportAbuseAbuserLocationEmpty");
-                  return;
+                  return false;
           };
         };
 
@@ -601,7 +627,7 @@ void LLFloaterReporter::sendReport()
                 {
                         gViewerWindow->alertXml("HelpReportBugSummaryEmpty");
                 }
-                return;
+                return false;
         };
 
         if ( childGetText("details_edit") == mDefaultSummary )
@@ -614,53 +640,19 @@ void LLFloaterReporter::sendReport()
                 {
                         gViewerWindow->alertXml("HelpReportBugDetailsEmpty");
                 }
-                return;
+                return false;
         };
+        return true;
+}
+
+LLSD LLFloaterReporter::gatherReport()
+{       
+        LLViewerRegion *regionp = gAgent.getRegion();
+        if (!regionp) return LLSD(); // *TODO handle this failure case more gracefully
 
         // reset flag in case the next report also contains this text
         mCopyrightWarningSeen = FALSE;
 
-        U32 check_flags = 0;
-        if (childGetValue("screen_check"))
-        {
-                check_flags |= INCLUDE_SCREENSHOT;
-        }
-
-        LLMessageSystem *msg = gMessageSystem;
-        msg->newMessageFast(_PREHASH_UserReport);
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->nextBlockFast(_PREHASH_ReportData);
-        msg->addU8Fast(_PREHASH_ReportType,     (U8) mReportType);
-        msg->addU8(_PREHASH_Category, category);
-        msg->addVector3Fast(_PREHASH_Position,  mPosition);
-        msg->addU8Fast(_PREHASH_CheckFlags,     (U8) check_flags);
-
-        // only send a screenshot ID if we're asked too and the email is 
-        // going to LL - Estate Owners cannot see the screenshot asset
-        LLSD screenshot_id = LLUUID::null;
-        if (childGetValue("screen_check"))
-        {
-                if ( mReportType != BUG_REPORT )
-                {
-                        if ( gEmailToEstateOwner == FALSE )
-                        {
-                                screenshot_id = childGetValue("screenshot");
-                        }
-                }
-                else
-                {
-                        screenshot_id = childGetValue("screenshot");
-                };
-        };
-        msg->addUUIDFast(_PREHASH_ScreenshotID, screenshot_id);
-        msg->addUUIDFast(_PREHASH_ObjectID,     mObjectID);
-
-        msg->addUUID("AbuserID", mAbuserID );
-        msg->addString("AbuseRegionName", "");
-        msg->addUUID("AbuseRegionID", LLUUID::null);
-
         std::ostringstream summary;
         if (!gInProductionGrid)
         {
@@ -708,7 +700,6 @@ void LLFloaterReporter::sendReport()
                         << " {" << childGetText("abuser_name_edit") << "} "                                     // name of abuse entered in report (chosen using LLAvatarPicker)
                         << " \"" << childGetValue("summary_edit").asString() << "\"";           // summary as entered
         };
-        msg->addStringFast(_PREHASH_Summary, summary.str().c_str());
 
         std::ostringstream details;
         if (mReportType != BUG_REPORT)
@@ -733,10 +724,10 @@ void LLFloaterReporter::sendReport()
         };
 
         details << childGetValue("details_edit").asString();
-        msg->addStringFast(_PREHASH_Details, details.str() );
 
-        char version_string[MAX_STRING];
-        sprintf(version_string,
+        char version_string[MAX_STRING];                /* Flawfinder: ignore */
+        snprintf(version_string,                                                /* Flawfinder: ignore */
+                        MAX_STRING,
                         "%d.%d.%d %s %s %s %s",
                         LL_VERSION_MAJOR,
                         LL_VERSION_MINOR,
@@ -745,120 +736,204 @@ void LLFloaterReporter::sendReport()
                         gSysCPU.getFamily().c_str(),
                         gGLManager.mGLRenderer.c_str(),
                         gGLManager.mDriverVersionVendorString.c_str());
-        msg->addString("VersionString", version_string);
 
-        msg->sendReliable(regionp->getHost());
+        // only send a screenshot ID if we're asked to and the email is 
+        // going to LL - Estate Owners cannot see the screenshot asset
+        LLUUID screenshot_id = LLUUID::null;
+        if (childGetValue("screen_check"))
+        {
+                if ( mReportType != BUG_REPORT )
+                {
+                        if ( gEmailToEstateOwner == FALSE )
+                        {
+                                screenshot_id = childGetValue("screenshot");
+                        }
+                }
+                else
+                {
+                        screenshot_id = childGetValue("screenshot");
+                };
+        };
+
+        LLSD report = LLSD::emptyMap();
+        report["report-type"] = (U8) mReportType;
+        report["category"] = childGetValue("category_combo");
+        report["position"] = mPosition.getValue();
+        report["check-flags"] = (U8)0; // this is not used
+        report["screenshot-id"] = screenshot_id;
+        report["object-id"] = mObjectID;
+        report["abuser-id"] = mAbuserID;
+        report["abuse-region-name"] = "";
+        report["abuse-region-id"] = LLUUID::null;
+        report["summary"] = summary.str();
+        report["version-string"] = version_string;
+        report["details"] = details.str();
+        return report;
+}
 
-        close();
+void LLFloaterReporter::sendReportViaLegacy(const LLSD & report)
+{
+        LLViewerRegion *regionp = gAgent.getRegion();
+        if (!regionp) return;
+        LLMessageSystem *msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_UserReport);
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        
+        msg->nextBlockFast(_PREHASH_ReportData);
+        msg->addU8Fast(_PREHASH_ReportType, report["report-type"].asInteger());
+        msg->addU8(_PREHASH_Category, report["category"].asInteger());
+        msg->addVector3Fast(_PREHASH_Position,  LLVector3(report["position"]));
+        msg->addU8Fast(_PREHASH_CheckFlags, report["check-flags"].asInteger());
+        msg->addUUIDFast(_PREHASH_ScreenshotID, report["screenshot-id"].asUUID());
+        msg->addUUIDFast(_PREHASH_ObjectID, report["object-id"].asUUID());
+        msg->addUUID("AbuserID", report["abuser-id"].asUUID());
+        msg->addString("AbuseRegionName", report["abuse-region-name"].asString());
+        msg->addUUID("AbuseRegionID", report["abuse-region-id"].asUUID());
+
+        msg->addStringFast(_PREHASH_Summary, report["summary"].asString().c_str());
+        msg->addString("VersionString", report["version-string"]);
+        msg->addStringFast(_PREHASH_Details, report["details"] );
+        
+        msg->sendReliable(regionp->getHost());
 }
 
+class LLUserReportScreenshotResponder : public LLAssetUploadResponder
+{
+public:
+        LLUserReportScreenshotResponder(const LLSD & post_data, 
+                                                                        const LLUUID & vfile_id, 
+                                                                        LLAssetType::EType asset_type):
+          LLAssetUploadResponder(post_data, vfile_id, asset_type)
+        {
+        }
+        void uploadFailed(const LLSD& content)
+        {
+                // *TODO pop up a dialog so the user knows their report screenshot didn't make it
+                LLUploadDialog::modalUploadFinished();
+        }
+        void uploadComplete(const LLSD& content)
+        {
+                // we don't care about what the server returns from this post, just clean up the UI
+                LLUploadDialog::modalUploadFinished();
+        }
+};
+
+class LLUserReportResponder : public LLHTTPClient::Responder
+{
+public:
+        LLUserReportResponder(): LLHTTPClient::Responder()  {}
+
+        void error(U32 status, const std::string& reason)
+        {
+                // *TODO do some user messaging here
+                LLUploadDialog::modalUploadFinished();
+        }
+        void result(const LLSD& content)
+        {
+                // we don't care about what the server returns
+                LLUploadDialog::modalUploadFinished();
+        }
+};
+
+void LLFloaterReporter::sendReportViaCaps(std::string url, std::string sshot_url, const LLSD& report)
+{
+        if(childGetValue("screen_check").asBoolean() && !sshot_url.empty())
+        {
+                // try to upload screenshot
+                LLHTTPClient::post(sshot_url, report, new LLUserReportScreenshotResponder(report, 
+                                                                                                                        mResourceDatap->mAssetInfo.mUuid, 
+                                                                                                                        mResourceDatap->mAssetInfo.mType));                     
+        }
+        else
+        {
+                // screenshot not wanted or we don't have screenshot cap
+                LLHTTPClient::post(url, report, new LLUserReportResponder());                   
+        }
+}
 
-void LLFloaterReporter::uploadScreenshot()
+void LLFloaterReporter::takeScreenshot()
 {
         const S32 IMAGE_WIDTH = 1024;
         const S32 IMAGE_HEIGHT = 768;
-        LLString filename("report_screenshot.bmp");
 
-        if( !gViewerWindow->saveSnapshot( filename, IMAGE_WIDTH, IMAGE_HEIGHT, TRUE, FALSE ) )
+        LLPointer<LLImageRaw> raw = new LLImageRaw;
+        if( !gViewerWindow->rawSnapshot(raw, IMAGE_WIDTH, IMAGE_HEIGHT, TRUE, TRUE, FALSE))
         {
+                llwarns << "Unable to take screenshot" << llendl;
                 return;
         }
+        LLPointer<LLImageJ2C> upload_data = LLViewerImageList::convertToUploadFile(raw);
 
-        // Generate the temporary filename
-        std::string temp_filename = gDirUtilp->getTempFilename();
-
-        // try to create the upload file
-        if (!LLViewerImageList::createUploadFile(filename,
-                                                                                        temp_filename,
-                                                                                        IMG_CODEC_BMP ))
+        // create a resource data
+        mResourceDatap->mInventoryType = LLInventoryType::IT_NONE;
+        mResourceDatap->mAssetInfo.mTransactionID.generate();
+        mResourceDatap->mAssetInfo.mUuid = mResourceDatap->mAssetInfo.mTransactionID.makeAssetID(gAgent.getSecureSessionID());
+        if (BUG_REPORT == mReportType)
         {
-                llwarns << "Unable to upload report screenshot " << filename << ":\n\n" << LLImageBase::getLastError() << "\n" << llendl;
-                if(LLFile::remove(temp_filename.c_str()) == -1)
-                {
-                        lldebugs << "unable to remove temp file" << llendl;
-                }
-                LLFilePicker::instance().reset();
+                mResourceDatap->mAssetInfo.mType = LLAssetType::AT_TEXTURE;
+                mResourceDatap->mPreferredLocation = LLAssetType::EType(-1);
+        }
+        else if (COMPLAINT_REPORT == mReportType)
+        {
+                mResourceDatap->mAssetInfo.mType = LLAssetType::AT_TEXTURE;
+                mResourceDatap->mPreferredLocation = LLAssetType::EType(-2);
         }
         else
         {
-                // create a resource data
-                LLResourceData* data = NULL;
-                data = new LLResourceData;
-                data->mInventoryType = LLInventoryType::IT_NONE;
-                data->mAssetInfo.mTransactionID.generate();
-                data->mAssetInfo.mUuid = data->mAssetInfo.mTransactionID.makeAssetID(gAgent.getSecureSessionID());
-                if (BUG_REPORT == mReportType)
-                {
-                        //data->mAssetInfo.mType = LLAssetType::AT_BUG_REPORT_SCREENSHOT;
-                        data->mAssetInfo.mType = LLAssetType::AT_TEXTURE;
-                        data->mPreferredLocation = LLAssetType::EType(-1);
-                }
-                else if (COMPLAINT_REPORT == mReportType)
-                {
-                        //data->mAssetInfo.mType = LLAssetType::AT_COMPLAINT_REPORT_SCREENSHOT;
-                        data->mAssetInfo.mType = LLAssetType::AT_TEXTURE;
-                        data->mPreferredLocation = LLAssetType::EType(-2);
-                }
-                else
-                {
-                        llwarns << "Unknown LLFloaterReporter type" << llendl;
-                }
-                data->mAssetInfo.mCreatorID = gAgentID;
-                data->mAssetInfo.setName("screenshot_name");
-                data->mAssetInfo.setDescription("screenshot_descr");
-
-                llinfos << "*** Uploading: " << llendl;
-                llinfos << "Type: " << LLAssetType::lookup(data->mAssetInfo.mType) << llendl;
-                llinfos << "File: " << filename << llendl;
-                llinfos << "Dest: " << temp_filename << llendl;
-                llinfos << "Name: " << data->mAssetInfo.getName() << llendl;
-                llinfos << "Desc: " << data->mAssetInfo.getDescription() << llendl;
-
-                gAssetStorage->storeAssetData(temp_filename.c_str(),
-                                                                                data->mAssetInfo.mTransactionID,
-                                                                                data->mAssetInfo.mType,
-                                                                                LLFloaterReporter::uploadDoneCallback,
-                                                                                (void*)data, TRUE);
+                llwarns << "Unknown LLFloaterReporter type" << llendl;
+        }
+        mResourceDatap->mAssetInfo.mCreatorID = gAgentID;
+        mResourceDatap->mAssetInfo.setName("screenshot_name");
+        mResourceDatap->mAssetInfo.setDescription("screenshot_descr");
+
+        // store in VFS
+        LLVFile::writeFile(upload_data->getData(), 
+                                                upload_data->getDataSize(), 
+                                                gVFS, 
+                                                mResourceDatap->mAssetInfo.mUuid, 
+                                                mResourceDatap->mAssetInfo.mType);
+
+        // store in the image list so it doesn't try to fetch from the server
+        LLViewerImage* image_in_list = new LLViewerImage(mResourceDatap->mAssetInfo.mUuid, TRUE);
+        image_in_list->createGLTexture(0, raw);
+        gImageList.addImage(image_in_list); 
+
+        // the texture picker then uses that texture
+        LLTexturePicker* texture = LLUICtrlFactory::getTexturePickerByName(this, "screenshot");
+        if (texture)
+        {
+                texture->setImageAssetID(mResourceDatap->mAssetInfo.mUuid);
+                texture->setDefaultImageAssetID(mResourceDatap->mAssetInfo.mUuid);
+                texture->setCaption("Screenshot");
         }
+
+}
+
+void LLFloaterReporter::uploadImage()
+{
+        llinfos << "*** Uploading: " << llendl;
+        llinfos << "Type: " << LLAssetType::lookup(mResourceDatap->mAssetInfo.mType) << llendl;
+        llinfos << "UUID: " << mResourceDatap->mAssetInfo.mUuid << llendl;
+        llinfos << "Name: " << mResourceDatap->mAssetInfo.getName() << llendl;
+        llinfos << "Desc: " << mResourceDatap->mAssetInfo.getDescription() << llendl;
+
+        gAssetStorage->storeAssetData(mResourceDatap->mAssetInfo.mTransactionID,
+                                                                        mResourceDatap->mAssetInfo.mType,
+                                                                        LLFloaterReporter::uploadDoneCallback,
+                                                                        (void*)mResourceDatap, TRUE);
 }
 
 
 // static
 void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data, S32 result) // StoreAssetData callback (fixed)
 {
-        LLResourceData* data = (LLResourceData*)user_data;
+        LLUploadDialog::modalUploadFinished();
 
-        if(result >= 0)
-        {
-                EReportType report_type = UNKNOWN_REPORT;
-                if (data->mPreferredLocation == -1)
-                {
-                        report_type = BUG_REPORT;
-                }
-                else if (data->mPreferredLocation == -2)
-                {
-                        report_type = COMPLAINT_REPORT;
-                }
-                else 
-                {
-                        llwarns << "Unknown report type : " << data->mPreferredLocation << llendl;
-                }
+        LLResourceData* data = (LLResourceData*)user_data;
 
-                LLFloaterReporter *self = getReporter(report_type);
-                if (self)
-                {
-                        LLTexturePicker* texture = LLUICtrlFactory::getTexturePickerByName(self, "screenshot");
-                        if (texture)
-                        {
-                                texture->setImageAssetID(uuid);
-                                texture->setDefaultImageAssetID(uuid);
-                                texture->setCaption("Screenshot");
-                        }
-                        self->mScreenID = uuid;
-                        llinfos << "Got screen shot " << uuid << llendl;
-                }
-        }
-        else //         if(result >= 0)
+        if(result < 0)
         {
                 LLStringBase<char>::format_map_t args;
                 args["[REASON]"] = std::string(LLAssetStorage::getErrorString(result));
@@ -867,8 +942,31 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
                 std::string err_msg("There was a problem uploading a report screenshot");
                 err_msg += " due to the following reason: " + args["[REASON]"];
                 llwarns << err_msg << llendl;
+                return;
+        }
+
+        EReportType report_type = UNKNOWN_REPORT;
+        if (data->mPreferredLocation == -1)
+        {
+                report_type = BUG_REPORT;
         }
-        delete data;
+        else if (data->mPreferredLocation == -2)
+        {
+                report_type = COMPLAINT_REPORT;
+        }
+        else 
+        {
+                llwarns << "Unknown report type : " << data->mPreferredLocation << llendl;
+        }
+
+        LLFloaterReporter *self = getReporter(report_type);
+        if (self)
+        {
+                self->mScreenID = uuid;
+                llinfos << "Got screen shot " << uuid << llendl;
+                self->sendReportViaLegacy(self->gatherReport());
+        }
+        self->close();
 }
 
 
diff --git a/linden/indra/newview/llfloaterreporter.h b/linden/indra/newview/llfloaterreporter.h
index af01771..5e25d59 100644
--- a/linden/indra/newview/llfloaterreporter.h
+++ b/linden/indra/newview/llfloaterreporter.h
@@ -40,6 +40,7 @@ class LLViewerObject;
 class LLAgent;
 class LLToolObjPicker;
 class LLMeanCollisionData;
+struct LLResourceData;
 
 // these flags are used to label info requests to the server
 const U32 BUG_REPORT_REQUEST            = 0x01 << 0;
@@ -70,7 +71,6 @@ enum EReportType
         CS_REQUEST_REPORT = 4
 };
 
-
 class LLFloaterReporter
 :       public LLFloater
 {
@@ -106,11 +106,16 @@ public:
         static void processRegionInfo(LLMessageSystem* msg);
         
         void setPickedObjectProperties(const char *object_name, const char *owner_name);
-        void uploadScreenshot();
 
 private:
+        void takeScreenshot();
+        void sendReportViaCaps(std::string url);
+        void uploadImage();
+        bool validateReport();
         void setReporterID();
-        void sendReport();
+        LLSD gatherReport();
+        void sendReportViaLegacy(const LLSD & report);
+        void sendReportViaCaps(std::string url, std::string sshot_url, const LLSD & report);
         void setPosBox(const LLVector3d &pos);
         void enableControls(BOOL own_avatar);
         void getObjectInfo(const LLUUID& object_id);
@@ -127,6 +132,7 @@ private:
         BOOL                    mCopyrightWarningSeen;
         std::list<LLMeanCollisionData*> mMCDList;
         LLString                mDefaultSummary;
+        LLResourceData* mResourceDatap;
 };
 
 #endif
diff --git a/linden/indra/newview/llfloatersaveavatar.cpp b/linden/indra/newview/llfloatersaveavatar.cpp
index 2f55288..3b8439e 100644
--- a/linden/indra/newview/llfloatersaveavatar.cpp
+++ b/linden/indra/newview/llfloatersaveavatar.cpp
@@ -68,7 +68,7 @@ void LLFloaterSaveAvatar::show()
         }
         else
         {
-                mSingleton->open();
+                mSingleton->open();             /*Flawfinder: ignore*/
         }
 }
 
diff --git a/linden/indra/newview/llfloaterscriptdebug.cpp b/linden/indra/newview/llfloaterscriptdebug.cpp
index 0781f7c..94047cb 100644
--- a/linden/indra/newview/llfloaterscriptdebug.cpp
+++ b/linden/indra/newview/llfloaterscriptdebug.cpp
@@ -66,7 +66,7 @@ void LLFloaterScriptDebug::show(const LLUUID& object_id)
         LLFloater* floaterp = addOutputWindow(object_id);
         if (sInstance)
         {
-                sInstance->open();
+                sInstance->open();              /* Flawfinder: ignore */
                 sInstance->showFloater(floaterp);
         }
 }
@@ -225,7 +225,7 @@ LLFloaterScriptDebugOutput* LLFloaterScriptDebugOutput::show(const LLUUID& objec
         {
                 floaterp = new LLFloaterScriptDebugOutput(object_id);
                 sInstanceMap[object_id] = floaterp;
-                floaterp->open();
+                floaterp->open();               /* Flawfinder: ignore*/
         }
         else
         {
diff --git a/linden/indra/newview/llfloatersellland.cpp b/linden/indra/newview/llfloatersellland.cpp
index 5fac819..cc7df3b 100755
--- a/linden/indra/newview/llfloatersellland.cpp
+++ b/linden/indra/newview/llfloatersellland.cpp
@@ -55,15 +55,15 @@ private:
         virtual ~LLFloaterSellLandUI();
 
         LLViewerRegion* mRegion;
-        LLParcel*               mParcel;
-        bool                    mParcelIsForSale;
-        bool                    mSellToBuyer;
-        bool                    mChoseSellTo;
-        S32                             mParcelPrice;
-        S32                             mParcelActualArea;
-        LLUUID                  mParcelSnapshot;
-        LLUUID                  mAuthorizedBuyer;
-        bool                    mParcelSoldWithObjects;
+        LLParcelSelectionHandle mParcelSelection;
+        bool                                    mParcelIsForSale;
+        bool                                    mSellToBuyer;
+        bool                                    mChoseSellTo;
+        S32                                             mParcelPrice;
+        S32                                             mParcelActualArea;
+        LLUUID                                  mParcelSnapshot;
+        LLUUID                                  mAuthorizedBuyer;
+        bool                                    mParcelSoldWithObjects;
         
         void updateParcelInfo();
         void refreshUI();
@@ -87,17 +87,24 @@ public:
         
         static LLFloaterSellLandUI* soleInstance(bool createIfNeeded);
 
-        bool setParcel(LLViewerRegion* region, LLParcel* parcel);
+        bool setParcel(LLViewerRegion* region, LLParcelSelectionHandle parcel);
+
+private:
+        class SelectionObserver : public LLParcelObserver
+        {
+        public:
+                virtual void changed();
+        };
 };
 
 // static
 void LLFloaterSellLand::sellLand(
-        LLViewerRegion* region, LLParcel* parcel)
+        LLViewerRegion* region, LLParcelSelectionHandle parcel)
 {
         LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(true);
         if (ui->setParcel(region, parcel))
         {
-                ui->open();
+                ui->open();             /* Flawfinder: ignore */
         }
 }
 
@@ -115,12 +122,20 @@ LLFloaterSellLandUI* LLFloaterSellLandUI::soleInstance(bool createIfNeeded)
                 sInstance->center();
         }
         
+
+        static SelectionObserver* parcelSelectionObserver = NULL;
+        if (!parcelSelectionObserver)
+        {
+                parcelSelectionObserver = new SelectionObserver;
+                gParcelMgr->addObserver(parcelSelectionObserver);
+        }
+
         return sInstance;
 }
 
 LLFloaterSellLandUI::LLFloaterSellLandUI()
 :       LLFloater("Sell Land"),
-        mRegion(0), mParcel(0)
+        mRegion(0)
 {
 }
 
@@ -132,11 +147,27 @@ LLFloaterSellLandUI::~LLFloaterSellLandUI()
         }
 }
 
+void LLFloaterSellLandUI::SelectionObserver::changed()
+{
+        LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(false);
+        if (ui)
+        {
+                if (gParcelMgr->selectionEmpty())
+                {
+                        ui->close();
+                }
+                else {
+                        ui->setParcel(
+                                gParcelMgr->getSelectionRegion(),
+                                gParcelMgr->getParcelSelection());
+                }
+        }
+}
 
 void LLFloaterSellLandUI::onClose(bool app_quitting)
 {
         LLFloater::onClose(app_quitting);
-        delete this;
+        destroy();
 }
 
 BOOL LLFloaterSellLandUI::postBuild()
@@ -152,17 +183,18 @@ BOOL LLFloaterSellLandUI::postBuild()
         return TRUE;
 }
 
-bool LLFloaterSellLandUI::setParcel(LLViewerRegion* region, LLParcel* parcel)
+bool LLFloaterSellLandUI::setParcel(LLViewerRegion* region, LLParcelSelectionHandle parcel)
 {
-        if (!parcel) // || !can_agent_modify_parcel(parcel)) // can_agent_modify_parcel was deprecated by GROUPS
+        if (!parcel->getParcel()) // || !can_agent_modify_parcel(parcel)) // can_agent_modify_parcel was deprecated by GROUPS
         {
                 return false;
         }
 
         mRegion = region;
-        mParcel = parcel;
+        mParcelSelection = parcel;
         mChoseSellTo = false;
 
+
         updateParcelInfo();
         refreshUI();
 
@@ -171,14 +203,17 @@ bool LLFloaterSellLandUI::setParcel(LLViewerRegion* region, LLParcel* parcel)
 
 void LLFloaterSellLandUI::updateParcelInfo()
 {
-        mParcelActualArea = mParcel->getArea();
-        mParcelIsForSale = mParcel->getForSale();
+        LLParcel* parcelp = mParcelSelection->getParcel();
+        if (!parcelp) return;
+
+        mParcelActualArea = parcelp->getArea();
+        mParcelIsForSale = parcelp->getForSale();
         if (mParcelIsForSale)
         {
                 mChoseSellTo = true;
         }
-        mParcelPrice = mParcelIsForSale ? mParcel->getSalePrice() : 0;
-        mParcelSoldWithObjects = mParcel->getSellWithObjects();
+        mParcelPrice = mParcelIsForSale ? parcelp->getSalePrice() : 0;
+        mParcelSoldWithObjects = parcelp->getSellWithObjects();
         if (mParcelIsForSale)
         {
                 childSetValue("price", mParcelPrice);
@@ -197,16 +232,16 @@ void LLFloaterSellLandUI::updateParcelInfo()
                 childSetValue("sell_objects", "none");
         }
 
-        mParcelSnapshot = mParcel->getSnapshotID();
+        mParcelSnapshot = parcelp->getSnapshotID();
 
-        mAuthorizedBuyer = mParcel->getAuthorizedBuyerID();
+        mAuthorizedBuyer = parcelp->getAuthorizedBuyerID();
         mSellToBuyer = mAuthorizedBuyer.notNull();
 
         if(mSellToBuyer)
         {
                 LLString name;
-                char firstname[MAX_STRING];
-                char lastname[MAX_STRING];
+                char firstname[MAX_STRING];             /* Flawfinder: ignore */
+                char lastname[MAX_STRING];              /* Flawfinder: ignore */
                 gCacheName->getName(mAuthorizedBuyer, firstname, lastname);
                 name.assign(firstname);
                 name.append(" ");
@@ -238,13 +273,16 @@ void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
 
 void LLFloaterSellLandUI::refreshUI()
 {
+        LLParcel* parcelp = mParcelSelection->getParcel();
+        if (!parcelp) return;
+
         LLTextureCtrl* snapshot = LLViewerUICtrlFactory::getTexturePickerByName(this, "info_image");
         if (snapshot)
         {
                 snapshot->setImageAssetID(mParcelSnapshot);
         }
 
-        childSetText("info_parcel", mParcel->getName());
+        childSetText("info_parcel", parcelp->getName());
         childSetTextArg("info_size", "[AREA]", llformat("%d", mParcelActualArea));
 
         LLString price_str = childGetValue("price").asString();
@@ -377,7 +415,7 @@ void LLFloaterSellLandUI::doSelectAgent(void *userdata)
 void LLFloaterSellLandUI::callbackAvatarPick(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
 {       
         LLFloaterSellLandUI* floaterp = (LLFloaterSellLandUI*)data;
-        LLParcel* parcel = floaterp->mParcel;
+        LLParcel* parcel = floaterp->mParcelSelection->getParcel();
 
         if (names.empty() || ids.empty()) return;
         
@@ -402,7 +440,10 @@ void LLFloaterSellLandUI::doCancel(void *userdata)
 void LLFloaterSellLandUI::doShowObjects(void *userdata)
 {
         LLFloaterSellLandUI* self = (LLFloaterSellLandUI*)userdata;
-        send_parcel_select_objects(self->mParcel->getLocalID(), RT_SELL);
+        LLParcel* parcel = self->mParcelSelection->getParcel();
+        if (!parcel) return;
+
+        send_parcel_select_objects(parcel->getLocalID(), RT_SELL);
 
         LLNotifyBox::showXml("TransferObjectsHighlighted",
                                                  callbackHighlightTransferable,
@@ -420,7 +461,7 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
 {
         LLFloaterSellLandUI* self = (LLFloaterSellLandUI*)userdata;
 
-        LLParcel* parcel = self->mParcel;
+        LLParcel* parcel = self->mParcelSelection->getParcel();
 
         // Do a confirmation
         if (!parcel->getForSale())
@@ -472,7 +513,8 @@ void LLFloaterSellLandUI::onConfirmSale(S32 option, void *userdata)
                 return;
         }
 
-        LLParcel* parcel = self->mParcel;
+        LLParcel* parcel = self->mParcelSelection->getParcel();
+        if (!parcel) return;
 
         // can_agent_modify_parcel deprecated by GROUPS
 //      if (!can_agent_modify_parcel(parcel))
@@ -499,7 +541,7 @@ void LLFloaterSellLandUI::onConfirmSale(S32 option, void *userdata)
         }
 
         // Send update to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, LLFloaterLand::sRequestReplyOnUpdate );
+        gParcelMgr->sendParcelPropertiesUpdate( parcel );
 
         self->close();
 }
diff --git a/linden/indra/newview/llfloatersellland.h b/linden/indra/newview/llfloatersellland.h
index 183ffc4..4131011 100755
--- a/linden/indra/newview/llfloatersellland.h
+++ b/linden/indra/newview/llfloatersellland.h
@@ -26,15 +26,17 @@
 
 #ifndef LL_LLFLOATERSELLLAND_H
 #define LL_LLFLOATERSELLLAND_H
+#include "llmemory.h"
 
 class LLParcel;
 class LLViewerRegion;
+class LLParcelSelection;
 
 class LLFloaterSellLand
 {
 public:
         static void sellLand(LLViewerRegion* region,
-                                                LLParcel* parcel);
+                                                LLHandle<LLParcelSelection> parcel);
 };
 
 #endif // LL_LLFLOATERSELLLAND_H
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 01f86af..cfa94a5 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -824,21 +824,22 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 
                 //RN: freeze all avatars
                 LLCharacter* avatarp;
-                for (avatarp = LLCharacter::sInstances.getFirstData(); avatarp; avatarp = LLCharacter::sInstances.getNextData())
+                for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                        iter != LLCharacter::sInstances.end(); ++iter)
                 {
+                        avatarp = *iter;
                         sInstance->impl.mAvatarPauseHandles.push_back(avatarp->requestPause());
                 }
 
                 // freeze everything else
                 gSavedSettings.setBOOL("FreezeTime", TRUE);
 
-                if (gCurrentToolset != gCameraToolset)
+                if (gToolMgr->getCurrentToolset() != gCameraToolset)
                 {
-                        sInstance->impl.mLastToolset = gCurrentToolset;
-                        gCurrentToolset = gCameraToolset;
+                        sInstance->impl.mLastToolset = gToolMgr->getCurrentToolset();
                         if (gToolMgr)
                         {
-                                gToolMgr->useSelectedTool( gCurrentToolset );
+                                gToolMgr->setCurrentToolset(gCameraToolset);
                         }
                 }
         }
@@ -861,10 +862,9 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
                 // restore last tool (e.g. pie menu, etc)
                 if (sInstance->impl.mLastToolset)
                 {
-                        gCurrentToolset = sInstance->impl.mLastToolset;
                         if (gToolMgr)
                         {
-                                gToolMgr->useSelectedTool( gCurrentToolset );
+                                gToolMgr->setCurrentToolset(sInstance->impl.mLastToolset);
                         }
                 }
         }
@@ -1239,10 +1239,9 @@ LLFloaterSnapshot::~LLFloaterSnapshot()
 
         if (impl.mLastToolset)
         {
-                gCurrentToolset = impl.mLastToolset;
-                if (gToolMgr && gCurrentToolset)
+                if (gToolMgr)
                 {
-                        gToolMgr->useSelectedTool( gCurrentToolset );
+                        gToolMgr->setCurrentToolset(impl.mLastToolset);
                 }
         }
 
@@ -1432,7 +1431,7 @@ void LLFloaterSnapshot::show(void*)
                 sInstance->impl.updateLayout(sInstance);
         }
         
-        sInstance->open();
+        sInstance->open();              /* Flawfinder: ignore */
         sInstance->focusFirstItem(FALSE);
         gSnapshotFloaterView->setEnabled(TRUE);
         gSnapshotFloaterView->adjustToFitScreen(sInstance, FALSE);
@@ -1506,7 +1505,7 @@ BOOL LLSnapshotFloaterView::handleMouseDown(S32 x, S32 y, MASK mask)
         // give floater a change to handle mouse, else camera tool
         if (childrenHandleMouseDown(x, y, mask) == NULL)
         {
-                gToolMgr->getCurrentTool(mask)->handleMouseDown( x, y, mask );
+                gToolMgr->getCurrentTool()->handleMouseDown( x, y, mask );
         }
         return TRUE;
 }
@@ -1521,7 +1520,7 @@ BOOL LLSnapshotFloaterView::handleMouseUp(S32 x, S32 y, MASK mask)
         // give floater a change to handle mouse, else camera tool
         if (childrenHandleMouseUp(x, y, mask) == NULL)
         {
-                gToolMgr->getCurrentTool(mask)->handleMouseUp( x, y, mask );
+                gToolMgr->getCurrentTool()->handleMouseUp( x, y, mask );
         }
         return TRUE;
 }
@@ -1536,7 +1535,7 @@ BOOL LLSnapshotFloaterView::handleHover(S32 x, S32 y, MASK mask)
         // give floater a change to handle mouse, else camera tool
         if (childrenHandleHover(x, y, mask) == NULL)
         {
-                gToolMgr->getCurrentTool(mask)->handleHover( x, y, mask );
+                gToolMgr->getCurrentTool()->handleHover( x, y, mask );
         }
         return TRUE;
 }
diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index 9fa614c..150e369 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -58,8 +58,8 @@ void LLFloaterTelehub::show()
         sInstance = new LLFloaterTelehub();
 
         // Show tools floater by selecting translate (select) tool
-        gCurrentToolset = gBasicToolset;
-        gCurrentToolset->selectTool( gToolTranslate );
+        gToolMgr->setCurrentToolset(gBasicToolset);
+        gToolMgr->getCurrentToolset()->selectTool( gToolTranslate );
 
         // Find tools floater, glue to bottom
         if (gFloaterTools)
@@ -101,6 +101,8 @@ LLFloaterTelehub::LLFloaterTelehub()
                 // otherwise you can't walk with arrow keys while floater is up
                 list->setAllowKeyboardMovement(FALSE);
         }
+
+        mObjectSelection = gSelectMgr->getEditSelection();
 }
 
 LLFloaterTelehub::~LLFloaterTelehub()
@@ -123,10 +125,10 @@ void LLFloaterTelehub::draw()
 // Per-frame updates, because we don't have a selection manager observer.
 void LLFloaterTelehub::refresh()
 {
-        LLViewerObject* object = gSelectMgr->getFirstRootObject();
+        LLViewerObject* object = mObjectSelection->getFirstRootObject();
         if(!object)
         {
-                object = gSelectMgr->getFirstObject();
+                object = mObjectSelection->getFirstObject();
         }
         
         BOOL have_selection = (object != NULL);
@@ -241,8 +243,8 @@ void LLFloaterTelehub::onClickRemoveSpawnPoint(void* data)
         msg->nextBlock("ParamList");
         msg->addString("Parameter", "spawnpoint remove");
 
-        char buffer[MAX_STRING];
-        sprintf(buffer, "%d", spawn_index);
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
+        snprintf(buffer, MAX_STRING, "%d", spawn_index);                /* Flawfinder: ignore */
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buffer);
 
@@ -260,7 +262,7 @@ void LLFloaterTelehub::processTelehubInfo(LLMessageSystem* msg, void**)
 
 void LLFloaterTelehub::unpackTelehubInfo(LLMessageSystem* msg)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
 
         msg->getUUID("TelehubBlock", "ObjectID", mTelehubObjectID);
         msg->getString("TelehubBlock", "ObjectName", MAX_STRING, buffer);
diff --git a/linden/indra/newview/llfloatertelehub.h b/linden/indra/newview/llfloatertelehub.h
index ccc75bc..3458998 100644
--- a/linden/indra/newview/llfloatertelehub.h
+++ b/linden/indra/newview/llfloatertelehub.h
@@ -32,6 +32,7 @@
 #include "llfloater.h"
 
 class LLMessageSystem;
+class LLObjectSelection;
 
 const S32 MAX_SPAWNPOINTS_PER_TELEHUB = 16;
 
@@ -69,6 +70,8 @@ private:
 
         S32 mNumSpawn;
         LLVector3 mSpawnPointPos[MAX_SPAWNPOINTS_PER_TELEHUB];
+        
+        LLHandle<LLObjectSelection> mObjectSelection;
 
         static LLFloaterTelehub* sInstance;
 };
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index 9f0503b..29c897d 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -303,7 +303,7 @@ LLFloaterTestImpl::LLFloaterTestImpl()
         //-----------------------------------------------------------------------
         // Hook us up with the floater view
         //-----------------------------------------------------------------------
-        open();
+        open();         /* Flawfinder: ignore */
         center();
 }
 
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 05dd70b..f777581 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -264,7 +264,7 @@ BOOL	LLFloaterTools::postBuild()
                         &LLToolPlacerPanel::sTriangleTorus,
                         &LLToolPlacerPanel::sTree,
                         &LLToolPlacerPanel::sGrass};
-        for(int t=0;t<sizeof(toolNames)/sizeof(toolNames[0]);t++)
+        for(size_t t=0; t<sizeof(toolNames)/sizeof(toolNames[0]); ++t)
         {
                 LLButton *found = LLViewerUICtrlFactory::getButtonByName(this,toolNames[t]);
                 if(found)
@@ -395,7 +395,7 @@ LLFloaterTools::LLFloaterTools()
         factory_map["ContentsInventory"] = LLCallbackMap(createPanelContentsInventory, this);//LLPanelContents
         factory_map["land info panel"] = LLCallbackMap(createPanelLandInfo, this);//LLPanelLandInfo
 
-        gUICtrlFactory->buildFloater(this,"floater_tools.xml",&factory_map);
+        gUICtrlFactory->buildFloater(this,"floater_tools.xml",&factory_map,FALSE);
 
         mLargeHeight = getRect().getHeight();
         mSmallHeight = mLargeHeight;
@@ -478,7 +478,7 @@ void LLFloaterTools::resetToolState()
 
 void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 {
-        LLTool *tool = gToolMgr->getCurrentTool( mask );
+        LLTool *tool = gToolMgr->getCurrentTool();
 
         // HACK to allow seeing the buttons when you have the app in a window.
         // Keep the visibility the same as it 
@@ -579,7 +579,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 S32 index = mComboGridMode->getCurrentIndex();
                 mComboGridMode->removeall();
 
-                switch (gSelectMgr->getSelectType())
+                switch (mObjectSelection->getSelectType())
                 {
                 case SELECT_TYPE_HUD:
                         mComboGridMode->add("Screen");
@@ -726,6 +726,13 @@ BOOL LLFloaterTools::canClose()
 }
 
 // virtual
+void LLFloaterTools::onOpen()
+{
+        mParcelSelection = gParcelMgr->getFloatingParcelSelection();
+        mObjectSelection = gSelectMgr->getEditSelection();
+}
+
+// virtual
 void LLFloaterTools::onClose(bool app_quitting)
 {
         setMinimized(FALSE);
@@ -744,10 +751,14 @@ void LLFloaterTools::onClose(bool app_quitting)
 
         resetToolState();
 
+        mParcelSelection = NULL;
+        mObjectSelection = NULL;
+
         // Switch back to basic toolset
-        gCurrentToolset = gBasicToolset;
-        gBasicToolset->selectFirstTool();
-        gToolMgr->useSelectedTool( gBasicToolset );
+        gToolMgr->setCurrentToolset(gBasicToolset);
+        // we were already in basic toolset, using build tools
+        // so manually reset tool to default (pie menu tool)
+        gToolMgr->getCurrentToolset()->selectFirstTool();
 }
 
 void LLFloaterTools::showMore(BOOL show_more)
@@ -955,6 +966,5 @@ void LLFloaterTools::setEditTool(void* tool_pointer)
 
 void LLFloaterTools::onFocusReceived()
 {
-        gCurrentToolset = gBasicToolset;
-        gCurrentToolset->selectTool(gCurrentToolset->getSelectedTool());
-}
\ No newline at end of file
+        gToolMgr->setCurrentToolset(gBasicToolset);
+}
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index a6c4ceb..664aa62 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -44,6 +44,11 @@ class LLPanelFace;
 class LLPanelLandInfo;
 class LLComboBox;
 class LLVolumeSliderCtrl;
+class LLParcelSelection;
+class LLObjectSelection;
+
+typedef LLHandle<LLParcelSelection> LLParcelSelectionHandle;
+typedef LLHandle<LLObjectSelection> LLObjectSelectionHandle;
 
 class LLFloaterTools
 : public LLFloater
@@ -61,6 +66,7 @@ public:
         LLFloaterTools();
         virtual ~LLFloaterTools();
 
+        virtual void onOpen();
         virtual void onClose(bool app_quitting);
         virtual BOOL canClose();
 
@@ -175,7 +181,10 @@ public:
         LLPanelLandInfo                 *mPanelLandInfo;
 
         LLTabContainer*                 mTabLand;
-        
+
+        LLParcelSelectionHandle mParcelSelection;
+        LLObjectSelectionHandle mObjectSelection;
+
 private:
         BOOL                                    mDirty;
         S32                                             mSmallHeight;
diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index 093b840..7c86e83 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -160,8 +160,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
                 LLUUID task_id;
                 F32 location_x, location_y, location_z;
                 F32 score;
-                char name_buf[MAX_STRING];
-                char owner_buf[MAX_STRING];
+                char name_buf[MAX_STRING];              /* Flawfinder: ignore */
+                char owner_buf[MAX_STRING];             /* Flawfinder: ignore */
 
                 msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block);
                 msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block);
@@ -250,7 +250,7 @@ void LLFloaterTopObjects::updateSelectionInfo()
         LLUUID object_id = list->getCurrentID();
         if (object_id.isNull()) return;
 
-        LLString object_id_string = object_id.getString();
+        std::string object_id_string = object_id.asString();
 
         childSetValue("id_editor", LLSD(object_id_string));
         childSetValue("object_name_editor", list->getFirstSelected()->getColumn(1)->getText());
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 35b4531..26346d5 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -125,9 +125,9 @@ BOOL LLFloaterTOS::postBuild()
         childSetAction("Cancel", onCancel, this);
         childSetCommitCallback("tos_agreement", updateAgree, this);
 
-        // this displays the critical message
         if ( mType != TOS_TOS )
         {
+                // this displays the critical message
                 LLTextEditor *Editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text");
                 if (Editor)
                 {
@@ -137,25 +137,11 @@ BOOL LLFloaterTOS::postBuild()
                         Editor->setWordWrap(TRUE);
                         Editor->setFocus(TRUE);
                 }
-                childSetValue("tos_text", LLSD(mMessage));      
-        };
-
-        // this displays the critical message
-        if ( mType != TOS_TOS )
-        {
-                LLTextEditor *Editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text");
-                if (Editor)
-                {
-                        Editor->setHandleEditKeysDirectly( TRUE );
-                        Editor->setEnabled( FALSE );
-                        Editor->setReadOnlyFgColor(LLColor4::white);
-                        Editor->setWordWrap(TRUE);
-                        Editor->setFocus(TRUE);
-                }
-                childSetValue("tos_text", LLSD(mMessage));      
-        };
+                childSetValue("tos_text", LLSD(mMessage));
+                return TRUE;
+        }
 
-        #if LL_LIBXUL_ENABLED
+#if LL_LIBXUL_ENABLED
         // disable Agree to TOS radio button until the page has fully loaded
         LLRadioGroup* tos_agreement = LLUICtrlFactory::getRadioGroupByName(this, "tos_agreement");
         if ( tos_agreement )
@@ -163,19 +149,26 @@ BOOL LLFloaterTOS::postBuild()
                 tos_agreement->setEnabled( false );
         };
 
+        // hide the SL text widget if we're displaying TOS with using a browser widget.
+        LLTextEditor *editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text");
+        if ( editor )
+        {
+                editor->setVisible( FALSE );
+        };
+
         LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(this, "tos_html");
         if ( web_browser )
         {
                 // start to observe it so we see navigate complete events
                 if ( web_browser )
                 {
-                        web_browser->addObserver( this );               
+                        web_browser->addObserver( this );
                 };
 
                 gResponsePtr = LLIamHere::build( this );
                 LLHTTPClient::get( childGetValue( "real_url" ).asString(), gResponsePtr );
         };
-        #else
+#else
         LLTextEditor *Editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text");
         if (Editor)
         {
@@ -186,7 +179,8 @@ BOOL LLFloaterTOS::postBuild()
                 Editor->setFocus(TRUE);
         }
         childSetValue("tos_text", LLSD(mMessage));      
-        #endif
+#endif
+
         return TRUE;
 }
 
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index af0e5c0..967e6d0 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -312,7 +312,7 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
         BOOL was_visible = gFloaterWorldMap->getVisible();
 
         gFloaterWorldMap->mIsClosing = FALSE;
-        gFloaterWorldMap->open();
+        gFloaterWorldMap->open();               /* Flawfinder: ignore */
 
         LLWorldMapView* map_panel;
         map_panel = (LLWorldMapView*)gFloaterWorldMap->mTabs->getCurrentPanel();
@@ -458,6 +458,14 @@ void LLFloaterWorldMap::draw()
                 return;
         }
 
+        // On orientation island, users don't have a home location yet, so don't
+        // let them teleport "home".  It dumps them in an often-crowed welcome
+        // area (infohub) and they get confused. JC
+        LLViewerRegion* regionp = gAgent.getRegion();
+        bool agent_on_prelude = (regionp && regionp->isPrelude());
+        bool enable_go_home = gAgent.isGodlike() || !agent_on_prelude;
+        childSetEnabled("Go Home", enable_go_home);
+
         updateLocation();
         
         LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus(); 
diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h
index 67386c9..4b812b6 100644
--- a/linden/indra/newview/llfloaterworldmap.h
+++ b/linden/indra/newview/llfloaterworldmap.h
@@ -56,18 +56,18 @@ public:
         static void *createWorldMapView(void* data);
         BOOL postBuild();
 
-        virtual void onClose(bool app_quitting);
+        /*virtual*/ void onClose(bool app_quitting);
 
         static void show(void*, BOOL center_on_target );
         static void reloadIcons(void*);
         static void toggle(void*);
         static void hide(void*); 
 
-        virtual void    reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
-        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
-        virtual void    setVisible(BOOL visible);
-        virtual void    draw();
+        /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
+        /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+        /*virtual*/ void setVisible(BOOL visible);
+        /*virtual*/ void draw();
 
         // methods for dealing with inventory. The observe() method is
         // called during program startup. inventoryUpdated() will be
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 431f212..377e620 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -327,10 +327,10 @@ void LLFolderViewItem::arrangeFromRoot()
 // UI. If open is TRUE, then folders are opened up along the way to
 // the selection.
 void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
-                                                                                        BOOL open,
+                                                                                        BOOL open,                                      /* Flawfinder: ignore */
                                                                                         BOOL take_keyboard_focus)
 {
-        getRoot()->setSelection(selection, open, take_keyboard_focus);
+        getRoot()->setSelection(selection, open, take_keyboard_focus);          /* Flawfinder: ignore */
 }
 
 // helper function to change the selection from the root.
@@ -534,7 +534,7 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
         }
 }
 
-void LLFolderViewItem::open( void )
+void LLFolderViewItem::open( void )             /* Flawfinder: ignore */
 {
         if( mListener )
         {
@@ -1365,7 +1365,7 @@ BOOL LLFolderViewFolder::hasFilteredDescendants()
 
 // Passes selection information on to children and record selection
 // information if necessary.
-BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,
+BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,           /* Flawfinder: ignore */
                                                                           BOOL take_keyboard_focus)
 {
         BOOL rv = FALSE;
@@ -1389,7 +1389,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,
                  iter != mFolders.end();)
         {
                 folders_t::iterator fit = iter++;
-                if((*fit)->setSelection(selection, open, take_keyboard_focus))
+                if((*fit)->setSelection(selection, open, take_keyboard_focus))          /* Flawfinder: ignore */
                 {
                         rv = TRUE;
                         child_selected = TRUE;
@@ -1400,14 +1400,14 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,
                  iter != mItems.end();)
         {
                 items_t::iterator iit = iter++;
-                if((*iit)->setSelection(selection, open, take_keyboard_focus))
+                if((*iit)->setSelection(selection, open, take_keyboard_focus))          /* Flawfinder: ignore */
                 {
                         rv = TRUE;
                         child_selected = TRUE;
                         mNumDescendantsSelected++;
                 }
         }
-        if(open && child_selected)
+        if(open && child_selected)              /* Flawfinder: ignore */
         {
                 setOpenArrangeRecursively(TRUE);
         }
@@ -1964,16 +1964,16 @@ void LLFolderViewFolder::toggleOpen()
 }
 
 // Force a folder open or closed
-void LLFolderViewFolder::setOpen(BOOL open)
+void LLFolderViewFolder::setOpen(BOOL open)             /* Flawfinder: ignore */
 {
-        setOpenArrangeRecursively(open);
+        setOpenArrangeRecursively(open);                /* Flawfinder: ignore */
 }
 
-void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)
+void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)             /* Flawfinder: ignore */
 {
         BOOL was_open = mIsOpen;
-        mIsOpen = open;
-        if(!was_open && open)
+        mIsOpen = open;         /* Flawfinder: ignore */
+        if(!was_open && open)           /* Flawfinder: ignore */
         {
                 if(mListener)
                 {
@@ -1986,12 +1986,12 @@ void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recur
                          iter != mFolders.end();)
                 {
                         folders_t::iterator fit = iter++;
-                        (*fit)->setOpenArrangeRecursively(open, RECURSE_DOWN);
+                        (*fit)->setOpenArrangeRecursively(open, RECURSE_DOWN);          /* Flawfinder: ignore */
                 }
         }
         if (mParentFolder && (recurse == RECURSE_UP || recurse == RECURSE_UP_DOWN))
         {
-                mParentFolder->setOpenArrangeRecursively(open, RECURSE_UP);
+                mParentFolder->setOpenArrangeRecursively(open, RECURSE_UP);             /* Flawfinder: ignore */
         }
         
         if (was_open != mIsOpen)
@@ -2024,7 +2024,7 @@ BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
         return TRUE;
 }
 
-void LLFolderViewFolder::open( void )
+void LLFolderViewFolder::open( void )           /* Flawfinder: ignore */
 {
         toggleOpen();
 }
@@ -2713,10 +2713,10 @@ void LLFolderView::openFolder(const LLString& foldername)
         }
 }
 
-void LLFolderView::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)
+void LLFolderView::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)           /* Flawfinder: ignore */
 {
         // call base class to do proper recursion
-        LLFolderViewFolder::setOpenArrangeRecursively(open, recurse);
+        LLFolderViewFolder::setOpenArrangeRecursively(open, recurse);           /* Flawfinder: ignore */
         // make sure root folder is always open
         mIsOpen = TRUE;
 }
@@ -2892,7 +2892,7 @@ LLFolderViewItem* LLFolderView::getCurSelectedItem( void )
 
 
 // Record the selected item and pass it down the hierachy.
-BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,
+BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,         /* Flawfinder: ignore */
                                                                 BOOL take_keyboard_focus)
 {
         if( selection == this )
@@ -2914,8 +2914,8 @@ BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,
                 addToSelectionList(selection);
         }
 
-        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);
-        if(open)
+        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);               /* Flawfinder: ignore */
+        if(open)                /* Flawfinder: ignore */
         {
                 selection->getParentFolder()->requestArrange();
         }
@@ -3331,7 +3331,7 @@ void LLFolderView::openSelectedItems( void )
         {
                 if (mSelectedItems.size() == 1)
                 {
-                        mSelectedItems.front()->open();
+                        mSelectedItems.front()->open();         /* Flawfinder: ignore */
                 }
                 else
                 {
@@ -3345,11 +3345,11 @@ void LLFolderView::openSelectedItems( void )
                         selected_items_t::iterator item_it;
                         for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
                         {
-                                (*item_it)->open();
+                                (*item_it)->open();             /* Flawfinder: ignore */
                         }
 
                         LLFloater::setFloaterHost(NULL);
-                        multi_previewp->open();
+                        multi_previewp->open();         /* Flawfinder: ignore */
                 }
         }
 }
@@ -3380,7 +3380,7 @@ void LLFolderView::propertiesSelectedItems( void )
                         }
 
                         LLFloater::setFloaterHost(NULL);
-                        multi_propertiesp->open();
+                        multi_propertiesp->open();              /* Flawfinder: ignore */
                 }
         }
 }
@@ -3858,34 +3858,8 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                         search(getCurSelectedItem(), mSearchString.c_str(), FALSE);
                         handled = TRUE;
                 }
-                else if (mask & MASK_CONTROL && key == 'N')
-                {
-                        LLFolderViewItem* selection = getCurSelectedItem();
-                        if (selection)
-                        {
-                                selection = selection->getNextOpenNode();
-                        }
-                        search(selection, mSearchString.c_str(), FALSE);
-                        mSearchTimer.reset();
-                        handled = TRUE;
-                }
-                else if (mask & MASK_CONTROL && key == 'P')
-                {
-                        LLFolderViewItem* selection = getCurSelectedItem();
-                        if (selection)
-                        {
-                                selection = selection->getPreviousOpenNode();
-                        }
-                        search(selection, mSearchString.c_str(), TRUE);
-                        mSearchTimer.reset();
-                        handled = TRUE;
-                }
         }
 
-        if (handled)
-        {
-                gViewerWindow->requestFastFrame(this);
-        }
         return handled;
 }
 
@@ -3921,11 +3895,6 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_pare
                 handled = TRUE;
         }
 
-        if (handled)
-        {
-                gViewerWindow->requestFastFrame(this);
-        }
-
         return handled;
 }
 
@@ -4078,7 +4047,7 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 }
 
                 menu->arrange();
-                menu->updateParent(gMenuHolder);
+                menu->updateParent(LLMenuGL::sMenuContainer);
                 LLMenuGL::showPopup(this, menu, x, y);
         }
         else
@@ -4499,14 +4468,15 @@ std::string::size_type LLInventoryFilter::getStringMatchOffset() const
         return mSubStringMatchOffset;
 }
 
+// has user modified default filter params?
 BOOL LLInventoryFilter::isActive()
 {
-        return mFilterOps.mFilterTypes != 0xffffffff 
+        return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes 
                 || mFilterSubString.size() 
-                || mFilterOps.mPermissions != PERM_NONE 
-                || mFilterOps.mMinDate != 0 
-                || mFilterOps.mMaxDate != U32_MAX
-                || mFilterOps.mHoursAgo != 0;
+                || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
+                || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate 
+                || mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate
+                || mFilterOps.mHoursAgo != mDefaultFilterOps.mHoursAgo;
 }
 
 BOOL LLInventoryFilter::isModified()
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index a63ae26..ccadba9 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -317,7 +317,7 @@ protected:
         // the specified selected item appropriately for display and use
         // in the UI. If open is TRUE, then folders are opened up along
         // the way to the selection.
-        void setSelectionFromRoot(LLFolderViewItem* selection, BOOL open,
+        void setSelectionFromRoot(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
                 BOOL take_keyboard_focus = TRUE);
 
         // helper function to change the selection from the root.
@@ -366,7 +366,7 @@ public:
         // ignore. Returns TRUE if this object was affected. If open is
         // TRUE, then folders are opened up along the way to the
         // selection.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
                 BOOL take_keyboard_focus);
 
         // This method is used to toggle the selection of an item. If
@@ -433,7 +433,7 @@ public:
         void rename(const LLString& new_name);
 
         // open
-        virtual void open( void );
+        virtual void open( void );              /* Flawfinder: ignore */
         virtual void preview(void);
 
         // Show children (unfortunate that this is called "open")
@@ -558,7 +558,7 @@ public:
         // Passes selection information on to children and record
         // selection information if necessary. Returns TRUE if this object
         // (or a child) was affected.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
                 BOOL take_keyboard_focus);
 
         // This method is used to change the selection of an item. If
@@ -612,7 +612,7 @@ public:
         virtual void toggleOpen();
 
         // Force a folder open or closed
-        virtual void setOpen(BOOL open = TRUE);
+        virtual void setOpen(BOOL open = TRUE);         /* Flawfinder: ignore */
 
         // Called when a child is refreshed.
         virtual void requestArrange();
@@ -621,7 +621,7 @@ public:
         // method was written because the list iterators destroy the state
         // of other iterations, thus, we can't arrange while iterating
         // through the children (such as when setting which is selected.
-        virtual void setOpenArrangeRecursively(BOOL open, ERecurseType recurse = RECURSE_NO);
+        virtual void setOpenArrangeRecursively(BOOL open, ERecurseType recurse = RECURSE_NO);           /* Flawfinder: ignore */
 
         // Get the current state of the folder.
         virtual BOOL isOpen() { return mIsOpen; }
@@ -637,7 +637,7 @@ public:
         void applyFunctorRecursively(LLFolderViewFunctor& functor);
         virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
 
-        virtual void open( void );
+        virtual void open( void );              /* Flawfinder: ignore */
         virtual BOOL addItem(LLFolderViewItem* item); 
         virtual BOOL addFolder( LLFolderViewFolder* folder);
 
@@ -705,7 +705,7 @@ public:
         void openFolder(const LLString& foldername);
 
         virtual void toggleOpen() {};
-        virtual void setOpenArrangeRecursively(BOOL open, ERecurseType recurse);
+        virtual void setOpenArrangeRecursively(BOOL open, ERecurseType recurse);                /* Flawfinder: ignore */
         virtual BOOL addFolder( LLFolderViewFolder* folder);
 
         // Finds width and height of this object and it's children.  Also
@@ -722,7 +722,7 @@ public:
         virtual LLFolderViewItem* getCurSelectedItem( void );
 
         // Record the selected item and pass it down the hierachy.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
                 BOOL take_keyboard_focus);
 
         // This method is used to toggle the selection of an item. Walks
@@ -817,7 +817,6 @@ public:
 
         static void idle(void* user_data);
 
-        void setAutoSelectOverride(bool override) { mAutoSelectOverride = override; }
         BOOL needsAutoSelect() { return mNeedsAutoSelect && !mAutoSelectOverride; }
         BOOL getDebugFilters() { return mDebugFilters; }
 
diff --git a/linden/indra/newview/llframestats.cpp b/linden/indra/newview/llframestats.cpp
index cd49e7d..237f59b 100644
--- a/linden/indra/newview/llframestats.cpp
+++ b/linden/indra/newview/llframestats.cpp
@@ -168,7 +168,7 @@ void LLFrameStats::dump()
                 S32 total_visible_objects = 0;
 
                 time_t cur_time;
-                char time_str[24];
+                char time_str[24];              /* Flawfinder: ignore */
                 //char *time_str;
                 time(&cur_time);
                 strftime(time_str, 24, "%Y.%m.%d %H:%M:%S", localtime(&cur_time));
@@ -177,13 +177,13 @@ void LLFrameStats::dump()
 
                 static S32 dump_count = 0;
 
-                char file_with_num[256];
-                sprintf(file_with_num, "fs%d.txt", dump_count);
+                char file_with_num[256];                /* Flawfinder: ignore */
+                snprintf(file_with_num, sizeof(file_with_num), "fs%d.txt", dump_count);         /* Flawfinder: ignore */
                 dump_count++;
 
-                char filename[LL_MAX_PATH];
-                sprintf(filename, "%s", gDirUtilp->getExpandedFilename(LL_PATH_LOGS, file_with_num).c_str());
-                FILE *fp = LLFile::fopen(filename, "w");
+                char filename[LL_MAX_PATH];             /* Flawfinder: ignore */
+                snprintf(filename, LL_MAX_PATH, "%s", gDirUtilp->getExpandedFilename(LL_PATH_LOGS, file_with_num).c_str());             /* Flawfinder: ignore */
+                FILE *fp = LLFile::fopen(filename, "w");                /* Flawfinder: ignore */
                 if (!fp)
                 {
                         llinfos << "Couldn't open file for dumping frame stats!" << llendl;
@@ -224,8 +224,8 @@ void LLFrameStats::dump()
                 fclose(fp);
 
                 // Now dump cumulative stats
-                sprintf(filename, "%s", gDirUtilp->getExpandedFilename(LL_PATH_LOGS, mSummaryFilename.c_str()).c_str());
-                fp = LLFile::fopen(filename, "a");
+                snprintf(filename, LL_MAX_PATH, "%s", gDirUtilp->getExpandedFilename(LL_PATH_LOGS, mSummaryFilename.c_str()).c_str());          /* Flawfinder: ignore */
+                fp = LLFile::fopen(filename, "a");              /* Flawfinder: ignore */
                 if (!fp)
                 {
                         llinfos << "Couldn't open file for dumping frame stats!" << llendl;
diff --git a/linden/indra/newview/llframestatview.cpp b/linden/indra/newview/llframestatview.cpp
index d17d51e..e0c1cc7 100644
--- a/linden/indra/newview/llframestatview.cpp
+++ b/linden/indra/newview/llframestatview.cpp
@@ -198,7 +198,7 @@ void LLFrameStatView::draw()
         
         // Draw ticks for the "Average bar"
         F32 tick_value;
-        char tick_label[256];
+        char tick_label[256];           /* Flawfinder: ignore */
         for (tick_value = 0; tick_value <= 100; tick_value += 10)
         {
                 left = 10 + llfloor(tick_value*(total_width/100.f));
@@ -215,7 +215,7 @@ void LLFrameStatView::draw()
                 right = left + 1;
                 gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.2f));
 
-                sprintf(tick_label, "%.2f", tick_value);
+                snprintf(tick_label, sizeof(tick_label), "%.2f", tick_value);           /* Flawfinder: ignore */
                 // draw labels for the tick marks
                 LLFontGL::sMonospace->renderUTF8(tick_label, 0, left, bottom,
                         LLColor4(1.f, 1.f, 1.f, 0.5f),
@@ -265,7 +265,7 @@ void LLFrameStatView::draw()
                         right = left + 1;
                         gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
 
-                        sprintf(tick_label, "%.2f", tick_value);
+                        snprintf(tick_label, sizeof(tick_label), "%.2f", tick_value);           /* Flawfinder: ignore */
                         // draw labels for the tick marks
                         LLFontGL::sMonospace->renderUTF8(tick_label, 0, left, bottom,
                                 LLColor4(1.f, 1.f, 1.f, 0.5f),
@@ -290,7 +290,7 @@ void LLFrameStatView::draw()
                         right = left + 1;
                         gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
 
-                        sprintf(tick_label, "%.2f", tick_value);
+                        snprintf(tick_label, sizeof(tick_label), "%.2f", tick_value);           /* Flawfinder: ignore */
                         // draw labels for the tick marks
                         LLFontGL::sMonospace->renderUTF8(tick_label, 0, left, bottom,
                                 LLColor4(1.f, 1.f, 1.f, 0.5f),
diff --git a/linden/indra/newview/llframestatview.h b/linden/indra/newview/llframestatview.h
index 35d63b1..465b238 100644
--- a/linden/indra/newview/llframestatview.h
+++ b/linden/indra/newview/llframestatview.h
@@ -64,7 +64,7 @@ public:
 private:
         LLStat *mStats[MAX_STATS];
         LLColor4 mColors[MAX_STATS];
-        const char *mLabels[MAX_STATS];
+        const char *mLabels[MAX_STATS];         /* Flawfinder: ignore */
         S32 mNumStats;
 };
 
diff --git a/linden/indra/newview/llgenepool.cpp b/linden/indra/newview/llgenepool.cpp
index 33cb70d..2a2c864 100644
--- a/linden/indra/newview/llgenepool.cpp
+++ b/linden/indra/newview/llgenepool.cpp
@@ -56,10 +56,10 @@ LLGenePool::~LLGenePool()
 
 BOOL LLGenePool::load()
 {
-        char filename[MAX_PATH]; 
-                
-        strcpy(filename,gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"genepool.xml").c_str());
+        char filename[MAX_PATH]; /*Flawfinder: ignore*/
 
+        strncpy(filename,gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"genepool.xml").c_str(), sizeof(filename) -1);                /*Flawfinder: ignore*/  
+        filename[sizeof(filename) -1] = '\0';
         if( mLoaded )
         {
                 return TRUE;
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index 8f906d9..76a2ca7 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -875,7 +875,13 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs,
                 S32 size = file.getSize();
 
                 char* buffer = new char[size+1];
-                file.read((U8*)buffer, size);
+                if (buffer == NULL)
+                {
+                        llerrs << "Memory Allocation Failed" << llendl;
+                        return;
+                }
+
+                file.read((U8*)buffer, size);           /* Flawfinder: ignore */
                 // ensure there's a trailing NULL so strlen will work.
                 buffer[size] = '\0';
 
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index d3c7598..0baf1f3 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -91,6 +91,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
         if (target_is_object)
         {
                 gUICtrlFactory->buildFloater(this,"floater_pay_object.xml");
+                mObjectSelection = gSelectMgr->getEditSelection();
         }
         else 
         {
@@ -166,13 +167,16 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
         childSetAction("cancel btn",&LLFloaterPay::onCancel,this);
 
         center();
-        open();
+        open();         /*Flawfinder: ignore*/
 }
 
 // Destroys the object
 LLFloaterPay::~LLFloaterPay()
 {
         std::for_each(mCallbackData.begin(), mCallbackData.end(), DeletePointer());
+
+        // Clean up if we are still waiting for a name.
+        gCacheName->cancelCallback(mTargetUUID,onCacheOwnerName,this);
 }
 
 // static
@@ -314,11 +318,16 @@ void LLFloaterPay::payViaObject(money_callback callback, const LLUUID& object_id
         LLViewerObject* object = gObjectList.findObject(object_id);
         if (!object) return;
         
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
-        if (!node) return;
-        
         LLFloaterPay *floater = new LLFloaterPay("Give Money", callback, object_id, TRUE);
         if (!floater) return;
+
+        LLSelectNode* node = floater->mObjectSelection->getFirstRootNode();
+        if (!node) 
+        {
+                //FIXME: notify user object no longer exists
+                floater->close();
+                return;
+        }
         
         LLHost target_region = object->getRegion()->getHost();
         
@@ -361,7 +370,7 @@ void LLFloaterPay::payDirectly(money_callback callback,
 void LLFloaterPay::finishPayUI(const LLUUID& target_id, BOOL is_group)
 {
         gCacheName->get(target_id, is_group, onCacheOwnerName, (void*)this);
-        
+
         // Make sure the amount field has focus
 
         childSetFocus("amount", TRUE);
@@ -402,10 +411,6 @@ void LLFloaterPay::onCancel(void* data)
         LLFloaterPay* self = reinterpret_cast<LLFloaterPay*>(data);
         if(self)
         {
-                if (self->mTargetIsObject)
-                {
-                        gSelectMgr->deselectAll();
-                }
                 self->close();
         }
 }
@@ -460,7 +465,7 @@ void LLFloaterPay::give(S32 amount)
                                 if (region)
                                 {
                                         // Find the name of the root object
-                                        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                                        LLSelectNode* node = mObjectSelection->getFirstRootNode();
                                         LLString object_name;
                                         if (node)
                                         {
@@ -469,7 +474,7 @@ void LLFloaterPay::give(S32 amount)
                                         S32 tx_type = TRANS_PAY_OBJECT;
                                         if(dest_object->isAvatar()) tx_type = TRANS_GIFT;
                                         mCallback(mTargetUUID, region, amount, FALSE, tx_type, object_name);
-                                        gSelectMgr->deselectAll();
+                                        mObjectSelection = NULL;
                                 }
                         }
                 }
diff --git a/linden/indra/newview/llgivemoney.h b/linden/indra/newview/llgivemoney.h
index 0edb735..cff4fb7 100644
--- a/linden/indra/newview/llgivemoney.h
+++ b/linden/indra/newview/llgivemoney.h
@@ -40,6 +40,7 @@ class LLViewerRegion;
 class LLLineEditor;
 class LLTextBox;
 class LLButton;
+class LLObjectSelection;
 struct LLGiveMoneyInfo;
 
 typedef void (*money_callback)(const LLUUID&, LLViewerRegion*,S32,BOOL,S32,const LLString&);
@@ -85,10 +86,13 @@ protected:
         LLUUID mTargetUUID;
         BOOL mTargetIsObject;
         BOOL mTargetIsGroup;
+        BOOL mHaveName;
 
         LLButton* mQuickPayButton[MAX_PAY_BUTTONS];
         LLGiveMoneyInfo* mQuickPayInfo[MAX_PAY_BUTTONS];
 
+        LLHandle<LLObjectSelection> mObjectSelection;
+
         static S32 sLastAmount;
 };
 
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index cc4ec9d..decbdd9 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -181,15 +181,17 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
         F32 select_dist_squared = gSavedSettings.getF32("MaxSelectDistance");
         select_dist_squared = select_dist_squared * select_dist_squared;
 
-        x = llround((F32)x * LLUI::sGLScaleFactor.mV[VX]);
-        y = llround((F32)y * LLUI::sGLScaleFactor.mV[VY]);
-
         BOOL deselect = (mask == MASK_CONTROL);
         S32 left =      llmin(x, mDragStartX);
         S32 right =     llmax(x, mDragStartX);
         S32 top =       llmax(y, mDragStartY);
         S32 bottom =llmin(y, mDragStartY);
 
+        left = llround((F32) left * LLUI::sGLScaleFactor.mV[VX]);
+        right = llround((F32) right * LLUI::sGLScaleFactor.mV[VX]);
+        top = llround((F32) top * LLUI::sGLScaleFactor.mV[VY]);
+        bottom = llround((F32) bottom * LLUI::sGLScaleFactor.mV[VY]);
+
         F32 old_far_plane = gCamera->getFar();
         F32 old_near_plane = gCamera->getNear();
 
@@ -245,9 +247,11 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
 
         if (shrink_selection)
         {
-                for (LLViewerObject* vobjp = gSelectMgr->getFirstHighlightedObject();
+                LLObjectSelectionHandle highlighted_objects = gSelectMgr->getHighlightedObjects();
+
+                for (LLViewerObject* vobjp = highlighted_objects->getFirstObject();
                         vobjp;
-                        vobjp = gSelectMgr->getNextHighlightedObject())
+                        vobjp = highlighted_objects->getNextObject())
                         {
                                 LLDrawable* drawable = vobjp->mDrawable;
                                 if (!drawable || vobjp->getPCode() != LL_PCODE_VOLUME || vobjp->isAttachment())
@@ -255,7 +259,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                                         continue;
                                 }
 
-                                S32 result = gCamera->sphereInFrustum(drawable->getWorldPosition(), drawable->getRadius());
+                                S32 result = gCamera->sphereInFrustum(drawable->getPositionAgent(), drawable->getRadius());
                                 switch (result)
                                 {
                                 case 0:
@@ -278,11 +282,16 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
         {
                 std::vector<LLDrawable*> potentials;
                 
-                if (gPipeline.mObjectPartition) 
+                
+                for (U32 i = 0; i < LLPipeline::NUM_PARTITIONS-1; i++)
                 {
-                        gPipeline.mObjectPartition->cull(*gCamera, &potentials, TRUE);
+                        LLSpatialPartition* part = gPipeline.getSpatialPartition(i);
+                        if (part)
+                        {
+                                part->cull(*gCamera, &potentials, TRUE);
+                        }
                 }
-
+                
                 for (std::vector<LLDrawable*>::iterator iter = potentials.begin();
                          iter != potentials.end(); iter++)
                 {
@@ -302,7 +311,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                                 continue;
                         }
 
-                        S32 result = gCamera->sphereInFrustum(drawable->getWorldPosition(), drawable->getRadius());
+                        S32 result = gCamera->sphereInFrustum(drawable->getPositionAgent(), drawable->getRadius());
                         if (result)
                         {
                                 switch (result)
@@ -956,119 +965,6 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV
         glEnd();
 }
 
-
-const S32 CLIENT_RECT_VPAD = 4;
-void LLPreviewTexture::draw()
-{
-        if( getVisible() )
-        {
-                updateAspectRatio();
-
-                LLPreview::draw();
-
-                if (!mMinimized)
-                {
-                        LLGLSUIDefault gls_ui;
-                        LLGLSNoTexture gls_notex;
-                        
-                        const LLRect& border = mClientRect;
-                        LLRect interior = mClientRect;
-                        interior.stretch( -PREVIEW_BORDER_WIDTH );
-
-                        // ...border
-                        gl_rect_2d( border, LLColor4(0.f, 0.f, 0.f, 1.f));
-                        gl_rect_2d_checkerboard( interior );
-
-                        if ( mImage.notNull() )
-                        {
-                                LLGLSTexture gls_no_texture;
-                                // Draw the texture
-                                glColor3f( 1.f, 1.f, 1.f );
-                                gl_draw_scaled_image(interior.mLeft,
-                                                                        interior.mBottom,
-                                                                        interior.getWidth(),
-                                                                        interior.getHeight(),
-                                                                        mImage);
-
-                                // Pump the texture priority
-                                F32 pixel_area = mLoadingFullImage ? (F32)MAX_IMAGE_AREA  : (F32)(interior.getWidth() * interior.getHeight() );
-                                mImage->addTextureStats( pixel_area );
-
-                                // Don't bother decoding more than we can display, unless
-                                // we're loading the full image.
-                                if (!mLoadingFullImage)
-                                {
-                                        S32 int_width = interior.getWidth();
-                                        S32 int_height = interior.getHeight();
-                                        mImage->setKnownDrawSize(int_width, int_height);
-                                }
-                                else
-                                {
-                                        // Don't use this feature
-                                        mImage->setKnownDrawSize(0, 0);
-                                }
-
-                                if( mLoadingFullImage )
-                                {
-                                        LLFontGL::sSansSerif->renderUTF8("Receiving:", 0,
-                                                interior.mLeft + 4, 
-                                                interior.mBottom + 4,
-                                                LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
-                                                LLFontGL::DROP_SHADOW);
-                                        
-                                        F32 data_progress = 0.0f;
-                                        F32 decode_progress = mImage->getDecodeProgress(&data_progress);
-                                        
-                                        // Draw the progress bar.
-                                        const S32 BAR_HEIGHT = 12;
-                                        const S32 BAR_LEFT_PAD = 80;
-                                        S32 left = interior.mLeft + 4 + BAR_LEFT_PAD;
-                                        S32 bar_width = mRect.getWidth() - left - RESIZE_HANDLE_WIDTH - 2;
-                                        S32 top = interior.mBottom + 4 + BAR_HEIGHT;
-                                        S32 right = left + bar_width;
-                                        S32 bottom = top - BAR_HEIGHT;
-
-                                        LLColor4 background_color(0.f, 0.f, 0.f, 0.75f);
-                                        LLColor4 decoded_color(0.f, 1.f, 0.f, 1.0f);
-                                        LLColor4 downloaded_color(0.f, 0.5f, 0.f, 1.0f);
-
-                                        gl_rect_2d(left, top, right, bottom, background_color);
-
-                                        if (data_progress > 0.0f)
-                                        {
-                                                // Decoded bytes
-                                                right = left + llfloor(decode_progress * (F32)bar_width);
-
-                                                if (left < right)
-                                                {
-                                                        gl_rect_2d(left, top, right, bottom, decoded_color);
-                                                }
-
-                                                // Downloaded bytes
-                                                left = right;
-                                                right = left + llfloor((data_progress - decode_progress) * (F32)bar_width);
-
-                                                if (left < right)
-                                                {
-                                                        gl_rect_2d(left, top, right, bottom, downloaded_color);
-                                                }
-                                        }
-                                }
-                                else
-                                if( !mSavedFileTimer.hasExpired() )
-                                {
-                                        LLFontGL::sSansSerif->renderUTF8("File Saved", 0,
-                                                interior.mLeft + 4,
-                                                interior.mBottom + 4,
-                                                LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
-                                                LLFontGL::DROP_SHADOW);
-                                }
-                        }
-                }
-        }
-}
-
-
 void draw_line_cube(F32 width, const LLVector3& center)
 {
         width = 0.5f * width;
diff --git a/linden/indra/newview/llgroupmgr.cpp b/linden/indra/newview/llgroupmgr.cpp
index 35e1b95..d020236 100644
--- a/linden/indra/newview/llgroupmgr.cpp
+++ b/linden/indra/newview/llgroupmgr.cpp
@@ -820,8 +820,8 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
         if (group_datap->mMemberCount > 0)
         {
                 S32 contribution = 0;
-                char online_status[DB_DATETIME_BUF_SIZE];
-                char title[DB_GROUP_TITLE_BUF_SIZE];
+                char online_status[DB_DATETIME_BUF_SIZE];               /* Flawfinder: ignore */
+                char title[DB_GROUP_TITLE_BUF_SIZE];            /* Flawfinder: ignore */
                 U64 agent_powers = 0;
                 BOOL is_owner = FALSE;
 
@@ -862,7 +862,7 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
                 }
         }
 
-        if (group_datap->mMembers.size() ==  group_datap->mMemberCount)
+        if (group_datap->mMembers.size() ==  (U32)group_datap->mMemberCount)
         {
                 group_datap->mMemberDataComplete = TRUE;
                 group_datap->mMemberRequestID.setNull();
@@ -892,13 +892,13 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
         }
 
         LLUUID group_id;
-        char    name[DB_GROUP_NAME_BUF_SIZE];
-        char    charter[DB_GROUP_CHARTER_BUF_SIZE];
+        char    name[DB_GROUP_NAME_BUF_SIZE];           /* Flawfinder: ignore */
+        char    charter[DB_GROUP_CHARTER_BUF_SIZE];             /* Flawfinder: ignore */
         BOOL    show_in_list = FALSE;
         LLUUID  founder_id;
         U64             powers_mask = GP_NO_POWERS;
         S32             money = 0;
-        char    member_title[DB_GROUP_TITLE_BUF_SIZE];
+        char    member_title[DB_GROUP_TITLE_BUF_SIZE];          /* Flawfinder: ignore */
         LLUUID  insignia_id;
         LLUUID  owner_role;
         U32             membership_fee = 0;
@@ -974,9 +974,9 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
 
         msg->getS32(_PREHASH_GroupData, "RoleCount", group_data->mRoleCount );
 
-        char    name[DB_GROUP_NAME_BUF_SIZE];
-        char    title[DB_GROUP_TITLE_BUF_SIZE];
-        char    desc[DB_GROUP_CHARTER_BUF_SIZE];
+        char    name[DB_GROUP_NAME_BUF_SIZE];           /* Flawfinder: ignore */
+        char    title[DB_GROUP_TITLE_BUF_SIZE];         /* Flawfinder: ignore */
+        char    desc[DB_GROUP_CHARTER_BUF_SIZE];                /* Flawfinder: ignore */
         U64             powers = 0;
         U32             member_count = 0;
         LLUUID role_id;
@@ -998,7 +998,7 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
                 group_data->mRoles[role_id] = rd;
         }
 
-        if (group_data->mRoles.size() == group_data->mRoleCount)
+        if (group_data->mRoles.size() == (U32)group_data->mRoleCount)
         {
                 group_data->mRoleDataComplete = TRUE;
                 group_data->mRoleDataRequestID.setNull();
@@ -1152,7 +1152,7 @@ void LLGroupMgr::processGroupTitlesReply(LLMessageSystem* msg, void** data)
                 return;
         }
 
-        char title_buf[DB_GROUP_TITLE_BUF_SIZE];
+        char title_buf[DB_GROUP_TITLE_BUF_SIZE];                /* Flawfinder: ignore */
 
         LLGroupTitle title;
 
@@ -1241,7 +1241,7 @@ void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data)
 {
         LLUUID group_id;
         BOOL success;
-        char message[MAX_STRING];
+        char message[MAX_STRING];               /* Flawfinder: ignore */
 
         msg->getUUIDFast(_PREHASH_ReplyData, _PREHASH_GroupID, group_id );
 
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 5d839f2..d6e5785 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -80,7 +80,7 @@ LLGroupNotifyBox* LLGroupNotifyBox::show(const char* subject,
         LLGroupData group_data;
         if (!gAgent.getGroupData(group_id,group_data))
         {
-                llwarns << "Group notice for unkown group : " << group_id.getString() << llendl;
+                llwarns << "Group notice for unkown group: " << group_id << llendl;
                 return NULL;
         }
 
@@ -129,7 +129,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
 
         time_t timestamp = (time_t)t;
 
-        char time_buf[30];
+        char time_buf[30];              /*Flawfinder: ignore*/  
         g_formatted_time(timestamp, time_buf);
 
         setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
@@ -401,7 +401,8 @@ void LLGroupNotifyBox::close()
                 inventory_offer_callback( 1 , mInventoryOffer); 
         }
         gNotifyBoxView->removeChild(this);
-        delete this;
+
+        die();
 }
 
 
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 9c403f4..30ee2b0 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -144,7 +144,7 @@ void LLHoverView::updateHover(LLTool* current_tool)
                         else if (mStartHoverTimer.getElapsedTimeF32() > DELAY_BEFORE_SHOW_TIP)
                         {
                                 gViewerWindow->hitObjectOrLandGlobalAsync(gViewerWindow->getCurrentMouseX(),
-                                                                                                         gViewerWindow->getCurrentMouseY(), 0, pickCallback, TRUE );
+                                                                                                         gViewerWindow->getCurrentMouseY(), 0, pickCallback );
                         }
                 }
                 else
@@ -214,9 +214,9 @@ void LLHoverView::resetLastHoverObject()
 
 void LLHoverView::updateText()
 {
-        char first_name[DB_FIRST_NAME_BUF_SIZE];
-        char last_name[DB_LAST_NAME_BUF_SIZE];
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        char first_name[DB_FIRST_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
+        char last_name[DB_LAST_NAME_BUF_SIZE];          /*Flawfinder: ignore*/
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
 
         LLViewerObject* hit_object = getLastHoverObject();
 
@@ -274,12 +274,10 @@ void LLHoverView::updateText()
                         //
                         BOOL suppressObjectHoverDisplay = !gSavedSettings.getBOOL("ShowAllObjectHoverTip");                     
                         
-
-                        LLSelectNodeList &nodes = gSelectMgr->getHoverObjects();
-                        LLSelectNode *nodep = nodes.getFirstRootNode();
+                        LLSelectNode *nodep = gSelectMgr->getHoverNode();;
                         if (nodep)
                         {
-                                char cstring[256];
+                                char cstring[256];              /*Flawfinder: ignore*/
                                 LLString *temp_str = NULL;
 
                                 temp_str = new LLString();
@@ -426,7 +424,7 @@ void LLHoverView::updateText()
                                         {
                                                 temp_str = new LLString();
                                                 temp_str->append("For Sale: ");
-                                                sprintf(cstring, "L$%d", nodep->mSaleInfo.getSalePrice());
+                                                snprintf(cstring, sizeof(cstring), "L$%d", nodep->mSaleInfo.getSalePrice());            /*Flawfinder: ignore*/
                                                 temp_str->append(cstring);
                                                 mText.addDataAtEnd(temp_str);
                                                 suppressObjectHoverDisplay = FALSE;             //  Show tip
@@ -616,8 +614,8 @@ void LLHoverView::updateText()
                 */
                 if (hover_parcel && hover_parcel->getParcelFlag(PF_FOR_SALE))
                 {
-                        char buffer[MAX_STRING];
-                        sprintf(buffer, "For Sale: L$%d", hover_parcel->getSalePrice() );
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                        snprintf(buffer, sizeof(buffer), "For Sale: L$%d", hover_parcel->getSalePrice() );              /*Flawfinder: ignore*/
 
                         line = new LLString(buffer);
                         mText.addDataAtEnd(line);
diff --git a/linden/indra/newview/llhoverview.h b/linden/indra/newview/llhoverview.h
index 1fd1a2e..e7fdd6a 100644
--- a/linden/indra/newview/llhoverview.h
+++ b/linden/indra/newview/llhoverview.h
@@ -40,7 +40,6 @@
 #include "lldarray.h"
 #include "llhudconnector.h"
 
-class LLSelectNodeList;
 class LLTool;
 
 //
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index ac7f22f..cf76357 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -175,7 +175,7 @@ void LLHUDEffectSpiral::triggerLocal()
         mKillTime = mTimer.getElapsedTimeF32() + mDuration;
 
         BOOL show_beam = gSavedSettings.getBOOL("ShowSelectionBeam");
-        
+
         LLColor4 color;
         color.setVec(mColor);
 
@@ -269,20 +269,12 @@ void LLHUDEffectSpiral::setTargetObject(LLViewerObject *objp)
 
 void LLHUDEffectSpiral::render()
 {
-        if (!mSourceObject.isNull() && mSourceObject->isDead())
-        {
-                markDead();
-                return;
-        }
-
-        if(!mTargetObject.isNull() && mTargetObject->isDead())
-        {
-                markDead();
-                return;
-        }
-
         F32 time = mTimer.getElapsedTimeF32();
-        if (mKillTime < time)
+
+        if (!mSourceObject.isNull() && mSourceObject->isDead() ||
+                !mTargetObject.isNull() && mTargetObject->isDead() ||
+                mKillTime < time ||
+                !gSavedSettings.getBOOL("ShowSelectionBeam"))
         {
                 markDead();
                 return;
diff --git a/linden/indra/newview/llhudicon.cpp b/linden/indra/newview/llhudicon.cpp
index 169a12b..d0d2ea5 100644
--- a/linden/indra/newview/llhudicon.cpp
+++ b/linden/indra/newview/llhudicon.cpp
@@ -34,6 +34,7 @@
 #include "llviewerobject.h"
 #include "lldrawable.h"
 #include "llviewercamera.h"
+#include "llviewerimage.h"
 #include "llviewerwindow.h"
 
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llhudobject.cpp b/linden/indra/newview/llhudobject.cpp
index eece86f..4aef468 100644
--- a/linden/indra/newview/llhudobject.cpp
+++ b/linden/indra/newview/llhudobject.cpp
@@ -167,7 +167,7 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type)
                 ((LLHUDEffectSpiral *)hud_objectp)->setColor(LLColor4U(255, 255, 255, 255));
                 break;
         case LL_HUD_EFFECT_GLOW:
-                llerrs << "Glow not implemented!" << llendl;
+                // deprecated
                 break;
         case LL_HUD_EFFECT_POINT:
                 hud_objectp = new LLHUDEffectSpiral(type);
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 317283c..088d601 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -263,7 +263,7 @@ BOOL LLFloaterIMPanel::addParticipants(const LLDynamicArray<LLUUID>& ids)
                         U8* pos = bucket;
                         for(S32 i = 0; i < count; ++i)
                         {
-                                memcpy(pos, &(ids.get(i)), UUID_BYTES);
+                                memcpy(pos, &(ids.get(i)), UUID_BYTES);         /* Flawfinder: ignore */
                                 pos += UUID_BYTES;
                         }
                         msg->addBinaryDataFast(_PREHASH_BinaryBucket, bucket, bucket_size);
@@ -611,7 +611,7 @@ void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller, void* userda
         }
 }
 
-void LLFloaterIMPanel::close(bool app_quitting)
+void LLFloaterIMPanel::onClose(bool app_quitting)
 {
         setTyping(FALSE);
 
@@ -685,8 +685,9 @@ void LLFloaterIMPanel::sendMsg()
                         gAgent.buildFullname(history_echo);
 
                         // Look for IRC-style emotes here.
-                        char tmpstr[5];
-                        strcpy(tmpstr,utf8_text.substr(0,4).c_str());
+                        char tmpstr[5];         /* Flawfinder: ignore */
+                        strncpy(tmpstr,utf8_text.substr(0,4).c_str(), sizeof(tmpstr) -1);               /* Flawfinder: ignore */
+                        tmpstr[sizeof(tmpstr) -1] = '\0';
                         if (!strncmp(tmpstr, "/me ", 4) || !strncmp(tmpstr, "/me'", 4))
                         {
                                 utf8_text.replace(0,3,"");
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 08a35cd..877fd88 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -56,7 +56,7 @@ public:
         // Check typing timeout timer.
         /*virtual*/ void draw();
 
-        /*virtual*/ void close(bool app_quitting = FALSE);
+        /*virtual*/ void onClose(bool app_quitting = FALSE);
 
         // add target ids to the session. 
         // Return TRUE if successful, otherwise FALSE.
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index e2d33fd..a4fd729 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -558,7 +558,7 @@ void LLIMView::setFloaterOpen(BOOL set_open)
         //RN "visible" and "open" are considered synonomous for now
         if (set_open)
         {
-                mTalkFloater->open();
+                mTalkFloater->open();           /*Flawfinder: ignore*/
         }
         else
         {
@@ -701,8 +701,8 @@ void LLIMView::noteOfflineUsers(LLFloaterIMPanel* floater,
                 for(S32 i = 0; i < count; ++i)
                 {
                         info = at.getBuddyInfo(ids.get(i));
-                        char first[DB_FIRST_NAME_BUF_SIZE];
-                        char last[DB_LAST_NAME_BUF_SIZE];
+                        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+                        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
                         if(info && !info->isOnline()
                            && gCacheName->getName(ids.get(i), first, last))
                         {
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 00b052f..9a0c462 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -97,7 +97,7 @@ public:
         // IM received that you haven't seen yet
         BOOL getIMReceived() const;
 
-        void            setFloaterOpen(BOOL open);
+        void            setFloaterOpen(BOOL open);              /*Flawfinder: ignore*/
         BOOL            getFloaterOpen();
 
         LLFloaterIM * getFloater() { return mTalkFloater; }
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index a10ccdf..756ba63 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -110,7 +110,7 @@ bool doToSelected(LLFolderView* folder, LLString action)
         LLMultiPreview* multi_previewp = NULL;
         LLMultiProperties* multi_propertiesp = NULL;
 
-        if ("open" == action && selected_items.size() > 1)
+        if (("task_open" == action  || "open" == action) && selected_items.size() > 1)
         {
                 S32 left, top;
                 gFloaterView->getNewFloaterPosition(&left, &top);
@@ -121,7 +121,7 @@ bool doToSelected(LLFolderView* folder, LLString action)
                 LLFloater::setFloaterHost(multi_previewp);
         
         }
-        else if ("properties" == action && selected_items.size() > 1)
+        else if (("task_properties" == action || "properties" == action) && selected_items.size() > 1)
         {
                 S32 left, top;
                 gFloaterView->getNewFloaterPosition(&left, &top);
@@ -145,13 +145,13 @@ bool doToSelected(LLFolderView* folder, LLString action)
         }
 
         LLFloater::setFloaterHost(NULL);
-        if ("open" == action && selected_items.size() > 1)
+        if (multi_previewp)
         {
                 multi_previewp->open();
         }
-        else if ("properties" == action && selected_items.size() > 1)
+        else if (multi_propertiesp)
         {
-                multi_propertiesp->open();
+                multi_propertiesp->open();              /*Flawfinder: ignore*/
         }
 
         return true;
@@ -209,7 +209,7 @@ class LLNewWindow : public inventory_listener_t
                                                                                                 mPtr->getActivePanel()->getModel());
                 iv->getActivePanel()->setFilterTypes(mPtr->getActivePanel()->getFilterTypes());
                 iv->getActivePanel()->setFilterSubString(mPtr->getActivePanel()->getFilterSubString());
-                iv->open();
+                iv->open();             /*Flawfinder: ignore*/
 
                 // force onscreen
                 gFloaterView->adjustToFitScreen(iv, FALSE);
@@ -283,6 +283,29 @@ class LLEmptyTrash : public inventory_panel_listener_t
         }
 };
 
+class LLEmptyLostAndFound : public inventory_panel_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLInventoryModel* model = mPtr->getModel();
+                if(!model) return false;
+                gViewerWindow->alertXml("ConfirmEmptyLostAndFound", callback_empty_lost_and_found, this);
+                return true;
+        }
+
+        static void callback_empty_lost_and_found(S32 option, void* userdata)
+        {
+                LLEmptyLostAndFound* empty_lost_and_found = (LLEmptyLostAndFound*)userdata;
+                if (option == 0) // YES
+                {
+                        LLInventoryModel* model = empty_lost_and_found->mPtr->getModel();
+                        LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
+                        model->purgeDescendentsOf(lost_and_found_id);
+                        model->notifyObservers();
+                }
+        }
+};
+
 class LLEmptyTrashFloater : public inventory_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -635,6 +658,7 @@ void init_inventory_panel_actions(LLInventoryPanel *panel)
         (new LLAttachObject())->registerListener(panel, "Inventory.AttachObject");
         (new LLCloseAllFolders())->registerListener(panel, "Inventory.CloseAllFolders");
         (new LLEmptyTrash())->registerListener(panel, "Inventory.EmptyTrash");
+        (new LLEmptyLostAndFound())->registerListener(panel, "Inventory.EmptyLostAndFound");
         (new LLDoCreate())->registerListener(panel, "Inventory.DoCreate");
         (new LLBeginIMSession())->registerListener(panel, "Inventory.BeginIMSession");
 }
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index a7628d7..baf6638 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -346,6 +346,14 @@ void hideContextEntries(LLMenuGL& menu,
         for (itor = list->begin(); itor != list->end(); ++itor)
         {
                 LLString name = (*itor)->getName();
+
+                // descend into split menus:
+                if ((name == "More") && (WIDGET_TYPE_MENU_ITEM_BRANCH == (*itor)->getWidgetType()))
+                {
+                        hideContextEntries(*((LLMenuItemBranchGL *)(*itor))->getBranch(), entries_to_show, disabled_entries);
+                }
+                
+                
                 bool found = false;
                 std::vector<LLString>::const_iterator itor2;
                 for (itor2 = entries_to_show.begin(); itor2 != entries_to_show.end(); ++itor2)
@@ -709,7 +717,7 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
                 LLInventoryItem* item = model->getItem(mUUID);
                 if(!item) return;
                 LLUUID asset_id = item->getAssetUUID();
-                char buffer[UUID_STR_LENGTH];
+                char buffer[UUID_STR_LENGTH];           /*Flawfinder: ignore*/
                 asset_id.toString(buffer);
 
                 gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
@@ -828,8 +836,8 @@ LLString LLItemBridge::getLabelSuffix() const
                         const char* sxfer;
                         if(xfer) sxfer = EMPTY;
                         else sxfer = NO_XFER;
-                        char buffer[MAX_STRING];
-                        snprintf(
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                        snprintf(                                       /*Flawfinder: ignore*/
                                 buffer,
                                 MAX_STRING,
                                 "%s%s%s",
@@ -1777,6 +1785,14 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
         LLInventoryModel* model = mInventoryPanel->getModel();
         if(!model) return;
         LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
+        LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
+
+        if (lost_and_found_id == mUUID)
+          {
+                // This is the lost+found folder.
+                mItems.push_back("Empty Lost And Found");
+          }
+
         if(trash_id == mUUID)
         {
                 // This is the trash.
@@ -2177,6 +2193,8 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
                 case LLAssetType::AT_CATEGORY:
                         is_movable = ( LLAssetType::AT_NONE == ((LLInventoryCategory*)inv_item)->getPreferredType() );
                         break;
+                default:
+                        break;
                 }
 
                 LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -2193,6 +2211,8 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
                         case LLAssetType::AT_OBJECT:
                                 is_movable = !avatar->isWearingAttachment(inv_item->getUUID());
                                 break;
+                        default:
+                                break;
                         }
                 }
  
@@ -2762,6 +2782,8 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop,
                                 }
                                 break;
                         }
+                default:
+                        break;
                 }
         }
         return rv;
@@ -3190,7 +3212,7 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
         rez_action->mItemID = item->getUUID();
         rez_action->mAttachPt = gAgent.getAvatarObject()->mAttachmentPoints.reverseLookup(attachment);
 
-        if (attachment && attachment->getObject(0))
+        if (attachment && attachment->getObject())
         {
                 gViewerWindow->alertXml("ReplaceAttachment", confirm_replace_attachment_rez, (void*)rez_action);
         }
@@ -3336,7 +3358,7 @@ BOOL LLObjectBridge::renameItem(const LLString& new_name)
                         {
                                 gSelectMgr->deselectAll();
                                 gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
-                                gSelectMgr->setObjectName( new_name );
+                                gSelectMgr->selectionSetObjectName( new_name );
                                 gSelectMgr->deselectAll();
                         }
                 }
@@ -3410,8 +3432,8 @@ struct LLFoundData
                                 LLAssetType::EType asset_type) :
                 mItemID(item_id),
                 mAssetID(asset_id),
-                mAssetType(asset_type),
                 mName(name),
+                mAssetType(asset_type),
                 mWearable( NULL ) {}
         
         LLUUID mItemID;
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 7864aa8..e35f71b 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -47,6 +47,7 @@
 #include "llmutelist.h"
 #include "llnotify.h"
 #include "llcallbacklist.h"
+#include "llpreview.h"
 #include <deque>
 
 //#define DIFF_INVENTORY_FILES
@@ -1150,11 +1151,11 @@ void LLInventoryModel::cache(
                 items,
                 INCLUDE_TRASH,
                 can_cache);
-        char agent_id_str[UUID_STR_LENGTH];
-        char inventory_filename[LL_MAX_PATH];
+        char agent_id_str[UUID_STR_LENGTH];             /*Flawfinder: ignore*/
+        char inventory_filename[LL_MAX_PATH];           /*Flawfinder: ignore*/
         agent_id.toString(agent_id_str);
         std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, agent_id_str));
-        snprintf(
+        snprintf(               /*Flawfinder: ignore*/
                 inventory_filename,
                 LL_MAX_PATH,
                 CACHE_FORMAT_STRING,
@@ -1439,11 +1440,11 @@ bool LLInventoryModel::loadSkeleton(
         {
                 cat_array_t categories;
                 item_array_t items;
-                char owner_id_str[UUID_STR_LENGTH];
+                char owner_id_str[UUID_STR_LENGTH];             /*Flawfinder: ignore*/
                 owner_id.toString(owner_id_str);
                 std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, owner_id_str));
-                char inventory_filename[LL_MAX_PATH];
-                snprintf(
+                char inventory_filename[LL_MAX_PATH];           /*Flawfinder: ignore*/
+                snprintf(               /*Flawfinder: ignore*/
                         inventory_filename,
                         LL_MAX_PATH,
                         CACHE_FORMAT_STRING,
@@ -1451,7 +1452,7 @@ bool LLInventoryModel::loadSkeleton(
                 const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN;
                 std::string gzip_filename(inventory_filename);
                 gzip_filename.append(".gz");
-                FILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb");
+                FILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb");          /*Flawfinder: ignore*/
                 bool remove_inventory_file = false;
                 if(fp)
                 {
@@ -1959,19 +1960,24 @@ bool LLInventoryModel::loadFromFile(
         LLInventoryModel::cat_array_t& categories,
         LLInventoryModel::item_array_t& items)
 {
+        if(!filename)
+        {
+                llerrs << "Filename is Null!" << llendl;
+                return false;
+        }
         llinfos << "LLInventoryModel::loadFromFile(" << filename << ")" << llendl;
-        FILE* file = LLFile::fopen(filename, "rb");
+        FILE* file = LLFile::fopen(filename, "rb");             /*Flawfinder: ignore*/
         if(!file)
         {
                 llinfos << "unable to load inventory from: " << filename << llendl;
                 return false;
         }
         // *NOTE: This buffer size is hard coded into scanf() below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
+        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+        char keyword[MAX_STRING];               /*Flawfinder: ignore*/
         while(!feof(file) && fgets(buffer, MAX_STRING, file)) 
         {
-                sscanf(buffer, " %254s", keyword);
+                sscanf(buffer, " %254s", keyword);      /* Flawfinder: ignore */
                 if(0 == strcmp("inv_category", keyword))
                 {
                         LLPointer<LLViewerInventoryCategory> inv_cat = new LLViewerInventoryCategory(LLUUID::null);
@@ -2027,8 +2033,13 @@ bool LLInventoryModel::saveToFile(
         const cat_array_t& categories,
         const item_array_t& items)
 {
+        if(!filename)
+        {
+                llerrs << "Filename is Null!" << llendl;
+                return false;
+        }
         llinfos << "LLInventoryModel::saveToFile(" << filename << ")" << llendl;
-        FILE* file = LLFile::fopen(filename, "wb");
+        FILE* file = LLFile::fopen(filename, "wb");             /*Flawfinder: ignore*/
         if(!file)
         {
                 llwarns << "unable to save inventory to: " << filename << llendl;
@@ -2304,6 +2315,8 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
         item_array_t items;
         update_map_t update;
         S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
+        bool all_one_folder = true;
+        LLUUID folder_id;
         for(S32 i = 0; i < count; ++i)
         {
                 LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
@@ -2330,6 +2343,14 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
                 {
                         ++update[titem->getParentUUID()];
                 }
+                if (folder_id.isNull())
+                {
+                        folder_id = titem->getParentUUID();
+                }
+                else
+                {
+                        all_one_folder = false;
+                }
         }
         if(account)
         {
@@ -2353,6 +2374,18 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
                 trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
                 if(!gInventory.isObjectDescendentOf(lastitem->getUUID(), trash_id))
                 {
+                        LLMultiPreview* multi_previewp = LLMultiPreview::getAutoOpenInstance(folder_id);
+                        if (!multi_previewp && all_one_folder && count > 1)
+                        {
+                                S32 left, top;
+                                gFloaterView->getNewFloaterPosition(&left, &top);
+
+                                multi_previewp = new LLMultiPreview(LLRect(left, top, left + 300, top - 100));
+                                LLMultiPreview::setAutoOpenInstance(multi_previewp, folder_id);
+                        }
+
+                        LLFloater::setFloaterHost(multi_previewp);
+
                         bool show_keep_discard = lastitem->getPermissions().getCreator() != gAgent.getID();
                         switch(lastitem->getType())
                         {
@@ -2383,6 +2416,13 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
                         default:
                                 break;
                         }
+
+                        LLFloater::setFloaterHost(NULL);
+                        if (multi_previewp)
+                        {
+                                multi_previewp->open();
+                        }
+
                         LLInventoryView* view = LLInventoryView::getActiveInventory();
                         if(view)
                         {
@@ -2814,7 +2854,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
 
         LLUUID item_id;
         LLUUID folder_id;
-        char new_name[MAX_STRING];
+        char new_name[MAX_STRING];              /*Flawfinder: ignore*/
         bool anything_changed = false;
         S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
         for(S32 i = 0; i < count; ++i)
@@ -2837,7 +2877,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
                         gInventory.accountForUpdate(update);
 
                         new_item->setParent(folder_id);
-                        if(strlen(new_name) > 0)
+                        if(strlen(new_name) > 0)                /*Flawfinder: ignore*/
                         {
                                 new_item->rename(new_name);
                         }
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 9eb33ee..afeb3be 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -373,19 +373,15 @@ void LLInventoryViewFinder::selectNoTypes(void* user_data)
 ///----------------------------------------------------------------------------
 /// LLInventoryView
 ///----------------------------------------------------------------------------
-class LLSaveFolderState : public LLFolderViewFunctor
+void LLSaveFolderState::setApply(BOOL apply)
 {
-public:
-        LLSaveFolderState() : mApply(FALSE) {}
-        virtual ~LLSaveFolderState() {}
-        virtual void doFolder(LLFolderViewFolder* folder);
-        virtual void doItem(LLFolderViewItem* item) {}
-        void setApply(BOOL apply) { mApply = apply; }
-        void clearOpenFolders() { mOpenFolders.clear(); }
-protected:
-        std::set<LLUUID> mOpenFolders;
-        BOOL mApply;
-};
+        mApply = apply; 
+        // before generating new list of open folders, clear the old one
+        if(!apply) 
+        {
+                clearOpenFolders(); 
+        }
+}
 
 void LLSaveFolderState::doFolder(LLFolderViewFolder* folder)
 {
@@ -512,17 +508,6 @@ LLInventoryView::~LLInventoryView( void )
 
 void LLInventoryView::draw()
 {
-        if (mActivePanel && mActivePanel->getNeedsAutoSelect())
-        {
-                LLOpenFilteredFolders opener;
-                mActivePanel->getRootFolder()->applyFunctorRecursively(opener);
-                // select first filtered item
-                LLSelectFirstFilteredItem filter;
-                mActivePanel->getRootFolder()->applyFunctorRecursively(filter);
-                mActivePanel->getRootFolder()->scrollToShowSelection();
-                mActivePanel->setNeedsAutoSelect(FALSE);
-        }
-
         if (LLInventoryModel::isEverythingFetched())
         {
                 LLLocale locale(LLLocale::USER_LOCALE);
@@ -590,15 +575,6 @@ void LLSelectFirstFilteredItem::doFolder(LLFolderViewFolder* folder)
         }
 }
 
-class LLOpenFoldersWithSelection : public LLFolderViewFunctor
-{
-public:
-        LLOpenFoldersWithSelection() {}
-        virtual ~LLOpenFoldersWithSelection() {}
-        virtual void doFolder(LLFolderViewFolder* folder);
-        virtual void doItem(LLFolderViewItem* item);
-};
-
 void LLOpenFoldersWithSelection::doItem(LLFolderViewItem *item)
 {
         if (item->getParentFolder() && item->isSelected())
@@ -728,7 +704,7 @@ LLInventoryView* LLInventoryView::showAgentInventory(BOOL take_keyboard_focus)
         {
                 // Make sure it's in front and it makes a noise
                 iv->setTitle("Inventory");
-                iv->open();
+                iv->open();             /*Flawfinder: ignore*/
         }
         //if (take_keyboard_focus)
         //{
@@ -813,7 +789,7 @@ void LLInventoryView::toggleFindOptions()
                                                                                 LLRect(mRect.mLeft - INV_FINDER_WIDTH, mRect.mTop, mRect.mLeft, mRect.mTop - INV_FINDER_HEIGHT),
                                                                                 this);
                 mFinderHandle = finder->getHandle();
-                finder->open();
+                finder->open();         /*Flawfinder: ignore*/
                 addDependentFloater(mFinderHandle);
 
                 // start background fetch of folders
@@ -894,7 +870,6 @@ void LLInventoryView::onSearchEdit(const LLString& search_string, void* user_dat
         // save current folder open state if no filter currently applied
         if (!self->mActivePanel->getRootFolder()->isFilterActive())
         {
-                self->mSavedFolderState->clearOpenFolders();
                 self->mSavedFolderState->setApply(FALSE);
                 self->mActivePanel->getRootFolder()->applyFunctorRecursively(*self->mSavedFolderState);
         }
@@ -1107,8 +1082,7 @@ LLInventoryPanel::LLInventoryPanel(const LLString& name,
         mScroller(NULL),
         mAllowMultiSelect(allow_multi_select),
         mSortOrderSetting(sort_order_setting),
-        mSearchFunction(search),
-        mNeedsAutoSelect(FALSE)
+        mSearchFunction(search)
 {
 }
 
@@ -1258,8 +1232,10 @@ void LLInventoryPanel::modelChanged(U32 mask)
 {
         LLFastTimer t2(LLFastTimer::FTM_REFRESH);
 
+        bool handled = false;
         if(mask & LLInventoryObserver::LABEL)
         {
+                handled = true;
                 // label change - empty out the display name for each object
                 // in this change set.
                 const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
@@ -1282,11 +1258,11 @@ void LLInventoryPanel::modelChanged(U32 mask)
                         }
                 }
         }
-        else if((mask & (LLInventoryObserver::STRUCTURE
+        if((mask & (LLInventoryObserver::STRUCTURE
                                 | LLInventoryObserver::ADD
                                 | LLInventoryObserver::REMOVE)) != 0)
         {
-
+                handled = true;
                 // Record which folders are open by uuid.
                 LLInventoryModel* model = getModel();
                 if (model)
@@ -1347,7 +1323,8 @@ void LLInventoryPanel::modelChanged(U32 mask)
                         }
                 }
         }
-        else
+
+        if (!handled)
         {
                 // it's a small change that only requires a refresh.
                 // *TODO: figure out a more efficient way to do the refresh
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 38c44da..78fa362 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -126,11 +126,6 @@ public:
 
         void unSelectAll()      { mFolders->setSelection(NULL, FALSE, FALSE); }
 
-        BOOL getNeedsAutoSelect() { return mNeedsAutoSelect; }
-        void setNeedsAutoSelect(BOOL val) { mNeedsAutoSelect = val; }
-
-        void setAutoSelectOverride(bool override) { mFolders->setAutoSelectOverride(override); }
-
 protected:
         // Given the id and the parent, build all of the folder views.
         void rebuildViewsFor(const LLUUID& id, U32 mask);
@@ -155,7 +150,6 @@ protected:
         BOOL                                            mAllowMultiSelect;
         const LLString                          mSortOrderSetting;
         LLFolderSearchFunction          mSearchFunction;
-        BOOL                                            mNeedsAutoSelect;
 };
 
 class LLInventoryView;
@@ -292,6 +286,29 @@ public:
         virtual void doItem(LLFolderViewItem* item);
 };
 
+class LLSaveFolderState : public LLFolderViewFunctor
+{
+public:
+        LLSaveFolderState() : mApply(FALSE) {}
+        virtual ~LLSaveFolderState() {}
+        virtual void doFolder(LLFolderViewFolder* folder);
+        virtual void doItem(LLFolderViewItem* item) {}
+        void setApply(BOOL apply);
+        void clearOpenFolders() { mOpenFolders.clear(); }
+protected:
+        std::set<LLUUID> mOpenFolders;
+        BOOL mApply;
+};
+
+class LLOpenFoldersWithSelection : public LLFolderViewFunctor
+{
+public:
+        LLOpenFoldersWithSelection() {}
+        virtual ~LLOpenFoldersWithSelection() {}
+        virtual void doFolder(LLFolderViewFolder* folder);
+        virtual void doItem(LLFolderViewItem* item);
+};
+
 ///----------------------------------------------------------------------------
 /// Function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
diff --git a/linden/indra/newview/lljoystickbutton.h b/linden/indra/newview/lljoystickbutton.h
index 8d1817a..69baa32 100644
--- a/linden/indra/newview/lljoystickbutton.h
+++ b/linden/indra/newview/lljoystickbutton.h
@@ -30,6 +30,7 @@
 
 #include "llbutton.h"
 #include "llcoord.h"
+#include "llviewerimage.h"
 
 typedef enum e_joystick_quadrant
 {
diff --git a/linden/indra/newview/lllandmarklist.cpp b/linden/indra/newview/lllandmarklist.cpp
index a1c658d..f17a73b 100644
--- a/linden/indra/newview/lllandmarklist.cpp
+++ b/linden/indra/newview/lllandmarklist.cpp
@@ -84,7 +84,7 @@ void LLLandmarkList::processGetAssetReply(
                 S32 file_length = file.getSize();
 
                 char* buffer = new char[ file_length + 1 ];
-                file.read( (U8*)buffer, file_length);
+                file.read( (U8*)buffer, file_length);           /*Flawfinder: ignore*/
                 buffer[ file_length ] = 0;
 
                 LLLandmark* landmark = LLLandmark::constructFromString(buffer);
diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp
index f8b100e..6be5ee1 100644
--- a/linden/indra/newview/lllogchat.cpp
+++ b/linden/indra/newview/lllogchat.cpp
@@ -43,7 +43,13 @@ LLString LLLogChat::makeLogFileName(LLString filename)
 //static
 void LLLogChat::saveHistory(LLString filename, LLString line)
 {
-        FILE *fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a"); 
+        if(!filename.size())
+        {
+                llinfos << "Filename is Empty!" << llendl;
+                return;
+        }
+
+        FILE* fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a");            /*Flawfinder: ignore*/
         if (!fp)
         {
                 llinfos << "Couldn't open chat history log!" << llendl;
@@ -58,14 +64,19 @@ void LLLogChat::saveHistory(LLString filename, LLString line)
 
 void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*), void* userdata)
 {
-        FILE *fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r");
+        if(!filename.size())
+        {
+                llerrs << "Filename is Empty!" << llendl;
+        }
+
+        FILE* fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r");             /*Flawfinder: ignore*/
         if (!fptr)
         {
                 return;                 //No previous conversation with this name.
         }
         else
         {
-                char buffer[LOG_RECALL_SIZE];
+                char buffer[LOG_RECALL_SIZE];           /*Flawfinder: ignore*/
                 char *bptr;
                 S32 len;
                 bool firstline=TRUE;
@@ -82,7 +93,7 @@ void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*)
 
                 while ( fgets(buffer, LOG_RECALL_SIZE, fptr)  && !feof(fptr) ) 
                 {
-                        len = strlen(buffer) - 1;
+                        len = strlen(buffer) - 1;               /*Flawfinder: ignore*/
                         for ( bptr = (buffer + len); (*bptr == '\n' || *bptr == '\r') && bptr>buffer; bptr--)   *bptr='\0';
                         
                         if (!firstline)
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 20d77e0..a1ff7c3 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -169,7 +169,7 @@ F32 LLManip::getSubdivisionLevel(const LLVector3 &reference_point, const LLVecto
 {
         //update current snap subdivision level
         LLVector3 cam_to_reference;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 cam_to_reference = LLVector3(1.f / gAgent.getAvatarObject()->mHUDCurZoom, 0.f, 0.f);
         }
@@ -186,12 +186,27 @@ F32 LLManip::getSubdivisionLevel(const LLVector3 &reference_point, const LLVecto
         return subdivisions;
 }
 
+void LLManip::handleSelect()
+{
+        mObjectSelection = gSelectMgr->getEditSelection();
+}
+
+void LLManip::handleDeselect()
+{
+        mObjectSelection = NULL;
+}
+
+LLObjectSelectionHandle LLManip::getSelection()
+{
+        return mObjectSelection;
+}
+
 BOOL LLManip::handleHover(S32 x, S32 y, MASK mask)
 {
         // We only handle the event if mousedown started with us
         if( hasMouseCapture() )
         {
-                if( gSelectMgr->isEmpty() )
+                if( mObjectSelection->isEmpty() )
                 {
                         // Somehow the object got deselected while we were dragging it.
                         // Release the mouse
@@ -236,7 +251,7 @@ BOOL LLManip::getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector
 
 BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal)
 {
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 BOOL result = FALSE;
                 F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * gCamera->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
@@ -271,12 +286,12 @@ BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVect
 // Given the line defined by mouse cursor (a1 + a_param*(a2-a1)) and the line defined by b1 + b_param*(b2-b1),
 // returns a_param and b_param for the points where lines are closest to each other.
 // Returns false if the two lines are parallel.
-BOOL LLManip::nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param ) const
+BOOL LLManip::nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param )
 {
         LLVector3 a1;
         LLVector3 a2;
 
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * gCamera->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
                 F32 mouse_y = (((F32)y / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
@@ -324,11 +339,11 @@ LLVector3 LLManip::getSavedPivotPoint() const
         return gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
 }
 
-LLVector3 LLManip::getPivotPoint() const
+LLVector3 LLManip::getPivotPoint()
 {
-        if (gSelectMgr->getFirstObject() && gSelectMgr->getObjectCount() == 1 && gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+        if (mObjectSelection->getFirstObject() && mObjectSelection->getObjectCount() == 1 && mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
         {
-                return gSelectMgr->getFirstObject()->getPivotPositionAgent();
+                return mObjectSelection->getFirstObject()->getPivotPositionAgent();
         }
         return gSelectMgr->getBBoxOfSelection().getCenterAgent();
 }
@@ -341,10 +356,10 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
         LLVector3 grid_scale;
         gSelectMgr->getGrid(grid_origin, grid_rot, grid_scale);
 
-        LLViewerObject* object = gSelectMgr->getFirstRootObject();
+        LLViewerObject* object = mObjectSelection->getFirstRootObject();
         if (!object)
         {
-                object = gSelectMgr->getFirstObject();
+                object = mObjectSelection->getFirstObject();
                 if (!object)
                 {
                         return;
@@ -404,7 +419,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
 void LLManip::renderXYZ(const LLVector3 &vec) 
 {
         const S32 PAD = 10;
-        char feedback_string[128];
+        char feedback_string[128];              /*Flawfinder: ignore*/
         LLVector3 camera_pos = gCamera->getOrigin() + gCamera->getAtAxis();
         S32 vertical_offset = gViewerWindow->getWindowHeight() / 2 - VERTICAL_OFFSET;
         S32 window_center_x = gViewerWindow->getWindowWidth() / 2;
@@ -439,25 +454,25 @@ void LLManip::renderXYZ(const LLVector3 &vec)
                 LLGLDepthTest gls_depth(GL_FALSE);
                 LLGLEnable tex(GL_TEXTURE_2D);
                 // render drop shadowed text
-                sprintf(feedback_string, "X: %.3f", vec.mV[VX]);
+                snprintf(feedback_string, sizeof(feedback_string), "X: %.3f", vec.mV[VX]);              /*Flawfinder: ignore*/
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *gResMgr->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 
-                sprintf(feedback_string, "Y: %.3f", vec.mV[VY]);
+                snprintf(feedback_string, sizeof(feedback_string), "Y: %.3f", vec.mV[VY]);              /*Flawfinder: ignore*/
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *gResMgr->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
                 
-                sprintf(feedback_string, "Z: %.3f", vec.mV[VZ]);
+                snprintf(feedback_string, sizeof(feedback_string), "Z: %.3f", vec.mV[VZ]);              /*Flawfinder: ignore*/
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *gResMgr->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 
                 // render text on top
-                sprintf(feedback_string, "X: %.3f", vec.mV[VX]);
+                snprintf(feedback_string, sizeof(feedback_string), "X: %.3f", vec.mV[VX]);              /*Flawfinder: ignore*/
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *gResMgr->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f, (F32)vertical_offset, LLColor4(1.f, 0.5f, 0.5f, 1.f), FALSE);
 
                 glColor3f(0.5f, 1.f, 0.5f);
-                sprintf(feedback_string, "Y: %.3f", vec.mV[VY]);
+                snprintf(feedback_string, sizeof(feedback_string), "Y: %.3f", vec.mV[VY]);              /*Flawfinder: ignore*/
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *gResMgr->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f, (F32)vertical_offset, LLColor4(0.5f, 1.f, 0.5f, 1.f), FALSE);
                 
                 glColor3f(0.5f, 0.5f, 1.f);
-                sprintf(feedback_string, "Z: %.3f", vec.mV[VZ]);
+                snprintf(feedback_string, sizeof(feedback_string), "Z: %.3f", vec.mV[VZ]);              /*Flawfinder: ignore*/
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *gResMgr->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f, (F32)vertical_offset, LLColor4(0.5f, 0.5f, 1.f, 1.f), FALSE);
         }
 }
@@ -466,7 +481,7 @@ void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLCol
 {
         const LLFontGL* big_fontp = gResMgr->getRes( LLFONT_SANSSERIF );
 
-        BOOL hud_selection = gSelectMgr->getSelectType() == SELECT_TYPE_HUD;
+        BOOL hud_selection = mObjectSelection->getSelectType() == SELECT_TYPE_HUD;
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
         LLVector3 render_pos = pos;
@@ -484,9 +499,9 @@ void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLCol
         LLGLEnable tex(GL_TEXTURE_2D);
         shadow_color.mV[VALPHA] = color.mV[VALPHA] * 0.5f;
         gViewerWindow->setupViewport(1, -1);
-        hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(text), 3.f, shadow_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+        hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(text), 3.f, shadow_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
         gViewerWindow->setupViewport();
-        hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(text), 3.f, color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+        hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(text), 3.f, color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
 
         glPopMatrix();
 }
@@ -498,34 +513,34 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
         const LLFontGL* big_fontp = gResMgr->getRes( LLFONT_SANSSERIF );
         const LLFontGL* small_fontp = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
 
-        char val_string[128];
-        char fraction_string[128];
+        char val_string[128];           /*Flawfinder: ignore*/
+        char fraction_string[128];              /*Flawfinder: ignore*/
         F32 val_to_print = llround(value, 0.001f);
         S32 fractional_portion = llround(fmodf(llabs(val_to_print), 1.f) * 100.f);
         if (val_to_print < 0.f)
         {
                 if (fractional_portion == 0)
                 {
-                        sprintf(val_string, "-%d%s", lltrunc(llabs(val_to_print)), suffix);
+                        snprintf(val_string, sizeof(val_string), "-%d%s", lltrunc(llabs(val_to_print)), suffix);                /*Flawfinder: ignore*/
                 }
                 else
                 {
-                        sprintf(val_string, "-%d", lltrunc(llabs(val_to_print)));
+                        snprintf(val_string, sizeof(val_string), "-%d", lltrunc(llabs(val_to_print)));          /*Flawfinder: ignore*/
                 }
         }
         else
         {
                 if (fractional_portion == 0)
                 {
-                        sprintf(val_string, "%d%s", lltrunc(llabs(val_to_print)), suffix);
+                        snprintf(val_string, sizeof(val_string), "%d%s", lltrunc(llabs(val_to_print)), suffix);         /*Flawfinder: ignore*/
                 }
                 else
                 {
-                        sprintf(val_string, "%d", lltrunc(val_to_print));
+                        snprintf(val_string, sizeof(val_string), "%d", lltrunc(val_to_print));          /*Flawfinder: ignore*/
                 }
         }
 
-        BOOL hud_selection = gSelectMgr->getSelectType() == SELECT_TYPE_HUD;
+        BOOL hud_selection = mObjectSelection->getSelectType() == SELECT_TYPE_HUD;
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
         LLVector3 render_pos = pos;
@@ -544,7 +559,7 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
         LLGLEnable tex(GL_TEXTURE_2D);
         if (fractional_portion != 0)
         {
-                sprintf(fraction_string, "%c%d%s", gResMgr->getDecimalPoint(), fractional_portion, suffix);
+                snprintf(fraction_string, sizeof(fraction_string), "%c%d%s", gResMgr->getDecimalPoint(), fractional_portion, suffix);           /*Flawfinder: ignore*/
 
                 gViewerWindow->setupViewport(1, -1);
                 hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -1.f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);
diff --git a/linden/indra/newview/llmanip.h b/linden/indra/newview/llmanip.h
index 7382bd4..7f83ae2 100644
--- a/linden/indra/newview/llmanip.h
+++ b/linden/indra/newview/llmanip.h
@@ -36,6 +36,7 @@ class LLTextBox;
 class LLViewerObject;
 class LLToolComposite;
 class LLVector3;
+class LLObjectSelection;
 
 const S32 MIN_DIVISION_PIXEL_WIDTH = 9;
 
@@ -121,14 +122,18 @@ public:
         void                            renderGuidelines(BOOL draw_x = TRUE, BOOL draw_y = TRUE, BOOL draw_z = TRUE);
         static void                     renderXYZ(const LLVector3 &vec);
 
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask) = 0;
     /*virtual*/ BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
     /*virtual*/ BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual EManipPart      getHighlightedPart() { return LL_NO_PART; }
         virtual void            highlightManipulators(S32 x, S32 y) {};
+        virtual void            handleSelect();
+        virtual void            handleDeselect();
+
+        LLHandle<LLObjectSelection> getSelection();
+
 protected:
         LLVector3                       getSavedPivotPoint() const;
-        LLVector3                       getPivotPoint() const;
+        LLVector3                       getPivotPoint();
         void                            getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3 &normal);
         BOOL                            getManipAxis(LLViewerObject* object, EManipPart manip, LLVector3 &axis);
         F32                                     getSubdivisionLevel(const LLVector3 &reference_point, const LLVector3 &translate_axis, F32 grid_scale, S32 min_pixel_spacing = MIN_DIVISION_PIXEL_WIDTH);
@@ -137,11 +142,12 @@ protected:
         void                            updateGridSettings();
         BOOL                            getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal);
         BOOL                            getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal);
-        BOOL                            nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param ) const;
+        BOOL                            nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param );
         LLColor4                        setupSnapGuideRenderPass(S32 pass);
 protected:
         LLFrameTimer            mHelpTextTimer;
         BOOL                            mInSnapRegime;
+        LLHandle<LLObjectSelection> mObjectSelection;
 
         static F32                      sHelpTextVisibleTime;
         static F32                      sHelpTextFadeTime;
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 93cbfe4..452e4d4 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -81,7 +81,6 @@ const F32 SELECTED_MANIPULATOR_SCALE = 1.05f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 
 extern void handle_reset_rotation(void*);  // in LLViewerWindow
-extern void handle_first_tool(void*);
 
 LLManipRotate::LLManipRotate( LLToolComposite* composite )
 :       LLManip( "Rotate", composite ),
@@ -108,6 +107,7 @@ void LLManipRotate::handleSelect()
         // *FIX: put this in mouseDown?
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         gFloaterTools->setStatusText("Drag colored bands to rotate object");
+        LLManip::handleSelect();
 }
 
 void LLManipRotate::handleDeselect()
@@ -116,6 +116,7 @@ void LLManipRotate::handleDeselect()
         mManipPart = LL_NO_PART;
 
         gFloaterTools->setStatusText("");
+        LLManip::handleDeselect();
 }
 
 void LLManipRotate::render()
@@ -127,7 +128,7 @@ void LLManipRotate::render()
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
         
         // You can rotate if you can move
-        LLViewerObject* first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject* first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         if( !first_object )
         {
                 return;
@@ -140,7 +141,7 @@ void LLManipRotate::render()
 
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
                 glScalef(zoom, zoom, zoom);
@@ -358,7 +359,7 @@ BOOL LLManipRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         BOOL    handled = FALSE;
 
-        LLViewerObject* first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject* first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         if( first_object )
         {
                 LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
@@ -374,10 +375,10 @@ BOOL LLManipRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 // Assumes that one of the parts of the manipulator was hit.
 BOOL LLManipRotate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
 {
-        BOOL can_rotate = gSelectMgr->getObjectCount() != 0;
-        for (LLViewerObject* objectp = gSelectMgr->getFirstObject();
+        BOOL can_rotate = mObjectSelection->getObjectCount() != 0;
+        for (LLViewerObject* objectp = mObjectSelection->getFirstObject();
                 objectp;
-                objectp = gSelectMgr->getNextObject())
+                objectp = mObjectSelection->getNextObject())
         {
                 can_rotate = can_rotate && objectp->permMove() && (objectp->permModify() || gSavedSettings.getBOOL("SelectLinkedSet"));
         }
@@ -463,11 +464,7 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
         mManipPart = LL_NO_PART;
 
         // Might have missed last update due to timing.
-        if (mSendUpdateOnMouseUp)
-        {
-                gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
-                mSendUpdateOnMouseUp = FALSE;
-        }
+        gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
         gSelectMgr->enableSilhouette(TRUE);
         //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 
@@ -482,7 +479,7 @@ BOOL LLManipRotate::handleHover(S32 x, S32 y, MASK mask)
 {
         if( hasMouseCapture() )
         {
-                if( gSelectMgr->isEmpty() )
+                if( mObjectSelection->isEmpty() )
                 {
                         // Somehow the object got deselected while we were dragging it.
                         setMouseCapture( FALSE );
@@ -523,12 +520,6 @@ extern U32 gFrameCount;
 // Freeform rotation
 void LLManipRotate::drag( S32 x, S32 y )
 {
-        static LLTimer  update_timer;
-        F32 elapsed_time = update_timer.getElapsedTimeF32();
-        const F32 UPDATE_DELAY = 0.1f;                                          //  min time between transmitted updates
-        BOOL send_rotation_update = FALSE;
-        BOOL send_position_update = FALSE;
-
         if( !updateVisiblity() )
         {
                 return;
@@ -548,9 +539,8 @@ void LLManipRotate::drag( S32 x, S32 y )
 
         LLViewerObject* object;
         LLSelectNode* selectNode;
-        BOOL using_linked_selection = gSavedSettings.getBOOL("SelectLinkedSet");
 
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode != NULL; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode != NULL; selectNode = mObjectSelection->getNextNode() )
         {
                 object = selectNode->getObject();
 
@@ -595,12 +585,6 @@ void LLManipRotate::drag( S32 x, S32 y )
                                 rebuild(object);
                         }
 
-                        // don't send updates all the time for sub-objects
-                        if (using_linked_selection && object->getRenderRotation() != new_rot)
-                        {
-                                send_rotation_update = TRUE;
-                        }
-
                         // for individually selected roots, we need to counterrotate all the children
                         if (object->isRootEdit() && selectNode->mIndividualSelection)
                         {
@@ -622,7 +606,7 @@ void LLManipRotate::drag( S32 x, S32 y )
         }
 
         // update positions
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode != NULL; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode != NULL; selectNode = mObjectSelection->getNextNode() )
         {
                 object = selectNode->getObject();
                 
@@ -692,11 +676,6 @@ void LLManipRotate::drag( S32 x, S32 y )
                                 }
                         }
 
-                        if (using_linked_selection && object->getPositionAgent() != new_position)
-                        {
-                                send_position_update = TRUE;
-                        }
-
                         // for individually selected roots, we need to counter-translate all unselected children
                         if (object->isRootEdit() && selectNode->mIndividualSelection)
                         {
@@ -727,27 +706,19 @@ void LLManipRotate::drag( S32 x, S32 y )
                 }
         }
 
-        if ((send_position_update || send_rotation_update) && (elapsed_time > UPDATE_DELAY))
+        // store changes to override updates
+        for (LLSelectNode* selectNode = gSelectMgr->getSelection()->getFirstNode();
+                 selectNode != NULL;
+                 selectNode = gSelectMgr->getSelection()->getNextNode())
         {
-                U32 flag = UPD_NONE;
-                if (send_rotation_update) 
-                {
-                        flag |= UPD_ROTATION;
-                }
-                if (send_position_update) 
+                LLViewerObject*cur = selectNode->getObject();
+                if( cur->permModify() && cur->permMove() && !cur->isAvatar())
                 {
-                        flag |= UPD_POSITION;
+                        selectNode->mLastRotation = cur->getRotation();
+                        selectNode->mLastPositionLocal = cur->getPosition();
                 }
+        }       
 
-                gSelectMgr->sendMultipleUpdate( flag );
-                update_timer.reset();
-                mSendUpdateOnMouseUp = FALSE;
-        }
-        else
-        {
-                mSendUpdateOnMouseUp = TRUE;
-        }
-        
         gSelectMgr->updateSelectionCenter();
 
         // RN: just clear focus so camera doesn't follow spurious object updates
@@ -785,7 +756,7 @@ void LLManipRotate::renderSnapGuides()
 
         LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
         LLVector3 cam_at_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 cam_at_axis.setVec(1.f, 0.f, 0.f);
         }
@@ -799,7 +770,7 @@ void LLManipRotate::renderSnapGuides()
         LLVector3 test_axis = constraint_axis;
 
         BOOL constrain_to_ref_object = FALSE;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 test_axis = test_axis * ~grid_rotation;
         }
@@ -826,7 +797,7 @@ void LLManipRotate::renderSnapGuides()
         }
 
         LLVector3 projected_snap_axis = world_snap_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 projected_snap_axis = projected_snap_axis * grid_rotation;
         }
@@ -966,32 +937,32 @@ void LLManipRotate::renderSnapGuides()
                                         {
                                                 if (i == 0)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Forward" : "East", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
                                                 }
                                                 else if (i == 16)
                                                 {
                                                         if (constraint_axis.mV[VZ] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Left" : "North", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Right" : "South", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
                                                         }
                                                 }
                                                 else if (i == 32)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Back" : "West", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
                                                 }
                                                 else
                                                 {
                                                         if (constraint_axis.mV[VZ] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Right" : "South", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Left" : "North", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
                                                         }
                                                 }
                                         }
@@ -999,7 +970,7 @@ void LLManipRotate::renderSnapGuides()
                                         {
                                                 if (i == 0)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Left" : "North", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
                                                 }
                                                 else if (i == 16)
                                                 {
@@ -1014,7 +985,7 @@ void LLManipRotate::renderSnapGuides()
                                                 }
                                                 else if (i == 32)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Right" : "South", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
                                                 }
                                                 else
                                                 {
@@ -1038,11 +1009,11 @@ void LLManipRotate::renderSnapGuides()
                                                 {
                                                         if (constraint_axis.mV[VY] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Forward" : "East", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Back" : "West", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
                                                         }
                                                 }
                                                 else if (i == 32)
@@ -1053,11 +1024,11 @@ void LLManipRotate::renderSnapGuides()
                                                 {
                                                         if (constraint_axis.mV[VY] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Back" : "West", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Forward" : "East", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
                                                         }
                                                 }
                                         }
@@ -1072,7 +1043,7 @@ void LLManipRotate::renderSnapGuides()
                                 getObjectAxisClosestToMouse(object_axis);
 
                                 // project onto constraint plane
-                                LLSelectNode* first_node = gSelectMgr->getFirstMoveableNode(TRUE);
+                                LLSelectNode* first_node = mObjectSelection->getFirstMoveableNode(TRUE);
                                 object_axis = object_axis * first_node->getObject()->getRenderRotation();
                                 object_axis = object_axis - (object_axis * getConstraintAxis()) * getConstraintAxis();
                                 object_axis.normVec();
@@ -1156,7 +1127,7 @@ BOOL LLManipRotate::updateVisiblity()
         BOOL visible = FALSE;
 
         LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 mCenterToCam = LLVector3(-1.f / gAgent.getAvatarObject()->mHUDCurZoom, 0.f, 0.f);
                 mCenterToCamNorm = mCenterToCam;
@@ -1265,7 +1236,7 @@ LLQuaternion LLManipRotate::dragUnconstrained( S32 x, S32 y )
                 F32 angle = (-1.f + dist_to_intersection / dist_to_tangent_point) * in_sphere_angle;
 
                 LLVector3 axis;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         axis = LLVector3(-1.f, 0.f, 0.f) % profile_center_to_intersection;
                 }
@@ -1308,7 +1279,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
 
                 gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
 
-                LLSelectNode* first_node = gSelectMgr->getFirstMoveableNode(TRUE);
+                LLSelectNode* first_node = mObjectSelection->getFirstMoveableNode(TRUE);
                 if (first_node)
                 {
                         // *FIX: get agent local attachment grid working
@@ -1322,7 +1293,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
 
 LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
 {
-        LLSelectNode* first_object_node = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode* first_object_node = mObjectSelection->getFirstMoveableNode(TRUE);
         LLVector3 constraint_axis = getConstraintAxis();
         LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
 
@@ -1339,7 +1310,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
         LLVector3 axis2;
 
         LLVector3 test_axis = constraint_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 test_axis = test_axis * ~grid_rotation;
         }
@@ -1363,7 +1334,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 axis1 = LLVector3::x_axis;
         }
 
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 axis1 = axis1 * grid_rotation;
         }
@@ -1385,7 +1356,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 // We're looking at the ring edge-on.
                 LLVector3 snap_plane_center = (center + (constraint_axis * mRadiusMeters * 0.5f));
                 LLVector3 cam_to_snap_plane;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         cam_to_snap_plane.setVec(1.f, 0.f, 0.f);
                 }
@@ -1435,7 +1406,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 {
                         // try other plane
                         snap_plane_center = (center - (constraint_axis * mRadiusMeters * 0.5f));
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                         {
                                 cam_to_snap_plane.setVec(1.f, 0.f, 0.f);
                         }
@@ -1482,7 +1453,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 if (snap_plane > 0)
                 {
                         LLVector3 cam_at_axis;
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                         {
                                 cam_at_axis.setVec(1.f, 0.f, 0.f);
                         }
@@ -1680,9 +1651,10 @@ LLVector3 LLManipRotate::intersectRayWithSphere( const LLVector3& ray_pt, const
 }
 
 // Utility function.  Should probably be moved to another class.
+//static
 void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_dir )
 {
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (gSelectMgr->getSelection()->getSelectType() == SELECT_TYPE_HUD)
         {
                 F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
                 F32 mouse_y = ((((F32)y) / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
@@ -1704,7 +1676,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
         mHighlightedPart = LL_NO_PART;
 
         //LLBBox bbox = gSelectMgr->getBBoxOfSelection();
-        LLViewerObject *first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject *first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         
         if (!first_object)
         {
@@ -1840,7 +1812,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
 
 S32 LLManipRotate::getObjectAxisClosestToMouse(LLVector3& object_axis)
 {
-        LLSelectNode* first_object_node = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode* first_object_node = mObjectSelection->getFirstMoveableNode(TRUE);
 
         if (!first_object_node)
         {
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index f143c5a..d520fbe 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -159,6 +159,7 @@ void LLManipScale::handleSelect()
         updateSnapGuides(bbox);
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         gFloaterTools->setStatusText("Click and drag to stretch selected side");
+        LLManip::handleSelect();
 }
 
 void LLManipScale::handleDeselect()
@@ -166,6 +167,7 @@ void LLManipScale::handleDeselect()
         mHighlightedPart = LL_NO_PART;
         mManipPart = LL_NO_PART;
         gFloaterTools->setStatusText("");
+        LLManip::handleDeselect();
 }
 
 BOOL sort_manip_by_z(LLManipScale::ManipulatorHandle *new_manip, LLManipScale::ManipulatorHandle *test_manip)
@@ -215,7 +217,7 @@ void LLManipScale::render()
         {
                 glMatrixMode(GL_MODELVIEW);
                 glPushMatrix();
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
                         glScalef(zoom, zoom, zoom);
@@ -231,7 +233,7 @@ void LLManipScale::render()
 
                 F32 range;
                 F32 range_from_agent;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         mBoxHandleSize = BOX_HANDLE_BASE_SIZE * BOX_HANDLE_BASE_FACTOR / (F32) gCamera->getViewHeightInPixels();
                         mBoxHandleSize /= gAgent.getAvatarObject()->mHUDCurZoom;
@@ -330,10 +332,10 @@ BOOL LLManipScale::handleMouseDown(S32 x, S32 y, MASK mask)
 // Assumes that one of the arrows on an object was hit.
 BOOL LLManipScale::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
 {
-        BOOL can_scale = gSelectMgr->getObjectCount() != 0;
-        for (LLViewerObject* objectp = gSelectMgr->getFirstObject();
+        BOOL can_scale = mObjectSelection->getObjectCount() != 0;
+        for (LLViewerObject* objectp = mObjectSelection->getFirstObject();
                 objectp;
-                objectp = gSelectMgr->getNextObject())
+                objectp = mObjectSelection->getNextObject())
         {
                 can_scale = can_scale && objectp->permModify() && objectp->permMove() && !objectp->isSeat();
         }
@@ -377,15 +379,27 @@ BOOL LLManipScale::handleMouseUp(S32 x, S32 y, MASK mask)
         // first, perform normal processing in case this was a quick-click
         handleHover(x, y, mask);
 
+        if( (LL_FACE_MIN <= (S32)mManipPart) 
+                && ((S32)mManipPart <= LL_FACE_MAX) )
+        {
+                sendUpdates(TRUE,TRUE,FALSE);
+        }
+        else
+        if( (LL_CORNER_MIN <= (S32)mManipPart) 
+                && ((S32)mManipPart <= LL_CORNER_MAX) )
+        {
+                sendUpdates(TRUE,TRUE,TRUE);
+        }
+        
+        //send texture update
+        gSelectMgr->adjustTexturesByScale(TRUE, getStretchTextures());
+        
         gSelectMgr->enableSilhouette(TRUE);
         mManipPart = LL_NO_PART;
 
         // Might have missed last update due to UPDATE_DELAY timing
-        if (mSendUpdateOnMouseUp)
-        {
-                gSelectMgr->sendMultipleUpdate( mLastUpdateFlags );
-        }
-                
+        gSelectMgr->sendMultipleUpdate( mLastUpdateFlags );
+        
         //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         return LLManip::handleMouseUp(x, y, mask);
@@ -396,7 +410,7 @@ BOOL LLManipScale::handleHover(S32 x, S32 y, MASK mask)
 {
         if( hasMouseCapture() )
         {
-                if( gSelectMgr->isEmpty() )
+                if( mObjectSelection->isEmpty() )
                 {
                         // Somehow the object got deselected while we were dragging it.
                         setMouseCapture( FALSE );
@@ -415,7 +429,7 @@ BOOL LLManipScale::handleHover(S32 x, S32 y, MASK mask)
         }
         
         // Patch up textures, if possible.
-        gSelectMgr->adjustTexturesByScale(TRUE, getStretchTextures());
+        gSelectMgr->adjustTexturesByScale(FALSE, getStretchTextures());
 
         gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLSCALE);
         return TRUE;
@@ -432,7 +446,7 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
         if( isSelectionScalable() )
         {
                 LLMatrix4 transform;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         LLVector4 translation(bbox.getPositionAgent());
                         transform.initRotTrans(bbox.getRotation(), translation);
@@ -473,7 +487,7 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
                 mManipulatorVertices[numManips++] = LLVector4(max.mV[VX], max.mV[VY], max.mV[VZ], 1.f);
                 
                 // 1-D highlights are applicable iff one object is selected
-                if( gSelectMgr->getObjectCount() == 1 )
+                if( mObjectSelection->getObjectCount() == 1 )
                 {
                         // face centers
                         mManipulatorVertices[numManips++] = LLVector4(ctr.mV[VX], ctr.mV[VY], max.mV[VZ], 1.f);
@@ -539,7 +553,7 @@ void LLManipScale::renderFaces( const LLBBox& bbox )
 {
         // Don't bother to render the drag handles for 1-D scaling if 
         // more than one object is selected or if it is an attachment
-        if ( gSelectMgr->getObjectCount() > 1 )
+        if ( mObjectSelection->getObjectCount() > 1 )
         {
                 return;
         }
@@ -806,8 +820,21 @@ void LLManipScale::drag( S32 x, S32 y )
                 dragCorner( x, y );
         }
         
-        //gAgent.setObjectTracking(FALSE);
-        gAgent.clearFocusObject();
+        // store changes to override updates
+        for (LLSelectNode* selectNode = gSelectMgr->getSelection()->getFirstNode();
+                 selectNode != NULL;
+                 selectNode = gSelectMgr->getSelection()->getNextNode())
+        {
+                LLViewerObject*cur = selectNode->getObject();
+                if( cur->permModify() && cur->permMove() && !cur->isAvatar())
+                {
+                        selectNode->mLastScale = cur->getScale();
+                        selectNode->mLastPositionLocal = cur->getPosition();
+                }
+        }       
+
+        gSelectMgr->updateSelectionCenter();
+    gAgent.clearFocusObject();
 }
 
 // Scale around the 
@@ -818,10 +845,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
         // Suppress scale if mouse hasn't moved.
         if (x == mLastMouseX && y == mLastMouseY)
         {
-                if (mSendUpdateOnMouseUp)
-                {
-                        sendUpdates(TRUE,TRUE,TRUE);
-                }
+        //      sendUpdates(TRUE,TRUE,TRUE);
                 return;
         }
 
@@ -945,7 +969,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
 
         // find max and min scale factors that will make biggest object hit max absolute scale and smallest object hit min absolute scale
         LLSelectNode* selectNode;
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode; selectNode = mObjectSelection->getNextNode() )
         {
                 LLViewerObject* cur = selectNode->getObject();
                 if(  cur->permModify() && cur->permMove() && !cur->isAvatar() )
@@ -965,7 +989,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
         LLVector3d drag_global = uniform ? mDragStartCenterGlobal : mDragFarHitGlobal;
 
         // do the root objects i.e. (TRUE == cur->isRootEdit())
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode; selectNode = mObjectSelection->getNextNode() )
         {
                 LLViewerObject* cur = selectNode->getObject();
                 if( cur->permModify() && cur->permMove() && !cur->isAvatar() && cur->isRootEdit() )
@@ -1009,7 +1033,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 }
         }
         // do the child objects i.e. (FALSE == cur->isRootEdit())
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode; selectNode = mObjectSelection->getNextNode() )
         {
                 LLViewerObject*cur = selectNode->getObject();
                 if( cur->permModify() && cur->permMove() && !cur->isAvatar() && !cur->isRootEdit() )
@@ -1020,11 +1044,8 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                         if (!selectNode->mIndividualSelection)
                         {
                                 cur->setPosition(selectNode->mSavedPositionLocal * scale_factor);
-                                continue;
                         }
 
-                        LLVector3d new_pos_global = drag_global + (selectNode->mSavedPositionGlobal - drag_global) * scale_factor;
-                        cur->setPositionAbsoluteGlobal( new_pos_global );
                         rebuild(cur);
                 }
         }
@@ -1032,8 +1053,6 @@ void LLManipScale::dragCorner( S32 x, S32 y )
         
 
         mDragPointGlobal = drag_point_global;
-
-        sendUpdates( TRUE, TRUE, TRUE );
 }
 
         
@@ -1042,10 +1061,7 @@ void LLManipScale::dragFace( S32 x, S32 y )
         // Suppress scale if mouse hasn't moved.
         if (x == mLastMouseX && y == mLastMouseY)
         {
-                if (mSendUpdateOnMouseUp)
-                {
-                        sendUpdates(TRUE,TRUE,FALSE);
-                }
+        //      sendUpdates(TRUE,TRUE,FALSE);
                 return;
         }
 
@@ -1179,8 +1195,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
         send_scale_update = TRUE;
 
         mDragPointGlobal = drag_point_global;
-
-        sendUpdates( send_position_update, send_scale_update );
 }
 
 void LLManipScale::sendUpdates( BOOL send_position_update, BOOL send_scale_update, BOOL corner )
@@ -1215,8 +1229,6 @@ void LLManipScale::sendUpdates( BOOL send_position_update, BOOL send_scale_updat
                 {
                         mSendUpdateOnMouseUp = TRUE;
                 }
-
-                gSelectMgr->updateSelectionCenter();
                 dialog_refresh_all();
         }
 }
@@ -1228,7 +1240,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
         LLVector3 drag_start_center_agent = gAgent.getPosAgentFromGlobal(mDragStartCenterGlobal);
 
         LLSelectNode *selectNode;
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode; selectNode = mObjectSelection->getNextNode() )
         {
                 LLViewerObject*cur = selectNode->getObject();
                 if( cur->permModify() && cur->permMove() && !cur->isAvatar() )
@@ -1349,7 +1361,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
         mScaleDir = box_corner_agent - mScaleCenter;
         mScaleDir.normVec();
 
-        if(gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if(mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 mSnapRegimeOffset = SNAP_GUIDE_SCREEN_OFFSET / gAgent.getAvatarObject()->mHUDCurZoom;
 
@@ -1361,7 +1373,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
         }
         LLVector3 cam_at_axis;
         F32 snap_guide_length;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 cam_at_axis.setVec(1.f, 0.f, 0.f);
                 snap_guide_length = SNAP_GUIDE_SCREEN_LENGTH / gAgent.getAvatarObject()->mHUDCurZoom;
@@ -1408,7 +1420,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
         {
                 LLVector3 local_scale_dir = partToUnitVector( mManipPart );
                 LLVector3 local_camera_dir;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         local_camera_dir = LLVector3(-1.f, 0.f, 0.f) * ~bbox.getRotation();
                 }
@@ -1687,7 +1699,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                 start_tick = -(llmin(ticks_from_scale_center_1, num_ticks_per_side1));
                 stop_tick = llmin(max_ticks1, num_ticks_per_side1);
 
-                F32 grid_resolution = gSelectMgr->getSelectType() == SELECT_TYPE_HUD ? 0.25f : llmax(gSavedSettings.getF32("GridResolution"), 0.001f);
+                F32 grid_resolution = mObjectSelection->getSelectType() == SELECT_TYPE_HUD ? 0.25f : llmax(gSavedSettings.getF32("GridResolution"), 0.001f);
                 S32 label_sub_div_offset_1 = llround(fmod(dist_grid_axis - grid_offset1, mScaleSnapUnit1  * 32.f) / (mScaleSnapUnit1 / max_subdivisions));
                 S32 label_sub_div_offset_2 = llround(fmod(dist_grid_axis - grid_offset2, mScaleSnapUnit2  * 32.f) / (mScaleSnapUnit2 / max_subdivisions));
 
@@ -1793,7 +1805,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
 
 
                 // render help text
-                if (gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
                 {
                         if (mHelpTextTimer.getElapsedTimeF32() < sHelpTextVisibleTime + sHelpTextFadeTime && sNumTimesHelpTextShown < sMaxTimesShowHelpText)
                         {
@@ -1815,10 +1827,10 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                                 std::string help_text = "Move mouse cursor over ruler";
                                 LLColor4 help_text_color = LLColor4::white;
                                 help_text_color.mV[VALPHA] = clamp_rescale(mHelpTextTimer.getElapsedTimeF32(), sHelpTextVisibleTime, sHelpTextVisibleTime + sHelpTextFadeTime, grid_alpha, 0.f);
-                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                                 help_text = "to snap to grid";
                                 help_text_pos -= gCamera->getUpAxis() * mSnapRegimeOffset * 0.4f;
-                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                         }
                 }
         }
@@ -2022,14 +2034,16 @@ LLVector3 LLManipScale::nearestAxis( const LLVector3& v ) const
         return LLVector3( coords[greatest_index] );
 }
 
-BOOL LLManipScale::isSelectionScalable() const
+//FIXME: make this const once we switch to iterator interface 
+//(making object traversal a const-able operation)
+BOOL LLManipScale::isSelectionScalable()
 {
         // An selection is scalable if you are allowed to both edit and move 
         // everything in it, and it does not have any sitting agents
-        BOOL scalable = gSelectMgr->getFirstObject() ? TRUE : FALSE;
-        for(LLViewerObject* cur = gSelectMgr->getFirstObject(); 
+        BOOL scalable = mObjectSelection->getFirstObject() ? TRUE : FALSE;
+        for(LLViewerObject* cur = mObjectSelection->getFirstObject(); 
                 cur; 
-                cur = gSelectMgr->getNextObject() )
+                cur = mObjectSelection->getNextObject() )
         {
                 if( !(cur->permModify() && cur->permMove())
                         || cur->isSeat())
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 7ac3aef..2452e6b 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -113,7 +113,7 @@ private:
         F32                             partToMinScale( S32 part, const LLBBox& bbox ) const;
         LLVector3               nearestAxis( const LLVector3& v ) const;
 
-        BOOL                    isSelectionScalable() const;
+        BOOL                    isSelectionScalable();
 
         void                    stretchFace( const LLVector3& drag_start_agent, const LLVector3& drag_delta_agent);
 
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index fea6092..bb58a9c 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -59,6 +59,7 @@
 #include "llworld.h"
 #include "viewer.h"
 #include "llui.h"
+#include "pipeline.h"
 
 const S32 NUM_AXES = 3;
 const S32 MOUSE_DRAG_SLOP = 2;       // pixels
@@ -257,6 +258,7 @@ void LLManipTranslate::handleSelect()
 {
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         gFloaterTools->setStatusText("Drag to move, shift-drag to copy");
+        LLManip::handleSelect();
 }
 
 void LLManipTranslate::handleDeselect()
@@ -264,6 +266,7 @@ void LLManipTranslate::handleDeselect()
         mHighlightedPart = LL_NO_PART;
         mManipPart = LL_NO_PART;
         gFloaterTools->setStatusText("");
+        LLManip::handleDeselect();
 }
 
 BOOL LLManipTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -289,10 +292,10 @@ BOOL LLManipTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
 // Assumes that one of the arrows on an object was hit.
 BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
 {
-        BOOL can_move = gSelectMgr->getObjectCount() != 0;
-        for (LLViewerObject* objectp = gSelectMgr->getFirstObject();
+        BOOL can_move = mObjectSelection->getObjectCount() != 0;
+        for (LLViewerObject* objectp = mObjectSelection->getFirstObject();
                 objectp;
-                objectp = gSelectMgr->getNextObject())
+                objectp = mObjectSelection->getNextObject())
         {
                 can_move = can_move && objectp->permMove() && (objectp->permModify() || gSavedSettings.getBOOL("SelectLinkedSet"));
         }
@@ -332,7 +335,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
 
         LLVector3               axis;
 
-        LLSelectNode *selectNode = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode *selectNode = mObjectSelection->getFirstMoveableNode(TRUE);
 
         if (!selectNode)
         {
@@ -407,7 +410,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
         BOOL rotated = FALSE;
 
         // ...build mode moves camera about focus point
-        if (gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
         {
                 if (x < ROTATE_H_MARGIN)
                 {
@@ -421,6 +424,8 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                 }
         }
 
+        LLViewerObject  *object;
+
         // Suppress processing if mouse hasn't actually moved.
         // This may cause problems if the camera moves outside of the
         // rotation above.
@@ -467,11 +472,10 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 
         LLVector3               axis_f;
         LLVector3d              axis_d;
-        LLViewerObject  *object;
 
         // pick the first object to constrain to grid w/ common origin
         // this is so we don't screw up groups
-        LLSelectNode* selectNode = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode* selectNode = mObjectSelection->getFirstMoveableNode(TRUE);
         if (!selectNode)
         {
                 // somehow we lost the object!
@@ -643,12 +647,12 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
         LLVector3d clamped_relative_move = axis_magnitude * axis_d;     // scalar multiply
         LLVector3 clamped_relative_move_f = (F32)axis_magnitude * axis_f; // scalar multiply
         
-        for(selectNode = gSelectMgr->getFirstNode(); 
+        for(selectNode = mObjectSelection->getFirstNode(); 
                 selectNode; 
-                selectNode = gSelectMgr->getNextNode() )
+                selectNode = mObjectSelection->getNextNode() )
         {
                 object = selectNode->getObject();
-
+                
                 // Only apply motion to root objects and objects selected
                 // as "individual".
                 if (!object->isRootEdit() && !selectNode->mIndividualSelection)
@@ -779,27 +783,12 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                         send_update = TRUE;
                                 }
                         }
+                        selectNode->mLastPositionLocal  = object->getPosition();
                 }
         }
 
-        // Handle throttling to 10 updates per second.
-        F32 elapsed_time = mUpdateTimer.getElapsedTimeF32();
-        const F32 UPDATE_DELAY = 0.1f;                                          //  min time between transmitted updates
-        if (send_update && (elapsed_time > UPDATE_DELAY))
-        {
-                gSelectMgr->sendMultipleUpdate(UPD_POSITION);
-                mUpdateTimer.reset();
-                mSendUpdateOnMouseUp = FALSE;
-        }
-        else
-        {
-                // ...suppressed update
-                mSendUpdateOnMouseUp = TRUE;
-        }
-
         gSelectMgr->updateSelectionCenter();
         gAgent.clearFocusObject();
-        //gAgent.setObjectTracking(FALSE);
         dialog_refresh_all();           // ??? is this necessary?
 
         lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (active)" << llendl;
@@ -811,7 +800,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
 {
         mHighlightedPart = LL_NO_PART;
 
-        if (!gSelectMgr->getObjectCount())
+        if (!mObjectSelection->getObjectCount())
         {
                 return;
         }
@@ -832,7 +821,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
 
         LLMatrix4 transform;
 
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 relative_camera_dir = LLVector3(1.f, 0.f, 0.f) * ~grid_rotation;
                 LLVector4 translation(object_position);
@@ -1056,17 +1045,8 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
         gSelectMgr->enableSilhouette(TRUE);
 
         // Might have missed last update due to UPDATE_DELAY timing.
-        if (mSendUpdateOnMouseUp)
-        {
-                gSelectMgr->sendMultipleUpdate( UPD_POSITION );
-                mSendUpdateOnMouseUp = FALSE;
-        }
-
-//      if (mCopyMadeThisDrag)
-//      {
-//              gSelectMgr->clearGridObjects();
-//      }
-
+        gSelectMgr->sendMultipleUpdate( UPD_POSITION );
+        
         mInSnapRegime = FALSE;
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
@@ -1079,7 +1059,7 @@ void LLManipTranslate::render()
 {
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
                 glScalef(zoom, zoom, zoom);
@@ -1117,7 +1097,7 @@ void LLManipTranslate::renderSnapGuides()
                 return;
         }
 
-        LLSelectNode *first_node = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode *first_node = mObjectSelection->getFirstMoveableNode(TRUE);
         if (!first_node)
         {
                 return;
@@ -1139,10 +1119,36 @@ void LLManipTranslate::renderSnapGuides()
         //pick appropriate projection plane for snap rulers according to relative camera position
         if (mManipPart >= LL_X_ARROW && mManipPart <= LL_Z_ARROW)
         {
+                LLVector3 normal;
+                LLColor4 inner_color;
+                LLManip::EManipPart temp_manip = mManipPart;
+                switch (mManipPart)
+                {
+                case LL_X_ARROW:
+                        normal.setVec(1,0,0);
+                        inner_color.setVec(0,1,1,line_alpha);
+                        mManipPart = LL_YZ_PLANE;
+                        break;
+                case LL_Y_ARROW:
+                        normal.setVec(0,1,0);
+                        inner_color.setVec(1,0,1,line_alpha);
+                        mManipPart = LL_XZ_PLANE;
+                        break;
+                case LL_Z_ARROW:
+                        normal.setVec(0,0,1);
+                        inner_color.setVec(1,1,0,line_alpha);
+                        mManipPart = LL_XY_PLANE;
+                        break;
+                default:
+                        break;
+                }
+
+                highlightIntersection(normal, selection_center, grid_rotation, inner_color);
+                mManipPart = temp_manip;
                 getManipAxis(first_object, mManipPart, translate_axis);
 
                 LLVector3 at_axis_abs;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         at_axis_abs = LLVector3::x_axis * ~grid_rotation;
                 }
@@ -1217,7 +1223,7 @@ void LLManipTranslate::renderSnapGuides()
 
                 F32 guide_size_meters;
 
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         guide_size_meters = 1.f / gAgent.getAvatarObject()->mHUDCurZoom;
                         mSnapOffsetMeters = mArrowLengthMeters * 1.5f;
@@ -1419,7 +1425,7 @@ void LLManipTranslate::renderSnapGuides()
                                 }
                         }
                 }
-                if (gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
                 {
                         // render helpful text
                         if (mHelpTextTimer.getElapsedTimeF32() < sHelpTextVisibleTime + sHelpTextFadeTime && sNumTimesHelpTextShown < sMaxTimesShowHelpText)
@@ -1443,10 +1449,10 @@ void LLManipTranslate::renderSnapGuides()
                                 std::string help_text = "Move mouse cursor over ruler to snap";
                                 LLColor4 help_text_color = LLColor4::white;
                                 help_text_color.mV[VALPHA] = clamp_rescale(mHelpTextTimer.getElapsedTimeF32(), sHelpTextVisibleTime, sHelpTextVisibleTime + sHelpTextFadeTime, line_alpha, 0.f);
-                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                                 help_text = "to snap to grid";
                                 help_text_pos -= gCamera->getUpAxis() * mSnapOffsetMeters * 0.2f;
-                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+                                hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                         }
                 }
         }
@@ -1455,18 +1461,13 @@ void LLManipTranslate::renderSnapGuides()
                 // render gridlines for planar snapping
 
                 F32 u = 0, v = 0;
-                glPushMatrix();
-
-                F32 x,y,z,angle_radians;
-                grid_rotation.getAngleAxis(&angle_radians, &x, &y, &z);
-                glTranslatef(selection_center.mV[VX], selection_center.mV[VY], selection_center.mV[VZ]);
-                glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
-
+        LLColor4 inner_color;
+                LLVector3 normal;
                 LLVector3 grid_center = selection_center - grid_origin;
-                grid_center *= ~grid_rotation;
-                
                 F32 usc = 1;
                 F32 vsc = 1;
+                
+                grid_center *= ~grid_rotation;
 
                 switch (mManipPart)
                 {
@@ -1475,23 +1476,38 @@ void LLManipTranslate::renderSnapGuides()
                         v = grid_center.mV[VZ];
                         usc = grid_scale.mV[VY];
                         vsc = grid_scale.mV[VZ];
+                        inner_color.setVec(0,1,1,line_alpha);
+                        normal.setVec(1,0,0);
                         break;
                 case LL_XZ_PLANE:
                         u = grid_center.mV[VX];
                         v = grid_center.mV[VZ];
                         usc = grid_scale.mV[VX];
                         vsc = grid_scale.mV[VZ];
+                        inner_color.setVec(1,0,1,line_alpha);
+                        normal.setVec(0,1,0);
                         break;
                 case LL_XY_PLANE:
                         u = grid_center.mV[VX];
                         v = grid_center.mV[VY];
                         usc = grid_scale.mV[VX];
                         vsc = grid_scale.mV[VY];
+                        inner_color.setVec(1,1,0,line_alpha);
+                        normal.setVec(0,0,1);
                         break;
                 default:
                         break;
                 }
 
+                highlightIntersection(normal, selection_center, grid_rotation, inner_color);
+
+                glPushMatrix();
+
+                F32 x,y,z,angle_radians;
+                grid_rotation.getAngleAxis(&angle_radians, &x, &y, &z);
+                glTranslatef(selection_center.mV[VX], selection_center.mV[VY], selection_center.mV[VZ]);
+                glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
+                
                 F32 sz = mGridSizeMeters;
                 F32 tiles = sz;
                 glMatrixMode(GL_TEXTURE);
@@ -1608,20 +1624,118 @@ void LLManipTranslate::renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F
         
 }
 
+void LLManipTranslate::highlightIntersection(LLVector3 normal, 
+                                                                                         LLVector3 selection_center, 
+                                                                                         LLQuaternion grid_rotation, 
+                                                                                         LLColor4 inner_color)
+{
+        if (!gSavedSettings.getBOOL("GridCrossSections"))
+        {
+                return;
+        }
+        
+        U32 types[] = { LLRenderPass::PASS_SIMPLE, LLRenderPass::PASS_ALPHA, LLRenderPass::PASS_FULLBRIGHT };
+
+        GLuint stencil_mask = 0xFFFFFFFF;
+        //stencil in volumes
+        {
+                glStencilMask(stencil_mask);
+                glClearStencil(1);
+                glClear(GL_STENCIL_BUFFER_BIT);
+                LLGLEnable cull_face(GL_CULL_FACE);
+                LLGLEnable stencil(GL_STENCIL_TEST);
+                LLGLDepthTest depth (GL_TRUE, GL_FALSE, GL_ALWAYS);
+                glStencilFunc(GL_ALWAYS, 0, stencil_mask);
+                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+        LLGLDisable tex(GL_TEXTURE_2D);
+                glColor4f(1,1,1,1);
+
+                //setup clip plane
+                normal = normal * grid_rotation;
+                if (normal * (gCamera->getOrigin()-selection_center) < 0)
+                {
+                        normal = -normal;
+                }
+                F32 d = -(selection_center * normal);
+                F64 plane[] = { normal.mV[0], normal.mV[1], normal.mV[2], d };
+                LLGLEnable clip(GL_CLIP_PLANE0);
+                glClipPlane(GL_CLIP_PLANE0, plane);
+
+                BOOL particles = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
+                BOOL clouds = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS);
+                
+                if (particles)
+                {
+                        LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
+                }
+                if (clouds)
+                {
+                        LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_CLOUDS);
+                }
+                
+                //stencil in volumes
+                glStencilOp(GL_INCR, GL_INCR, GL_INCR);
+                glCullFace(GL_FRONT);
+                for (U32 i = 0; i < 3; i++)
+                {
+                        gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, FALSE);
+                }
+
+                glStencilOp(GL_DECR, GL_DECR, GL_DECR);
+                glCullFace(GL_BACK);
+                for (U32 i = 0; i < 3; i++)
+                {
+                        gPipeline.renderObjects(types[i], LLVertexBuffer::MAP_VERTEX, FALSE);
+                }
+                
+                if (particles)
+                {
+                        LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
+                }
+                if (clouds)
+                {
+                        LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_CLOUDS);
+                }
+
+                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        }
+
+        glPushMatrix();
+
+        F32 x,y,z,angle_radians;
+        grid_rotation.getAngleAxis(&angle_radians, &x, &y, &z);
+        glTranslatef(selection_center.mV[VX], selection_center.mV[VY], selection_center.mV[VZ]);
+        glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
+        
+        F32 sz = mGridSizeMeters;
+        F32 tiles = sz;
+
+        //draw volume/plane intersections
+        {
+                LLGLDisable tex(GL_TEXTURE_2D);
+                LLGLDepthTest depth(GL_FALSE);
+                LLGLEnable stencil(GL_STENCIL_TEST);
+                glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+                glStencilFunc(GL_EQUAL, 0, stencil_mask);
+                renderGrid(0,0,tiles,inner_color.mV[0], inner_color.mV[1], inner_color.mV[2], 0.25f);
+        }
+
+        glPopMatrix();
+}
 
 void LLManipTranslate::renderText()
 {
-        if (gSelectMgr->getRootObjectCount() && !gSelectMgr->selectionIsAttachment())
+        if (mObjectSelection->getRootObjectCount() && !mObjectSelection->isAttachment())
         {
                 LLVector3 pos = getPivotPoint();
                 renderXYZ(pos);
         }
         else
         {
-                LLViewerObject* objectp = gSelectMgr->getFirstRootObject();
+                LLViewerObject* objectp = mObjectSelection->getFirstRootObject();
                 if(!objectp)
                 {
-                        objectp = gSelectMgr->getFirstObject();
+                        objectp = mObjectSelection->getFirstObject();
                 }
 
                 if (objectp)
@@ -1640,7 +1754,7 @@ void LLManipTranslate::renderTranslationHandles()
         
         gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
         LLVector3 at_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 at_axis = LLVector3::x_axis * ~grid_rotation;
         }
@@ -1676,13 +1790,13 @@ void LLManipTranslate::renderTranslationHandles()
                 mPlaneManipPositions.mV[VZ] = -1.f;
         }
 
-        LLViewerObject *first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject *first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         if (!first_object) return;
 
         LLVector3 selection_center = getPivotPoint();
 
         // Drag handles         
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWindowHeight();
                 mArrowLengthMeters /= gAgent.getAvatarObject()->mHUDCurZoom;
@@ -1735,7 +1849,7 @@ void LLManipTranslate::renderTranslationHandles()
 
                 LLVector3 relative_camera_dir;
                 
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         relative_camera_dir = LLVector3::x_axis * invRotation;
                 }
@@ -2007,7 +2121,7 @@ void LLManipTranslate::renderTranslationHandles()
 
                         // draw arrows for deeper faces first, closer faces last
                         LLVector3 camera_axis;
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                         {
                                 camera_axis = LLVector3::x_axis;
                         }
diff --git a/linden/indra/newview/llmaniptranslate.h b/linden/indra/newview/llmaniptranslate.h
index b055478..4937d71 100644
--- a/linden/indra/newview/llmaniptranslate.h
+++ b/linden/indra/newview/llmaniptranslate.h
@@ -77,6 +77,10 @@ protected:
         void            renderSnapGuides();
         void            renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F32 a);
         void            renderGridVert(F32 x_trans, F32 y_trans, F32 r, F32 g, F32 b, F32 alpha);
+        void            highlightIntersection(LLVector3 normal, 
+                                                                         LLVector3 selection_center, 
+                                                                         LLQuaternion grid_rotation, 
+                                                                         LLColor4 inner_color);
         F32                     getMinGridScale();
 
 private:
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index 0bf8754..2863c0b 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -96,99 +96,102 @@ void LLMapLayerResponder::result(const LLSD& result)
         bool found_null_sim = false;
 
         adjust = FALSE;
-        const LLSD& map_blocks = result["MapBlocks"];
-        for (iter = map_blocks.beginArray(); iter != map_blocks.endArray(); ++iter)
+        if (result.has("MapBlocks"))
         {
-                const LLSD& map_block = *iter;
-                
-                S32 x_regions = map_block["X"];
-                S32 y_regions = map_block["Y"];
-                std::string name = map_block["Name"];
-                S32 access = map_block["Access"];
-                S32 region_flags = map_block["RegionFlags"];
-                S32 water_height = map_block["WaterHeight"];
-                LLUUID image_id = map_block["MapImageID"];
-
-                U32 x_meters = x_regions * REGION_WIDTH_UNITS;
-                U32 y_meters = y_regions * REGION_WIDTH_UNITS;
-
-                if (access == 255)
+                const LLSD& map_blocks = result["MapBlocks"];
+                for (iter = map_blocks.beginArray(); iter != map_blocks.endArray(); ++iter)
                 {
-                        // This region doesn't exist
-                        if (gWorldMap->mIsTrackingUnknownLocation &&
-                                gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
-                                gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
-                                gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
-                                gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
-                        {
-                                // We were tracking this location, but it doesn't exist
-                                gWorldMap->mInvalidLocation = TRUE;
-                        }
-
-                        found_null_sim = true;
-                }
-                else
-                {
-                        adjust = gWorldMap->extendAABB(x_meters, 
-                                                                                y_meters, 
-                                                                                x_meters+REGION_WIDTH_UNITS,
-                                                                                y_meters+REGION_WIDTH_UNITS) || adjust;
-                        U64 handle = to_region_handle(x_meters, y_meters);
-
-//                      llinfos << "Map sim " << name << " image layer " << agent_flags << " ID " << image_id.getString() << llendl;
-                        
-                        LLSimInfo* siminfo = new LLSimInfo();
-                        LLWorldMap::sim_info_map_t::iterator iter = gWorldMap->mSimInfoMap.find(handle);
-                        if (iter != gWorldMap->mSimInfoMap.end())
+                        const LLSD& map_block = *iter;
+                
+                        S32 x_regions = map_block["X"];
+                        S32 y_regions = map_block["Y"];
+                        std::string name = map_block["Name"];
+                        S32 access = map_block["Access"];
+                        S32 region_flags = map_block["RegionFlags"];
+                        S32 water_height = map_block["WaterHeight"];
+                        LLUUID image_id = map_block["MapImageID"];
+
+                        U32 x_meters = x_regions * REGION_WIDTH_UNITS;
+                        U32 y_meters = y_regions * REGION_WIDTH_UNITS;
+
+                        if (access == 255)
                         {
-                                LLSimInfo* oldinfo = iter->second;
-                                for (S32 image=0; image<MAP_SIM_IMAGE_TYPES; ++image)
+                                // This region doesn't exist
+                                if (gWorldMap->mIsTrackingUnknownLocation &&
+                                        gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
+                                        gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
+                                        gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
+                                        gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
                                 {
-                                        siminfo->mMapImageID[image] = oldinfo->mMapImageID[image];
+                                        // We were tracking this location, but it doesn't exist
+                                        gWorldMap->mInvalidLocation = TRUE;
                                 }
-                                delete oldinfo;
-                        }
-                        gWorldMap->mSimInfoMap[handle] = siminfo;
-
-                        siminfo->mHandle = handle;
-                        siminfo->mName.assign( name );
-                        siminfo->mAccess = access;
-                        siminfo->mRegionFlags = region_flags;
-                        siminfo->mWaterHeight = (F32) water_height;
-                        siminfo->mMapImageID[agent_flags] = image_id;
-                        siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[gWorldMap->mCurrentMap], MIPMAP_TRUE, FALSE);
-                        siminfo->mCurrentImage->bindTexture(0);
-                        siminfo->mCurrentImage->setClamp(TRUE, TRUE);
-                        
-                        if (siminfo->mMapImageID[2].notNull())
-                        {
-                                siminfo->mOverlayImage = gImageList.getImage(siminfo->mMapImageID[2], MIPMAP_TRUE, FALSE);
+
+                                found_null_sim = true;
                         }
                         else
                         {
-                                siminfo->mOverlayImage = NULL;
-                        }
+                                adjust = gWorldMap->extendAABB(x_meters, 
+                                                                                           y_meters, 
+                                                                                           x_meters+REGION_WIDTH_UNITS,
+                                                                                           y_meters+REGION_WIDTH_UNITS) || adjust;
+                                U64 handle = to_region_handle(x_meters, y_meters);
 
-                        if (gWorldMap->mIsTrackingUnknownLocation &&
-                                gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
-                                gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
-                                gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
-                                gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
-                        {
-                                if (siminfo->mAccess == SIM_ACCESS_DOWN)
+                                //                      llinfos << "Map sim " << name << " image layer " << agent_flags << " ID " << image_id.getString() << llendl;
+                        
+                                LLSimInfo* siminfo = new LLSimInfo();
+                                LLWorldMap::sim_info_map_t::iterator iter = gWorldMap->mSimInfoMap.find(handle);
+                                if (iter != gWorldMap->mSimInfoMap.end())
                                 {
-                                        // We were tracking this location, but it doesn't exist
-                                        gWorldMap->mInvalidLocation = true;
+                                        LLSimInfo* oldinfo = iter->second;
+                                        for (S32 image=0; image<MAP_SIM_IMAGE_TYPES; ++image)
+                                        {
+                                                siminfo->mMapImageID[image] = oldinfo->mMapImageID[image];
+                                        }
+                                        delete oldinfo;
+                                }
+                                gWorldMap->mSimInfoMap[handle] = siminfo;
+
+                                siminfo->mHandle = handle;
+                                siminfo->mName.assign( name );
+                                siminfo->mAccess = access;              /*Flawfinder: ignore*/
+                                siminfo->mRegionFlags = region_flags;
+                                siminfo->mWaterHeight = (F32) water_height;
+                                siminfo->mMapImageID[agent_flags] = image_id;
+                                siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[gWorldMap->mCurrentMap], MIPMAP_TRUE, FALSE);
+                                siminfo->mCurrentImage->bindTexture(0);
+                                siminfo->mCurrentImage->setClamp(TRUE, TRUE);
+                        
+                                if (siminfo->mMapImageID[2].notNull())
+                                {
+                                        siminfo->mOverlayImage = gImageList.getImage(siminfo->mMapImageID[2], MIPMAP_TRUE, FALSE);
                                 }
                                 else
                                 {
-                                        // We were tracking this location, and it does exist
-                                        bool is_tracking_dbl = gWorldMap->mIsTrackingDoubleClick == TRUE;
-                                        gFloaterWorldMap->trackLocation(gWorldMap->mUnknownLocation);
-                                        if (is_tracking_dbl)
+                                        siminfo->mOverlayImage = NULL;
+                                }
+
+                                if (gWorldMap->mIsTrackingUnknownLocation &&
+                                        gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
+                                        gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
+                                        gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
+                                        gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
+                                {
+                                        if (siminfo->mAccess == SIM_ACCESS_DOWN)
+                                        {
+                                                // We were tracking this location, but it doesn't exist
+                                                gWorldMap->mInvalidLocation = true;
+                                        }
+                                        else
                                         {
-                                                LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
-                                                gAgent.teleportViaLocation( pos_global );
+                                                // We were tracking this location, and it does exist
+                                                bool is_tracking_dbl = gWorldMap->mIsTrackingDoubleClick == TRUE;
+                                                gFloaterWorldMap->trackLocation(gWorldMap->mUnknownLocation);
+                                                if (is_tracking_dbl)
+                                                {
+                                                        LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
+                                                        gAgent.teleportViaLocation( pos_global );
+                                                }
                                         }
                                 }
                         }
diff --git a/linden/indra/newview/llmemoryview.cpp b/linden/indra/newview/llmemoryview.cpp
index 3432c4d..c377560 100644
--- a/linden/indra/newview/llmemoryview.cpp
+++ b/linden/indra/newview/llmemoryview.cpp
@@ -35,6 +35,7 @@
 #include "llgl.h"
 #include "llmath.h"
 #include "llfontgl.h"
+#include "llmemtype.h"
 
 #include "viewer.h"
 #include "llui.h"
@@ -114,6 +115,7 @@ static struct mtv_display_info mtv_display_table[] =
         { LLMemType::MTYPE_PIPELINE,            "Pipeline",                     &LLColor4::green3 },
         { LLMemType::MTYPE_PARTICLES,           "Particles",            &LLColor4::green4 },
         { LLMemType::MTYPE_SPACE_PARTITION,     "Space Partition",      &LLColor4::blue2 },
+        { LLMemType::MTYPE_VERTEX_DATA,         "Vertex Buffer",        &LLColor4::blue3 },
         { LLMemType::MTYPE_AVATAR,                      "Avatar",                       &LLColor4::purple1 },
         { LLMemType::MTYPE_REGIONS,                     "Regions",                      &LLColor4::blue1 },
         { LLMemType::MTYPE_TEMP1,                       "Temp1",                        &LLColor4::red1 },
diff --git a/linden/indra/newview/llmorphview.cpp b/linden/indra/newview/llmorphview.cpp
index 9c56ab3..f2ac87c 100644
--- a/linden/indra/newview/llmorphview.cpp
+++ b/linden/indra/newview/llmorphview.cpp
@@ -143,7 +143,7 @@ void LLMorphView::setVisible(BOOL visible)
                         llassert( !gFloaterCustomize );
                         gFloaterCustomize = new LLFloaterCustomize();
                         gFloaterCustomize->fetchInventory();
-                        gFloaterCustomize->open();
+                        gFloaterCustomize->open();      /*Flawfinder: ignore*/
 
                         // Must do this _after_ gFloaterView is initialized.
                         gFloaterCustomize->switchToDefaultSubpart();
diff --git a/linden/indra/newview/llmoveview.cpp b/linden/indra/newview/llmoveview.cpp
index 878705f..755aec9 100644
--- a/linden/indra/newview/llmoveview.cpp
+++ b/linden/indra/newview/llmoveview.cpp
@@ -135,12 +135,12 @@ void LLFloaterMove::show(void*)
 {
         if (sInstance)
         {
-                sInstance->open();
+                sInstance->open();      /*Flawfinder: ignore*/
         }
         else
         {
                 LLFloaterMove* f = new LLFloaterMove();
-                f->open();
+                f->open();      /*Flawfinder: ignore*/
         }
         
         gSavedSettings.setBOOL("ShowMovementControls", TRUE);
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index fc0046a..e02d6fc 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -356,7 +356,13 @@ std::vector<LLMute> LLMuteList::getMutes() const
 //-----------------------------------------------------------------------------
 BOOL LLMuteList::loadFromFile(const LLString& filename)
 {
-        FILE* fp = LLFile::fopen(filename.c_str(), "rb");
+        if(!filename.size())
+        {
+                llwarns << "Mute List Filename is Empty!" << llendl;
+                return FALSE;
+        }
+
+        FILE* fp = LLFile::fopen(filename.c_str(), "rb");               /*Flawfinder: ignore*/
         if (!fp)
         {
                 llwarns << "Couldn't open mute list " << filename << llendl;
@@ -365,16 +371,17 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
 
         // *NOTE: Changing the size of these buffers will require changes
         // in the scanf below.
-        char id_buffer[MAX_STRING];
-        char name_buffer[MAX_STRING];
-        char buffer[MAX_STRING];
+        char id_buffer[MAX_STRING];             /*Flawfinder: ignore*/
+        char name_buffer[MAX_STRING];           /*Flawfinder: ignore*/
+        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
         while (!feof(fp) 
                    && fgets(buffer, MAX_STRING, fp))
         {
                 id_buffer[0] = '\0';
                 name_buffer[0] = '\0';
                 S32 type = 0;
-                sscanf(buffer, " %d %254s %254[^|]", &type, id_buffer, name_buffer);
+                sscanf( /* Flawfinder: ignore */
+                        buffer, " %d %254s %254[^|]", &type, id_buffer, name_buffer);
                 LLUUID id = LLUUID(id_buffer);
                 LLMute mute(id, name_buffer, (LLMute::EType)type);
                 if (mute.mID.isNull()
@@ -398,14 +405,20 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
 //-----------------------------------------------------------------------------
 BOOL LLMuteList::saveToFile(const LLString& filename)
 {
-        FILE* fp = LLFile::fopen(filename.c_str(), "wb");
+        if(!filename.size())
+        {
+                llwarns << "Mute List Filename is Empty!" << llendl;
+                return FALSE;
+        }
+
+        FILE* fp = LLFile::fopen(filename.c_str(), "wb");               /*Flawfinder: ignore*/
         if (!fp)
         {
                 llwarns << "Couldn't open mute list " << filename << llendl;
                 return FALSE;
         }
         // legacy mutes have null uuid
-        char id_string[UUID_STR_LENGTH];
+        char id_string[UUID_STR_LENGTH];                /*Flawfinder: ignore*/
         LLUUID::null.toString(id_string);
         for (string_set_t::iterator it = mLegacyMutes.begin();
                  it != mLegacyMutes.end();
@@ -446,10 +459,10 @@ BOOL LLMuteList::isMuted(const LLUUID& id, const LLString& name) const
 //-----------------------------------------------------------------------------
 void LLMuteList::requestFromServer(const LLUUID& agent_id)
 {
-        char agent_id_string[UUID_STR_LENGTH];
-        char filename[LL_MAX_PATH];
+        char agent_id_string[UUID_STR_LENGTH];          /*Flawfinder: ignore*/
+        char filename[LL_MAX_PATH];             /*Flawfinder: ignore*/
         agent_id.toString(agent_id_string);
-        sprintf(filename, "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());
+        snprintf(filename, sizeof(filename), "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());          /*Flawfinder: ignore*/
         LLCRC crc;
         crc.update(filename);
 
@@ -472,10 +485,10 @@ void LLMuteList::cache(const LLUUID& agent_id)
         // Write to disk even if empty.
         if(mIsLoaded)
         {
-                char agent_id_string[UUID_STR_LENGTH];
-                char filename[LL_MAX_PATH];
+                char agent_id_string[UUID_STR_LENGTH];          /*Flawfinder: ignore*/
+                char filename[LL_MAX_PATH];             /*Flawfinder: ignore*/
                 agent_id.toString(agent_id_string);
-                sprintf(filename, "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());
+                snprintf(filename, sizeof(filename), "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());          /*Flawfinder: ignore*/
                 saveToFile(filename);
         }
 }
@@ -495,7 +508,7 @@ void LLMuteList::processMuteListUpdate(LLMessageSystem* msg, void**)
                 llwarns << "Got an mute list update for the wrong agent." << llendl;
                 return;
         }
-        char filename[MAX_STRING];
+        char filename[MAX_STRING];              /*Flawfinder: ignore*/
         filename[0] = '\0';
         msg->getStringFast(_PREHASH_MuteData, _PREHASH_Filename, MAX_STRING, filename);
         
@@ -515,10 +528,10 @@ void LLMuteList::processUseCachedMuteList(LLMessageSystem* msg, void**)
         llinfos << "LLMuteList::processUseCachedMuteList()" << llendl;
         if (!gMuteListp) return;
 
-        char agent_id_string[UUID_STR_LENGTH];
+        char agent_id_string[UUID_STR_LENGTH];          /*Flawfinder: ignore*/
         gAgent.getID().toString(agent_id_string);
-        char filename[LL_MAX_PATH];
-        sprintf(filename, "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());
+        char filename[LL_MAX_PATH];             /*Flawfinder: ignore*/
+        snprintf(filename, sizeof(filename), "%s.cached_mute", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,agent_id_string).c_str());          /*Flawfinder: ignore*/
         gMuteListp->loadFromFile(filename);
 }
 
diff --git a/linden/indra/newview/llnamebox.cpp b/linden/indra/newview/llnamebox.cpp
index bdaa224..8dacf34 100644
--- a/linden/indra/newview/llnamebox.cpp
+++ b/linden/indra/newview/llnamebox.cpp
@@ -66,9 +66,9 @@ void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group)
 {
         mNameID = name_id;
 
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
         LLString name;
 
         if (!is_group)
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp
index fb238e9..5cc5ddd 100644
--- a/linden/indra/newview/llnameeditor.cpp
+++ b/linden/indra/newview/llnameeditor.cpp
@@ -86,9 +86,9 @@ void LLNameEditor::setNameID(const LLUUID& name_id, BOOL is_group)
 {
         mNameID = name_id;
 
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
         LLString name;
 
         if (!is_group)
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index f02e86b..90bfb86 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -69,8 +69,8 @@ BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
 {
         //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl;
 
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
 
         BOOL result = gCacheName->getName(agent_id, first, last);
 
@@ -138,7 +138,7 @@ void LLNameListCtrl::addGroupNameItem(const LLUUID& group_id, EAddPosition pos,
                                                                           BOOL enabled)
 {
         //llinfos << "LLNameListCtrl::addGroupNameItem " << group_id << llendl;
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
         gCacheName->getGroupName(group_id, group_name);
         addStringUUIDItem(group_name, group_id, pos, enabled);
 }
@@ -149,7 +149,7 @@ void LLNameListCtrl::addGroupNameItem(LLScrollListItem* item, EAddPosition pos)
 {
         //llinfos << "LLNameListCtrl::addGroupNameItem " << item->getUUID() << llendl;
 
-        char group_name[DB_GROUP_NAME_BUF_SIZE];
+        char group_name[DB_GROUP_NAME_BUF_SIZE];                /*Flawfinder: ignore*/
         gCacheName->getGroupName(item->getUUID(), group_name);
 
         LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
@@ -162,8 +162,8 @@ BOOL LLNameListCtrl::addNameItem(LLScrollListItem* item, EAddPosition pos)
 {
         //llinfos << "LLNameListCtrl::addNameItem " << item->getUUID() << llendl;
 
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
 
         BOOL result = gCacheName->getName(item->getUUID(), first, last);
 
@@ -184,8 +184,8 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos
 {
         LLScrollListItem* item = LLScrollListCtrl::addElement(value, pos, userdata);
 
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
 
         gCacheName->getName(item->getUUID(), first, last);
 
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 3db447a..dcbf960 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -609,7 +609,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_s
                         msg.assign( region->getName() );
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
-                        char buffer[MAX_STRING];
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                         msg.append("\n");
                         region->getHost().getHostName(buffer, MAX_STRING);
                         msg.append(buffer);
@@ -791,7 +791,7 @@ BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
         if (menu)
         {
                 menu->buildDrawLabels();
-                menu->updateParent(gMenuHolder);
+                menu->updateParent(LLMenuGL::sMenuContainer);
                 LLMenuGL::showPopup(this, menu, x, y);
         }
         return TRUE;
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index c7d3a95..3512e57 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -281,10 +281,6 @@ LLNotifyBox::LLNotifyBox(const LLString& xml_desc, const LLString::format_map_t&
 // virtual
 LLNotifyBox::~LLNotifyBox()
 {
-        if (!mIsTip)
-        {
-                sNotifyBoxCount--;
-        }
         S32 count = mBtnCallbackData.count();
         for (S32 i = 0; i < count; i++)
         {
@@ -395,9 +391,13 @@ void LLNotifyBox::drawBackground() const
 void LLNotifyBox::close()
 {
         BOOL isTipTmp = mIsTip;
-        // delete this so that the sNotifyBoxCount is updated properly, so that the 
-        // new frontman properly has a next button or not
-        delete this;
+
+        if (!mIsTip)
+        {
+                sNotifyBoxCount--;
+        }
+
+        die();
         if(!isTipTmp)
         {
                 LLNotifyBox * front = gNotifyBoxView->getFirstNontipBox();
@@ -714,7 +714,7 @@ LLNotifyBox * LLNotifyBoxView::getFirstNontipBox() const
                         iter++)
         {
                 LLNotifyBox * box = static_cast<LLNotifyBox*>(*iter);
-                if(!box->isTip())
+                if(!box->isTip() && !box->isDead())
                 {
                         return box;
                 }
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index c7019e0..70b18be 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -64,6 +64,7 @@
 #include "lluiconstants.h"
 #include "llvoavatar.h"
 #include "llviewermenu.h"               // *FIX: for is_agent_friend()
+#include "llviewermessage.h"    // send_generic_message
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
 #include "llviewborder.h"
@@ -253,35 +254,60 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 
 
 //-----------------------------------------------------------------------------
-// LLPanelAvatarSecondLife()
+// LLPanelAvatarTab()
 //-----------------------------------------------------------------------------
-LLPanelAvatarSecondLife::LLPanelAvatarSecondLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar ) 
+LLPanelAvatarTab::LLPanelAvatarTab(const std::string& name, const LLRect &rect, 
+                                                                   LLPanelAvatar* panel_avatar)
 :       LLPanel(name, rect),
         mPanelAvatar(panel_avatar),
-        mPartnerID()
-{
-}
+        mDataRequested(false)
+{ }
 
-LLPanelAvatarSecondLife::~LLPanelAvatarSecondLife()
+// virtual
+void LLPanelAvatarTab::draw()
 {
+        if (getVisible())
+        {
+                refresh();
+
+                LLPanel::draw();
+        }
 }
 
-void LLPanelAvatarSecondLife::draw()
+void LLPanelAvatarTab::sendAvatarProfileRequestIfNeeded(const char* type)
 {
-        if (getVisible())
+        if (!mDataRequested)
         {
-                updatePartnerName();
+                std::vector<std::string> strings;
+                strings.push_back( mPanelAvatar->getAvatarID().asString() );
+                strings.push_back( type );
+                send_generic_message("avatarprofilerequest", strings);
+                mDataRequested = true;
         }
+}
+
+//-----------------------------------------------------------------------------
+// LLPanelAvatarSecondLife()
+//-----------------------------------------------------------------------------
+LLPanelAvatarSecondLife::LLPanelAvatarSecondLife(const std::string& name, 
+                                                                                                 const LLRect &rect, 
+                                                                                                 LLPanelAvatar* panel_avatar ) 
+:       LLPanelAvatarTab(name, rect, panel_avatar),
+        mPartnerID()
+{
+}
 
-        LLPanel::draw();
+void LLPanelAvatarSecondLife::refresh()
+{
+        updatePartnerName();
 }
 
 void LLPanelAvatarSecondLife::updatePartnerName()
 {
         if (mPartnerID.notNull())
         {
-                char first[128];
-                char last[128];
+                char first[128];                /*Flawfinder: ignore*/
+                char last[128];         /*Flawfinder: ignore*/
                 BOOL found = gCacheName->getName(mPartnerID, first, last);
                 if (found)
                 {
@@ -378,17 +404,27 @@ void LLPanelAvatarSecondLife::onClickPublishHelp(void *)
         gViewerWindow->alertXml("ClickPublishHelpAvatar");
 }
 
-//-----------------------------------------------------------------------------
-// LLPanelAvatarFirstLife()
-//-----------------------------------------------------------------------------
-LLPanelAvatarFirstLife::LLPanelAvatarFirstLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar ) 
-:       LLPanel(name, rect),
-        mPanelAvatar(panel_avatar)
+// static
+void LLPanelAvatarSecondLife::onClickPartnerHelp(void *)
+{
+    gViewerWindow->alertXml("ClickPartnerHelpAvatar", onClickPartnerHelpLoadURL, (void*) NULL);
+}
+
+// static 
+void LLPanelAvatarSecondLife::onClickPartnerHelpLoadURL(S32 option, void* userdata)
 {
+  if (option == 0)
+    LLWeb::loadURL("http://secondlife.com/partner");
 }
 
 
-LLPanelAvatarFirstLife::~LLPanelAvatarFirstLife()
+//-----------------------------------------------------------------------------
+// LLPanelAvatarFirstLife()
+//-----------------------------------------------------------------------------
+LLPanelAvatarFirstLife::LLPanelAvatarFirstLife(const std::string& name, 
+                                                                                           const LLRect &rect, 
+                                                                                           LLPanelAvatar* panel_avatar ) 
+:       LLPanelAvatarTab(name, rect, panel_avatar)
 {
 }
 
@@ -407,9 +443,10 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
 {
         childSetEnabled("born", FALSE);
         childSetEnabled("partner_edit", FALSE);
+        childSetAction("partner_help",onClickPartnerHelp,this);
         
         childSetAction("?",onClickPublishHelp,this);
-        BOOL own_avatar = (mPanelAvatar->getAvatarID() == gAgent.getID() );
+        BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
         enableControls(own_avatar);
 
         childSetVisible("About:",LLPanelAvatar::sAllowFirstLife);
@@ -426,26 +463,30 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
         childSetVisible("online_unknown",FALSE);
         childSetVisible("online_no",FALSE);
 
-        childSetAction("Show on Map", LLPanelAvatar::onClickTrack, mPanelAvatar);
-        childSetAction("Instant Message...", LLPanelAvatar::onClickIM, mPanelAvatar);
-        childSetAction("Rate...", LLPanelAvatar::onClickRate, mPanelAvatar);
-        childSetAction("Pay...", LLPanelAvatar::onClickPay, mPanelAvatar);
-        childSetAction("Mute", LLPanelAvatar::onClickMute, mPanelAvatar );      
+        childSetAction("Show on Map", LLPanelAvatar::onClickTrack, getPanelAvatar());
+        childSetAction("Instant Message...", LLPanelAvatar::onClickIM, getPanelAvatar());
+        childSetAction("Rate...", LLPanelAvatar::onClickRate, getPanelAvatar());
+        childSetAction("Pay...", LLPanelAvatar::onClickPay, getPanelAvatar());
+        childSetAction("Mute", LLPanelAvatar::onClickMute, getPanelAvatar() );  
 
-        childSetAction("Offer Teleport...", LLPanelAvatar::onClickOfferTeleport, mPanelAvatar);
+        childSetAction("Offer Teleport...", LLPanelAvatar::onClickOfferTeleport, 
+                getPanelAvatar() );
 
         childSetDoubleClickCallback("groups", onDoubleClickGroup, this );
 
         return TRUE;
 }
+
 BOOL LLPanelAvatarFirstLife::postBuild(void)
 {
-        BOOL own_avatar = (mPanelAvatar->getAvatarID() == gAgent.getID() );
+        BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
         enableControls(own_avatar);
         return TRUE;
 }
+
 BOOL LLPanelAvatarNotes::postBuild(void)
-{       childSetCommitCallback("notes edit",onCommitNotes,this);
+{
+        childSetCommitCallback("notes edit",onCommitNotes,this);
         
         LLTextEditor*   te = LLUICtrlFactory::getTextEditorByName(this,"notes edit");
         if(te) te->setCommitOnFocusLost(TRUE);
@@ -482,6 +523,7 @@ BOOL LLPanelAvatarClassified::postBuild(void)
         childSetAction("Delete...",onClickDelete,NULL);
         return TRUE;
 }
+
 BOOL LLPanelAvatarPicks::postBuild(void)
 {
         childSetAction("New...",onClickNew,NULL);
@@ -489,25 +531,25 @@ BOOL LLPanelAvatarPicks::postBuild(void)
         return TRUE;
 }
 
-BOOL    LLPanelAvatarAdvanced::postBuild()
+BOOL LLPanelAvatarAdvanced::postBuild()
 {
-        for( S32 i = 0; i < kArraySize(mWantToCheck); i++ )
-                mWantToCheck[i] = NULL;
-        for( S32 i = 0; i < kArraySize(mSkillsCheck); i++ )
-                mSkillsCheck[i] = NULL;
+        for(size_t ii = 0; ii < kArraySize(mWantToCheck); ++ii)
+                mWantToCheck[ii] = NULL;
+        for(size_t ii = 0; ii < kArraySize(mSkillsCheck); ++ii)
+                mSkillsCheck[ii] = NULL;
         mWantToCount = (8>kArraySize(mWantToCheck))?kArraySize(mWantToCheck):8;
-        for(int t=0;t < mWantToCount ;t++)
+        for(S32 tt=0; tt < mWantToCount; ++tt)
         {       
-                LLString ctlname = llformat("chk%d",t);
-                mWantToCheck[t] = LLUICtrlFactory::getCheckBoxByName(this,ctlname);
+                LLString ctlname = llformat("chk%d", tt);
+                mWantToCheck[tt] = LLUICtrlFactory::getCheckBoxByName(this,ctlname);
         }       
         mSkillsCount = (6>kArraySize(mSkillsCheck))?kArraySize(mSkillsCheck):6;
 
-        for(int t=0;t<mSkillsCount;t++)
+        for(S32 tt=0; tt < mSkillsCount; ++tt)
         {
                 //Find the Skills checkboxes and save off thier controls
-                LLString ctlname = llformat("schk%d",t);
-                mSkillsCheck[t] = LLUICtrlFactory::getCheckBoxByName(this,ctlname);
+                LLString ctlname = llformat("schk%d",tt);
+                mSkillsCheck[tt] = LLUICtrlFactory::getCheckBoxByName(this,ctlname);
         }
 
         mWantToEdit = LLUICtrlFactory::getLineEditorByName(this,"want_to_edit");
@@ -518,9 +560,12 @@ BOOL	LLPanelAvatarAdvanced::postBuild()
         return TRUE;
 }
 
-LLPanelAvatarWeb::LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar)
-:       LLPanel(name, rect),
-        mPanelAvatar(panel_avatar),
+//-----------------------------------------------------------------------------
+// LLPanelAvatarWeb
+//-----------------------------------------------------------------------------
+LLPanelAvatarWeb::LLPanelAvatarWeb(const std::string& name, const LLRect& rect, 
+                                                                   LLPanelAvatar* panel_avatar)
+:       LLPanelAvatarTab(name, rect, panel_avatar),
         mWebBrowser(NULL)
 {
 }
@@ -668,13 +713,14 @@ void LLPanelAvatarWeb::onLocationChange( const EventType& eventIn )
 }
 #endif
 
-LLPanelAvatarAdvanced::LLPanelAvatarAdvanced(
-        const std::string& name,
-        const LLRect& rect,
-        LLPanelAvatar* panel_avatar)
-        :
-        LLPanel(name, rect),
-        mPanelAvatar(panel_avatar),
+
+//-----------------------------------------------------------------------------
+// LLPanelAvatarAdvanced
+//-----------------------------------------------------------------------------
+LLPanelAvatarAdvanced::LLPanelAvatarAdvanced(const std::string& name, 
+                                                                                         const LLRect& rect, 
+                                                                                         LLPanelAvatar* panel_avatar)
+:       LLPanelAvatarTab(name, rect, panel_avatar),
         mWantToCount(0),
         mSkillsCount(0),
         mWantToEdit( NULL ),
@@ -682,13 +728,9 @@ LLPanelAvatarAdvanced::LLPanelAvatarAdvanced(
 {
 }
 
-LLPanelAvatarAdvanced::~LLPanelAvatarAdvanced()
-{
-}
-
-
 void LLPanelAvatarAdvanced::enableControls(BOOL self)
-{       int t;
+{
+        S32 t;
         for(t=0;t<mWantToCount;t++)
         {
                 if(mWantToCheck[t])mWantToCheck[t]->setEnabled(self);
@@ -774,25 +816,27 @@ void LLPanelAvatarAdvanced::getWantSkills(U32* want_to_mask, std::string& want_t
 // LLPanelAvatarNotes()
 //-----------------------------------------------------------------------------
 LLPanelAvatarNotes::LLPanelAvatarNotes(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar)
-:       LLPanel(name, rect),
-        mPanelAvatar(panel_avatar)
+:       LLPanelAvatarTab(name, rect, panel_avatar)
 {
 }
 
-LLPanelAvatarNotes::~LLPanelAvatarNotes()
+void LLPanelAvatarNotes::refresh()
 {
+        sendAvatarProfileRequestIfNeeded("notes");
 }
 
-
-void LLPanelAvatarNotes::enableControls(BOOL self)
-{ }
+void LLPanelAvatarNotes::clearControls()
+{
+        childSetText("notes edit", "Loading...");
+        childSetEnabled("notes edit", false);
+}
 
 // static
 void LLPanelAvatarNotes::onCommitNotes(LLUICtrl*, void* userdata)
 {
         LLPanelAvatarNotes* self = (LLPanelAvatarNotes*)userdata;
 
-        self->mPanelAvatar->sendAvatarNotesUpdate();
+        self->getPanelAvatar()->sendAvatarNotesUpdate();
 }
 
 
@@ -801,33 +845,14 @@ void LLPanelAvatarNotes::onCommitNotes(LLUICtrl*, void* userdata)
 //-----------------------------------------------------------------------------
 LLPanelAvatarClassified::LLPanelAvatarClassified(const LLString& name, const LLRect& rect,
                                                                            LLPanelAvatar* panel_avatar)
-:       LLPanel(name, rect),
-        mPanelAvatar(panel_avatar)
+:       LLPanelAvatarTab(name, rect, panel_avatar)
 {
 }
 
 
-LLPanelAvatarClassified::~LLPanelAvatarClassified()
-{
-        // children deleted by view destructor
-}
-
-
-void LLPanelAvatarClassified::draw()
-{
-        if (getVisible())
-        {
-                refresh();
-
-                LLPanel::draw();
-        }
-}
-
-
 void LLPanelAvatarClassified::refresh()
 {
-        BOOL self = (gAgent.getID() == mPanelAvatar->getAvatarID());
-
+        BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
         
         LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(this,"classified tab");
         
@@ -839,15 +864,12 @@ void LLPanelAvatarClassified::refresh()
 
         childSetEnabled("New...",self && allow_new);
         childSetEnabled("Delete...",self && allow_delete);
-        childSetVisible("help_text",self && show_help);
         childSetVisible("classified tab",!show_help);
-}
 
-
-void LLPanelAvatarClassified::enableControls(BOOL self)
-{
+        sendAvatarProfileRequestIfNeeded("classifieds");
 }
 
+
 BOOL LLPanelAvatarClassified::titleIsValid()
 {
         LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
@@ -884,6 +906,10 @@ void LLPanelAvatarClassified::deleteClassifiedPanels()
         {
                 tabs->deleteAllTabs();
         }
+
+        childSetVisible("New...", false);
+        childSetVisible("Delete...", false);
+        childSetVisible("loading_text", true);
 }
 
 
@@ -892,7 +918,7 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
         S32 block = 0;
         S32 block_count = 0;
         LLUUID classified_id;
-        char classified_name[DB_PICK_NAME_SIZE];
+        char classified_name[DB_PICK_NAME_SIZE];                /*Flawfinder: ignore*/
         LLPanelClassified* panel_classified = NULL;
 
         LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
@@ -927,6 +953,10 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
         {
                 tabs->selectFirstTab();
         }
+
+        childSetVisible("New...", true);
+        childSetVisible("Delete...", true);
+        childSetVisible("loading_text", false);
 }
 
 
@@ -1018,34 +1048,17 @@ void LLPanelAvatarClassified::callbackDelete(S32 option, void* data)
 //-----------------------------------------------------------------------------
 // LLPanelAvatarPicks()
 //-----------------------------------------------------------------------------
-LLPanelAvatarPicks::LLPanelAvatarPicks(const std::string& name, const LLRect& rect,
+LLPanelAvatarPicks::LLPanelAvatarPicks(const std::string& name, 
+                                                                           const LLRect& rect,
                                                                            LLPanelAvatar* panel_avatar)
-:       LLPanel(name, rect),
-        mPanelAvatar(panel_avatar)
+:       LLPanelAvatarTab(name, rect, panel_avatar)
 {
 }
 
 
-LLPanelAvatarPicks::~LLPanelAvatarPicks()
-{
-        // children deleted by view destructor
-}
-
-
-void LLPanelAvatarPicks::draw()
-{
-        if (getVisible())
-        {
-                refresh();
-
-                LLPanel::draw();
-        }
-}
-
-
 void LLPanelAvatarPicks::refresh()
 {
-        BOOL self = (gAgent.getID() == mPanelAvatar->getAvatarID());
+        BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
 
         LLTabContainerCommon*   tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"picks tab");
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
@@ -1054,12 +1067,8 @@ void LLPanelAvatarPicks::refresh()
 
         childSetEnabled("New...",self && allow_new);
         childSetEnabled("Delete...",self && allow_delete);
-}
 
-
-// You are only allowed 10 picks.
-void LLPanelAvatarPicks::enableControls(BOOL self)
-{
+        sendAvatarProfileRequestIfNeeded("picks");
 }
 
 
@@ -1070,15 +1079,18 @@ void LLPanelAvatarPicks::deletePickPanels()
         {
                 tabs->deleteAllTabs();
         }
-}
 
+        childSetVisible("New...", false);
+        childSetVisible("Delete...", false);
+        childSetVisible("loading_text", true);
+}
 
 void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
 {
         S32 block = 0;
         S32 block_count = 0;
         LLUUID pick_id;
-        char pick_name[DB_PICK_NAME_SIZE];
+        char pick_name[DB_PICK_NAME_SIZE];              /*Flawfinder: ignore*/
         LLPanelPick* panel_pick = NULL;
 
         LLTabContainerCommon* tabs =  LLUICtrlFactory::getTabContainerByName(this,"picks tab");
@@ -1114,6 +1126,10 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
         {
                 tabs->selectFirstTab();
         }
+
+        childSetVisible("New...", true);
+        childSetVisible("Delete...", true);
+        childSetVisible("loading_text", false);
 }
 
 
@@ -1313,6 +1329,31 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
         }
 
         mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
+
+        // Since setOnlineStatus gets called after setAvatarID
+        // need to make sure that "Offer Teleport" doesn't get set
+        // to TRUE again for yourself
+        if (mAvatarID != gAgent.getID())
+        {
+                childSetVisible("Offer Teleport...",TRUE);
+        }
+
+        BOOL in_prelude = gAgent.inPrelude();
+        if(gAgent.isGodlike())
+        {
+                childSetEnabled("Offer Teleport...", TRUE);
+                childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
+        }
+        else if (in_prelude)
+        {
+                childSetEnabled("Offer Teleport...",FALSE);
+                childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
+        }
+        else
+        {
+                childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES));
+                childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
+        }
 }
 
 void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
@@ -1338,12 +1379,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
         mPanelSecondLife->enableControls(own_avatar && mAllowEdit);
         mPanelWeb->enableControls(own_avatar && mAllowEdit);
         mPanelAdvanced->enableControls(own_avatar && mAllowEdit);
-        mPanelPicks->enableControls(own_avatar && mAllowEdit);
-        mPanelClassified->enableControls(own_avatar && mAllowEdit);
         // Teens don't have this.
         if (mPanelFirstLife) mPanelFirstLife->enableControls(own_avatar && mAllowEdit);
-        mPanelNotes->enableControls(own_avatar && mAllowEdit);
-
 
         LLView *target_view = getChildByName("drop_target_rect", TRUE);
         if(target_view)
@@ -1357,16 +1394,16 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
                 mDropTarget->setAgentID(mAvatarID);
         }
 
-        LLNameEditor*   NameEdit = LLViewerUICtrlFactory::getNameEditorByName(this, "name");
-        if(NameEdit)
+        LLNameEditor* name_edit = LLViewerUICtrlFactory::getNameEditorByName(this, "name");
+        if(name_edit)
         {
                 if (name.empty())
                 {
-                        NameEdit->setNameID(avatar_id, FALSE);
+                        name_edit->setNameID(avatar_id, FALSE);
                 }
                 else
                 {
-                        NameEdit->setText(name);
+                        name_edit->setText(name);
                 }
         }
 //      if (avatar_changed)
@@ -1374,9 +1411,19 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
                 // While we're waiting for data off the network, clear out the
                 // old data.
                 mPanelSecondLife->clearControls();
+
                 mPanelPicks->deletePickPanels();
+                mPanelPicks->setDataRequested(false);
+
                 mPanelClassified->deleteClassifiedPanels();
+                mPanelClassified->setDataRequested(false);
 
+                mPanelNotes->clearControls();
+                mPanelNotes->setDataRequested(false);
+
+                // Request just the first two pages of data.  The picks,
+                // classifieds, and notes will be requested when that panel
+                // is made visible. JC
                 sendAvatarPropertiesRequest();
 
                 if (own_avatar)
@@ -1423,25 +1470,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
                         childSetVisible("Mute",TRUE);
                         childSetEnabled("Mute",FALSE);
 
-                        childSetVisible("Offer Teleport...",TRUE);
-                        BOOL in_prelude = gAgent.inPrelude();
-                        if(gAgent.isGodlike())
-                        {
-                                childSetEnabled("Offer Teleport...", TRUE);
-                                childSetToolTip("Offer Teleport...", childGetValue("TeleportGod").asString());
-                        }
-                        else if (in_prelude)
-                        {
-                                childSetEnabled("Offer Teleport...",FALSE);
-                                childSetToolTip("Offer Teleport...",childGetValue("TeleportPrelude").asString());
-                        }
-                        else
-                        {
-                                // Even if user might be offline, allow a teleport offer.
-                                BOOL maybe_online = (online_status != ONLINE_STATUS_NO);
-                                childSetEnabled("Offer Teleport...", maybe_online);
-                                childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
-                        }
                         childSetVisible("drop target",TRUE);
                         childSetEnabled("drop target",FALSE);
 
@@ -1670,12 +1698,17 @@ void LLPanelAvatar::onClickCancel(void *userdata)
 
         if (self)
         {
-                self->sendAvatarPropertiesRequest();
                 LLFloaterAvatarInfo *infop;
                 if ((infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID)))
                 {
                         infop->close();
                 }
+                else
+                {
+                        // We're in the Search directory and are cancelling an edit
+                        // to our own profile, so reset.
+                        self->sendAvatarPropertiesRequest();
+                }
         }
 }
 
@@ -1721,16 +1754,16 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
         LLUUID  image_id;
         LLUUID  fl_image_id;
         LLUUID  partner_id;
-        char    about_text[DB_USER_ABOUT_BUF_SIZE];
-        char    fl_about_text[DB_USER_FL_ABOUT_BUF_SIZE];
-        char    born_on[DB_BORN_BUF_SIZE];
+        char    about_text[DB_USER_ABOUT_BUF_SIZE];             /*Flawfinder: ignore*/
+        char    fl_about_text[DB_USER_FL_ABOUT_BUF_SIZE];               /*Flawfinder: ignore*/
+        char    born_on[DB_BORN_BUF_SIZE];              /*Flawfinder: ignore*/
         S32             charter_member_size = 0;
         BOOL    allow_publish = FALSE;
         //BOOL  mature = FALSE;
         BOOL    identified = FALSE;
         BOOL    transacted = FALSE;
         BOOL    online = FALSE;
-        char    profile_url[DB_USER_PROFILE_URL_BUF_SIZE];
+        char    profile_url[DB_USER_PROFILE_URL_BUF_SIZE];              /*Flawfinder: ignore*/
 
         U32             flags = 0x0;
 
@@ -1786,7 +1819,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 }
                 else if(1 < charter_member_size)
                 {
-                        char caption[MAX_STRING];
+                        char caption[MAX_STRING];               /*Flawfinder: ignore*/
                         msg->getString("PropertiesData", "CharterMember", MAX_STRING, caption);
                         caption_text = caption;
                 }
@@ -1868,10 +1901,10 @@ void LLPanelAvatar::processAvatarInterestsReply(LLMessageSystem *msg, void**)
         LLUUID  avatar_id;      // target of this panel
 
         U32             want_to_mask;
-        char    want_to_text[DB_USER_WANT_TO_BUF_SIZE];
+        char    want_to_text[DB_USER_WANT_TO_BUF_SIZE];         /*Flawfinder: ignore*/
         U32             skills_mask;
-        char    skills_text[DB_USER_SKILLS_BUF_SIZE];
-        char    languages_text[DB_USER_SKILLS_BUF_SIZE];
+        char    skills_text[DB_USER_SKILLS_BUF_SIZE];           /*Flawfinder: ignore*/
+        char    languages_text[DB_USER_SKILLS_BUF_SIZE];                /*Flawfinder: ignore*/
 
         //llinfos << "properties packet size " << msg->getReceiveSize() << llendl;
 
@@ -1903,9 +1936,9 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
         LLUUID  agent_id;       // your id
         LLUUID  avatar_id;      // target of this panel
         U64             group_powers;
-        char    group_title[DB_GROUP_TITLE_BUF_SIZE];
+        char    group_title[DB_GROUP_TITLE_BUF_SIZE];           /*Flawfinder: ignore*/
         LLUUID  group_id;
-        char    group_name[DB_GROUP_NAME_BUF_SIZE];
+        char    group_name[DB_GROUP_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
         LLUUID  group_insignia_id;
         const LLFontGL* FONT = LLFontGL::sSansSerifSmall;
 
@@ -2117,10 +2150,10 @@ void LLPanelAvatar::processAvatarStatisticsReply(LLMessageSystem *msg, void**)
                 S32 items = msg->getNumberOfBlocksFast(_PREHASH_StatisticsData);
                 for (S32 i = 0; i < items; i++)
                 {
-                        char name[MAX_STRING];
+                        char name[MAX_STRING];          /*Flawfinder: ignore*/
                         S32 positive;
                         S32 negative;
-                        char value_string[MAX_STRING];
+                        char value_string[MAX_STRING];          /*Flawfinder: ignore*/
 
                         msg->getStringFast(     _PREHASH_StatisticsData, 
                                                                 _PREHASH_Name, MAX_STRING, name, i);
@@ -2134,7 +2167,7 @@ void LLPanelAvatar::processAvatarStatisticsReply(LLMessageSystem *msg, void**)
                         item = new LLScrollListItem();
                         item->addColumn( name, font, TEXT_WIDTH );
 
-                        sprintf( value_string, "+%d", positive);
+                        snprintf( value_string, sizeof(value_string),  "+%d", positive);                /*Flawfinder: ignore*/
                         item->addColumn( value_string, font, 50 );
 
                         item->addColumn("", font);      // extra column to force striped appearance
@@ -2163,9 +2196,10 @@ void LLPanelAvatar::processAvatarNotesReply(LLMessageSystem *msg, void**)
                         continue;
                 }
 
-                char text[DB_USER_NOTE_SIZE];
+                char text[DB_USER_NOTE_SIZE];           /*Flawfinder: ignore*/
                 msg->getString("Data", "Notes", DB_USER_NOTE_SIZE, text);
                 self->childSetValue("notes edit", text);
+                self->childSetEnabled("notes edit", true);
         }
 }
 
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 81cfe02..3e8bffd 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -59,35 +59,61 @@ enum EOnlineStatus
         ONLINE_STATUS_YES     = 1
 };
 
-class LLPanelAvatarFirstLife
-: public LLPanel
+// Base class for all sub-tabs inside the avatar profile.  Many of these
+// panels need to keep track of the parent panel (to get the avatar id)
+// and only request data from the database when they are first drawn. JC
+class LLPanelAvatarTab : public LLPanel
 {
 public:
-        LLPanelAvatarFirstLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarFirstLife();
-        /*virtual*/ BOOL        postBuild(void);
+        LLPanelAvatarTab(const std::string& name, const LLRect &rect, 
+                LLPanelAvatar* panel_avatar);
 
-        void enableControls(BOOL own_avatar);
+        // Calls refresh() once per frame when panel is visible
+        /*virtual*/ void draw();
 
-protected:
+        LLPanelAvatar* getPanelAvatar() const { return mPanelAvatar; }
+
+        void setDataRequested(bool requested) { mDataRequested = requested; }
+        bool isDataRequested() const              { return mDataRequested; }
+
+        // If the data for this tab has not yet been requested,
+        // send the request.  Used by tabs that are filled in only
+        // when they are first displayed.
+        // type is one of "notes", "classifieds", "picks"
+        void sendAvatarProfileRequestIfNeeded(const char* type);
+
+private:
         LLPanelAvatar* mPanelAvatar;
+        bool mDataRequested;
+};
+
+
+class LLPanelAvatarFirstLife : public LLPanelAvatarTab
+{
+public:
+        LLPanelAvatarFirstLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar);
+
+        /*virtual*/ BOOL postBuild(void);
+
+        void enableControls(BOOL own_avatar);
 };
 
 
 class LLPanelAvatarSecondLife
-: public LLPanel
+: public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarSecondLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar );
-        /*virtual*/ ~LLPanelAvatarSecondLife();
 
-        /*virtual*/ BOOL        postBuild(void);
-        /*virtual*/ void draw();
+        /*virtual*/ BOOL postBuild(void);
+        /*virtual*/ void refresh();
 
         static void onClickImage(                       void *userdata);
         static void onClickFriends(                     void *userdata);
         static void onDoubleClickGroup(void* userdata);
         static void onClickPublishHelp(void *userdata);
+        static void onClickPartnerHelp(void *userdata);
+        static void onClickPartnerHelpLoadURL(S32 option, void* userdata);
 
         // Clear out the controls anticipating new network data.
         void clearControls();
@@ -97,15 +123,14 @@ public:
 
         void setPartnerID(LLUUID id) { mPartnerID = id; }
         
-protected:
-        LLPanelAvatar* mPanelAvatar;
-
+private:
         LLUUID                          mPartnerID;
 };
 
+
 // WARNING!  The order of the inheritance here matters!!  Do not change.  - KLW
 class LLPanelAvatarWeb : 
-        public LLPanel
+        public LLPanelAvatarTab
 #if LL_LIBXUL_ENABLED
         , public LLWebBrowserCtrlObserver
 #endif
@@ -132,17 +157,17 @@ public:
         virtual void onLocationChange( const EventType& eventIn );
 #endif
 
-protected:
-        LLPanelAvatar*          mPanelAvatar;
+private:
         std::string                     mURL;
         LLWebBrowserCtrl*       mWebBrowser;
 };
 
-class LLPanelAvatarAdvanced : public LLPanel
+
+class LLPanelAvatarAdvanced : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarAdvanced(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarAdvanced();
+
         /*virtual*/ BOOL        postBuild(void);
 
         void enableControls(BOOL own_avatar);
@@ -153,8 +178,7 @@ public:
                                            U32* skills_mask, std::string& skills_text,
                                            std::string& languages_text);
 
-protected:
-        LLPanelAvatar*          mPanelAvatar;
+private:
         S32                                     mWantToCount;
         S32                                     mSkillsCount;
         LLCheckBoxCtrl          *mWantToCheck[8];
@@ -164,35 +188,31 @@ protected:
 };
 
 
-class LLPanelAvatarNotes : public LLPanel
+class LLPanelAvatarNotes : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarNotes(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarNotes();
+
         /*virtual*/ BOOL        postBuild(void);
 
-        void enableControls(BOOL own_avatar);
+        /*virtual*/ void refresh();
 
-        static void onCommitNotes(LLUICtrl* field, void* userdata);
+        void clearControls();
 
-protected:
-        LLPanelAvatar* mPanelAvatar;
+        static void onCommitNotes(LLUICtrl* field, void* userdata);
 };
 
 
-class LLPanelAvatarClassified : public LLPanel
+class LLPanelAvatarClassified : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarClassified(const LLString& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarClassified();
 
-        /*virtual*/ BOOL        postBuild(void);
-        /*virtual*/ void draw();
+        /*virtual*/ BOOL postBuild(void);
 
-        void refresh();
+        /*virtual*/ void refresh();
 
         void apply();
-        void enableControls(BOOL own_avatar);
 
         BOOL titleIsValid();
 
@@ -209,23 +229,17 @@ private:
 
         static void callbackDelete(S32 option, void* data);
         static void callbackNew(S32 option, void* data);
-
-private:
-        LLPanelAvatar* mPanelAvatar;
 };
 
-class LLPanelAvatarPicks : public LLPanel
+
+class LLPanelAvatarPicks : public LLPanelAvatarTab
 {
 public:
         LLPanelAvatarPicks(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
-        /*virtual*/ ~LLPanelAvatarPicks();
 
         /*virtual*/ BOOL        postBuild(void);
-        /*virtual*/ void draw();
-
-        void refresh();
 
-        void enableControls(BOOL own_avatar);
+        /*virtual*/ void refresh();
 
         // Delete all the pick sub-panels from the tab container
         void deletePickPanels();
@@ -240,9 +254,6 @@ private:
         static void onClickDelete(void* data);
 
         static void callbackDelete(S32 option, void* data);
-
-private:
-        LLPanelAvatar* mPanelAvatar;
 };
 
 
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index d6ca984..11120e0 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -102,16 +102,17 @@ LLPanelClassified::LLPanelClassified(BOOL in_finder)
         mDataRequested(FALSE),
         mEnableCommit(FALSE),
         mPaidFor(FALSE),
-        mParcelID(),
     mPosGlobal(),
     mSnapshotCtrl(NULL),
     mNameEditor(NULL),
-    mLocationEditor(NULL),
     mDescEditor(NULL),
+    mLocationEditor(NULL),
+        mCategoryCombo(NULL),
+        mUpdateBtn(NULL),
     mTeleportBtn(NULL),
     mMapBtn(NULL),
-    //mLandmarkBtn(NULL),
-    //mEnabledCheck(NULL),
+        mProfileBtn(NULL),
+        mInfoText(NULL),
         mMatureCheck(NULL),
         mAutoRenewCheck(NULL),
     mSetBtn(NULL),
@@ -441,10 +442,10 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
     LLUUID parcel_id;
     msg->getUUIDFast(_PREHASH_Data, _PREHASH_ParcelID, parcel_id);
 
-        char name[DB_PARCEL_NAME_SIZE];
+        char name[DB_PARCEL_NAME_SIZE];         /*Flawfinder: ignore*/
         msg->getStringFast(_PREHASH_Data, _PREHASH_Name, DB_PARCEL_NAME_SIZE, name);
 
-        char desc[DB_PICK_DESC_SIZE];
+        char desc[DB_PICK_DESC_SIZE];           /*Flawfinder: ignore*/
         msg->getStringFast(_PREHASH_Data, _PREHASH_Desc, DB_PICK_DESC_SIZE, desc);
 
         LLUUID snapshot_id;
@@ -452,7 +453,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
 
     // "Location text" is actually the original
     // name that owner gave the parcel, and the location.
-        char buffer[256];
+        char buffer[256];               /*Flawfinder: ignore*/
     LLString location_text;
 
     msg->getStringFast(_PREHASH_Data, _PREHASH_ParcelName, 256, buffer);
@@ -466,7 +467,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
                 location_text.assign("");
         }
 
-        char sim_name[256];
+        char sim_name[256];             /*Flawfinder: ignore*/
         msg->getStringFast(_PREHASH_Data, _PREHASH_SimName, 256, sim_name);
 
         LLVector3d pos_global;
@@ -476,7 +477,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
     S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
         S32 region_z = llround((F32)pos_global.mdV[VZ]);
    
-    sprintf(buffer, "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);
+    snprintf(buffer, sizeof(buffer), "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);                /*Flawfinder: ignore*/
     location_text.append(buffer);
 
         U8 flags;
@@ -762,7 +763,7 @@ void LLPanelClassified::onClickSet(void* data)
         self->mPosGlobal = gAgent.getPositionGlobal();
 
         LLString location_text;
-        location_text.assign("(will update after save)");
+        location_text.assign("(will update after publish)");
         location_text.append(", ");
 
     S32 region_x = llround((F32)self->mPosGlobal.mdV[VX]) % REGION_WIDTH_UNITS;
@@ -804,7 +805,7 @@ void LLPanelClassified::sendClassifiedClickMessage(const char* type)
         // You're allowed to click on your own ads to reassure yourself
         // that the system is working.
         std::vector<std::string> strings;
-        strings.push_back(mClassifiedID.getString());
+        strings.push_back(mClassifiedID.asString());
         strings.push_back(type);
         LLUUID no_invoice;
         send_generic_message("classifiedclick", strings, no_invoice);
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 6fa34cf..47f2d35 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -115,8 +115,8 @@ void LLPanelContents::getState(LLViewerObject *objectp )
         // unambiguous destination for the object.
         if(     editable && 
                 all_volume && 
-                ((gSelectMgr->getRootObjectCount() == 1)
-                                        || (gSelectMgr->getObjectCount() == 1)))
+                ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
+                                        || (gSelectMgr->getSelection()->getObjectCount() == 1)))
         {
                 //mBtnNewScript->setEnabled(TRUE);
                 childSetEnabled("button new script",TRUE);
@@ -131,10 +131,10 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 
 void LLPanelContents::refresh()
 {
-        LLViewerObject* object = gSelectMgr->getFirstRootObject();
+        LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
         if(!object)
         {
-                object = gSelectMgr->getFirstObject();
+                object = gSelectMgr->getSelection()->getFirstObject();
         }
 
         getState(object);
@@ -153,10 +153,10 @@ void LLPanelContents::refresh()
 // static
 void LLPanelContents::onClickNewScript(void *userdata)
 {
-        LLViewerObject* object = gSelectMgr->getFirstRootObject();
+        LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
         if(!object)
         {
-                object = gSelectMgr->getFirstObject();
+                object = gSelectMgr->getSelection()->getFirstObject();
         }
         if(object)
         {
@@ -203,7 +203,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
                                                                            "Script: New Script",
                                                                            object->mID,
                                                                            LLUUID::null);
-                editor->open();
+                editor->open(); /*Flawfinder: ignore*/
 
                 // keep onscreen
                 gFloaterView->adjustToFitScreen(editor, FALSE);
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index f701bf4..7f15a85 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -400,8 +400,8 @@ void LLPanelDirBrowser::showEvent(const U32 event_id)
 void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
 {
         LLUUID query_id;
-        char   first_name[DB_FIRST_NAME_BUF_SIZE];
-        char   last_name[DB_LAST_NAME_BUF_SIZE];        
+        char   first_name[DB_FIRST_NAME_BUF_SIZE];      /* Flawfinder: ignore */
+        char   last_name[DB_LAST_NAME_BUF_SIZE];        /* Flawfinder: ignore */
         LLUUID agent_id;
 
         msg->getUUIDFast(_PREHASH_QueryData,_PREHASH_QueryID, query_id);
@@ -471,9 +471,7 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
                 content["name"] = fullname;
 
                 list->addElement(row);
-
-                LLString id_str = agent_id.getString();
-                self->mResultsContents[id_str] = content;
+                self->mResultsContents[agent_id.asString()] = content;
         }
 
         list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
@@ -490,7 +488,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
         LLUUID  agent_id;
         LLUUID  query_id;
         LLUUID  parcel_id;
-        char    name[MAX_STRING];
+        char    name[MAX_STRING];               /*Flawfinder: ignore*/
         BOOL    is_for_sale;
         BOOL    is_auction;
         BOOL    is_newbie;
@@ -552,9 +550,7 @@ void LLPanelDirBrowser::processDirPlacesReply(LLMessageSystem* msg, void**)
                 row["columns"][3]["font"] = "SANSSERIFSMALL";
 
                 list->addElement(row);
-
-                LLString id_str = parcel_id.getString();
-                self->mResultsContents[id_str] = content;
+                self->mResultsContents[parcel_id.asString()] = content;
         }
 
         list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
@@ -572,7 +568,7 @@ void LLPanelDirBrowser::processDirPopularReply(LLMessageSystem *msg, void**)
         LLUUID  agent_id;
         LLUUID  query_id;
         LLUUID  parcel_id;
-        char    name[MAX_STRING];
+        char    name[MAX_STRING];               /*Flawfinder: ignore*/
         F32             dwell;
 
         msg->getUUID("AgentData", "AgentID", agent_id);
@@ -634,9 +630,7 @@ void LLPanelDirBrowser::processDirPopularReply(LLMessageSystem *msg, void**)
                 row["columns"][2]["font"] = "SANSSERIFSMALL";
 
                 list->addElement(row);
-
-                LLString id_str = parcel_id.getString();
-                self->mResultsContents[id_str] = content;
+                self->mResultsContents[parcel_id.asString()] = content;
         }
 
         list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
@@ -653,8 +647,8 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
         LLUUID  agent_id;
         LLUUID  query_id;
         LLUUID  owner_id;
-        char    name[MAX_STRING];       
-        char    date[MAX_STRING];
+        char    name[MAX_STRING];                       /*Flawfinder: ignore*/
+        char    date[MAX_STRING];               /*Flawfinder: ignore*/
         BOOL    show_mature = gSavedSettings.getBOOL("ShowMatureEvents");
 
         msg->getUUID("AgentData", "AgentID", agent_id);
@@ -771,7 +765,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
         
         LLUUID  query_id;
         LLUUID  group_id;
-        char    group_name[DB_GROUP_NAME_BUF_SIZE];
+        char    group_name[DB_GROUP_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
         S32     members;
         BOOL    open_enrollment;
         S32     membership_fee;
@@ -836,8 +830,7 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
                 row["columns"][2]["font"] = "SANSSERIFSMALL";
 
                 list->addElement(row);
-                LLString id_str = group_id.getString();
-                self->mResultsContents[id_str] = content;
+                self->mResultsContents[group_id.asString()] = content;
         }
         list->sortByColumn(self->mCurrentSortColumn, self->mCurrentSortAscending);
         self->updateResultCount();
@@ -890,7 +883,7 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
         for (i = 0; i < num_new_rows; i++)
         {
                 LLUUID classified_id;
-                char name[DB_PARCEL_NAME_SIZE];
+                char name[DB_PARCEL_NAME_SIZE];         /*Flawfinder: ignore*/
                 U32 creation_date = 0;  // unix timestamp
                 U32 expiration_date = 0;        // future use
                 S32 price_for_listing = 0;
@@ -907,9 +900,7 @@ void LLPanelDirBrowser::processDirClassifiedReply(LLMessageSystem* msg, void**)
                         LLSD content;
                         content["type"] = CLASSIFIED_CODE;
                         content["name"] = name;
-
-                        LLString id_str = classified_id.getString();
-                        self->mResultsContents[id_str] = content;
+                        self->mResultsContents[classified_id.asString()] = content;
                 }
         }
         // The server does the initial sort, by price paid per listing and date. JC
@@ -925,7 +916,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
         LLUUID  agent_id;
         LLUUID  query_id;
         LLUUID  parcel_id;
-        char    name[MAX_STRING];
+        char    name[MAX_STRING];               /*Flawfinder: ignore*/
         BOOL    auction;
         BOOL    for_sale;
         S32             sale_price;
@@ -1033,8 +1024,7 @@ void LLPanelDirBrowser::processDirLandReply(LLMessageSystem *msg, void**)
                 }
 
                 list->addElement(row);
-                LLString id_str = parcel_id.getString();
-                self->mResultsContents[id_str] = content;
+                self->mResultsContents[parcel_id.asString()] = content;
         }
 
         // All auction results are shown on the first page
diff --git a/linden/indra/newview/llpaneldirevents.cpp b/linden/indra/newview/llpaneldirevents.cpp
index 703ee5e..f3cd2ce 100644
--- a/linden/indra/newview/llpaneldirevents.cpp
+++ b/linden/indra/newview/llpaneldirevents.cpp
@@ -50,8 +50,8 @@ BOOL gDisplayEventHack = FALSE;
 
 LLPanelDirEvents::LLPanelDirEvents(const std::string& name, LLFloaterDirectory* floater)
         :       LLPanelDirBrowser(name, floater),
-        mDay(0),
-        mDoneQuery(FALSE)
+        mDoneQuery(FALSE),
+        mDay(0)
 {
         // more results per page for this
         mResultsPerPage = 200;
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index ea3d7e7..a8611b1 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -247,11 +247,11 @@ void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
 
 void LLPanelDisplay::applyResolution()
 {
-        char aspect_ratio_text[ASPECT_RATIO_STR_LEN];
+        char aspect_ratio_text[ASPECT_RATIO_STR_LEN];           /*Flawfinder: ignore*/
         if (mCtrlAspectRatio->getCurrentIndex() == -1)
         {
-                strcpy(aspect_ratio_text, mCtrlAspectRatio->getSimple().c_str());
-
+                strncpy(aspect_ratio_text, mCtrlAspectRatio->getSimple().c_str(), sizeof(aspect_ratio_text) -1);        /*Flawfinder: ignore*/
+                aspect_ratio_text[sizeof(aspect_ratio_text) -1] = '\0';
                 char *element = strtok(aspect_ratio_text, ":/\\");
                 if (!element)
                 {
@@ -385,7 +385,7 @@ void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
 
         if (auto_detect)
         {
-                char aspect[100];
+                char aspect[100];               /*Flawfinder: ignore*/
                 S32 numerator = 0;
                 S32 denominator = 0;
                 // clear any aspect ratio override
@@ -394,11 +394,11 @@ void LLPanelDisplay::onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data)
 
                 if (numerator != 0)
                 {
-                        sprintf(aspect, "%d:%d", numerator, denominator); 
+                        snprintf(aspect, sizeof(aspect), "%d:%d", numerator, denominator);              /*Flawfinder: ignore*/
                 }
                 else
                 {
-                        sprintf(aspect, "%.3f", gViewerWindow->mWindow->getNativeAspectRatio());
+                        snprintf(aspect, sizeof(aspect), "%.3f", gViewerWindow->mWindow->getNativeAspectRatio());               /*Flawfinder: ignore*/
                 }
 
                 panel->mCtrlAspectRatio->setLabel(aspect);
@@ -449,7 +449,7 @@ BOOL LLPanelDisplay2::postBuild()
 
         requires("ani", WIDGET_TYPE_CHECKBOX);
         requires("gamma", WIDGET_TYPE_SPINNER);
-        requires("agp", WIDGET_TYPE_CHECKBOX);
+        requires("vbo", WIDGET_TYPE_CHECKBOX);
         requires("video card memory radio", WIDGET_TYPE_RADIO_GROUP);
         requires("fog", WIDGET_TYPE_SPINNER);
         requires("particles", WIDGET_TYPE_SPINNER);
@@ -460,35 +460,9 @@ BOOL LLPanelDisplay2::postBuild()
                 return FALSE;
         }
 
-        //============================================================================
-         //Visual Enancements
-
-        // Anisotropic filtering checkbox
-        mCtrlAnisotropic = LLUICtrlFactory::getCheckBoxByName(this, "ani");
-        
-        //============================================================================
-        // Gamma
-        mCtrlGamma = LLUICtrlFactory::getSpinnerByName(this, "gamma");
-
-        // Nighttime brigtness detail slider
-        mCtrlNighttimeBrightness = LLUICtrlFactory::getSpinnerByName(this, "nighttime_brightness");
-
-        //============================================================================
-        // Use AGP
-        mCtrlUseAGP = LLUICtrlFactory::getCheckBoxByName(this, "agp");
-
         // Graphics Card Memory
         mRadioVideoCardMem = LLUICtrlFactory::getRadioGroupByName(this, "video card memory radio");
 
-        // Fog ratio spin ctrl
-        mCtrlFogRatio = LLUICtrlFactory::getSpinnerByName(this, "fog");
-
-        // Particle count spin ctrl
-        mCtrlParticles = LLUICtrlFactory::getSpinnerByName(this, "particles");
-        
-        // Avatar composite limit spin ctrl
-        mCtrlCompositeLimit = LLUICtrlFactory::getSpinnerByName(this, "comp limit");
-
         refresh();
 
         return TRUE;
@@ -504,7 +478,7 @@ void LLPanelDisplay2::refresh()
 {
         LLPanel::refresh();
 
-        mUseAGP = gSavedSettings.getBOOL("RenderUseAGP");
+        mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
         mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
         mGamma = gSavedSettings.getF32("RenderGamma");
         mBrightness = gSavedSettings.getF32("RenderNightBrightness");
@@ -525,9 +499,10 @@ void LLPanelDisplay2::refreshEnabledState()
                 mRadioVideoCardMem->getRadioButton(i)->setEnabled(FALSE);
         }
 
-        if (!gGLManager.mHasAnyAGP || !gFeatureManagerp->isFeatureAvailable("RenderAGP"))
+        if (!gFeatureManagerp->isFeatureAvailable("RenderVBO") ||
+                !gGLManager.mHasVertexBufferObject)
         {
-                mCtrlUseAGP->setEnabled(FALSE);
+                childSetEnabled("vbo", FALSE);
         }
 }
 
@@ -535,7 +510,7 @@ void LLPanelDisplay2::apply()
 {
         // Anisotropic rendering
         BOOL old_anisotropic = LLImageGL::sGlobalUseAnisotropic;
-        LLImageGL::sGlobalUseAnisotropic = mCtrlAnisotropic->get();
+        LLImageGL::sGlobalUseAnisotropic = childGetValue("ani");
         if (old_anisotropic != LLImageGL::sGlobalUseAnisotropic)
         {
                 BOOL logged_in = (gStartupState >= STATE_STARTED);
@@ -549,7 +524,7 @@ void LLPanelDisplay2::apply()
 
 void LLPanelDisplay2::cancel()
 {
-        gSavedSettings.setBOOL("RenderUseAGP", mUseAGP);
+        gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
         gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
         gSavedSettings.setF32("RenderGamma", mGamma);
         gSavedSettings.setF32("RenderNightBrightness", mBrightness);
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index ed711c5..305b290 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -90,17 +90,9 @@ public:
         void refreshEnabledState();
 
 protected:
-        LLCheckBoxCtrl  *mCtrlAnisotropic;                              // Anisitropic filtering
-        LLSpinCtrl              *mCtrlGamma;
-        LLSpinCtrl              *mCtrlNighttimeBrightness;              // user adjusted nighttime brightness ([0.0, 2.0] 1.0 = normal)
-        LLCheckBoxCtrl  *mCtrlUseAGP;                                   // Use AGP if available
-        LLSpinCtrl              *mCtrlFogRatio;                                 // Fig distance / draw distance ratio
-        LLSpinCtrl              *mCtrlParticles;                                // Max number of particles
-        LLSpinCtrl              *mCtrlCompositeLimit;                   // Max num non-self avatars that can be composited
-
         LLRadioGroup*   mRadioVideoCardMem;
 
-        BOOL mUseAGP;
+        BOOL mUseVBO;
         BOOL mUseAniso;
         F32 mGamma;
         F32 mBrightness;
diff --git a/linden/indra/newview/llpanelevent.cpp b/linden/indra/newview/llpanelevent.cpp
index 498d4fc..9478ea2 100644
--- a/linden/indra/newview/llpanelevent.cpp
+++ b/linden/indra/newview/llpanelevent.cpp
@@ -166,7 +166,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
                 {
                         continue;
                 }
-                char buffer[256];
+                char buffer[256];               /*Flawfinder: ignore*/
 
                 self->mEventInfo.unpack(msg);
                 self->mTBName->setText(self->mEventInfo.mName);
@@ -174,7 +174,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
                 self->mTBDate->setText(self->mEventInfo.mTimeStr);
                 self->mTBDesc->setText(self->mEventInfo.mDesc);
 
-                sprintf(buffer, "%d:%.2d", self->mEventInfo.mDuration / 60, self->mEventInfo.mDuration % 60);
+                snprintf(buffer, sizeof(buffer), "%d:%.2d", self->mEventInfo.mDuration / 60, self->mEventInfo.mDuration % 60);          /*Flawfinder: ignore*/
 
                 self->mTBDuration->setText(buffer);
 
@@ -184,7 +184,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
                 }
                 else
                 {
-                        sprintf(buffer, "%d", self->mEventInfo.mCover);
+                        snprintf(buffer, sizeof(buffer), "%d", self->mEventInfo.mCover);                /*Flawfinder: ignore*/
                         self->mTBCover->setText(buffer);
                 }
 
@@ -195,7 +195,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
                 S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
                 S32 region_z = llround((F32)self->mEventInfo.mPosGlobal.mdV[VZ]);
                 
-                sprintf(buffer, "%s (%d, %d, %d)", self->mEventInfo.mSimName.c_str(), region_x, region_y, region_z);
+                snprintf(buffer, sizeof(buffer), "%s (%d, %d, %d)", self->mEventInfo.mSimName.c_str(), region_x, region_y, region_z);           /*Flawfinder: ignore*/
                 self->mTBLocation->setText(buffer);
 
                 if (self->mEventInfo.mEventFlags & EVENT_FLAG_MATURE)
@@ -232,8 +232,8 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
 
 void LLPanelEvent::draw()
 {
-        char firstname[DB_FIRST_NAME_BUF_SIZE];
-        char lastname[DB_LAST_NAME_BUF_SIZE];
+        char firstname[DB_FIRST_NAME_BUF_SIZE];         /*Flawfinder: ignore*/
+        char lastname[DB_LAST_NAME_BUF_SIZE];           /*Flawfinder: ignore*/
         gCacheName->getName(mEventInfo.mRunByID, firstname, lastname);
 
         LLString name;
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 56deb91..c69d765 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -257,7 +257,8 @@ void LLPanelFace::sendTextureInfo()
 {
         S32 te;
         LLViewerObject* object;
-        for ( gSelectMgr->getFirstTE(&object, &te); object; gSelectMgr->getNextTE(&object, &te) )
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        for ( selection->getFirstTE(&object, &te); object; selection->getNextTE(&object, &te) )
         {
                 BOOL valid;
                 F32 value;
@@ -336,7 +337,7 @@ void LLPanelFace::sendTextureInfo()
                 }
         }
 
-        for ( object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() )
+        for ( object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() )
         {
                 object->sendTEUpdate();
         }
@@ -344,7 +345,7 @@ void LLPanelFace::sendTextureInfo()
 
 void LLPanelFace::getState()
 {
-        LLViewerObject* objectp = gSelectMgr->getFirstObject();
+        LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstObject();
 
         if( objectp
                 && objectp->getPCode() == LL_PCODE_VOLUME)
@@ -619,7 +620,7 @@ BOOL LLPanelFace::allFacesSameValue( F32 (get_face_value(LLViewerObject*, S32)),
         // Get the value from the primary selected TE
         F32 first_value = *value;
         BOOL got_first = FALSE;
-        gSelectMgr->getPrimaryTE(&object, &te);
+        gSelectMgr->getSelection()->getPrimaryTE(&object, &te);
         if (object)
         {
                 first_value = get_face_value(object, te);
@@ -628,7 +629,8 @@ BOOL LLPanelFace::allFacesSameValue( F32 (get_face_value(LLViewerObject*, S32)),
 
         // Now iterate through all TEs to test for sameness
         BOOL identical = TRUE;
-        for ( gSelectMgr->getFirstTE(&object, &te); object; gSelectMgr->getNextTE(&object, &te) )
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        for ( selection->getFirstTE(&object, &te); object; selection->getNextTE(&object, &te) )
         {
                 if (!got_first)
                 {
@@ -779,13 +781,13 @@ void LLPanelFace::onCommitFullbright(LLUICtrl* ctrl, void* userdata)
 BOOL LLPanelFace::onDragTexture(LLUICtrl*, LLInventoryItem* item, void*)
 {
         BOOL accept = TRUE;
-        LLViewerObject* obj = gSelectMgr->getFirstRootObject();
+        LLViewerObject* obj = gSelectMgr->getSelection()->getFirstRootObject();
         while(accept && obj)
         {
                 if(!LLToolDragAndDrop::isInventoryDropAcceptable(obj, item))
                         accept = FALSE;
                 else
-                        obj = gSelectMgr->getNextRootObject();
+                        obj = gSelectMgr->getSelection()->getNextRootObject();
         }
         return accept;
 }
@@ -842,7 +844,8 @@ void LLPanelFace::onClickAutoFix(void* userdata)
         LLViewerObject* object;
 
         // for all selected objects
-        for ( gSelectMgr->getFirstTE(&object, &te); object; gSelectMgr->getNextTE(&object, &te) )
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        for ( selection->getFirstTE(&object, &te); object; selection->getNextTE(&object, &te) )
         {
                 // only do this if it's a media texture
                 if ( object->getTE ( te )->getID() ==  LLMediaEngine::getInstance()->getImageUUID () )
@@ -867,7 +870,7 @@ void LLPanelFace::onClickAutoFix(void* userdata)
         };
 
         // not clear why this is in a separate loop but i followed the patter from further up this file just in case.
-        for ( object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() )
+        for ( object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() )
         {
                 object->sendTEUpdate();
         };
diff --git a/linden/indra/newview/llpanelgroup.cpp b/linden/indra/newview/llpanelgroup.cpp
index 8a44da5..ce7c67a 100644
--- a/linden/indra/newview/llpanelgroup.cpp
+++ b/linden/indra/newview/llpanelgroup.cpp
@@ -151,8 +151,8 @@ LLPanelGroup::LLPanelGroup(const std::string& filename,
         mCurrentTab( NULL ),
         mRequestedTab( NULL ),
         mTabContainer( NULL ),
-        mForceClose( FALSE ),
         mIgnoreTransition( FALSE ),
+        mForceClose( FALSE ),
         mInitialTab(initial_tab_selected),
         mAllowEdit( TRUE ),
         mShowingNotifyDialog( FALSE )
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 871bc4b..e99f341 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -452,7 +452,7 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
         if (!gdatap)
         {
                 mesg = "No group data found for group ";
-                mesg.append(mGroupID.getString());
+                mesg.append(mGroupID.asString());
                 return false;
         }
 
@@ -638,7 +638,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
         }
         if ( mBtnJoinGroup )
         {
-                char fee_buff[20];
+                char fee_buff[20];              /*Flawfinder: ignore*/
                 bool visible;
 
                 visible = !is_member && gdatap->mOpenEnrollment;
@@ -646,7 +646,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
                 if ( visible )
                 {
-                        sprintf(fee_buff, "Join (L$%d)", gdatap->mMembershipFee);
+                        snprintf(fee_buff, sizeof(fee_buff), "Join (L$%d)", gdatap->mMembershipFee);            /*Flawfinder: ignore*/
                         mBtnJoinGroup->setLabelSelected(std::string(fee_buff));
                         mBtnJoinGroup->setLabelUnselected(std::string(fee_buff));
                 }
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index e7dcb9f..21f4d4b 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -226,9 +226,9 @@ int LLPanelGroupLandMoney::impl::getStoredContribution()
 // Fills in the text field with the contribution, contrib
 void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];        /* Flawfinder: ignore*/
         buffer[0] = '\0';
-        sprintf(buffer, "%d", contrib);
+        snprintf(buffer, sizeof(buffer), "%d", contrib);        /* Flawfinder: ignore*/
 
         if ( mYourContributionEditorp )
         {
@@ -239,10 +239,10 @@ void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib)
 
 void LLPanelGroupLandMoney::impl::setYourMaxContributionTextBox(int max)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
         buffer[0] = '\0';
 
-        sprintf(buffer, "(%d max)", max);
+        snprintf(buffer, sizeof(buffer), "(%d max)", max);              /*Flawfinder: ignore*/
         if ( mYourContributionMaxTextp )
         {
                 mYourContributionMaxTextp->setText(buffer);
@@ -307,15 +307,15 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
                         ++first_block;
                         S32 total_contribution;
                         msg->getS32("QueryData", "ActualArea", total_contribution, 0);
-                        char buffer[MAX_STRING];
-                        sprintf(buffer, "%d sq. meters", total_contribution);
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                        snprintf(buffer, sizeof(buffer), "%d sq. meters", total_contribution);          /*Flawfinder: ignore*/
                         mTotalContributedLandp->setText(buffer);
                         S32 committed;
                         msg->getS32("QueryData", "BillableArea", committed, 0);
-                        sprintf(buffer, "%d sq. meters", committed);
+                        snprintf(buffer, sizeof(buffer), "%d sq. meters", committed);           /*Flawfinder: ignore*/
                         mTotalLandInUsep->setText(buffer);
                         S32 available = total_contribution - committed;
-                        sprintf(buffer, "%d sq. meters", available);
+                        snprintf(buffer, sizeof(buffer), "%d sq. meters", available);           /*Flawfinder: ignore*/
                         mLandAvailablep->setText(buffer);
                         buffer[0] = '\0';
                         if ( mGroupOverLimitTextp && mGroupOverLimitIconp )
@@ -336,14 +336,14 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
                         mMapButtonp->setEnabled(TRUE);
                 }
 
-                char name[MAX_STRING];
-                char desc[MAX_STRING];
+                char name[MAX_STRING];          /*Flawfinder: ignore*/
+                char desc[MAX_STRING];          /*Flawfinder: ignore*/
                 S32 actual_area;
                 S32 billable_area;
                 U8 flags;
                 F32 global_x;
                 F32 global_y;
-                char sim_name[MAX_STRING];
+                char sim_name[MAX_STRING];              /*Flawfinder: ignore*/
                 for(S32 i = first_block; i < count; ++i)
                 {
                         msg->getUUID("QueryData", "OwnerID", owner_id, i);
@@ -358,19 +358,19 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
 
                         S32 region_x = llround(global_x) % REGION_WIDTH_UNITS;
                         S32 region_y = llround(global_y) % REGION_WIDTH_UNITS;
-                        char location[MAX_STRING];
-                        sprintf(location, "%s (%d, %d)", sim_name, region_x, region_y);
-                        char area[MAX_STRING];
+                        char location[MAX_STRING];              /*Flawfinder: ignore*/
+                        snprintf(location, MAX_STRING, "%s (%d, %d)", sim_name, region_x, region_y);            /*Flawfinder: ignore*/
+                        char area[MAX_STRING];          /*Flawfinder: ignore*/
                         if(billable_area == actual_area)
                         {
-                                sprintf(area, "%d", billable_area);
+                                snprintf(area, MAX_STRING, "%d", billable_area);                /*Flawfinder: ignore*/
                         }
                         else
                         {
-                                sprintf(area, "%d / %d", billable_area, actual_area);
+                                snprintf(area, MAX_STRING, "%d / %d", billable_area, actual_area);              /*Flawfinder: ignore*/
                         }
-                        char hidden[MAX_STRING];
-                        sprintf(hidden, "%f %f", global_x, global_y);
+                        char hidden[MAX_STRING];                /*Flawfinder: ignore*/
+                        snprintf(hidden, MAX_STRING, "%f %f", global_x, global_y);              /*Flawfinder: ignore*/
 
                         LLSD row;
 
@@ -977,10 +977,10 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
                 return;
         }
 
-        char line[MAX_STRING];
+        char line[MAX_STRING];          /*Flawfinder: ignore*/
         LLString text;
 
-        char start_date[MAX_STRING];
+        char start_date[MAX_STRING];            /*Flawfinder: ignore*/
         S32 interval_days;
         S32 current_interval;
 
@@ -996,7 +996,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
                 return;
         }
 
-        sprintf(line,     "%s\n\n", start_date);
+        snprintf(line, MAX_STRING,  "%s\n\n", start_date);              /*Flawfinder: ignore*/
         text.append(line);
 
         S32 total_amount = 0;
@@ -1004,14 +1004,14 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
         for(S32 i = 0; i < transactions; i++)
         {
                 S32                     amount = 0;
-                char            desc[MAX_STRING];
+                char            desc[MAX_STRING];               /*Flawfinder: ignore*/
 
                 msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Description,  MAX_STRING, desc, i );
                 msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount,          amount, i);
 
                 if (amount != 0)
                 {
-                        sprintf(line, "%-24s %6d\n", desc, amount );
+                        snprintf(line, MAX_STRING, "%-24s %6d\n", desc, amount );               /*Flawfinder: ignore*/
                         text.append(line);
                 }
                 else
@@ -1024,7 +1024,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
 
         text.append(1, '\n');
 
-        sprintf(line, "%-24s %6d\n", "Total", total_amount );
+        snprintf(line, MAX_STRING, "%-24s %6d\n", "Total", total_amount );              /*Flawfinder: ignore*/
         text.append(line);
 
         if ( mImplementationp->mTextEditorp )
@@ -1116,10 +1116,10 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
                 return;
         }
 
-        char line[MAX_STRING];
+        char line[MAX_STRING];          /*Flawfinder: ignore*/
         std::string text = mImplementationp->mTextEditorp->getText();
 
-        char start_date[MAX_STRING];
+        char start_date[MAX_STRING];            /*Flawfinder: ignore*/
         S32 interval_days;
         S32 current_interval;
 
@@ -1141,7 +1141,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
         {
                 text.clear();
 
-                sprintf(line, "%s\n\n", start_date); 
+                snprintf(line, MAX_STRING, "%s\n\n", start_date);               /*Flawfinder: ignore*/
                 text.append(line);
         }
 
@@ -1155,11 +1155,11 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
                 for(S32 i = 0; i < transactions; i++)
                 {
                         const S32 SHORT_STRING = 64;
-                        char            time[SHORT_STRING];
+                        char            time[SHORT_STRING];             /*Flawfinder: ignore*/
                         S32                     type = 0;
                         S32                     amount = 0;
-                        char            user[SHORT_STRING];
-                        char            item[SHORT_STRING];
+                        char            user[SHORT_STRING];             /*Flawfinder: ignore*/
+                        char            item[SHORT_STRING];             /*Flawfinder: ignore*/
 
                         msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Time,         SHORT_STRING, time, i);
                         msg->getStringFast(_PREHASH_HistoryData, _PREHASH_User,         SHORT_STRING, user, i );
@@ -1196,7 +1196,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
                                         break;
                                 }
 
-                                sprintf(line, "%s %6d - %s %s %s\n", time, amount, user, verb, item);
+                                snprintf(line, sizeof(line), "%s %6d - %s %s %s\n", time, amount, user, verb, item);            /*Flawfinder: ignore*/
                                 text.append(line);
                         }
                 }
@@ -1292,12 +1292,12 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
                 return;
         }
 
-        char line[MAX_STRING];
+        char line[MAX_STRING];          /*Flawfinder: ignore*/
         LLString text;
 
-        char start_date[MAX_STRING];
-        char last_stipend_date[MAX_STRING];
-        char next_stipend_date[MAX_STRING];
+        char start_date[MAX_STRING];            /*Flawfinder: ignore*/
+        char last_stipend_date[MAX_STRING];             /*Flawfinder: ignore*/
+        char next_stipend_date[MAX_STRING];             /*Flawfinder: ignore*/
         S32 interval_days;
         S32 current_interval;
         S32 balance;
@@ -1349,26 +1349,26 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
                 return;
         }
 
-        sprintf(line, "Summary for this week, beginning on %s\n", start_date);
+        snprintf(line, MAX_STRING, "Summary for this week, beginning on %s\n", start_date);             /*Flawfinder: ignore*/
         text.append(line);
 
         if (current_interval == 0)
         {
-                sprintf(line, "The next stipend day is %s\n\n", next_stipend_date);
+                snprintf(line, MAX_STRING, "The next stipend day is %s\n\n", next_stipend_date);                /*Flawfinder: ignore*/
                 text.append(line);
-                sprintf(line, "%-24sL$%6d\n", "Balance", balance );
+                snprintf(line, MAX_STRING, "%-24sL$%6d\n", "Balance", balance );                /*Flawfinder: ignore*/
                 text.append(line);
 
                 text.append(1, '\n');
         }
 
-        sprintf(line, "                      Group       Individual Share\n");
+        snprintf(line, MAX_STRING,  "                      Group       Individual Share\n");            /*Flawfinder: ignore*/
         text.append(line);
-        sprintf(line,     "%-24s %6d      %6d \n", "Credits", total_credits, (S32)floor((F32)total_credits/(F32)non_exempt_members));
+        snprintf(line, MAX_STRING,     "%-24s %6d      %6d \n", "Credits", total_credits, (S32)floor((F32)total_credits/(F32)non_exempt_members));              /*Flawfinder: ignore*/
         text.append(line);
-        sprintf(line,     "%-24s %6d      %6d \n", "Debits", total_debits,  (S32)floor((F32)total_debits/(F32)non_exempt_members));
+        snprintf(line, MAX_STRING,     "%-24s %6d      %6d \n", "Debits", total_debits,  (S32)floor((F32)total_debits/(F32)non_exempt_members));                /*Flawfinder: ignore*/
         text.append(line);
-        sprintf(line,     "%-24s %6d      %6d \n", "Total", total_credits + total_debits,  (S32)floor((F32)(total_credits + total_debits)/(F32)non_exempt_members));
+        snprintf(line, MAX_STRING,     "%-24s %6d      %6d \n", "Total", total_credits + total_debits,  (S32)floor((F32)(total_credits + total_debits)/(F32)non_exempt_members));               /*Flawfinder: ignore*/
         text.append(line);
 
         if ( mImplementationp->mTextEditorp )
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index b8b2f2c..2a7cdf5 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -50,6 +50,8 @@
 #include "llviewerwindow.h"
 #include "llviewermessage.h"
 
+const S32 NOTICE_DATE_STRING_SIZE = 30;
+
 /////////////////////////
 // LLPanelGroupNotices //
 /////////////////////////
@@ -181,8 +183,7 @@ char* build_notice_date(const time_t& the_time, char* buffer)
         tm* lt = localtime(&t);
         //for some reason, the month is off by 1.  See other uses of
         //"local" time in the code...
-        sprintf(buffer,"%i/%i/%i", lt->tm_mon + 1, lt->tm_mday, lt->tm_year + 1900);
-
+        snprintf(buffer, NOTICE_DATE_STRING_SIZE, "%i/%i/%i", lt->tm_mon + 1, lt->tm_mday, lt->tm_year + 1900);         /*Flawfinder: ignore*/
         return buffer;
 }
 
@@ -447,8 +448,8 @@ void LLPanelGroupNotices::processGroupNoticesListReply(LLMessageSystem* msg, voi
 void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
 {
         LLUUID id;
-        char subj[MAX_STRING];
-        char name[MAX_STRING];
+        char subj[MAX_STRING];          /*Flawfinder: ignore*/
+        char name[MAX_STRING];          /*Flawfinder: ignore*/
         U32 timestamp;
         BOOL has_attachment;
         U8 asset_type;
@@ -492,12 +493,12 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
                 row["columns"][2]["column"] = "from";
                 row["columns"][2]["value"] = name;
 
-                char buffer[30];
+                char buffer[NOTICE_DATE_STRING_SIZE];           /*Flawfinder: ignore*/
                 build_notice_date(t, buffer);
                 row["columns"][3]["column"] = "date";
                 row["columns"][3]["value"] = buffer;
 
-                snprintf(buffer, 30, "%u", timestamp);
+                snprintf(buffer, 30, "%u", timestamp);          /*Flawfinder: ignore*/
                 row["columns"][4]["column"] = "sort";
                 row["columns"][4]["value"] = buffer;
 
@@ -522,7 +523,7 @@ void LLPanelGroupNotices::onSelectNotice(LLUICtrl* ctrl, void* data)
         msg->addUUID("GroupNoticeID",item->getUUID());
         gAgent.sendReliableMessage();
 
-        lldebugs << "Item " << item->getUUID().getString().c_str() << " selected." << llendl;
+        lldebugs << "Item " << item->getUUID() << " selected." << llendl;
 }
 
 void LLPanelGroupNotices::showNotice(const char* subject,
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index 82f38e2..59ac556 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -185,6 +185,9 @@ BOOL LLPanelGroupRoles::postBuild()
 
 BOOL LLPanelGroupRoles::isVisibleByAgent(LLAgent* agentp)
 {
+        if (agentp->isGodlike())
+                return TRUE;
+        
         /* This power was removed to make group roles simpler
         return agentp->hasPowerInGroup(mGroupID, 
                                                                    GP_ROLE_CREATE |
@@ -1117,7 +1120,10 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
                                 check->setCommitCallback(onRoleCheck);
                                 check->setCallbackUserData(this);
                                 check->set( count > 0 );
-                                check->setTentative(0 != count && selected_members.size() != count);
+                                check->setTentative(
+                                        (0 != count)
+                                        && (selected_members.size() !=
+                                                (std::vector<LLUUID>::size_type)count));
 
                                 //NOTE: as of right now a user can break the group
                                 //by removing himself from a role if he is the
@@ -1696,8 +1702,8 @@ void LLPanelGroupMembersSubTab::updateMembers()
                 
         LLGroupMgrGroupData::member_iter end = gdatap->mMembers.end();
 
-        char first[DB_FIRST_NAME_BUF_SIZE];
-        char last[DB_LAST_NAME_BUF_SIZE];
+        char first[DB_FIRST_NAME_BUF_SIZE];             /*Flawfinder: ignore*/
+        char last[DB_LAST_NAME_BUF_SIZE];               /*Flawfinder: ignore*/
         S32 i = 0;
         for( ; mMemberProgress != end && i<UPDATE_MEMBERS_PER_FRAME; 
                         ++mMemberProgress, ++i)
@@ -2012,7 +2018,7 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 
                 mRolesList->sortByColumn("name", TRUE);
 
-                if ( (gdatap->mRoles.size() < MAX_ROLES)
+                if ( (gdatap->mRoles.size() < (U32)MAX_ROLES)
                         && gAgent.hasPowerInGroup(mGroupID, GP_ROLE_CREATE) )
                 {
                         mCreateRoleButton->setEnabled(TRUE);
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp
index 1be6bf0..ebe99b1 100644
--- a/linden/indra/newview/llpanelgroupvoting.cpp
+++ b/linden/indra/newview/llpanelgroupvoting.cpp
@@ -330,8 +330,8 @@ void LLPanelGroupVoting::impl::setEnableVoteProposal()
 
                 if (already_voted == "Yes")
                 {
-                        char message[MAX_STRING];
-                        sprintf(message, "You have voted: %s ", vote_cast.c_str());
+                        char message[MAX_STRING];               /*Flawfinder: ignore*/
+                        snprintf(message, MAX_STRING, "You have voted: %s ", vote_cast.c_str());                /*Flawfinder: ignore*/
                         mInstructions->setText(message);
 
                         mBtnYes->setEnabled(FALSE);
@@ -641,8 +641,8 @@ void LLPanelGroupVoting::impl::updateQuorumText()
         if ( mQuorumText )
         {
                 //update the quorum count
-                char quorum_text[MAX_STRING];
-                sprintf(quorum_text,
+                char quorum_text[MAX_STRING];           /*Flawfinder: ignore*/
+                snprintf(quorum_text, MAX_STRING,                               /*Flawfinder: ignore*/
                                 " out of %d members must vote",
                                 mNumGroupMembers);
                 mQuorumText->setText(quorum_text);
@@ -737,15 +737,15 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
 
         U32 num_expected;
         const S32 MAX_STRING_NUM_LEN = 20;
-        char item_num_string[DB_TERSE_DATETIME_BUF_SIZE];
-        char proposal_text[DB_VOTE_TEXT_BUF_SIZE];
-        char vote_cast[DB_VOTE_RESULT_BUF_SIZE];
-        char start_datetime[DB_DATETIME_BUF_SIZE];
-        char end_datetime[DB_DATETIME_BUF_SIZE];
-        char vote_type[DB_VOTE_TYPE_BUF_SIZE];
-        char majority_text[MAX_STRING_NUM_LEN];
-        char quorum_text[MAX_STRING_NUM_LEN];
-        char vote_initiator_string[UUID_STR_LENGTH];
+        char item_num_string[DB_TERSE_DATETIME_BUF_SIZE];               /*Flawfinder: ignore*/
+        char proposal_text[DB_VOTE_TEXT_BUF_SIZE];              /*Flawfinder: ignore*/
+        char vote_cast[DB_VOTE_RESULT_BUF_SIZE];                /*Flawfinder: ignore*/
+        char start_datetime[DB_DATETIME_BUF_SIZE];              /*Flawfinder: ignore*/
+        char end_datetime[DB_DATETIME_BUF_SIZE];                /*Flawfinder: ignore*/
+        char vote_type[DB_VOTE_TYPE_BUF_SIZE];          /*Flawfinder: ignore*/
+        char majority_text[MAX_STRING_NUM_LEN];         /*Flawfinder: ignore*/
+        char quorum_text[MAX_STRING_NUM_LEN];           /*Flawfinder: ignore*/
+        char vote_initiator_string[UUID_STR_LENGTH];            /*Flawfinder: ignore*/
 
         LLUUID vote_id;
         LLUUID vote_initiator;
@@ -778,8 +778,8 @@ void LLPanelGroupVoting::impl::processGroupActiveProposalItemReply(LLMessageSyst
                 msg->getS32Fast(_PREHASH_ProposalData, _PREHASH_Quorum, quorum, i );
 
                 vote_initiator.toString(vote_initiator_string);
-                sprintf(majority_text, "%f", majority);
-                sprintf(quorum_text, "%i", quorum);
+                snprintf(majority_text, MAX_STRING_NUM_LEN, "%f", majority);            /*Flawfinder: ignore*/
+                snprintf(quorum_text, MAX_STRING_NUM_LEN, "%i", quorum);                /*Flawfinder: ignore*/
 
                 LLScrollListItem *row = new LLScrollListItem( TRUE, NULL, vote_id );
                 if (!row) return;
@@ -879,12 +879,12 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
         }
 
         const S32 ITEM_NUM_MAX_BUF_LEN = 15;
-        char item_num_string[ITEM_NUM_MAX_BUF_LEN];
-        char proposal_text[DB_VOTE_TEXT_BUF_SIZE];
-        char vote_result[MAX_STRING];
-        char start_datetime[DB_DATETIME_BUF_SIZE];
-        char end_datetime[DB_DATETIME_BUF_SIZE];
-        char vote_type[DB_VOTE_TYPE_BUF_SIZE];
+        char item_num_string[ITEM_NUM_MAX_BUF_LEN];             /*Flawfinder: ignore*/
+        char proposal_text[DB_VOTE_TEXT_BUF_SIZE];              /*Flawfinder: ignore*/
+        char vote_result[MAX_STRING];           /*Flawfinder: ignore*/
+        char start_datetime[DB_DATETIME_BUF_SIZE];              /*Flawfinder: ignore*/
+        char end_datetime[DB_DATETIME_BUF_SIZE];                /*Flawfinder: ignore*/
+        char vote_type[DB_VOTE_TYPE_BUF_SIZE];          /*Flawfinder: ignore*/
 
         LLString vote_text;
         LLUUID vote_id;
@@ -927,15 +927,15 @@ void LLPanelGroupVoting::impl::processGroupVoteHistoryItemReply(LLMessageSystem
                         }
                         vote_text.append("  Votes->\n");
 
-                        char vote_result[DB_VOTE_RESULT_BUF_SIZE];
-                        char result_msg[MAX_STRING];
+                        char vote_result[DB_VOTE_RESULT_BUF_SIZE];              /*Flawfinder: ignore*/
+                        char result_msg[MAX_STRING];            /*Flawfinder: ignore*/
                         S32 num_votes;
 
                         for (S32 i = 0; i < vote_items; ++i)
                         {
                                 msg->getStringFast(_PREHASH_VoteItem, _PREHASH_VoteCast, DB_VOTE_RESULT_BUF_SIZE, vote_result, i);
                                 msg->getS32Fast(_PREHASH_VoteItem, _PREHASH_NumVotes, num_votes, i);
-                                sprintf(result_msg,
+                                snprintf(result_msg, MAX_STRING,                /*Flawfinder: ignore*/
                                                 "    %s: %d\n",
                                                 vote_result,
                                                 num_votes);
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index bd32ad2..d9638fd 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -182,7 +182,7 @@ void LLTaskInvFVBridge::showProperties()
                                                                                                            "Object Inventory Item Properties",
                                                                                                            mUUID,
                                                                                                            mPanel->getTaskUUID());
-                floater->open();
+                floater->open();                /*Flawfinder: ignore*/
         }
 }
 
@@ -943,7 +943,7 @@ void LLTaskSoundBridge::openSoundPreview(void* data)
                                                            self->getName(),
                                                            self->mUUID,
                                                            self->mPanel->getTaskUUID());
-                floaterp->open();
+                floaterp->open();       /*Flawfinder: ignore*/
         }
 }
 
@@ -1182,7 +1182,7 @@ void LLTaskLSLBridge::openItem()
                                                                            mUUID);
                 LLMultiFloater* previous_host = LLFloater::getFloaterHost();
                 LLFloater::setFloaterHost(NULL);
-                editor->open();
+                editor->open(); /*Flawfinder: ignore*/
                 LLFloater::setFloaterHost(previous_host);
 
                 // keep onscreen
@@ -1824,16 +1824,16 @@ void LLPanelInventory::refresh()
 {
         //llinfos << "LLPanelInventory::refresh()" << llendl;
         BOOL has_inventory = FALSE;
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
         if(!node)
         {
-                node = gSelectMgr->getFirstNode();
+                node = gSelectMgr->getSelection()->getFirstNode();
         }
         if(node)
         {
                 LLViewerObject* object = node->getObject();
-                if(object && ((gSelectMgr->getRootObjectCount() == 1)
-                                          || (gSelectMgr->getObjectCount() == 1)))
+                if(object && ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
+                                          || (gSelectMgr->getSelection()->getObjectCount() == 1)))
                 {
                         // determine if we need to make a request. Start with a
                         // default based on if we have inventory at all.
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index 38eac5d..1b3e146 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -109,7 +109,7 @@ void LLPanelLandInfo::refreshAll()
 // public
 void LLPanelLandInfo::refresh()
 {
-        LLParcel *parcel = gParcelMgr->getSelectedParcel();
+        LLParcel *parcel = gParcelMgr->getParcelSelection()->getParcel();
         LLViewerRegion *regionp = gParcelMgr->getSelectionRegion();
 
         if (!parcel || !regionp)
@@ -177,7 +177,7 @@ void LLPanelLandInfo::refresh()
                 // and it must not be a whole parcel.
                 if (gParcelMgr->getSelectedArea() > PARCEL_UNIT_AREA
                         //&& gParcelMgr->getSelfCount() > 1
-                        && !gParcelMgr->getWholeParcelSelected())
+                        && !gParcelMgr->getParcelSelection()->getWholeParcelSelected())
                 {
                         childSetEnabled("button join land",TRUE);
                 }
@@ -200,7 +200,7 @@ void LLPanelLandInfo::refresh()
                                                                    &rent_price,
                                                                    &for_sale,
                                                                    &dwell);
-                if(is_public || (is_for_sale && gParcelMgr->getWholeParcelSelected()))
+                if(is_public || (is_for_sale && gParcelMgr->getParcelSelection()->getWholeParcelSelected()))
                 {
                         childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price));
                         childSetTextArg("label_area_price","[AREA]", llformat("%d",area));
@@ -246,7 +246,7 @@ void LLPanelLandInfo::onClickJoin(void*)
 void LLPanelLandInfo::onClickAbout(void*)
 {
         // Promote the rectangle selection to a parcel selection
-        if (!gParcelMgr->getWholeParcelSelected())
+        if (!gParcelMgr->getParcelSelection()->getWholeParcelSelected())
         {
                 gParcelMgr->selectParcelInRectangle();
         }
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 3d3aee9..6a0bdb4 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -518,14 +518,15 @@ void LLPanelLogin::setFields(const std::string& firstname, const std::string& la
                 // nice row of asterixes.
                 const char* filler = "123456789!123456";
                 sInstance->childSetText("password_edit", filler);
-                strcpy(sInstance->mIncomingPassword, filler);
-                strcpy(sInstance->mMungedPassword, password.c_str());
+                strcpy(sInstance->mIncomingPassword, filler);           /*Flawfinder: ignore*/
+                strcpy(sInstance->mMungedPassword, password.c_str());   /*Flawfinder: ignore*/
         }
         else
         {
                 // this is a normal text password
                 sInstance->childSetText("password_edit", password);
-                strcpy(sInstance->mIncomingPassword, password.c_str());
+                strncpy(sInstance->mIncomingPassword, password.c_str(), sizeof(sInstance->mIncomingPassword) -1);    /*Flawfinder: ignore*/
+                sInstance->mIncomingPassword[sizeof(sInstance->mIncomingPassword) -1] = '\0';
                 LLMD5 pass((unsigned char *)password.c_str());
                 pass.hex_digest(sInstance->mMungedPassword);
         }
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 6e11f6f..6bd825a 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -91,8 +91,8 @@ private:
         void                    (*mCallback)(S32 option, void *userdata);
         void*                   mCallbackData;
 
-        char            mIncomingPassword[DB_USER_PASSWORD_BUF_SIZE];
-        char            mMungedPassword[MD5HEX_STR_SIZE];
+        char mIncomingPassword[DB_USER_PASSWORD_BUF_SIZE];              /*Flawfinder: ignore*/
+        char mMungedPassword[MD5HEX_STR_SIZE];          /*Flawfinder: ignore*/
 
         static LLPanelLogin* sInstance;
         static BOOL             sCapslockDidNotification;
diff --git a/linden/indra/newview/llpanelmoney.cpp b/linden/indra/newview/llpanelmoney.cpp
deleted file mode 100644
index 1dcd544..0000000
--- a/linden/indra/newview/llpanelmoney.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-/** 
- * @file llpanelmoney.cpp
- * @author James Cook
- * @brief Panels for Account History floater
- *
- * Copyright (c) 2003-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llpanelmoney.h"
-
-#include "llfontgl.h"
-#include "message.h"
-#include "lltransactiontypes.h"
-
-#include "llpanel.h"
-#include "llbutton.h"
-#include "llviewercontrol.h"
-#include "llstatusbar.h"
-#include "lluiconstants.h"
-#include "llvieweruictrlfactory.h"
-#include "viewer.h"
-
-// XUI:translate
-const char LOADING_STRING[]  = "Computing...";
-
-S32 LLPanelAccount::sCurrentInterval = 0;
-
-//---------------------------------------------------------------------------
-// LLPanelAccount - the base class for all account panels
-//---------------------------------------------------------------------------
-
-// Construct with a dummy rectangle because tab containers will
-// resize their panels.  Thus, merely need to make sure the follow
-// flags are correctly set.
-LLPanelAccount::LLPanelAccount(const LLUUID& request_id, S32 interval_days, S32 max_interval, const std::string& filename)
-:       LLPanel("account_panel"),
-        mRequestID( request_id ),
-        mDataRequested( FALSE ),
-        mIntervalDays( interval_days ),
-        mMaxInterval( max_interval )
-{
-        sCurrentInterval = 0;
-
-        gUICtrlFactory->buildPanel(this, filename);
-
-        childSetText("editor", LOADING_STRING);
-
-        childSetAction("earlier_btn", onClickEarlier, this);
-        childSetAction("later_btn", onClickLater, this);
-}
-
-
-// public virtual
-void LLPanelAccount::draw()
-{
-        if (!mDataRequested || (mDisplayedInterval != sCurrentInterval) )
-        {
-                sendRequest();
-                refreshPanel();
-                mDisplayedInterval = sCurrentInterval;
-                mDataRequested = TRUE;
-        }
-
-        LLPanel::draw();
-}
-
-void LLPanelAccount::refreshPanel()
-{
-        // Used by some panels that have buttons and some that don't (so no warnings)
-        if (hasChild("earlier_btn"))
-        {
-                childSetEnabled("earlier_btn",  sCurrentInterval < mMaxInterval);
-        }
-        if (hasChild("later_btn"))
-        {
-                childSetEnabled("later_btn",    sCurrentInterval > 0);
-        }
-}
-
-// static
-void LLPanelAccount::onClickEarlier(void *userdata)
-{
-        LLPanelAccount* self = (LLPanelAccount*)userdata;
-        if (!self) return;
-
-        if (self->sCurrentInterval < self->mMaxInterval)
-        {
-                self->childSetText("editor", LOADING_STRING);
-                self->sCurrentInterval++;
-                self->refreshPanel();
-                self->setDataRequested(FALSE);
-        }
-}
-
-// static
-void LLPanelAccount::onClickLater(void *userdata)
-{
-        LLPanelAccount* self = (LLPanelAccount*)userdata;
-        if (!self) return;
-
-        if (self->sCurrentInterval > 0)
-        {
-                self->childSetText("editor", LOADING_STRING);
-                self->sCurrentInterval--;
-                self->refreshPanel();
-                self->setDataRequested(FALSE);
-        }
-}
-
-
-//---------------------------------------------------------------------------
-// LLPanelAccountPlanning - the first, default view of money
-//---------------------------------------------------------------------------
-LLPanelAccountPlanning::LLPanelAccountPlanning(const LLUUID& request_id)
-:       LLPanelAccount(request_id, SUMMARY_INTERVAL, SUMMARY_MAX, "panel_account_planning.xml")
-{
-        childSetText("editor", LOADING_STRING);
-}
-
-// virtual
-void LLPanelAccountPlanning::sendRequest()
-{
-        LLMessageSystem* msg = gMessageSystem;
-
-        msg->newMessageFast(_PREHASH_MoneySummaryRequest);
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, agent_get_id() );
-        msg->addUUIDFast(_PREHASH_SessionID, agent_get_session_id() );
-        msg->nextBlockFast(_PREHASH_MoneyData);
-        msg->addUUIDFast(_PREHASH_RequestID, mRequestID );
-        msg->addS32Fast(_PREHASH_IntervalDays, mIntervalDays );
-        msg->addS32Fast(_PREHASH_CurrentInterval, 0 );
-
-        agent_send_reliable_message();
-
-        childSetText("editor", LOADING_STRING);
-}
-
-// virtual
-void LLPanelAccountPlanning::processReply(LLMessageSystem* msg, void** data)
-{
-        char line[MAX_STRING];
-        LLString text;
-
-        char start_date[MAX_STRING];
-        char last_stipend_date[MAX_STRING];
-        char next_stipend_date[MAX_STRING];
-        S32 interval_days;
-        S32 current_interval;
-        S32 balance;
-        S32 total_credits;
-        S32 total_debits;
-        S32 cur_object_tax;
-        S32 cur_light_tax;
-        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 stipend;
-
-        msg->getS32("MoneyData", "IntervalDays", interval_days );
-        msg->getS32("MoneyData", "CurrentInterval", current_interval );
-        msg->getS32("MoneyData", "Balance", balance );
-        msg->getS32("MoneyData", "TotalCredits", total_credits );
-        msg->getS32("MoneyData", "TotalDebits", total_debits );
-        msg->getS32("MoneyData", "ObjectTaxCurrent", cur_object_tax );
-        msg->getS32("MoneyData", "LightTaxCurrent", cur_light_tax );
-        msg->getS32("MoneyData", "LandTaxCurrent", cur_land_tax );
-        msg->getS32("MoneyData", "GroupTaxCurrent", cur_group_tax );
-        msg->getS32("MoneyData", "ParcelDirFeeCurrent", cur_parcel_dir_fee );
-        msg->getS32("MoneyData", "ObjectTaxEstimate", proj_object_tax );
-        msg->getS32("MoneyData", "LightTaxEstimate", proj_light_tax );
-        msg->getS32("MoneyData", "LandTaxEstimate", proj_land_tax );
-        msg->getS32("MoneyData", "GroupTaxEstimate", proj_group_tax );
-        msg->getS32("MoneyData", "ParcelDirFeeEstimate", proj_parcel_dir_fee );
-        msg->getS32("MoneyData", "StipendEstimate", stipend );
-
-        msg->getString("MoneyData", "StartDate", MAX_STRING, start_date);
-        msg->getString("MoneyData", "LastTaxDate", MAX_STRING, last_stipend_date);
-        msg->getString("MoneyData", "TaxDate", MAX_STRING, 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 != mIntervalDays || current_interval != sCurrentInterval)
-        {
-                llinfos << "Out of date summary packet " << interval_days << " " 
-                        << current_interval << llendl;
-                return;
-        }
-
-        // *NOTE: actually use the balance from the status bar, so the two
-        // match.  This should not be necessary because the simulator no
-        // longer buffers transaction. If status bar balance is zero,
-        // assume this is because we haven't received the first balance
-        // yet, and trust the database.
-        if (0 != gStatusBar->getBalance())
-        {
-                balance = gStatusBar->getBalance();
-        }
-
-        sprintf(line, "Summary for this week, beginning on %s\n", start_date);
-        text.append(line);
-
-        if (current_interval == 0)
-        {
-                text.append(1, '\n');
-
-                sprintf(line, "Your next stipend day is %s\n\n", next_stipend_date);
-                text.append(line);
-                sprintf(line, "%-24sL$%6d\n", "Balance", balance );
-                text.append(line);
-
-                text.append(1, '\n');
-        }
-
-        sprintf(line,     "%-24s  %6d\n", "Credits", total_credits);
-        text.append(line);
-
-        sprintf(line,     "%-24s  %6d\n", "Debits", total_debits);
-        text.append(line);
-
-        sprintf(line,     "%-24s  %6d\n", "Total Change", total_credits + total_debits);
-        text.append(line);
-
-        if (current_interval == 0)
-        {
-                text.append(1, '\n');
-
-                text.append(1, '\n');
-
-                sprintf(line, "%-24s  %6d\n", "Estimated Stipend", stipend );
-                text.append(line);
-
-                // Generate projected "wealth tax" based on current balance, projected stipend/bonus
-        }
-        else
-        {
-                text.append(1, '\n');
-                text.append(1, '\n');
-
-                sprintf(line, "%-24s  %6d\n", "Parcel Directory Fee", cur_parcel_dir_fee);
-                text.append(line);
-        }
-
-        childSetText("editor", text);
-}
-
-
-//---------------------------------------------------------------------------
-// LLPanelAccountDetails 
-//---------------------------------------------------------------------------
-LLPanelAccountDetails::LLPanelAccountDetails(const LLUUID& request_id)
-:       LLPanelAccount(request_id, 
-                                   DETAILS_INTERVAL, 
-                                   DETAILS_MAX, 
-                                   "panel_account_details.xml")
-{
-        childSetText("editor", LOADING_STRING);
-}
-
-// virtual
-void LLPanelAccountDetails::sendRequest()
-{
-        LLMessageSystem* msg = gMessageSystem;
-
-        msg->newMessageFast(_PREHASH_MoneyDetailsRequest);
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, agent_get_id() );
-        msg->addUUIDFast(_PREHASH_SessionID, agent_get_session_id() );
-        msg->nextBlockFast(_PREHASH_MoneyData);
-        msg->addUUIDFast(_PREHASH_RequestID, mRequestID );
-        msg->addS32Fast(_PREHASH_IntervalDays, mIntervalDays );
-        msg->addS32Fast(_PREHASH_CurrentInterval, sCurrentInterval );
-
-        agent_send_reliable_message();
-}
-
-// virtual
-void LLPanelAccountDetails::processReply(LLMessageSystem* msg, void** data)
-{
-        char line[MAX_STRING];
-        LLString text;
-
-        char start_date[MAX_STRING];
-        S32 interval_days;
-        S32 current_interval;
-
-        msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
-        msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_CurrentInterval, current_interval );
-        msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, MAX_STRING, start_date);
-
-        if (interval_days != mIntervalDays || current_interval != sCurrentInterval)
-        {
-                llinfos << "Out of date details packet " << interval_days << " " 
-                        << current_interval << llendl;
-                return;
-        }
-
-        sprintf(line,     "%s\n\n", start_date);
-        text.append(line);
-
-        S32 total_amount = 0;
-        S32 transactions = msg->getNumberOfBlocksFast(_PREHASH_HistoryData);
-        for(S32 i = 0; i < transactions; i++)
-        {
-                S32                     amount = 0;
-                char            desc[MAX_STRING];
-
-                msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Description,  MAX_STRING, desc, i );
-                msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount,          amount, i);
-
-                if (amount != 0)
-                {
-                        sprintf(line, "%-24s %6d\n", desc, amount );
-                        text.append(line);
-                }
-                else
-                {
-                        // skip it
-                }
-
-                total_amount += amount;
-        }
-
-        text.append(1, '\n');
-
-        sprintf(line, "%-24s %6d\n", "Total", total_amount );
-        text.append(line);
-
-        childSetText("editor", text);
-}
-
-//---------------------------------------------------------------------------
-// LLPanelAccountTransactions
-//---------------------------------------------------------------------------
-LLPanelAccountTransactions::LLPanelAccountTransactions(const LLUUID& request_id)
-:       LLPanelAccount(request_id, 
-                                   TRANSACTIONS_INTERVAL, 
-                                   TRANSACTIONS_MAX, 
-                                   "panel_account_transactions.xml")
-{
-        childSetText("editor", LOADING_STRING);
-}
-
-// virtual
-void LLPanelAccountTransactions::sendRequest()
-{
-        LLMessageSystem* msg = gMessageSystem;
-
-        msg->newMessageFast(_PREHASH_MoneyTransactionsRequest);
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, agent_get_id() );
-        msg->addUUIDFast(_PREHASH_SessionID, agent_get_session_id() );
-        msg->nextBlockFast(_PREHASH_MoneyData);
-        msg->addUUIDFast(_PREHASH_RequestID, mRequestID );
-        msg->addS32Fast(_PREHASH_IntervalDays, mIntervalDays );
-        msg->addS32Fast(_PREHASH_CurrentInterval, sCurrentInterval );
-
-        agent_send_reliable_message();
-
-        childSetText("editor", LOADING_STRING);
-}
-
-// virtual
-void LLPanelAccountTransactions::processReply(LLMessageSystem* msg, void** data)
-{
-        char line[MAX_STRING];
-        LLSD value = childGetValue("editor");
-        std::string text = value.asString();
-
-        char start_date[MAX_STRING];
-        S32 interval_days;
-        S32 current_interval;
-
-        msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
-        msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_CurrentInterval, current_interval );
-        msg->getStringFast(_PREHASH_MoneyData, _PREHASH_StartDate, MAX_STRING, start_date);
-
-        if (interval_days != mIntervalDays || current_interval != sCurrentInterval)
-        {
-                llinfos << "Out of date details packet " << interval_days << " " 
-                        << current_interval << llendl;
-                return;
-        }
-
-        // If this is the first packet, clear the text, don't append.
-        // Start with the date.
-        if (text == LOADING_STRING)
-        {
-                text.clear();
-
-                sprintf(line, "%s\n\n", start_date); 
-                text.append(line);
-        }
-
-        S32 transactions = msg->getNumberOfBlocksFast(_PREHASH_HistoryData);
-        if (transactions == 0)
-        {
-                text.append("(none)");
-        }
-        else
-        {
-                for(S32 i = 0; i < transactions; i++)
-                {
-                        const S32 SHORT_STRING = 64;
-                        char            time[SHORT_STRING];
-                        S32                     type = 0;
-                        S32                     amount = 0;
-                        char            user[SHORT_STRING];
-                        char            item[SHORT_STRING];
-
-                        msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Time,         SHORT_STRING, time, i);
-                        msg->getStringFast(_PREHASH_HistoryData, _PREHASH_User,         SHORT_STRING, user, i );
-                        msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Type,            type, i);
-                        msg->getStringFast(_PREHASH_HistoryData, _PREHASH_Item,         SHORT_STRING, item, i );
-                        msg->getS32Fast(_PREHASH_HistoryData, _PREHASH_Amount,  amount, i);
-
-                        if (amount != 0)
-                        {
-                                char* verb;
-
-                                switch(type)
-                                {
-                                case TRANS_OBJECT_SALE:
-                                        verb = "bought";
-                                        break;
-                                case TRANS_GIFT:
-                                        verb = "paid you";
-                                        break;
-                                case TRANS_PAY_OBJECT:
-                                        verb = "paid into";
-                                        break;
-                                case TRANS_LAND_PASS_SALE:
-                                        verb = "bought pass to";
-                                        break;
-                                case TRANS_EVENT_FEE:
-                                        verb = "paid fee for event";
-                                        break;
-                                case TRANS_EVENT_PRIZE:
-                                        verb = "paid prize for event";
-                                        break;
-                                default:
-                                        verb = "";
-                                        break;
-                                }
-
-                                sprintf(line, "%s %6d - %s %s %s\n", time, amount, user, verb, item);
-                                text.append(line);
-                        }
-                }
-        }
-
-        childSetText("editor", text);
-}
diff --git a/linden/indra/newview/llpanelmoney.h b/linden/indra/newview/llpanelmoney.h
deleted file mode 100644
index 9600a33..0000000
--- a/linden/indra/newview/llpanelmoney.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/** 
- * @file llpanelmoney.h
- * @author James Cook
- * @brief Panels for Account History floater
- *
- * Copyright (c) 2003-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLPANELMONEY_H
-#define LL_LLPANELMONEY_H
-
-#include "llpanel.h"
-#include "lluuid.h"
-
-class LLMessageSystem;
-class LLTextEditor;
-class LLButton;
-
-// Base class for all the panels.
-class LLPanelAccount
-: public LLPanel
-{
-public:
-        LLPanelAccount(const LLUUID& request_id, S32 interval_days, S32 max_interval, const std::string& filename);
-
-        void    setDataRequested(BOOL b)        { mDataRequested = b; }
-
-        virtual void draw();
-
-        virtual void sendRequest() = 0;
-        virtual void processReply(LLMessageSystem* msg, void** data) = 0;
-        
-        void refreshPanel();
-
-        static void onClickEarlier(void* userdata);
-        static void onClickLater(void* userdata);
-
-protected:
-        LLUUID                  mRequestID;
-
-        BOOL                    mDataRequested;
-
-        // Time between start and end day, inclusive.  7 = one week
-        S32             mIntervalDays;
-
-        // How many intervals back are we looking?
-        static S32              sCurrentInterval;
-        S32             mDisplayedInterval;
-
-        S32             mMaxInterval;
-};
-
-
-class LLPanelAccountPlanning
-:       public LLPanelAccount
-{
-public:
-        LLPanelAccountPlanning(const LLUUID& request_id);
-
-        virtual void sendRequest();
-        virtual void processReply(LLMessageSystem* msg, void** data);
-};
-
-
-class LLPanelAccountDetails
-:       public LLPanelAccount
-{
-public:
-        LLPanelAccountDetails(const LLUUID& request_id);
-
-        virtual void sendRequest();
-        virtual void processReply(LLMessageSystem* msg, void** data);
-};
-
-
-class LLPanelAccountTransactions
-:       public LLPanelAccount
-{
-public:
-        LLPanelAccountTransactions(const LLUUID& request_id);
-
-        virtual void sendRequest();
-        virtual void processReply(LLMessageSystem* msg, void** data);
-};
-
-#endif
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index c55dacb..ef538ba 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -37,19 +37,25 @@
 
 // project includes
 #include "llbutton.h"
+#include "lldirpicker.h"
 #include "llui.h"
 #include "lluictrlfactory.h"
 #include "llresmgr.h"
 #include "llsliderctrl.h"
+#include "llspinctrl.h"
+#include "llcheckboxctrl.h"
 #include "lltextbox.h"
 #include "llviewerregion.h"
 #include "llviewerthrottle.h"
 #include "llworld.h"
 #include "llviewercontrol.h"
 #include "llvieweruictrlfactory.h"
-#include "llmozlib.h"
 #include "llviewerwindow.h"
 
+#if LL_LIBXUL_ENABLED
+#include "llmozlib.h"
+#endif // LL_LIBXUL_ENABLED
+
 
 LLPanelNetwork::LLPanelNetwork()
 {
@@ -58,22 +64,17 @@ LLPanelNetwork::LLPanelNetwork()
 
 BOOL LLPanelNetwork::postBuild()
 {
-        requires("disk cache", WIDGET_TYPE_RADIO_GROUP);
-        requires("max_bandwidth", WIDGET_TYPE_SLIDER);
-        requires("clear_cache", WIDGET_TYPE_BUTTON);
-
-        if (!checkRequirements())
-        {
-                return FALSE;
-        }
+        LLString cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
+        childSetText("cache_location", cache_location);
+                
+        childSetAction("clear_cache", onClickClearCache, this);
+        childSetAction("set_cache", onClickSetCache, this);
+        childSetAction("reset_cache", onClickResetCache, this);
+        
+        childSetEnabled("connection_port", 
+                        gSavedSettings.getBOOL("ConnectionPortEnabled"));
+        childSetCommitCallback("connection_port_enabled", onCommitPort, this);
 
-        // retrieve controls
-        mDiskCacheRadio = LLUICtrlFactory::getRadioGroupByName(this, "disk cache");
-        mCtrlBandwidth = LLUICtrlFactory::getSliderByName(this, "max_bandwidth");
-
-        mClearCacheBtn = LLUICtrlFactory::getButtonByName(this, "clear_cache");
-        mClearCacheBtn->setClickedCallback(onClickClearCache);
-        mClearCacheBtn->setCallbackUserData(this);
 
         refresh();
 
@@ -94,14 +95,18 @@ void LLPanelNetwork::refresh()
 {
         LLPanel::refresh();
 
-        mCacheSetting = gSavedSettings.getU32("VFSSize");
+        mCacheSetting = gSavedSettings.getU32("CacheSize");
         mBandwidthBPS = gSavedSettings.getF32("ThrottleBandwidthKBPS")*1024;
+        mConnectionPortEnabled = gSavedSettings.getBOOL("ConnectionPortEnabled");
+        mConnectionPort = gSavedSettings.getU32("ConnectionPort");
 }
 
 void LLPanelNetwork::cancel()
 {
-        gSavedSettings.setU32("VFSSize", mCacheSetting);
+        gSavedSettings.setU32("CacheSize", mCacheSetting);
         gSavedSettings.setF32("ThrottleBandwidthKBPS", mBandwidthBPS/1024);
+        gSavedSettings.setBOOL("ConnectionPortEnabled", mConnectionPortEnabled);
+        gSavedSettings.setU32("ConnectionPort", mConnectionPort);
 }
 
 // static
@@ -116,3 +121,55 @@ void LLPanelNetwork::onClickClearCache(void*)
         gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
         gViewerWindow->alertXml("CacheWillClear");
 }
+
+// static
+void LLPanelNetwork::onClickSetCache(void* user_data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
+
+        LLString cur_name(gSavedSettings.getString("CacheLocation"));
+        LLString proposed_name(cur_name);
+        
+        LLDirPicker& picker = LLDirPicker::instance();
+        if (! picker.getDir(&proposed_name ) )
+        {
+                return; //Canceled!
+        }
+
+        LLString dir_name = picker.getDirName();
+        if (!dir_name.empty() && dir_name != cur_name)
+        {
+                self->childSetText("cache_location", dir_name);
+                gViewerWindow->alertXml("CacheWillBeMoved");
+                gSavedSettings.setString("NewCacheLocation", dir_name);
+        }
+        else
+        {
+                LLString cache_location = gDirUtilp->getCacheDir();
+                self->childSetText("cache_location", cache_location);
+        }
+}
+
+// static
+void LLPanelNetwork::onClickResetCache(void* user_data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
+        if (!gSavedSettings.getString("CacheLocation").empty())
+        {
+                gSavedSettings.setString("NewCacheLocation", "");
+                gViewerWindow->alertXml("CacheWillBeMoved");
+        }
+        LLString cache_location = gDirUtilp->getCacheDir(true);
+        self->childSetText("cache_location", cache_location);
+}
+
+// static
+void LLPanelNetwork::onCommitPort(LLUICtrl* ctrl, void* data)
+{
+  LLPanelNetwork* self = (LLPanelNetwork*)data;
+  LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+
+  if (!self || !check) return;
+  self->childSetEnabled("connection_port", check->get());
+  gViewerWindow->alertXml("ChangeConnectionPort");
+}
diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h
index eb54042..051293a 100644
--- a/linden/indra/newview/llpanelnetwork.h
+++ b/linden/indra/newview/llpanelnetwork.h
@@ -51,14 +51,15 @@ public:
 
 private:
         static void onClickClearCache(void*);
+        static void onClickSetCache(void*);
+        static void onClickResetCache(void*);
+        static void onCommitPort(LLUICtrl* ctrl, void*);
 
 private:
-        LLSliderCtrl *mCtrlBandwidth;
-        LLRadioGroup* mDiskCacheRadio;
-        LLButton* mClearCacheBtn;
-
         U32 mCacheSetting;
         F32 mBandwidthBPS;
+        BOOL mConnectionPortEnabled;
+        U32 mConnectionPort;
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 54e24e2..590eb63 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -275,11 +275,11 @@ LLPanelObject::~LLPanelObject()
 
 void LLPanelObject::getState( )
 {
-        LLViewerObject* objectp = gSelectMgr->getFirstRootObject();
+        LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstRootObject();
         LLViewerObject* root_objectp = objectp;
         if(!objectp)
         {
-                objectp = gSelectMgr->getFirstObject();
+                objectp = gSelectMgr->getSelection()->getFirstObject();
                 // *FIX: shouldn't we just keep the child?
                 if (objectp)
                 {
@@ -391,9 +391,9 @@ void LLPanelObject::getState( )
         owners_identical = gSelectMgr->selectGetOwner(owner_id, owner_name);
 
         // BUG? Check for all objects being editable?
-        S32 roots_selected = gSelectMgr->getRootObjectCount();
+        S32 roots_selected = gSelectMgr->getSelection()->getRootObjectCount();
         BOOL editable = root_objectp->permModify();
-        S32 selected_count = gSelectMgr->getObjectCount();
+        S32 selected_count = gSelectMgr->getSelection()->getObjectCount();
         BOOL single_volume = (gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ))
                                                  && (selected_count == 1);
 
@@ -1525,7 +1525,7 @@ void LLPanelObject::draw()
         const LLColor4  blue(   0.f,    0.5f,   1.0f,   1);
 
         // Tune the colors of the labels
-        LLTool* tool = gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) );
+        LLTool* tool = gToolMgr->getCurrentTool();
 
         if (tool == gToolTranslate)
         {
@@ -1645,7 +1645,7 @@ void LLPanelObject::onCommitLock(LLUICtrl *ctrl, void *data)
 
         BOOL new_state = self->mCheckLock->get();
         
-        gSelectMgr->setObjectPermissions(PERM_OWNER, !new_state, PERM_MOVE | PERM_MODIFY);
+        gSelectMgr->selectionSetObjectPermissions(PERM_OWNER, !new_state, PERM_MOVE | PERM_MODIFY);
 }
 
 // static
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 84509a9..8512342 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -147,16 +147,16 @@ void LLPanelPermissions::refresh()
                 BtnDeedToGroup->setLabelUnselected(deedText);
         }
         BOOL root_selected = TRUE;
-        LLSelectNode* nodep = gSelectMgr->getFirstRootNode();
-        S32 object_count = gSelectMgr->getRootObjectCount();
+        LLSelectNode* nodep = gSelectMgr->getSelection()->getFirstRootNode();
+        S32 object_count = gSelectMgr->getSelection()->getRootObjectCount();
         if(!nodep || 0 == object_count)
         {
-                nodep = gSelectMgr->getFirstNode();
-                object_count = gSelectMgr->getObjectCount();
+                nodep = gSelectMgr->getSelection()->getFirstNode();
+                object_count = gSelectMgr->getSelection()->getObjectCount();
                 root_selected = FALSE;
         }
 
-        //BOOL attachment_selected = gSelectMgr->selectionIsAttachment();
+        //BOOL attachment_selected = gSelectMgr->getSelection()->isAttachment();
         //attachment_selected = false;
         LLViewerObject* objectp = NULL;
         if(nodep) objectp = nodep->getObject();
@@ -249,7 +249,7 @@ void LLPanelPermissions::refresh()
         BOOL is_one_object = (object_count == 1);
 
         // BUG: fails if a root and non-root are both single-selected.
-        BOOL is_perm_modify = (gSelectMgr->getFirstRootNode() 
+        BOOL is_perm_modify = (gSelectMgr->getSelection()->getFirstRootNode() 
                                                         && gSelectMgr->selectGetRootsModify()) 
                                                         || gSelectMgr->selectGetModify();
         const LLView* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
@@ -373,8 +373,8 @@ void LLPanelPermissions::refresh()
 
 
         // Pre-compute object info string
-        S32 prim_count = gSelectMgr->getObjectCount();
-        S32 obj_count = gSelectMgr->getRootObjectCount();
+        S32 prim_count = gSelectMgr->getSelection()->getObjectCount();
+        S32 obj_count = gSelectMgr->getSelection()->getRootObjectCount();
 
         LLString object_info_string;
         if (1 == obj_count)
@@ -383,8 +383,8 @@ void LLPanelPermissions::refresh()
         }
         else
         {
-                char buffer[MAX_STRING];
-                sprintf(buffer, "%d Objects, ", obj_count);
+                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                snprintf(buffer, MAX_STRING, "%d Objects, ", obj_count);                /*Flawfinder: ignore*/
                 object_info_string.assign(buffer);
         }
         if (1 == prim_count)
@@ -393,8 +393,8 @@ void LLPanelPermissions::refresh()
         }
         else
         {
-                char buffer[MAX_STRING];
-                sprintf(buffer, "%d Primitives", prim_count);
+                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                snprintf(buffer, MAX_STRING, "%d Primitives", prim_count);              /*Flawfinder: ignore*/
                 object_info_string.append(buffer);
         }
         childSetText("prim info",object_info_string);
@@ -496,36 +496,36 @@ void LLPanelPermissions::refresh()
         
         if( gSavedSettings.getBOOL("DebugPermissions") )
         {
-                char perm_string[10];
+                char perm_string[10];           /*Flawfinder: ignore*/
                 if (valid_base_perms)
                 {
 
-                        strcpy(perm_string, "B: ");
+                        strcpy(perm_string, "B: ");     /*Flawfinder: ignore*/
                         mask_to_string(base_mask_on, perm_string+3);
                         childSetText("B:",perm_string);
                         childSetVisible("B:",true);
                         
-                        strcpy(perm_string, "O: ");
+                        strcpy(perm_string, "O: ");     /*Flawfinder: ignore*/
                         mask_to_string(owner_mask_on, perm_string+3);
                         childSetText("O:",perm_string);
                         childSetVisible("O:",true);
                         
-                        strcpy(perm_string, "G: ");
+                        strcpy(perm_string, "G: ");     /*Flawfinder: ignore*/
                         mask_to_string(group_mask_on, perm_string+3);
                         childSetText("G:",perm_string);
                         childSetVisible("G:",true);
                         
-                        strcpy(perm_string, "E: ");
+                        strcpy(perm_string, "E: ");     /*Flawfinder: ignore*/
                         mask_to_string(everyone_mask_on, perm_string+3);
                         childSetText("E:",perm_string);
                         childSetVisible("E:",true);
                         
-                        strcpy(perm_string, "N: ");
+                        strcpy(perm_string, "N: ");     /*Flawfinder: ignore*/
                         mask_to_string(next_owner_mask_on, perm_string+3);
                         childSetText("N:",perm_string);
                         childSetVisible("N:",true);
                 }
-                strcpy(perm_string, "F: ");
+                strcpy(perm_string, "F: ");     /*Flawfinder: ignore*/
                 U32 flag_mask = 0x0;
                 if (objectp->permMove())
                         flag_mask |= PERM_MOVE;
@@ -729,6 +729,11 @@ void LLPanelPermissions::refresh()
         {
                 RadioSaleType->setSelectedIndex((S32)sale_type - 1);
         }
+        else
+        {
+                // default option is sell copy, determined to be safest
+                RadioSaleType->setSelectedIndex((S32)LLSaleInfo::FS_COPY - 1);
+        }
 
         if (is_for_sale)
         {
@@ -847,7 +852,7 @@ void LLPanelPermissions::onClickDeedToGroup(void* data)
 // static
 void LLPanelPermissions::onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm)
 {
-        LLViewerObject* object = gSelectMgr->getFirstRootObject();
+        LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
         if(!object) return;
 
         // Checkbox will have toggled itself
@@ -855,7 +860,7 @@ void LLPanelPermissions::onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32
         LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
         BOOL new_state = check->get();
         
-        gSelectMgr->setObjectPermissions(field, new_state, perm);
+        gSelectMgr->selectionSetObjectPermissions(field, new_state, perm);
 }
 
 // static
@@ -906,8 +911,8 @@ void LLPanelPermissions::onCommitName(LLUICtrl*, void* data)
         LLLineEditor*   tb = gUICtrlFactory->getLineEditorByName(self,"Object Name");
         if(tb)
         {
-                gSelectMgr->setObjectName(tb->getText());
-//              gSelectMgr->setObjectName(self->mLabelObjectName->getText());
+                gSelectMgr->selectionSetObjectName(tb->getText());
+//              gSelectMgr->selectionSetObjectName(self->mLabelObjectName->getText());
         }
 }
 
@@ -920,7 +925,7 @@ void LLPanelPermissions::onCommitDesc(LLUICtrl*, void* data)
         LLLineEditor*   le = gUICtrlFactory->getLineEditorByName(self,"Object Description");
         if(le)
         {
-                gSelectMgr->setObjectDescription(le->getText());
+                gSelectMgr->selectionSetObjectDescription(le->getText());
         }
 }
 
@@ -982,7 +987,7 @@ void LLPanelPermissions::setAllSaleInfo()
         }
 
         LLSaleInfo sale_info(sale_type, price);
-        gSelectMgr->setObjectSaleInfo(sale_info);
+        gSelectMgr->selectionSetObjectSaleInfo(sale_info);
 
         // If turned off for-sale, make sure click-action buy is turned
         // off as well
@@ -1036,7 +1041,7 @@ void LLPanelPermissions::onCommitClickAction(LLUICtrl* ctrl, void*)
         {
                 // Verify object has script with money() handler
                 LLSelectionPayable payable;
-                bool can_pay = gSelectMgr->applyToObjects(&payable);
+                bool can_pay = gSelectMgr->getSelection()->applyToObjects(&payable);
                 if (!can_pay)
                 {
                         // Warn, but do it anyway.
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 4c9d5c3..ddd7934 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -289,10 +289,10 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
     LLUUID parcel_id;
     msg->getUUID("Data", "ParcelID", parcel_id);
 
-        char name[DB_PARCEL_NAME_SIZE];
+        char name[DB_PARCEL_NAME_SIZE];         /*Flawfinder: ignore*/
         msg->getString("Data", "Name", DB_PARCEL_NAME_SIZE, name);
 
-        char desc[DB_PICK_DESC_SIZE];
+        char desc[DB_PICK_DESC_SIZE];           /*Flawfinder: ignore*/
         msg->getString("Data", "Desc", DB_PICK_DESC_SIZE, desc);
 
         LLUUID snapshot_id;
@@ -300,7 +300,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
 
     // "Location text" is actually the owner name, the original
     // name that owner gave the parcel, and the location.
-        char buffer[256];
+        char buffer[256];               /*Flawfinder: ignore*/
     LLString location_text;
 
     msg->getString("Data", "User", 256, buffer);
@@ -314,7 +314,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
                 location_text.append(", ");
         }
 
-        char sim_name[256];
+        char sim_name[256];             /*Flawfinder: ignore*/
         msg->getString("Data", "SimName", 256, sim_name);
 
         LLVector3d pos_global;
@@ -324,7 +324,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
     S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
         S32 region_z = llround((F32)pos_global.mdV[VZ]);
    
-    sprintf(buffer, "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);
+    snprintf(buffer, sizeof(buffer), "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z);                /*Flawfinder: ignore*/
     location_text.append(buffer);
 
         S32 sort_order;
@@ -359,7 +359,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
         self->mLocationEditor->setText(location_text);
         self->mEnabledCheck->set(enabled);
 
-                sprintf(buffer, "%d", sort_order);
+                snprintf(buffer, sizeof(buffer), "%d", sort_order);             /*Flawfinder: ignore*/
                 self->mSortOrderEditor->setText(buffer);
     }
 }
@@ -506,8 +506,11 @@ void LLPanelPick::onCommitAny(LLUICtrl* ctrl, void* data)
                 }
                 else
                 {*/
-                        LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
-                        tab->setCurrentTabName(self->mNameEditor->getText());
+                LLTabContainerVertical* tab = (LLTabContainerVertical*)self->getParent();
+                if (tab)
+                {
+                        if(tab) tab->setCurrentTabName(self->mNameEditor->getText());
+                }
                 //}
         }
 }
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 4f316c9..f373e99 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -139,20 +139,20 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
         LLUUID  agent_id;
         LLUUID  parcel_id;
         LLUUID  owner_id;
-        char    name[MAX_STRING];
-        char    desc[MAX_STRING];
+        char    name[MAX_STRING];               /*Flawfinder: ignore*/
+        char    desc[MAX_STRING];               /*Flawfinder: ignore*/
         S32             actual_area;
         S32             billable_area;
         U8              flags;
         F32             global_x;
         F32             global_y;
         F32             global_z;
-        char    sim_name[MAX_STRING];
+        char    sim_name[MAX_STRING];           /*Flawfinder: ignore*/
         LLUUID  snapshot_id;
         F32             dwell;
         S32             sale_price;
         S32             auction_id;
-        char    buffer[256];
+        char    buffer[256];            /*Flawfinder: ignore*/
 
         msg->getUUID("AgentData", "AgentID", agent_id );
         msg->getUUID("Data", "ParcelID", parcel_id);
@@ -193,16 +193,16 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                 self->mDescEditor->setText(desc);
 
                 LLString info;
-                sprintf(buffer, "Traffic: %.0f, Area: %d sq. m.", dwell, actual_area);
+                snprintf(buffer, sizeof(buffer), "Traffic: %.0f, Area: %d sq. m.", dwell, actual_area);         /*Flawfinder: ignore*/
                 info.append(buffer);
                 if (flags & DFQ_FOR_SALE)
                 {
-                        sprintf(buffer, ", For Sale for L$%d", sale_price);
+                        snprintf(buffer, sizeof(buffer), ", For Sale for L$%d", sale_price);            /*Flawfinder: ignore*/
                         info.append(buffer);
                 }
                 if (auction_id != 0)
                 {
-                        sprintf(buffer, ", Auction ID %010d", auction_id);
+                        snprintf(buffer, sizeof(buffer), ", Auction ID %010d", auction_id);             /*Flawfinder: ignore*/
                         info.append(buffer);
                 }
                 self->mInfoEditor->setText(info);
@@ -218,7 +218,7 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                         rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
                 }
 
-                sprintf(buffer, "%s %d, %d, %d (%s)", 
+                snprintf(buffer, sizeof(buffer), "%s %d, %d, %d (%s)",          /*Flawfinder: ignore*/
                         sim_name, region_x, region_y, region_z, rating);
                 self->mLocationEditor->setText(buffer);
 
@@ -280,8 +280,8 @@ void LLPanelPlace::callbackAuctionWebPage(S32 option, void* data)
 
         if (0 == option)
         {
-                char url[256];
-                sprintf(url, "%s%010d", AUCTION_URL, self->mAuctionID);
+                char url[256];          /*Flawfinder: ignore*/
+                snprintf(url, sizeof(url), "%s%010d", AUCTION_URL, self->mAuctionID);           /*Flawfinder: ignore*/
 
                 llinfos << "Loading auction page " << url << llendl;
 
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index afda5bd..3a8650d 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -136,11 +136,11 @@ LLPanelVolume::~LLPanelVolume()
 
 void LLPanelVolume::getState( )
 {
-        LLViewerObject* objectp = gSelectMgr->getFirstRootObject();
+        LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstRootObject();
         LLViewerObject* root_objectp = objectp;
         if(!objectp)
         {
-                objectp = gSelectMgr->getFirstObject();
+                objectp = gSelectMgr->getSelection()->getFirstObject();
                 // *FIX: shouldn't we just keep the child?
                 if (objectp)
                 {
@@ -185,7 +185,7 @@ void LLPanelVolume::getState( )
         // BUG? Check for all objects being editable?
         BOOL editable = root_objectp->permModify();
         BOOL single_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME )
-                && gSelectMgr->getObjectCount() == 1;
+                && gSelectMgr->getSelection()->getObjectCount() == 1;
 
         // Select Single Message
         if (single_volume)
diff --git a/linden/indra/newview/llpolymesh.cpp b/linden/indra/newview/llpolymesh.cpp
index d58ec74..4f339ac 100644
--- a/linden/indra/newview/llpolymesh.cpp
+++ b/linden/indra/newview/llpolymesh.cpp
@@ -261,7 +261,12 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
         //-------------------------------------------------------------------------
         // Open the file
         //-------------------------------------------------------------------------
-        FILE *fp = LLFile::fopen(fileName, "rb");
+        if(!fileName)
+        {
+                llerrs << "Filename is Empty!" << llendl;
+                return FALSE;
+        }
+        FILE* fp = LLFile::fopen(fileName, "rb");                       /*Flawfinder: ignore*/
         if (!fp)
         {
                 llerrs << "can't open: " << fileName << llendl;
@@ -271,14 +276,14 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
         //-------------------------------------------------------------------------
         // Read a chunk
         //-------------------------------------------------------------------------
-        char header[128];
+        char header[128];               /*Flawfinder: ignore*/
         fread(header, sizeof(char), 128, fp);
 
         //-------------------------------------------------------------------------
         // Check for proper binary header
         //-------------------------------------------------------------------------
         BOOL status = FALSE;
-        if ( strncmp(header, HEADER_BINARY, strlen(HEADER_BINARY)) == 0 )
+        if ( strncmp(header, HEADER_BINARY, strlen(HEADER_BINARY)) == 0 )       /*Flawfinder: ignore*/
         {
                 lldebugs << "Loading " << fileName << llendl;
 
@@ -541,7 +546,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         //----------------------------------------------------------------
                         for (i=0; i < numSkinJoints; i++)
                         {
-                                char jointName[64];
+                                char jointName[64];             /*Flawfinder: ignore*/
                                 numRead = fread(jointName, sizeof(jointName), 1, fp);
                                 if (numRead != 1)
                                 {
@@ -555,7 +560,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         //-------------------------------------------------------------------------
                         // look for morph section
                         //-------------------------------------------------------------------------
-                        char morphName[64];
+                        char morphName[64];             /*Flawfinder: ignore*/
                         while(fread(&morphName, sizeof(char), 64, fp) == 64)
                         {
                                 if (!strcmp(morphName, "End Morphs"))
@@ -739,8 +744,8 @@ LLPolyMesh *LLPolyMesh::getMesh(const LLString &name, LLPolyMesh* reference_mesh
         //-------------------------------------------------------------------------
         // if not found, create a new one, add it to the list
         //-------------------------------------------------------------------------
-        char full_path[LL_MAX_PATH];
-        sprintf(full_path, "%s", (gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,name.c_str())).c_str());
+        char full_path[LL_MAX_PATH];            /*Flawfinder: ignore*/
+        snprintf(full_path, LL_MAX_PATH, "%s", (gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,name.c_str())).c_str());               /*Flawfinder: ignore*/
 
         LLPolyMeshSharedData *mesh_data = new LLPolyMeshSharedData();
         if (reference_mesh)
@@ -799,7 +804,7 @@ void LLPolyMesh::dumpDiagInfo()
         U32 total_faces = 0;
         U32 total_kb = 0;
 
-        char buf[1024];
+        char buf[1024];         /*Flawfinder: ignore*/
 
         llinfos << "-----------------------------------------------------" << llendl;
         llinfos << "       Global PolyMesh Table (DEBUG only)" << llendl;
@@ -818,7 +823,7 @@ void LLPolyMesh::dumpDiagInfo()
                 S32 num_faces = mesh.mNumFaces;
                 U32 num_kb = mesh.getNumKB();
 
-                sprintf(buf, "%8d %8d %8d %s", num_verts, num_faces, num_kb, mesh_name_p->c_str());
+                snprintf(buf, sizeof(buf), "%8d %8d %8d %s", num_verts, num_faces, num_kb, mesh_name_p->c_str());               /*Flawfinder: ignore*/
                 llinfos << buf << llendl;
 
                 total_verts += num_verts;
@@ -827,7 +832,7 @@ void LLPolyMesh::dumpDiagInfo()
         }
 
         llinfos << "-----------------------------------------------------" << llendl;
-        sprintf(buf, "%8d %8d %8d TOTAL", total_verts, total_faces, total_kb );
+        snprintf(buf, sizeof(buf), "%8d %8d %8d TOTAL", total_verts, total_faces, total_kb );           /*Flawfinder: ignore*/
         llinfos << buf << llendl;
         llinfos << "-----------------------------------------------------" << llendl;
 }
@@ -906,12 +911,12 @@ void LLPolyMesh::initializeForMorph()
         if (!mSharedData)
                 return;
 
-        memcpy(mCoords, mSharedData->mBaseCoords, sizeof(LLVector3) * mSharedData->mNumVertices);
-        memcpy(mNormals, mSharedData->mBaseNormals, sizeof(LLVector3) * mSharedData->mNumVertices);
-        memcpy(mScaledNormals, mSharedData->mBaseNormals, sizeof(LLVector3) * mSharedData->mNumVertices);
-        memcpy(mBinormals, mSharedData->mBaseBinormals, sizeof(LLVector3) * mSharedData->mNumVertices);
-        memcpy(mScaledBinormals, mSharedData->mBaseBinormals, sizeof(LLVector3) * mSharedData->mNumVertices);
-        memcpy(mTexCoords, mSharedData->mTexCoords, sizeof(LLVector2) * mSharedData->mNumVertices);
+        memcpy(mCoords, mSharedData->mBaseCoords, sizeof(LLVector3) * mSharedData->mNumVertices);       /*Flawfinder: ignore*/
+        memcpy(mNormals, mSharedData->mBaseNormals, sizeof(LLVector3) * mSharedData->mNumVertices);     /*Flawfinder: ignore*/
+        memcpy(mScaledNormals, mSharedData->mBaseNormals, sizeof(LLVector3) * mSharedData->mNumVertices);       /*Flawfinder: ignore*/
+        memcpy(mBinormals, mSharedData->mBaseBinormals, sizeof(LLVector3) * mSharedData->mNumVertices); /*Flawfinder: ignore*/
+        memcpy(mScaledBinormals, mSharedData->mBaseBinormals, sizeof(LLVector3) * mSharedData->mNumVertices);           /*Flawfinder: ignore*/
+        memcpy(mTexCoords, mSharedData->mTexCoords, sizeof(LLVector2) * mSharedData->mNumVertices);             /*Flawfinder: ignore*/
         memset(mClothingWeights, 0, sizeof(LLVector4) * mSharedData->mNumVertices);
 }
 
@@ -1070,10 +1075,10 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
                 mJointScales[joint] = bone_info->mScaleDeformation;
 
                 // apply to children that need to inherit it
-                for (   LLViewerJoint *child_joint = (LLViewerJoint *)joint->mChildren.getFirstData();
-                                child_joint != NULL;
-                                child_joint = (LLViewerJoint *)joint->mChildren.getNextData() )
+                for (LLJoint::child_list_t::iterator iter = joint->mChildren.begin();
+                         iter != joint->mChildren.end(); ++iter)
                 {
+                        LLViewerJoint* child_joint = (LLViewerJoint*)(*iter);
                         if (child_joint->inheritScale())
                         {
                                 LLVector3 childDeformation = LLVector3(child_joint->getScale());
diff --git a/linden/indra/newview/llpolymesh.h b/linden/indra/newview/llpolymesh.h
index 851a9bc..0d448ac 100644
--- a/linden/indra/newview/llpolymesh.h
+++ b/linden/indra/newview/llpolymesh.h
@@ -324,6 +324,7 @@ public:
 
         U32                             mFaceVertexOffset;
         U32                             mFaceVertexCount;
+        U32                             mFaceIndexOffset;
         U32                             mFaceIndexCount;
         U32                             mCurVertexCount;
 private:
diff --git a/linden/indra/newview/llpolymorph.cpp b/linden/indra/newview/llpolymorph.cpp
index ae9b37a..3937da2 100644
--- a/linden/indra/newview/llpolymorph.cpp
+++ b/linden/indra/newview/llpolymorph.cpp
@@ -49,8 +49,8 @@ LLPolyMorphData::LLPolyMorphData(char *morph_name)
 {
         llassert (morph_name);
 
-        mName = new char[strlen(morph_name) + 1];
-        strcpy(mName, morph_name);
+        mName = new char[strlen(morph_name) + 1];       /*Flawfinder: ignore*/
+        strcpy(mName, morph_name);      /*Flawfinder: ignore*/
 
         mNumIndices = 0;
         mCurrentIndex = 0;
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index c5dc414..534513f 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -52,6 +52,7 @@
 // Globals and statics
 LLPreview::preview_multimap_t LLPreview::sPreviewsBySource;
 LLPreview::preview_map_t LLPreview::sInstances;
+std::map<LLUUID, LLViewHandle> LLMultiPreview::sAutoOpenPreviewHandles;
 
 // Functions
 LLPreview::LLPreview(const std::string& name) :
@@ -219,11 +220,11 @@ void LLPreview::onCommit()
                                         {
                                                 gSelectMgr->deselectAll();
                                                 gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
-                                                gSelectMgr->setObjectDescription( childGetText("desc") );
+                                                gSelectMgr->selectionSetObjectDescription( childGetText("desc") );
                                         
                                                 if( has_sale_info )
                                                 {
-                                                        gSelectMgr->setObjectSaleInfo( sale_info );
+                                                        gSelectMgr->selectionSetObjectSaleInfo( sale_info );
                                                 }
 
                                                 gSelectMgr->deselectAll();
@@ -272,7 +273,7 @@ LLPreview* LLPreview::show( const LLUUID& item_uuid, BOOL take_focus )
                         // needs to be rehosted
                         LLFloater::getFloaterHost()->addFloater(instance, TRUE);
                 }
-                instance->open();
+                instance->open();  /*Flawfinder: ignore*/
                 if (take_focus)
                 {
                         instance->setFocus(TRUE);
@@ -382,14 +383,14 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
         return LLFloater::handleHover(x,y,mask);
 }
 
-void LLPreview::open()
+void LLPreview::open()  /*Flawfinder: ignore*/
 {
         LLMultiFloater* hostp = getHost();
         if (!sHostp && !hostp && getAssetStatus() == PREVIEW_ASSET_UNLOADED)
         {
                 loadAsset();
         }
-        LLFloater::open();
+        LLFloater::open();              /*Flawfinder: ignore*/
 }
 
 // virtual
@@ -491,11 +492,12 @@ LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id)
 
 LLMultiPreview::LLMultiPreview(const LLRect& rect) : LLMultiFloater("Preview", rect)
 {
+        setCanResize(TRUE);
 }
 
-void LLMultiPreview::open()
+void LLMultiPreview::open()             /*Flawfinder: ignore*/
 {
-        LLMultiFloater::open();
+        LLMultiFloater::open();         /*Flawfinder: ignore*/
         LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
         if (frontmost_preview && frontmost_preview->getAssetStatus() == LLPreview::PREVIEW_ASSET_UNLOADED)
         {
@@ -511,3 +513,23 @@ void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
                 opened_preview->loadAsset();
         }
 }
+
+//static 
+LLMultiPreview* LLMultiPreview::getAutoOpenInstance(const LLUUID& id)
+{
+        handle_map_t::iterator found_it = sAutoOpenPreviewHandles.find(id);
+        if (found_it != sAutoOpenPreviewHandles.end())
+        {
+                return (LLMultiPreview*)gFloaterView->getFloaterByHandle(found_it->second);     
+        }
+        return NULL;
+}
+
+//static
+void LLMultiPreview::setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id)
+{
+        if (previewp)
+        {
+                sAutoOpenPreviewHandles[id] = previewp->getHandle();
+        }
+}
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index 418c797..7882b4c 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -34,7 +34,7 @@
 #include "lluuid.h"
 #include "llviewerinventory.h"
 #include "lltabcontainer.h"
-#include "lllineeditor.h"
+#include <map>
 
 class LLLineEditor;
 class LLRadioGroup;
@@ -45,8 +45,15 @@ class LLMultiPreview : public LLMultiFloater
 public:
         LLMultiPreview(const LLRect& rect);
 
-        /*virtual*/void open();
+        /*virtual*/void open();         /*Flawfinder: ignore*/
         /*virtual*/void tabOpen(LLFloater* opened_floater, bool from_click);
+
+        static LLMultiPreview* getAutoOpenInstance(const LLUUID& id);
+        static void setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id);
+
+protected:
+        typedef std::map<LLUUID, LLViewHandle> handle_map_t;
+        static std::map<LLUUID, LLViewHandle> sAutoOpenPreviewHandles;
 };
 
 class LLPreview : public LLFloater
@@ -79,7 +86,7 @@ public:
         virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL handleHover(S32 x, S32 y, MASK mask);
-        virtual void open();
+        virtual void open();            /*Flawfinder: ignore*/
         virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr);
  
         void setAuxItem( const LLInventoryItem* item )
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 1ff782a..fdbeb6c 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -41,6 +41,7 @@
 
 // newview
 #include "llagent.h"            // todo: remove
+#include "llassetuploadresponders.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
@@ -57,6 +58,7 @@
 #include "llviewerinventory.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
+#include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"             // busycount
 #include "viewer.h"                     // gVFS
@@ -112,7 +114,7 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
         LLPreviewGesture* previewp = (LLPreviewGesture*)LLPreview::find(item_id);
         if (previewp)
         {
-                previewp->open();
+                previewp->open();   /*Flawfinder: ignore*/
                 if (take_focus)
                 {
                         previewp->setFocus(TRUE);
@@ -790,8 +792,8 @@ void LLPreviewGesture::refresh()
                                 mWaitTimeCheck->setVisible(TRUE);
                                 mWaitTimeCheck->set(wait_step->mFlags & WAIT_FLAG_TIME);
                                 mWaitTimeEditor->setVisible(TRUE);
-                                char buffer[16];
-                                sprintf(buffer, "%.1f", (double)wait_step->mWaitSeconds);
+                                char buffer[16];                /*Flawfinder: ignore*/
+                                snprintf(buffer, sizeof(buffer),  "%.1f", (double)wait_step->mWaitSeconds);             /*Flawfinder: ignore*/
                                 mWaitTimeEditor->setText(buffer);
                                 break;
                         }
@@ -895,7 +897,7 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
                         S32 size = file.getSize();
 
                         char* buffer = new char[size+1];
-                        file.read((U8*)buffer, size);
+                        file.read((U8*)buffer, size);           /*Flawfinder: ignore*/
                         buffer[size] = '\0';
 
                         LLMultiGesture* gesture = new LLMultiGesture();
@@ -1120,13 +1122,31 @@ void LLPreviewGesture::saveIfNeeded()
                 LLInventoryItem* item = getItem();
                 if (item)
                 {
-                        LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
-                        LLSaveInfo* info = new LLSaveInfo(mItemUUID, mObjectUUID, descEditor->getText(), tid);
-
-                        const BOOL temp_file = FALSE;
-
-                        gAssetStorage->storeAssetData(tid, LLAssetType::AT_GESTURE, onSaveComplete, info, temp_file);
-
+                        std::string agent_url = gAgent.getRegion()->getCapability("UpdateGestureAgentInventory");
+                        std::string task_url = gAgent.getRegion()->getCapability("UpdateGestureTaskInventory");
+                        if (mObjectUUID.isNull() && !agent_url.empty())
+                        {
+                                // Saving into agent inventory
+                                LLSD body;
+                                body["item_id"] = mItemUUID;
+                                LLHTTPClient::post(agent_url, body,
+                                        new LLUpdateAgentInventoryResponder(body, asset_id, LLAssetType::AT_GESTURE));
+                        }
+                        else if (!mObjectUUID.isNull() && !task_url.empty())
+                        {
+                                // Saving into task inventory
+                                LLSD body;
+                                body["task_id"] = mObjectUUID;
+                                body["item_id"] = mItemUUID;
+                                LLHTTPClient::post(task_url, body,
+                                        new LLUpdateTaskInventoryResponder(body, asset_id, LLAssetType::AT_GESTURE));
+                        }
+                        else if (gAssetStorage)
+                        {
+                                LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+                                LLSaveInfo* info = new LLSaveInfo(mItemUUID, mObjectUUID, descEditor->getText(), tid);
+                                gAssetStorage->storeAssetData(tid, LLAssetType::AT_GESTURE, onSaveComplete, info, FALSE);
+                        }
                 }
 
                 // If this gesture is active, then we need to update the in-memory
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index da8b9fc..fe5ade2 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -32,6 +32,7 @@
 #include "llinventory.h"
 
 #include "llagent.h"
+#include "llassetuploadresponders.h"
 #include "llviewerwindow.h"
 #include "llbutton.h"
 #include "llinventorymodel.h"
@@ -110,8 +111,12 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
                 }
         }       
 
-        reshape(curRect.getWidth(), curRect.getHeight(), TRUE);
-        setRect(curRect);
+        // only assert shape if not hosted in a multifloater
+        if (!getHost())
+        {
+                reshape(curRect.getWidth(), curRect.getHeight(), TRUE);
+                setRect(curRect);
+        }
                         
         childSetVisible("lock", FALSE); 
         
@@ -142,6 +147,7 @@ BOOL LLPreviewNotecard::postBuild()
         if (ed)
         {
                 ed->setNotecardInfo(mNotecardItemID, mObjectID);
+                ed->makePristine();
         }
         return TRUE;
 }
@@ -234,6 +240,22 @@ const LLInventoryItem* LLPreviewNotecard::getDragItem()
         return NULL;
 }
 
+bool LLPreviewNotecard::hasEmbeddedInventory()
+{
+        LLViewerTextEditor* editor = NULL;
+        editor = LLViewerUICtrlFactory::getViewerTextEditorByName(
+                this,
+                "Notecard Editor");
+        if (!editor) return false;
+        return editor->hasEmbeddedInventory();
+}
+
+void LLPreviewNotecard::refreshFromInventory()
+{
+        lldebugs << "LLPreviewNotecard::refreshFromInventory()" << llendl;
+        loadAsset();
+}
+
 void LLPreviewNotecard::loadAsset()
 {
         // request the asset.
@@ -337,7 +359,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
                         S32 file_length = file.getSize();
 
                         char* buffer = new char[file_length+1];
-                        file.read((U8*)buffer, file_length);
+                        file.read((U8*)buffer, file_length);            /*Flawfinder: ignore*/
 
                         // put a EOS at the end
                         buffer[file_length] = 0;
@@ -363,7 +385,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
                         LLInventoryItem* item = preview->getItem();
                         BOOL modifiable = item && gAgent.allowOperation(PERM_MODIFY,
                                                                 item->getPermissions(), GP_OBJECT_MANIPULATE);
-                        previewEditor->setEnabled(modifiable);
+                        preview->setEnabled(modifiable);
                         delete[] buffer;
                         preview->mAssetStatus = PREVIEW_ASSET_LOADED;
                 }
@@ -468,14 +490,43 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem)
                 LLInventoryItem* item = getItem();
                 // save it out to database
                 if (item)
-                {
-                        
-                        LLSaveNotecardInfo* info = new LLSaveNotecardInfo(this, mItemUUID, mObjectUUID,
-                                                                                                                          tid, copyitem);
-                        gAssetStorage->storeAssetData(tid, LLAssetType::AT_NOTECARD,
-                                                                                        &onSaveComplete,
-                                                                                        (void*)info,
-                                                                                        FALSE);
+                {                       
+                        std::string agent_url = gAgent.getRegion()->getCapability("UpdateNotecardAgentInventory");
+                        std::string task_url = gAgent.getRegion()->getCapability("UpdateNotecardTaskInventory");
+                        if (mObjectUUID.isNull() && !agent_url.empty())
+                        {
+                                // Saving into agent inventory
+                                mAssetStatus = PREVIEW_ASSET_LOADING;
+                                setEnabled(FALSE);
+                                LLSD body;
+                                body["item_id"] = mItemUUID;
+                                llinfos << "Saving notecard " << mItemUUID
+                                        << " into agent inventory via " << agent_url << llendl;
+                                LLHTTPClient::post(agent_url, body,
+                                        new LLUpdateAgentInventoryResponder(body, asset_id, LLAssetType::AT_NOTECARD));
+                        }
+                        else if (!mObjectUUID.isNull() && !task_url.empty())
+                        {
+                                // Saving into task inventory
+                                mAssetStatus = PREVIEW_ASSET_LOADING;
+                                setEnabled(FALSE);
+                                LLSD body;
+                                body["task_id"] = mObjectUUID;
+                                body["item_id"] = mItemUUID;
+                                llinfos << "Saving notecard " << mItemUUID << " into task "
+                                        << mObjectUUID << " via " << task_url << llendl;
+                                LLHTTPClient::post(task_url, body,
+                                        new LLUpdateTaskInventoryResponder(body, asset_id, LLAssetType::AT_NOTECARD));
+                        }
+                        else if (gAssetStorage)
+                        {
+                                LLSaveNotecardInfo* info = new LLSaveNotecardInfo(this, mItemUUID, mObjectUUID,
+                                                                                                                                tid, copyitem);
+                                gAssetStorage->storeAssetData(tid, LLAssetType::AT_NOTECARD,
+                                                                                                &onSaveComplete,
+                                                                                                (void*)info,
+                                                                                                FALSE);
+                        }
                 }
         }
         return true;
@@ -551,10 +602,10 @@ void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data
                 gViewerWindow->alertXml("SaveNotecardFailReason",args);
         }
 
-        char uuid_string[UUID_STR_LENGTH];
+        char uuid_string[UUID_STR_LENGTH];              /*Flawfinder: ignore*/
         asset_uuid.toString(uuid_string);
-        char filename[LL_MAX_PATH];
-        sprintf(filename, "%s.tmp", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
+        char filename[LL_MAX_PATH];             /*Flawfinder: ignore*/
+        snprintf(filename, LL_MAX_PATH, "%s.tmp", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());           /*Flawfinder: ignore*/
         LLFile::remove(filename);
         delete info;
 }
diff --git a/linden/indra/newview/llpreviewnotecard.h b/linden/indra/newview/llpreviewnotecard.h
index da3fc3f..9b72ec8 100644
--- a/linden/indra/newview/llpreviewnotecard.h
+++ b/linden/indra/newview/llpreviewnotecard.h
@@ -69,6 +69,14 @@ public:
         const LLInventoryItem* getDragItem();
 
 
+        // return true if there is any embedded inventory.
+        bool hasEmbeddedInventory();
+
+        // After saving a notecard, the tcp based upload system will
+        // change the asset, therefore, we need to re-fetch it from the
+        // asset system. :(
+        void refreshFromInventory();
+
 protected:
 
         virtual void loadAsset();
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index c13da9b..75371b2 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -30,6 +30,7 @@
 #include "llpreviewscript.h"
 
 #include "llassetstorage.h"
+#include "llassetuploadresponders.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
@@ -155,7 +156,7 @@ public:
         LLScriptEdCore* getEditorCore() { return mEditorCore; }
         static LLFloaterScriptSearch* getInstance() { return sInstance; }
 
-        void open();
+        void open();            /*Flawfinder: ignore*/
 
 private:
 
@@ -187,6 +188,18 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLS
         sInstance = this;
 
         childSetFocus("search_text", TRUE);
+
+        // find floater in which script panel is embedded
+        LLView* viewp = (LLView*)editor_core;
+        while(viewp)
+        {
+                if (viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
+                {
+                        ((LLFloater*)viewp)->addDependentFloater(this);
+                        break;
+                }
+                viewp = viewp->getParent();
+        }
 }
 
 //static 
@@ -208,7 +221,7 @@ void LLFloaterScriptSearch::show(LLScriptEdCore* editor_core)
                 new LLFloaterScriptSearch("Script Search",LLRect(left,top,left + SCRIPT_SEARCH_WIDTH,top - SCRIPT_SEARCH_HEIGHT),editor_core);
         }
 
-        sInstance->open();
+        sInstance->open();              /*Flawfinder: ignore*/
 }
 
 LLFloaterScriptSearch::~LLFloaterScriptSearch()
@@ -255,9 +268,9 @@ void LLFloaterScriptSearch::handleBtnReplaceAll()
         mEditorCore->mEditor->replaceTextAll(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
 }
 
-void LLFloaterScriptSearch::open()
+void LLFloaterScriptSearch::open()              /*Flawfinder: ignore*/
 {
-        LLFloater::open();
+        LLFloater::open();              /*Flawfinder: ignore*/
         childSetFocus("search_text", TRUE); 
 }
 /// ---------------------------------------------------------------------------
@@ -428,8 +441,8 @@ void LLScriptEdCore::draw()
                 S32 line = 0;
                 S32 column = 0;
                 mEditor->getCurrentLineAndColumn( &line, &column, FALSE );  // don't include wordwrap
-                char cursor_pos[STD_STRING_BUF_SIZE];
-                sprintf( cursor_pos, "Line %d, Column %d", line, column );
+                char cursor_pos[STD_STRING_BUF_SIZE];           /*Flawfinder: ignore*/
+                snprintf( cursor_pos, STD_STRING_BUF_SIZE, "Line %d, Column %d", line, column );                /*Flawfinder: ignore*/
                 childSetText("line_col", cursor_pos);
         }
         else
@@ -851,6 +864,33 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
         }
 }
 
+// virtual
+void LLPreviewLSL::callbackLSLCompileSucceeded()
+{
+        llinfos << "LSL Bytecode saved" << llendl;
+        mScriptEd->mErrorList->addSimpleItem("Compile successful!");
+        mScriptEd->mErrorList->addSimpleItem("Save complete.");
+        closeIfNeeded();
+}
+
+// virtual
+void LLPreviewLSL::callbackLSLCompileFailed(const LLSD& compile_errors)
+{
+        llinfos << "Compile failed!" << llendl;
+
+        const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
+        LLScrollListItem* item = NULL;
+        for(LLSD::array_const_iterator line = compile_errors.beginArray();
+                line < compile_errors.endArray();
+                line++)
+        {
+                item = new LLScrollListItem();
+                item->addColumn(line->asString(), err_font);
+                mScriptEd->mErrorList->addItem(item);
+        }
+        mScriptEd->selectFirstError();
+        closeIfNeeded();
+}
 
 void LLPreviewLSL::loadAsset()
 {
@@ -912,10 +952,21 @@ BOOL LLPreviewLSL::canClose()
         return mScriptEd->canClose();
 }
 
+void LLPreviewLSL::closeIfNeeded()
+{
+        // Find our window and close it if requested.
+        getWindow()->decBusyCount();
+        mPendingUploads--;
+        if (mPendingUploads <= 0 && mCloseAfterSave)
+        {
+                close();
+        }
+}
+
 //override the llpreview open which attempts to load asset, load after xml ui made
-void LLPreviewLSL::open()
+void LLPreviewLSL::open()               /*Flawfinder: ignore*/
 {
-        LLFloater::open();
+        LLFloater::open();              /*Flawfinder: ignore*/
 }
 
 // static
@@ -933,152 +984,152 @@ void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save)
         self->saveIfNeeded();
 }
 
-
 // Save needs to compile the text in the buffer. If the compile
 // succeeds, then save both assets out to the database. If the compile
 // fails, go ahead and save the text anyway so that the user doesn't
 // get too fucked.
 void LLPreviewLSL::saveIfNeeded()
 {
-        // llinfos << "LLPreviewLSL::save()" << llendl;
-        if(!mScriptEd->mEditor->isPristine())
+        // llinfos << "LLPreviewLSL::saveIfNeeded()" << llendl;
+        if(mScriptEd->mEditor->isPristine())
         {
-                mPendingUploads = 0;
-                mScriptEd->mErrorList->deleteAllItems();
-                mScriptEd->mEditor->makePristine();
-
-                // We need to update the asset information
-                LLTransactionID tid;
-                LLAssetID uuid;
-                tid.generate();
-                uuid = tid.makeAssetID(gAgent.getSecureSessionID());
-                char uuid_string[UUID_STR_LENGTH];
-                uuid.toString(uuid_string);
-                char filename[LL_MAX_PATH];
-                sprintf(filename, "%s.lsl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-                FILE* fp = LLFile::fopen(filename, "wb");
-                if(!fp)
-                {
-                        llwarns << "Unable to write to " << filename << llendl;
-                        LLScrollListItem* item = new LLScrollListItem();
-                        item->addColumn("Error writing to local file. Is your hard drive full?", LLFontGL::sSansSerifSmall);
-                        mScriptEd->mErrorList->addItem(item);
-                        return;
-                }
+                return;
+        }
 
-                LLString utf8text = mScriptEd->mEditor->getText();
-                //fprintf(fp, "%s|%s\n", LLAssetType::lookup(LLAssetType::AT_LSL_TEXT),
-                //uuid_string);
-                //fprintf(fp,"{\n%s}\n", text.c_str());
-                fputs(utf8text.c_str(), fp);
-                fclose(fp);
-                fp = NULL;
+        mPendingUploads = 0;
+        mScriptEd->mErrorList->deleteAllItems();
+        mScriptEd->mEditor->makePristine();
 
-                // also write it out to the vfs for upload
-                LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_TEXT, LLVFile::APPEND);
-                S32 size = utf8text.length() + 1;
+        // save off asset into file
+        LLTransactionID tid;
+        tid.generate();
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string filename = llformat("%s.lsl", filepath.c_str());
 
-                file.setMaxSize(size);
-                file.write((U8*)utf8text.c_str(), size);
+        FILE* fp = LLFile::fopen(filename.c_str(), "wb");
+        if(!fp)
+        {
+                llwarns << "Unable to write to " << filename << llendl;
+                LLScrollListItem* item = new LLScrollListItem();
+                item->addColumn("Error writing to local file. Is your hard drive full?", LLFontGL::sSansSerifSmall);
+                mScriptEd->mErrorList->addItem(item);
+                return;
+        }
 
-                LLInventoryItem *inv_item = getItem();
+        LLString utf8text = mScriptEd->mEditor->getText();
+        fputs(utf8text.c_str(), fp);
+        fclose(fp);
+        fp = NULL;
 
-                // save it out to database
-                if(gAssetStorage && inv_item)
+        LLInventoryItem *inv_item = getItem();
+        // save it out to asset server
+        std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgentInventory");
+        if(inv_item)
+        {
+                getWindow()->incBusyCount();
+                mPendingUploads++;
+                if (!url.empty())
                 {
-                        getWindow()->incBusyCount();
-                        mPendingUploads++;
-                        LLScriptSaveInfo* info = NULL;
+                        uploadAssetViaCaps(url, filename, mItemUUID);
+                }
+                else if (gAssetStorage)
+                {
+                        uploadAssetLegacy(filename, mItemUUID, tid);
+                }
+        }
+}
 
-                        LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+void LLPreviewLSL::uploadAssetViaCaps(const std::string& url,
+                                                                          const std::string& filename,
+                                                                          const LLUUID& item_id)
+{
+        llinfos << "Update Agent Inventory via capability" << llendl;
+        LLSD body;
+        body["item_id"] = item_id;
+        LLHTTPClient::post(url, body, new LLUpdateAgentInventoryResponder(body, filename));
+}
 
-                        info = new LLScriptSaveInfo(mItemUUID,
-                                                                                descEditor->getText(),
-                                                                                tid);
-                        gAssetStorage->storeAssetData(tid, LLAssetType::AT_LSL_TEXT, &LLPreviewLSL::onSaveComplete, info);
-                }
+void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
+                                                                          const LLUUID& item_id,
+                                                                          const LLTransactionID& tid)
+{
+        LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+        LLScriptSaveInfo* info = new LLScriptSaveInfo(item_id,
+                                                                descEditor->getText(),
+                                                                tid);
+        gAssetStorage->storeAssetData(filename.c_str(), tid,
+                                                                  LLAssetType::AT_LSL_TEXT,
+                                                                  &LLPreviewLSL::onSaveComplete,
+                                                                  info);
 
-                char dst_filename[LL_MAX_PATH];
-                sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-                char err_filename[LL_MAX_PATH];
-                sprintf(err_filename, "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-                LLScrollListItem* item = NULL;
-                const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
-                if(!lscript_compile(filename, dst_filename, err_filename, gAgent.isGodlike()))
-                {
-                        llinfos << "Compile failed!" << llendl;
-                        //char command[256];
-                        //sprintf(command, "type %s\n", err_filename);
-                        //system(command);
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string dst_filename = llformat("%s.lso", filepath.c_str());
+        std::string err_filename = llformat("%s.out", filepath.c_str());
 
-                        // load the error file into the error scrolllist
-                        if(NULL != (fp = LLFile::fopen(err_filename, "r")))
+        LLScrollListItem* item = NULL;
+        const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
+        if(!lscript_compile(filename.c_str(),
+                                                dst_filename.c_str(),
+                                                err_filename.c_str(),
+                                                gAgent.isGodlike()))
+        {
+                llinfos << "Compile failed!" << llendl;
+                //char command[256];
+                //sprintf(command, "type %s\n", err_filename);
+                //system(command);
+
+                // load the error file into the error scrolllist
+                FILE* fp = LLFile::fopen(err_filename.c_str(), "r");
+                if(fp)
+                {
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                        LLString line;
+                        while(!feof(fp)) 
                         {
-                                char buffer[MAX_STRING];
-                                LLString line;
-                                while(!feof(fp)) 
+                                fgets(buffer, MAX_STRING, fp);
+                                if(feof(fp))
                                 {
-                                        
-                                        fgets(buffer, MAX_STRING, fp);
-                                        if(feof(fp))
-                                        {
-                                                break;
-                                        }
-                                        else if(!buffer)
-                                        {
-                                                continue;
-                                        }
-                                        else
-                                        {
-                                                line.assign(buffer);
-                                                LLString::stripNonprintable(line);
-                                                item = new LLScrollListItem();
-                                                item->addColumn(line, err_font);
-                                                mScriptEd->mErrorList->addItem(item);
-                                        }
+                                        break;
                                 }
-                                fclose(fp);
-                                mScriptEd->selectFirstError();
-                        }
-                }
-                else
-                {
-                        llinfos << "Compile worked!" << llendl;
-                        if(gAssetStorage)
-                        {
-                                // move the compiled file into the vfs for transport
-                                FILE* fp = LLFile::fopen(dst_filename, "rb");
-                                LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_BYTECODE, LLVFile::APPEND);
-
-                                fseek(fp, 0, SEEK_END);
-                                S32 size = ftell(fp);
-                                fseek(fp, 0, SEEK_SET);
-
-                                file.setMaxSize(size);
-
-                                const S32 buf_size = 65536;
-                                U8 copy_buf[buf_size];
-                                while ((size = fread(copy_buf, 1, buf_size, fp)))
+                                else if(!buffer)
                                 {
-                                        file.write(copy_buf, size);
+                                        continue;
+                                }
+                                else
+                                {
+                                        line.assign(buffer);
+                                        LLString::stripNonprintable(line);
+                                        item = new LLScrollListItem();
+                                        item->addColumn(line, err_font);
+                                        mScriptEd->mErrorList->addItem(item);
                                 }
-                                fclose(fp);
-                                fp = NULL;
-                                getWindow()->incBusyCount();
-                                mPendingUploads++;
-                                LLUUID* this_uuid = new LLUUID(mItemUUID);
-                                gAssetStorage->storeAssetData(tid,
-                                                                                          LLAssetType::AT_LSL_BYTECODE,
-                                                                                          &LLPreviewLSL::onSaveBytecodeComplete,
-                                                                                          (void**)this_uuid);
                         }
+                        fclose(fp);
+                        mScriptEd->selectFirstError();
+                }
+        }
+        else
+        {
+                llinfos << "Compile worked!" << llendl;
+                if(gAssetStorage)
+                {
+                        getWindow()->incBusyCount();
+                        mPendingUploads++;
+                        LLUUID* this_uuid = new LLUUID(mItemUUID);
+                        gAssetStorage->storeAssetData(dst_filename.c_str(),
+                                                                                  tid,
+                                                                                  LLAssetType::AT_LSL_BYTECODE,
+                                                                                  &LLPreviewLSL::onSaveBytecodeComplete,
+                                                                                  (void**)this_uuid);
                 }
-
-                // get rid of any temp files left lying around
-                LLFile::remove(filename);
-                LLFile::remove(err_filename);
-                LLFile::remove(dst_filename);
         }
+
+        // get rid of any temp files left lying around
+        LLFile::remove(filename.c_str());
+        LLFile::remove(err_filename.c_str());
+        LLFile::remove(dst_filename.c_str());
 }
 
 
@@ -1184,7 +1235,7 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
                         S32 file_length = file.getSize();
 
                         char* buffer = new char[file_length+1];
-                        file.read((U8*)buffer, file_length);
+                        file.read((U8*)buffer, file_length);            /*Flawfinder: ignore*/
 
                         // put a EOS at the end
                         buffer[file_length] = 0;
@@ -1287,7 +1338,7 @@ LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
                                                                  const std::string& title,
                                                                  const LLUUID& object_id,
                                                                  const LLUUID& item_id) :
-        LLFloater(name, rect, title, TRUE, SCRIPT_MIN_WIDTH, SCRIPT_MIN_HEIGHT),
+        LLPreview(name, rect, title, item_id, object_id, TRUE, SCRIPT_MIN_WIDTH, SCRIPT_MIN_HEIGHT),
         mObjectID(object_id),
         mItemID(item_id),
         mScriptEd(NULL),
@@ -1346,6 +1397,40 @@ LLLiveLSLEditor::~LLLiveLSLEditor()
         LLLiveLSLEditor::sInstances.removeData(mItemID ^ mObjectID);
 }
 
+// this is called via LLPreview::loadAsset() virtual method
+void LLLiveLSLEditor::loadAsset()
+{
+        loadAsset(FALSE);
+}
+
+// virtual
+void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
+                                                                                                  const LLUUID& item_id,
+                                                                                                  bool is_script_running)
+{
+        lldebugs << "LSL Bytecode saved" << llendl;
+        mScriptEd->mErrorList->addSimpleItem("Compile successful!");
+        mScriptEd->mErrorList->addSimpleItem("Save complete.");
+        closeIfNeeded();
+}
+
+// virtual
+void LLLiveLSLEditor::callbackLSLCompileFailed(const LLSD& compile_errors)
+{
+        lldebugs << "Compile failed!" << llendl;
+        const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
+        LLScrollListItem* item = NULL;
+        for(LLSD::array_const_iterator line = compile_errors.beginArray();
+                line < compile_errors.endArray();
+                line++)
+        {
+                item = new LLScrollListItem();
+                item->addColumn(line->asString(), err_font);
+                mScriptEd->mErrorList->addItem(item);
+        }
+        mScriptEd->selectFirstError();
+        closeIfNeeded();
+}
 
 void LLLiveLSLEditor::loadAsset(BOOL is_new)
 {
@@ -1377,6 +1462,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                 mScriptEd->mEditor->setText("You are not allowed to view this script.");
                                 mScriptEd->mEditor->makePristine();
                                 mScriptEd->mEditor->setEnabled(FALSE);
+                                mAssetStatus = PREVIEW_ASSET_LOADED;
                         }
                         else if(mItem.notNull())
                         {
@@ -1400,11 +1486,13 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                 msg->addUUIDFast(_PREHASH_ItemID, mItemID);
                                 msg->sendReliable(object->getRegion()->getHost());
                                 mAskedForRunningInfo = TRUE;
+                                mAssetStatus = PREVIEW_ASSET_LOADING;
                         }
                         else
                         {
                                 mScriptEd->mEditor->setText("");
                                 mScriptEd->mEditor->makePristine();
+                                mAssetStatus = PREVIEW_ASSET_LOADED;
                         }
 
                         if(item
@@ -1448,6 +1536,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                                                         LLSaleInfo::DEFAULT,
                                                                         LLInventoryItem::II_FLAGS_NONE,
                                                                         time_corrected());
+                mAssetStatus = PREVIEW_ASSET_LOADED;
         }
 }
 
@@ -1463,10 +1552,11 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
 
         if( LLLiveLSLEditor::sInstances.checkData(*xored_id) )
         {
+                instance = LLLiveLSLEditor::sInstances[*xored_id];
                 if( LL_ERR_NOERR == status )
                 {
-                        instance = LLLiveLSLEditor::sInstances[*xored_id];
                         instance->loadScriptText(vfs, asset_id, type);
+                        instance->mAssetStatus = PREVIEW_ASSET_LOADED;
                 }
                 else
                 {
@@ -1488,6 +1578,7 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
                         {
                                 LLNotifyBox::showXml("UnableToLoadScript");
                         }
+                        instance->mAssetStatus = PREVIEW_ASSET_ERROR;
                 }
         }
 
@@ -1496,7 +1587,11 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
 
 void LLLiveLSLEditor::loadScriptText(const char* filename)
 {
-        FILE* file = LLFile::fopen(filename, "rb");
+        if(!filename)
+        {
+                llerrs << "Filename is Empty!" << llendl;
+        }
+        FILE* file = LLFile::fopen(filename, "rb");             /*Flawfinder: ignore*/
         if(file)
         {
                 // read in the whole file
@@ -1522,7 +1617,7 @@ void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType
         LLVFile file(vfs, uuid, type);
         S32 file_length = file.getSize();
         char *buffer = new char[file_length + 1];
-        file.read((U8*)buffer, file_length);
+        file.read((U8*)buffer, file_length);            /*Flawfinder: ignore*/
 
         if (file.getLastBytesRead() != file_length ||
                 file_length <= 0)
@@ -1680,18 +1775,16 @@ void LLLiveLSLEditor::saveIfNeeded()
         // set up the save on the local machine.
         mScriptEd->mEditor->makePristine();
         LLTransactionID tid;
-        LLAssetID uuid;
         tid.generate();
-        uuid = tid.makeAssetID(gAgent.getSecureSessionID());
-        mItem->setAssetUUID(uuid);
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string filename = llformat("%s.lsl", filepath.c_str());
+
+        mItem->setAssetUUID(asset_id);
         mItem->setTransactionID(tid);
 
         // write out the data, and store it in the asset database
-        char uuid_string[UUID_STR_LENGTH];
-        uuid.toString(uuid_string);
-        char filename[LL_MAX_PATH];
-        sprintf(filename, "%s.lsl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        FILE* fp = LLFile::fopen(filename, "wb");
+        FILE* fp = LLFile::fopen(filename.c_str(), "wb");
         if(!fp)
         {
                 llwarns << "Unable to write to " << filename << llendl;
@@ -1703,65 +1796,71 @@ void LLLiveLSLEditor::saveIfNeeded()
         LLString utf8text = mScriptEd->mEditor->getText();
         fputs(utf8text.c_str(), fp);
         fclose(fp);
-
-        LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(this, "running");
+        fp = NULL;
         
-        // save it out to database
-        if(gAssetStorage)
+        // save it out to asset server
+        std::string url = gAgent.getRegion()->getCapability("UpdateScriptTaskInventory");
+        getWindow()->incBusyCount();
+        mPendingUploads++;
+        BOOL is_running = LLUICtrlFactory::getCheckBoxByName(this, "running")->get();
+        if (!url.empty())
         {
-                // write it out to the vfs for upload
-                LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_TEXT, LLVFile::APPEND);
-                S32 size = utf8text.length() + 1;
-
-                file.setMaxSize(size);
-                file.write((U8*)utf8text.c_str(), size);
-
-                getWindow()->incBusyCount();
-                mPendingUploads++;
-                LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectID,
-                                                                                                                mItem,
-                                                                                                                runningCheckbox->get());
-                gAssetStorage->storeAssetData(tid, LLAssetType::AT_LSL_TEXT, &onSaveTextComplete, (void*)data, FALSE);
+                uploadAssetViaCaps(url, filename, mObjectID,
+                                                   mItemID, is_running);
         }
-
-#if LL_WINDOWS
-        // This major hack was inserted because sometimes compilation
-        // would fail because it couldn't open this file... I decided
-        // to make a loop until open was successful. This seems to be
-        // a problem specific to ntfs.
-        fp = NULL;
-        const U32 MAX_TRIES = 20;
-        U32 tries = MAX_TRIES;
-        while((!fp) && --tries)
+        else if (gAssetStorage)
         {
-                ms_sleep(17);
-                fp = LLFile::fopen(filename, "r");
-                if(!fp)
-                {
-                        llwarns << "Trying to open the source file " << filename
-                                        << " again" << llendl;
-                }
-                else
-                {
-                        fclose(fp);
-                }
+                uploadAssetLegacy(filename, object, tid, is_running);
         }
-        fp = NULL;
-#endif
+}
+
+void LLLiveLSLEditor::uploadAssetViaCaps(const std::string& url,
+                                                                                 const std::string& filename,
+                                                                                 const LLUUID& task_id,
+                                                                                 const LLUUID& item_id,
+                                                                                 BOOL is_running)
+{
+        llinfos << "Update Task Inventory via capability" << llendl;
+        LLSD body;
+        body["task_id"] = task_id;
+        body["item_id"] = item_id;
+        body["is_script_running"] = is_running;
+        LLHTTPClient::post(url, body,
+                new LLUpdateTaskInventoryResponder(body, filename));
+}
+
+void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
+                                                                                LLViewerObject* object,
+                                                                                const LLTransactionID& tid,
+                                                                                BOOL is_running)
+{
+        LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectID,
+                                                                                                        mItem,
+                                                                                                        is_running);
+        gAssetStorage->storeAssetData(filename.c_str(), tid,
+                                                                  LLAssetType::AT_LSL_TEXT,
+                                                                  &onSaveTextComplete,
+                                                                  (void*)data,
+                                                                  FALSE);
+
+        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString());
+        std::string dst_filename = llformat("%s.lso", filepath.c_str());
+        std::string err_filename = llformat("%s.out", filepath.c_str());
 
-        char dst_filename[LL_MAX_PATH];
-        sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        char err_filename[LL_MAX_PATH];
-        sprintf(err_filename, "%s.out", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
         LLScrollListItem* item = NULL;
         const LLFontGL* err_font = gResMgr->getRes(LLFONT_OCRA);
-        if(!lscript_compile(filename, dst_filename, err_filename, gAgent.isGodlike()))
+        FILE *fp;
+        if(!lscript_compile(filename.c_str(),
+                                                dst_filename.c_str(),
+                                                err_filename.c_str(),
+                                                gAgent.isGodlike()))
         {
                 // load the error file into the error scrolllist
                 llinfos << "Compile failed!" << llendl;
-                if(NULL != (fp = LLFile::fopen(err_filename, "r")))
+                if(NULL != (fp = LLFile::fopen(err_filename.c_str(), "r")))
                 {
-                        char buffer[MAX_STRING];
+                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
                         LLString line;
                         while(!feof(fp)) 
                         {
@@ -1801,33 +1900,14 @@ void LLLiveLSLEditor::saveIfNeeded()
                 {
                         llinfos << "LLLiveLSLEditor::saveAsset "
                                         << mItem->getAssetUUID() << llendl;
-
-                        // move the compiled file into the vfs for transport
-                        FILE* fp = LLFile::fopen(dst_filename, "rb");
-                        LLVFile file(gVFS, uuid, LLAssetType::AT_LSL_BYTECODE, LLVFile::APPEND);
-
-                        fseek(fp, 0, SEEK_END);
-                        S32 size = ftell(fp);
-                        fseek(fp, 0, SEEK_SET);
-
-                        file.setMaxSize(size);
-
-                        const S32 buf_size = 65536;
-                        U8 copy_buf[buf_size];
-                        while ((size = fread(copy_buf, 1, buf_size, fp)))
-                        {
-                                file.write(copy_buf, size);
-                        }
-                        fclose(fp);
-                        fp = NULL;
-
                         getWindow()->incBusyCount();
                         mPendingUploads++;
                         LLLiveLSLSaveData* data = NULL;
                         data = new LLLiveLSLSaveData(mObjectID,
                                                                                  mItem,
-                                                                                 runningCheckbox->get());
-                        gAssetStorage->storeAssetData(tid,
+                                                                                 is_running);
+                        gAssetStorage->storeAssetData(dst_filename.c_str(),
+                                                                                  tid,
                                                                                   LLAssetType::AT_LSL_BYTECODE,
                                                                                   &LLLiveLSLEditor::onSaveBytecodeComplete,
                                                                                   (void*)data);
@@ -1836,11 +1916,12 @@ void LLLiveLSLEditor::saveIfNeeded()
         }
 
         // get rid of any temp files left lying around
-        LLFile::remove(filename);
-        LLFile::remove(err_filename);
-        LLFile::remove(dst_filename);
+        LLFile::remove(filename.c_str());
+        LLFile::remove(err_filename.c_str());
+        LLFile::remove(dst_filename.c_str());
 
         // If we successfully saved it, then we should be able to check/uncheck the running box!
+        LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(this, "running");
         runningCheckbox->setLabel(ENABLED_RUNNING_CHECKBOX_LABEL);
         runningCheckbox->setEnabled(TRUE);
 }
@@ -1916,13 +1997,10 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
                 args["[REASON]"] = std::string(LLAssetStorage::getErrorString(status));
                 gViewerWindow->alertXml("CompileQueueSaveBytecode", args);
         }
-        char uuid_string[UUID_STR_LENGTH];
-        data->mItem->getAssetUUID().toString(uuid_string);
-        char dst_filename[LL_MAX_PATH];
-        sprintf(dst_filename, "%s.lso", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        LLFile::remove(dst_filename);
-        sprintf(dst_filename, "%s.lsl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_string).c_str());
-        LLFile::remove(dst_filename);
+
+        std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_uuid.asString());
+        std::string dst_filename = llformat("%s.lso", filepath.c_str());
+        LLFile::remove(dst_filename.c_str());
         delete data;
 }
 
@@ -1931,6 +2009,16 @@ BOOL LLLiveLSLEditor::canClose()
         return (mScriptEd->canClose());
 }
 
+void LLLiveLSLEditor::closeIfNeeded()
+{
+        getWindow()->decBusyCount();
+        mPendingUploads--;
+        if (mPendingUploads <= 0 && mCloseAfterSave)
+        {
+                close();
+        }
+}
+
 // static
 void LLLiveLSLEditor::onLoad(void* userdata)
 {
@@ -1955,7 +2043,7 @@ LLLiveLSLEditor* LLLiveLSLEditor::show(const LLUUID& script_id, const LLUUID& ob
         {
                 // Move the existing view to the front
                 instance = LLLiveLSLEditor::sInstances[xored_id];
-                instance->open();
+                instance->open();               /*Flawfinder: ignore*/
         }
         return instance;
 }
@@ -1974,6 +2062,13 @@ void LLLiveLSLEditor::hide(const LLUUID& script_id, const LLUUID& object_id)
                 delete instance;
         }
 }
+// static
+LLLiveLSLEditor* LLLiveLSLEditor::find(const LLUUID& script_id, const LLUUID& object_id)
+{
+        LLUUID xored_id = script_id ^ object_id;
+        return sInstances.getIfThere(xored_id);
+}
+
 
 // static
 void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index fd17388..cdc4df8 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -135,15 +135,24 @@ class LLPreviewLSL : public LLPreview
 public:
         LLPreviewLSL(const std::string& name, const LLRect& rect, const std::string& title,
                                  const LLUUID& item_uuid );
+        virtual void callbackLSLCompileSucceeded();
+        virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
 
-        /*virtual*/ void open();
+        /*virtual*/ void open();                /*Flawfinder: ignore*/
 
 protected:
         virtual BOOL canClose();
+        void closeIfNeeded();
         virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
         virtual void loadAsset();
         void saveIfNeeded();
+        void uploadAssetViaCaps(const std::string& url,
+                                                        const std::string& filename, 
+                                                        const LLUUID& item_id);
+        void uploadAssetLegacy(const std::string& filename,
+                                                        const LLUUID& item_id,
+                                                        const LLTransactionID& tid);
 
         static void onLoad(void* userdata);
         static void onSave(void* userdata, BOOL close_after_save);
@@ -166,7 +175,7 @@ protected:
 
 
 // Used to view and edit an LSL that is attached to an object.
-class LLLiveLSLEditor : public LLFloater
+class LLLiveLSLEditor : public LLPreview
 {
 public: 
         LLLiveLSLEditor(const std::string& name, const LLRect& rect,
@@ -177,16 +186,33 @@ public:
 
         static LLLiveLSLEditor* show(const LLUUID& item_id, const LLUUID& object_id);
         static void hide(const LLUUID& item_id, const LLUUID& object_id);
+        static LLLiveLSLEditor* find(const LLUUID& item_id, const LLUUID& object_id);
 
         static void processScriptRunningReply(LLMessageSystem* msg, void**);
-        
+
+        virtual void callbackLSLCompileSucceeded(const LLUUID& task_id,
+                                                                                        const LLUUID& item_id,
+                                                                                        bool is_script_running);
+        virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
+
 protected:
         virtual BOOL canClose();
+        void closeIfNeeded();
         virtual void draw();
         virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
-        void loadAsset(BOOL is_new = FALSE);
+        virtual void loadAsset();
+        void loadAsset(BOOL is_new);
         void saveIfNeeded();
+        void uploadAssetViaCaps(const std::string& url,
+                                                        const std::string& filename, 
+                                                        const LLUUID& task_id,
+                                                        const LLUUID& item_id,
+                                                        BOOL is_running);
+        void uploadAssetLegacy(const std::string& filename,
+                                                   LLViewerObject* object,
+                                                   const LLTransactionID& tid,
+                                                   BOOL is_running);
 
         static void onLoad(void* userdata);
         static void onSave(void* userdata, BOOL close_after_save);
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 76d41b0..10130db 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -35,6 +35,7 @@
 #include "audioengine.h"
 #include "llviewermessage.h"  // send_guid_sound_trigger
 #include "llagent.h"          // gAgent
+#include "lllineeditor.h"
 #include "llvieweruictrlfactory.h"
 
 extern LLAudioEngine* gAudiop;
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index 7948db4..99d0959 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -29,19 +29,21 @@
 
 #include "llpreviewtexture.h"
 
-#include "llviewerimage.h"
-#include "llviewerimagelist.h"
-#include "llresmgr.h"
 #include "llagent.h"
 #include "llbutton.h"
-#include "llui.h"
+#include "llfilepicker.h"
+#include "llimagetga.h"
 #include "llinventoryview.h"
 #include "llinventory.h"
-#include "llviewerwindow.h"
+#include "llresmgr.h"
 #include "lltextbox.h"
-#include "llimagetga.h"
-#include "llfilepicker.h"
+#include "lltextureview.h"
+#include "llui.h"
+#include "llviewerimage.h"
+#include "llviewerimagelist.h"
 #include "llvieweruictrlfactory.h"
+#include "llviewerwindow.h"
+#include "lllineeditor.h"
 
 const S32 PREVIEW_TEXTURE_MIN_WIDTH = 300;
 const S32 PREVIEW_TEXTURE_MIN_HEIGHT = 120;
@@ -185,6 +187,105 @@ void LLPreviewTexture::init()
         }
 }
 
+void LLPreviewTexture::draw()
+{
+        if( getVisible() )
+        {
+                updateAspectRatio();
+
+                LLPreview::draw();
+
+                if (!mMinimized)
+                {
+                        LLGLSUIDefault gls_ui;
+                        LLGLSNoTexture gls_notex;
+                        
+                        const LLRect& border = mClientRect;
+                        LLRect interior = mClientRect;
+                        interior.stretch( -PREVIEW_BORDER_WIDTH );
+
+                        // ...border
+                        gl_rect_2d( border, LLColor4(0.f, 0.f, 0.f, 1.f));
+                        gl_rect_2d_checkerboard( interior );
+
+                        if ( mImage.notNull() )
+                        {
+                                LLGLSTexture gls_no_texture;
+                                // Draw the texture
+                                glColor3f( 1.f, 1.f, 1.f );
+                                gl_draw_scaled_image(interior.mLeft,
+                                                                        interior.mBottom,
+                                                                        interior.getWidth(),
+                                                                        interior.getHeight(),
+                                                                        mImage);
+
+                                // Pump the texture priority
+                                F32 pixel_area = mLoadingFullImage ? (F32)MAX_IMAGE_AREA  : (F32)(interior.getWidth() * interior.getHeight() );
+                                mImage->addTextureStats( pixel_area );
+
+                                // Don't bother decoding more than we can display, unless
+                                // we're loading the full image.
+                                if (!mLoadingFullImage)
+                                {
+                                        S32 int_width = interior.getWidth();
+                                        S32 int_height = interior.getHeight();
+                                        mImage->setKnownDrawSize(int_width, int_height);
+                                }
+                                else
+                                {
+                                        // Don't use this feature
+                                        mImage->setKnownDrawSize(0, 0);
+                                }
+
+                                if( mLoadingFullImage )
+                                {
+                                        LLFontGL::sSansSerif->renderUTF8("Receiving:", 0,
+                                                interior.mLeft + 4, 
+                                                interior.mBottom + 4,
+                                                LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
+                                                LLFontGL::DROP_SHADOW);
+                                        
+                                        F32 data_progress = mImage->mDownloadProgress;
+                                        
+                                        // Draw the progress bar.
+                                        const S32 BAR_HEIGHT = 12;
+                                        const S32 BAR_LEFT_PAD = 80;
+                                        S32 left = interior.mLeft + 4 + BAR_LEFT_PAD;
+                                        S32 bar_width = mRect.getWidth() - left - RESIZE_HANDLE_WIDTH - 2;
+                                        S32 top = interior.mBottom + 4 + BAR_HEIGHT;
+                                        S32 right = left + bar_width;
+                                        S32 bottom = top - BAR_HEIGHT;
+
+                                        LLColor4 background_color(0.f, 0.f, 0.f, 0.75f);
+                                        LLColor4 decoded_color(0.f, 1.f, 0.f, 1.0f);
+                                        LLColor4 downloaded_color(0.f, 0.5f, 0.f, 1.0f);
+
+                                        gl_rect_2d(left, top, right, bottom, background_color);
+
+                                        if (data_progress > 0.0f)
+                                        {
+                                                // Downloaded bytes
+                                                right = left + llfloor(data_progress * (F32)bar_width);
+                                                if (right > left)
+                                                {
+                                                        gl_rect_2d(left, top, right, bottom, downloaded_color);
+                                                }
+                                        }
+                                }
+                                else
+                                if( !mSavedFileTimer.hasExpired() )
+                                {
+                                        LLFontGL::sSansSerif->renderUTF8("File Saved", 0,
+                                                interior.mLeft + 4,
+                                                interior.mBottom + 4,
+                                                LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
+                                                LLFontGL::DROP_SHADOW);
+                                }
+                        }
+                }
+        }
+}
+
 
 // virtual
 BOOL LLPreviewTexture::canSaveAs()
@@ -330,43 +431,46 @@ void LLPreviewTexture::updateAspectRatio()
                 button_height = BTN_HEIGHT + PREVIEW_PAD;
         }
         
-        LLRect window_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
-        window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
-        window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
-        LLMultiFloater* hostp = getHost();
-        if (hostp)
+        if (client_height != mLastHeight || client_width != mLastWidth)
         {
-                // try to keep aspect ratio when hosted, as hosting view can resize without user input
-                mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);
-        }
-        else
-        {
-                mClientRect.setLeftTopAndSize(LLPANEL_BORDER_WIDTH + PREVIEW_PAD + 6,
-                                                mRect.getHeight() - (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD),
-                                                mRect.getWidth() - horiz_pad,
-                                                mRect.getHeight() - (view_height - client_height) - 8);
-        }
-
-        if (mImage->mFullHeight > mLastHeight && mImage->mFullWidth > mLastWidth)
-        {
-                mLastWidth = image_width;
-                mLastHeight = image_height;
+                mLastWidth = client_width;
+                mLastHeight = client_height;
 
                 S32 old_top = mRect.mTop;
                 S32 old_left = mRect.mLeft;
-                if (hostp)
+                if (getHost())
                 {
-                        hostp->growToFit(this, view_width, view_height);
+                        getHost()->growToFit(this, view_width, view_height);
                 }
                 else
                 {
                         reshape( view_width, view_height );
                         S32 new_bottom = old_top - mRect.getHeight();
                         setOrigin( old_left, new_bottom );
+                        // Try to keep whole view onscreen, don't allow partial offscreen.
+                        gFloaterView->adjustToFitScreen(this, FALSE);
                 }
+        }
+
+        // clamp texture size to fit within actual size of floater after attempting resize
+        client_width = llmin(client_width, mRect.getWidth() - horiz_pad);
+        client_height = llmin(client_height, mRect.getHeight() - PREVIEW_HEADER_SIZE - (2 * CLIENT_RECT_VPAD) - LLPANEL_BORDER_WIDTH - info_height);
 
-                // Try to keep whole view onscreen, don't allow partial offscreen.
-                gFloaterView->adjustToFitScreen(this, FALSE);
+        LLRect window_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
+        window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
+        window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
+
+        if (getHost())
+        {
+                // try to keep aspect ratio when hosted, as hosting view can resize without user input
+                mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);
+        }
+        else
+        {
+                mClientRect.setLeftTopAndSize(LLPANEL_BORDER_WIDTH + PREVIEW_PAD + 6,
+                                                mRect.getHeight() - (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD),
+                                                mRect.getWidth() - horiz_pad,
+                                                client_height);
         }
 }
 
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index 9e7f1a5..dd75c3f 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -39,8 +39,9 @@
 #include "llglheaders.h"
 
 #include "llagent.h"
-#include "llfocusmgr.h"
 #include "llbutton.h"
+#include "llfocusmgr.h"
+#include "llstartup.h"
 #include "llviewercontrol.h"
 #include "llviewerimagelist.h"
 #include "llviewerwindow.h"
@@ -48,9 +49,8 @@
 
 LLProgressView* LLProgressView::sInstance = NULL;
 
-LLPointer<LLImageGL> gStartImageGL = NULL;
-S32                                             gStartImageWidth = 1;
-S32                                             gStartImageHeight = 1;
+S32 gStartImageWidth = 1;
+S32 gStartImageHeight = 1;
 const F32 FADE_IN_TIME = 1.f;
 
 const LLString ANIMATION_FILENAME = "Login Sequence ";
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 9b13441..4e0cb17 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -122,6 +122,10 @@ LLColor4 LLSelectMgr::sHighlightParentColor;
 LLColor4 LLSelectMgr::sHighlightChildColor;
 LLColor4 LLSelectMgr::sContextSilhouetteColor;
 
+static LLObjectSelection* get_null_object_selection();
+template<> 
+        const LLHandle<LLObjectSelection>::NullFunc 
+                LLHandle<LLObjectSelection>::sNullFunc = get_null_object_selection;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // struct LLDeRezInfo
@@ -146,6 +150,13 @@ struct LLDeRezInfo
 // Functions
 //
 
+LLObjectSelection* get_null_object_selection()
+{
+        static LLObjectSelectionHandle null_ptr(new LLObjectSelection());
+        return (LLObjectSelection*)null_ptr;
+}
+
+
 //-----------------------------------------------------------------------------
 // LLSelectMgr()
 //-----------------------------------------------------------------------------
@@ -177,7 +188,9 @@ LLSelectMgr::LLSelectMgr()
         gSavedSettings.setS32("GridMode", (S32)GRID_MODE_WORLD);
         mGridValid = FALSE;
 
-        mSelectType = SELECT_TYPE_WORLD;
+        mSelectedObjects = new LLObjectSelection();
+        mHoverObjects = new LLObjectSelection();
+        mHighlightedObjects = new LLObjectSelection();
 }
 
 
@@ -186,78 +199,72 @@ LLSelectMgr::LLSelectMgr()
 //-----------------------------------------------------------------------------
 LLSelectMgr::~LLSelectMgr()
 {
-        mHoverObjects.deleteAllNodes();
-        mSelectedObjects.deleteAllNodes();
-        mHighlightedObjects.deleteAllNodes();
+        mHoverObjects->deleteAllNodes();
+        mSelectedObjects->deleteAllNodes();
+        mHighlightedObjects->deleteAllNodes();
         mRectSelectedObjects.clear();
         mGridObjects.deleteAllNodes();
-        mUndoQueue.clear();
-        mRedoQueue.clear();
-}
-
-bool LLSelectMgr::applyToObjects(LLSelectedObjectFunctor* func)
-{
-        bool result = true;
-        LLViewerObject* object;
-        for (object = getFirstObject(); object != NULL; object = getNextObject())
-        {
-                result = result && func->apply(object);
-        }
-        return result;
-}
-
-bool LLSelectMgr::applyToRootObjects(LLSelectedObjectFunctor* func)
-{
-        bool result = true;
-        LLViewerObject* object;
-        for (object = getFirstRootObject(); 
-                 object != NULL; 
-                 object = getNextRootObject())
-        {
-                result = result && func->apply(object);
-        }
-        return result;
 }
 
-bool LLSelectMgr::applyToNodes(LLSelectedNodeFunctor *func)
+void LLSelectMgr::updateEffects()
 {
-        bool result = true;
-        LLSelectNode* node;
-        for (node = getFirstNode(); node != NULL; node = getNextNode())
+        if (mEffectsTimer.getElapsedTimeF32() > 1.f)
         {
-                result = result && func->apply(node);
+                mSelectedObjects->updateEffects();
+                mEffectsTimer.reset();
         }
-        return result;
 }
 
-void LLSelectMgr::updateEffects()
+void LLSelectMgr::overrideObjectUpdates()
 {
-        if (mEffectsTimer.getElapsedTimeF32() > 1.f)
+        //override any position updates from simulator on objects being edited
+        LLSelectNode* selectNode;
+        for (selectNode = gSelectMgr->getSelection()->getFirstNode();
+                 selectNode != NULL;
+                 selectNode = gSelectMgr->getSelection()->getNextNode())
         {
-                mSelectedObjects.updateEffects();
-                mEffectsTimer.reset();
+                LLViewerObject* object = selectNode->getObject();
+                
+                if (object->permMove())
+                {
+                        if (!selectNode->mLastPositionLocal.isExactlyZero())
+                        {
+                                object->setPosition(selectNode->mLastPositionLocal);
+                        }
+                        if (selectNode->mLastRotation != LLQuaternion())
+                        {
+                                object->setRotation(selectNode->mLastRotation);
+                        }
+                        if (!selectNode->mLastScale.isExactlyZero())
+                        {
+                                object->setScale(selectNode->mLastScale);
+                        }
+                }
         }
 }
 
 //-----------------------------------------------------------------------------
 // Select just the object, not any other group members.
 //-----------------------------------------------------------------------------
-void LLSelectMgr::selectObjectOnly(LLViewerObject* object, S32 face)
+LLObjectSelectionHandle LLSelectMgr::selectObjectOnly(LLViewerObject* object, S32 face)
 {
         llassert( object );
 
+        //remember primary object
+        mSelectedObjects->mPrimaryObject = object;
+
         // Don't add an object that is already in the list
         if (object->isSelected() ) {
                 // make sure point at position is updated
                 updatePointAt();
                 gEditMenuHandler = this;
-                return;
+                return NULL;
         }
 
         if (!canSelectObject(object))
         {
                 //make_ui_sound("UISndInvalidOp");
-                return;
+                return NULL;
         }
 
         // llinfos << "Adding object to selected object list" << llendl;
@@ -291,19 +298,24 @@ void LLSelectMgr::selectObjectOnly(LLViewerObject* object, S32 face)
 
         // have selection manager handle edit menu immediately after 
         // user selects an object
-        if (getObjectCount())
+        if (mSelectedObjects->getObjectCount())
         {
                 gEditMenuHandler = this;
         }
+
+        return mSelectedObjects;
 }
 
 //-----------------------------------------------------------------------------
 // Select the object, parents and children.
 //-----------------------------------------------------------------------------
-void LLSelectMgr::selectObjectAndFamily(LLViewerObject* obj, BOOL add_to_end)
+LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(LLViewerObject* obj, BOOL add_to_end)
 {
         llassert( obj );
 
+        //remember primary object
+        mSelectedObjects->mPrimaryObject = obj;
+
         // This may be incorrect if things weren't family selected before... - djs 07/08/02
         // Don't add an object that is already in the list
         if (obj->isSelected() ) 
@@ -311,13 +323,13 @@ void LLSelectMgr::selectObjectAndFamily(LLViewerObject* obj, BOOL add_to_end)
                 // make sure pointat position is updated
                 updatePointAt();
                 gEditMenuHandler = this;
-                return;
+                return NULL;
         }
 
         if (!canSelectObject(obj))
         {
                 //make_ui_sound("UISndInvalidOp");
-                return;
+                return NULL;
         }
 
         // Since we're selecting a family, start at the root, but
@@ -366,16 +378,18 @@ void LLSelectMgr::selectObjectAndFamily(LLViewerObject* obj, BOOL add_to_end)
 
         // have selection manager handle edit menu immediately after 
         // user selects an object
-        if (getObjectCount())
+        if (mSelectedObjects->getObjectCount())
         {
                 gEditMenuHandler = this;
         }
+
+        return mSelectedObjects;
 }
 
 //-----------------------------------------------------------------------------
 // Select the object, parents and children.
 //-----------------------------------------------------------------------------
-void LLSelectMgr::selectObjectAndFamily(const LLDynamicArray<LLViewerObject*>& object_list,
+LLObjectSelectionHandle LLSelectMgr::selectObjectAndFamily(const LLDynamicArray<LLViewerObject*>& object_list,
                                                                                 BOOL send_to_sim)
 {
         // Collect all of the objects, children included
@@ -383,7 +397,10 @@ void LLSelectMgr::selectObjectAndFamily(const LLDynamicArray<LLViewerObject*>& o
         LLViewerObject *object;
         S32 i;
 
-        if (object_list.count() < 1) return;
+        //clear primary object (no primary object)
+        mSelectedObjects->mPrimaryObject = NULL;
+
+        if (object_list.count() < 1) return NULL;
 
         // NOTE -- we add the objects in REVERSE ORDER 
         // to preserve the order in the mSelectedObjects list
@@ -429,25 +446,25 @@ void LLSelectMgr::selectObjectAndFamily(const LLDynamicArray<LLViewerObject*>& o
 
         // have selection manager handle edit menu immediately after 
         // user selects an object
-        if (getObjectCount())
+        if (mSelectedObjects->getObjectCount())
         {
                 gEditMenuHandler = this;
         }
+
+        return mSelectedObjects;
 }
 
 // Use for when the simulator kills an object.  This version also
 // handles informing the current tool of the object's deletion.
 //
 // Caller needs to call dialog_refresh_all if necessary.
-BOOL LLSelectMgr::selectionRemoveObject(const LLUUID &id)
+BOOL LLSelectMgr::removeObjectFromSelections(const LLUUID &id)
 {
-
-
         BOOL object_found = FALSE;
         LLTool *tool = NULL;
         if (!gNoRender)
         {
-                tool = gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) );
+                tool = gToolMgr->getCurrentTool();
 
                 // It's possible that the tool is editing an object that is not selected
                 LLViewerObject* tool_editing_object = tool->getEditingObject();
@@ -462,13 +479,13 @@ BOOL LLSelectMgr::selectionRemoveObject(const LLUUID &id)
         if( !object_found )
         {
                 LLViewerObject* prevobjp = NULL;
-                for( LLViewerObject* tobjp = getFirstObject(); tobjp != NULL; tobjp = getNextObject() )
+                for( LLViewerObject* tobjp = mSelectedObjects->getFirstObject(); tobjp != NULL; tobjp = mSelectedObjects->getNextObject() )
                 {
                         if (tobjp == prevobjp)
                         {
                                 // Somehow we got stuck in an infinite loop... (DaveP)
                                 //  this logic is kind of twisted, not sure how this is happening, so...
-                                llwarns << "Detected infinite loop #1 in LLSelectMgr::selectionRemoveObject:|" << llendl;
+                                llwarns << "Detected infinite loop #1 in LLSelectMgr::removeObjectFromSelections:|" << llendl;
                                 //MikeS. adding warning and comment...
                                 //These infinite loops happen because the LLSelectMgr iteration routines are non-reentrant.
                                 //deselectObjectAndFamily uses getFirstObject and getNextObject to mess with the array,
@@ -492,7 +509,7 @@ BOOL LLSelectMgr::selectionRemoveObject(const LLUUID &id)
                                         if(object_found == TRUE){
                                                 //MikeS. adding warning... This happens when removing a linked attachment while sitting on an object..
                                                 //I think the selection manager needs to be rewritten. BAD.
-                                                llwarns << "Detected infinite loop #2 in LLSelectMgr::selectionRemoveObject:|" << llendl;
+                                                llwarns << "Detected infinite loop #2 in LLSelectMgr::removeObjectFromSelections:|" << llendl;
                                                 break;
                                         }
                                         object_found = TRUE;
@@ -613,11 +630,11 @@ void LLSelectMgr::addAsFamily(LLDynamicArray<LLViewerObject*>& objects, BOOL add
                         nodep = new LLSelectNode(objectp, TRUE);
                         if (add_to_end)
                         {
-                                mSelectedObjects.addNodeAtEnd(nodep);
+                                mSelectedObjects->addNodeAtEnd(nodep);
                         }
                         else
                         {
-                                mSelectedObjects.addNode(nodep);
+                                mSelectedObjects->addNode(nodep);
                         }
                         objectp->setSelected(TRUE);
 
@@ -634,7 +651,7 @@ void LLSelectMgr::addAsFamily(LLDynamicArray<LLViewerObject*>& objects, BOOL add
                 {
                         // we want this object to be selected for real
                         // so clear transient flag
-                        LLSelectNode* select_node = findSelectNode(objectp);
+                        LLSelectNode* select_node = mSelectedObjects->findNode(objectp);
                         if (select_node)
                         {
                                 select_node->setTransient(FALSE);
@@ -650,21 +667,21 @@ void LLSelectMgr::addAsFamily(LLDynamicArray<LLViewerObject*>& objects, BOOL add
 void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, BOOL undoable)
 {
         // check to see if object is already in list
-        LLSelectNode *nodep = findSelectNode(objectp);
+        LLSelectNode *nodep = mSelectedObjects->findNode(objectp);
 
         // if not in list, add it
         if (!nodep)
         {
                 nodep = new LLSelectNode(objectp, TRUE);
-                mSelectedObjects.addNode(nodep);
+                mSelectedObjects->addNode(nodep);
         }
         else
         {
                 // make this a full-fledged selection
                 nodep->setTransient(FALSE);
                 // Move it to the front of the list
-                mSelectedObjects.removeNode(nodep);
-                mSelectedObjects.addNode(nodep);
+                mSelectedObjects->removeNode(nodep);
+                mSelectedObjects->addNode(nodep);
         }
 
         // Make sure the object is tagged as selected
@@ -698,26 +715,26 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, BOOL undoab
 }
 
 
-void LLSelectMgr::setHoverObject(LLViewerObject *objectp)
+LLObjectSelectionHandle LLSelectMgr::setHoverObject(LLViewerObject *objectp)
 {
         // Always blitz hover list when setting
-        mHoverObjects.deleteAllNodes();
+        mHoverObjects->deleteAllNodes();
 
         if (!objectp)
         {
-                return;
+                return NULL;
         }
 
         // Can't select yourself
         if (objectp->mID == gAgentID)
         {
-                return;
+                return NULL;
         }
 
         // Can't select land
         if (objectp->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH)
         {
-                return;
+                return NULL;
         }
 
         // Collect all of the objects
@@ -733,15 +750,16 @@ void LLSelectMgr::setHoverObject(LLViewerObject *objectp)
         {
                 cur_objectp = objects[i];
                 nodep = new LLSelectNode(cur_objectp, FALSE);
-                mHoverObjects.addNodeAtEnd(nodep);
+                mHoverObjects->addNodeAtEnd(nodep);
         }
 
         requestObjectPropertiesFamily(objectp);
+        return mHoverObjects;
 }
 
 LLSelectNode *LLSelectMgr::getHoverNode()
 {
-        return getHoverObjects().getFirstRootNode();
+        return getHoverObjects()->getFirstRootNode();
 }
 
 void LLSelectMgr::highlightObjectOnly(LLViewerObject* objectp)
@@ -842,20 +860,23 @@ void LLSelectMgr::unhighlightObjectAndFamily(LLViewerObject* objectp)
 void LLSelectMgr::unhighlightAll()
 {
         mRectSelectedObjects.clear();
-        mHighlightedObjects.deleteAllNodes();
+        mHighlightedObjects->deleteAllNodes();
 }
 
-void LLSelectMgr::selectHighlightedObjects()
+LLObjectSelectionHandle LLSelectMgr::selectHighlightedObjects()
 {
-        if (!mHighlightedObjects.getNumNodes())
+        if (!mHighlightedObjects->getNumNodes())
         {
-                return;
+                return NULL;
         }
 
+        //clear primary object
+        mSelectedObjects->mPrimaryObject = NULL;
+
         LLSelectNode *nodep;
-        for (nodep = mHighlightedObjects.getFirstNode();
+        for (nodep = mHighlightedObjects->getFirstNode();
                 nodep;
-                nodep = mHighlightedObjects.getNextNode())
+                nodep = mHighlightedObjects->getNextNode())
         {
                 LLViewerObject* objectp = nodep->getObject();
 
@@ -871,12 +892,12 @@ void LLSelectMgr::selectHighlightedObjects()
                 }
 
                 LLSelectNode* new_nodep = new LLSelectNode(*nodep);
-                mSelectedObjects.addNode(new_nodep);
+                mSelectedObjects->addNode(new_nodep);
 
                 // flag this object as selected
                 objectp->setSelected(TRUE);
 
-                mSelectType = getSelectTypeForObject(objectp);
+                mSelectedObjects->mSelectType = getSelectTypeForObject(objectp);
 
                 // request properties on root objects
                 if (objectp->isRootEdit())
@@ -892,10 +913,12 @@ void LLSelectMgr::selectHighlightedObjects()
         saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         updatePointAt();
 
-        if (getObjectCount())
+        if (mSelectedObjects->getObjectCount())
         {
                 gEditMenuHandler = this;
         }
+
+        return mSelectedObjects;
 }
 
 void LLSelectMgr::deselectHighlightedObjects()
@@ -957,7 +980,7 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
                 grid_object = NULL;
         }
 
-        if (mGridMode == GRID_MODE_LOCAL && gSelectMgr->getObjectCount())
+        if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount())
         {
                 LLBBox bbox = mSavedSelectionBBox;
                 mGridOrigin = mSavedSelectionBBox.getCenterAgent();
@@ -1011,18 +1034,18 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
         }
         else // GRID_MODE_WORLD or just plain default
         {
-                LLViewerObject* first_object = gSelectMgr->getFirstRootObject();
+                LLViewerObject* first_object = mSelectedObjects->getFirstRootObject();
                 if (!first_object)
                 {
-                        first_object = gSelectMgr->getFirstObject();
+                        first_object = mSelectedObjects->getFirstObject();
                 }
 
                 mGridOrigin.clearVec();
                 mGridRotation.loadIdentity();
 
-                mSelectType = getSelectTypeForObject( first_object );
+                mSelectedObjects->mSelectType = getSelectTypeForObject( first_object );
 
-                switch (mSelectType)
+                switch (mSelectedObjects->mSelectType)
                 {
                 case SELECT_TYPE_ATTACHMENT:
                         if (first_object)
@@ -1051,59 +1074,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
         mGridValid = TRUE;
 }
 
-
-
-LLSelectNode* LLSelectMgr::findSelectNode(LLViewerObject *object)
-{
-        return mSelectedObjects.findNode(object);
-}
-
-//-----------------------------------------------------------------------------
-// contains()
-//-----------------------------------------------------------------------------
-BOOL LLSelectMgr::contains(LLViewerObject* object)
-{
-        return mSelectedObjects.findNode(object) != NULL;
-}
-
-
-//-----------------------------------------------------------------------------
-// contains()
-//-----------------------------------------------------------------------------
-BOOL LLSelectMgr::contains(LLViewerObject* object, S32 te)
-{
-        LLSelectNode *nodep;
-        if (te == SELECT_ALL_TES)
-        {
-                // ...all faces
-                for (nodep = mSelectedObjects.getFirstNode(); nodep; nodep = mSelectedObjects.getNextNode() )
-                {
-                        if (nodep->getObject() == object)
-                        {
-                                BOOL all_selected = TRUE;
-                                for (S32 i = 0; i < SELECT_MAX_TES; i++)
-                                {
-                                        all_selected = all_selected && nodep->isTESelected(i);
-                                }
-                                return all_selected;
-                        }
-                }
-                return FALSE;
-        }
-        else
-        {
-                // ...one face
-                for (nodep = mSelectedObjects.getFirstNode(); nodep; nodep = mSelectedObjects.getNextNode() )
-                {
-                        if (nodep->getObject() == object && nodep->isTESelected(te))
-                        {
-                                return TRUE;
-                        }
-                }
-                return FALSE;
-        }
-}
-
 //-----------------------------------------------------------------------------
 // remove() - an array of objects
 //-----------------------------------------------------------------------------
@@ -1116,14 +1086,14 @@ void LLSelectMgr::remove(LLDynamicArray<LLViewerObject*>& objects)
         for(S32 i = 0; i < count; i++)
         {
                 objectp = objects.get(i);
-                for(nodep = mSelectedObjects.getFirstNode();
+                for(nodep = mSelectedObjects->getFirstNode();
                         nodep != NULL;
-                        nodep = mSelectedObjects.getNextNode())
+                        nodep = mSelectedObjects->getNextNode())
                 {
                         if(nodep->getObject() == objectp)
                         {
                                 objectp->setSelected(FALSE);
-                                mSelectedObjects.removeNode(nodep);
+                                mSelectedObjects->removeNode(nodep);
                                 break;
                         }
                 }
@@ -1140,7 +1110,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
 {
         // check if object already in list
         // *FIX: can we just check isSelected()?
-        LLSelectNode *nodep = findSelectNode(objectp);
+        LLSelectNode *nodep = mSelectedObjects->findNode(objectp);
 
         if (!nodep)
         {
@@ -1152,12 +1122,12 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
         if (objectp->getNumTEs() <= 0)
         {
                 // object doesn't have faces, so blow it away
-                mSelectedObjects.removeNode(nodep);
+                mSelectedObjects->removeNode(nodep);
                 objectp->setSelected( FALSE );
         }
         else if (te == SELECT_ALL_TES)
         {
-                mSelectedObjects.removeNode(nodep);
+                mSelectedObjects->removeNode(nodep);
                 objectp->setSelected( FALSE );
         }
         else if (0 <= te && te < SELECT_MAX_TES)
@@ -1183,7 +1153,7 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
                 // ...all faces now turned off, so remove
                 if (!found)
                 {
-                        mSelectedObjects.removeNode(nodep);
+                        mSelectedObjects->removeNode(nodep);
                         objectp->setSelected( FALSE );
 
                         // BUG: Doesn't update simulator that object is gone.
@@ -1206,12 +1176,12 @@ void LLSelectMgr::remove(LLViewerObject *objectp, S32 te, BOOL undoable)
 void LLSelectMgr::removeAll()
 {
         LLViewerObject *objectp;
-        for (objectp = mSelectedObjects.getFirstObject(); objectp; objectp = mSelectedObjects.getNextObject() )
+        for (objectp = mSelectedObjects->getFirstObject(); objectp; objectp = mSelectedObjects->getNextObject() )
         {
                 objectp->setSelected( FALSE );
         }
 
-        mSelectedObjects.deleteAllNodes();
+        mSelectedObjects->deleteAllNodes();
 
         updateSelectionCenter();
         dialog_refresh_all();
@@ -1228,9 +1198,9 @@ void LLSelectMgr::promoteSelectionToRoot()
 
         LLSelectNode* nodep;
         LLViewerObject *objectp;
-        for (nodep = mSelectedObjects.getFirstNode(); 
+        for (nodep = mSelectedObjects->getFirstNode(); 
                  nodep; 
-                 nodep = mSelectedObjects.getNextNode() )
+                 nodep = mSelectedObjects->getNextNode() )
         {
                 if (nodep->mIndividualSelection)
                 {
@@ -1266,9 +1236,9 @@ void LLSelectMgr::demoteSelectionToIndividuals()
 {
         LLDynamicArray<LLViewerObject*> objects;
 
-        for (LLViewerObject* root_objectp = mSelectedObjects.getFirstRootObject();
+        for (LLViewerObject* root_objectp = mSelectedObjects->getFirstRootObject();
                 root_objectp;
-                root_objectp = mSelectedObjects.getNextRootObject())
+                root_objectp = mSelectedObjects->getNextRootObject())
         {
                 root_objectp->addThisAndNonJointChildren(objects);
         }
@@ -1284,71 +1254,20 @@ void LLSelectMgr::demoteSelectionToIndividuals()
 }
 
 //-----------------------------------------------------------------------------
-// getObjectCount()
-//-----------------------------------------------------------------------------
-S32 LLSelectMgr::getObjectCount()
-{
-        return mSelectedObjects.getNumNodes();
-}
-
-
-//-----------------------------------------------------------------------------
-// getTECount()
-//-----------------------------------------------------------------------------
-S32 LLSelectMgr::getTECount()
-{
-        S32 count = 0;
-
-        LLSelectNode* nodep;
-        for (nodep = mSelectedObjects.getFirstNode(); nodep; nodep = mSelectedObjects.getNextNode() )
-        {
-                if (nodep->getObject())
-                {
-                        S32 num_tes = nodep->getObject()->getNumTEs();
-                        for (S32 te = 0; te < num_tes; te++)
-                        {
-                                if (nodep->isTESelected(te))
-                                {
-                                        count++;
-                                }
-                        }
-                }
-        }
-
-        return count;
-}
-
-//-----------------------------------------------------------------------------
-// getRootObjectCount()
-//-----------------------------------------------------------------------------
-S32 LLSelectMgr::getRootObjectCount()
-{
-        LLSelectNode *nodep;
-
-        S32 count = 0;
-        for(nodep = mSelectedObjects.getFirstRootNode(); nodep; nodep = mSelectedObjects.getNextRootNode())
-        {
-                ++count;
-        }
-        return count;
-}
-
-
-//-----------------------------------------------------------------------------
 // dump()
 //-----------------------------------------------------------------------------
 void LLSelectMgr::dump()
 {
-        llinfos << "Selection Manager: " << mSelectedObjects.getNumNodes() << " items" << llendl;
+        llinfos << "Selection Manager: " << mSelectedObjects->getNumNodes() << " items" << llendl;
 
         llinfos << "TE mode " << mTEMode << llendl;
 
         S32 i = 0;
 
         LLViewerObject *objectp;
-        for (objectp = mSelectedObjects.getFirstObject();
+        for (objectp = mSelectedObjects->getFirstObject();
                  objectp;
-                 objectp = mSelectedObjects.getNextObject())
+                 objectp = mSelectedObjects->getNextObject())
         {
                 llinfos << "Object " << i << " type " << LLPrimitive::pCodeToString(objectp->getPCode()) << llendl;
                 llinfos << "  hasLSL " << objectp->flagScripted() << llendl;
@@ -1366,14 +1285,14 @@ void LLSelectMgr::dump()
 
         // Face iterator
         S32 te;
-        for (mSelectedObjects.getFirstTE(&objectp, &te);
+        for (mSelectedObjects->getFirstTE(&objectp, &te);
                  objectp;
-                 mSelectedObjects.getNextTE(&objectp, &te))
+                 mSelectedObjects->getNextTE(&objectp, &te))
         {
                 llinfos << "Object " << objectp << " te " << te << llendl;
         }
 
-        llinfos << mHighlightedObjects.getNumNodes() << " objects currently highlighted." << llendl;
+        llinfos << mHighlightedObjects->getNumNodes() << " objects currently highlighted." << llendl;
 
         llinfos << "Center global " << mSelectionCenterGlobal << llendl;
 }
@@ -1402,7 +1321,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
 
         if(item 
                 && !item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID())
-                && (mSelectedObjects.getNumNodes() > 1) )
+                && (mSelectedObjects->getNumNodes() > 1) )
         {
                 llwarns << "Attempted to apply no-copy texture to multiple objects"
                                 << llendl;
@@ -1412,43 +1331,43 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
         LLViewerObject* objectp;
         S32 te;
 
-        // Apply the texture to each side
-        for (mSelectedObjects.getFirstTE(&objectp, &te); objectp; mSelectedObjects.getNextTE(&objectp, &te))
+        for (mSelectedObjects->getFirstTE(&objectp, &te); objectp; mSelectedObjects->getNextTE(&objectp, &te))
         {
-
                 if (item)
                 {
-                        LLToolDragAndDrop::dropTextureOneFace(objectp,te,item,LLToolDragAndDrop::SOURCE_AGENT,LLUUID::null);
-                        
-                        // HACK! HACK! ARG!
-                        // *TODO: Replace mSelectedObjects with a REAL container class!
-                        LLViewerObject* tmp_object;
-                        S32 tmp_te;
-                        mSelectedObjects.getCurrentTE(&tmp_object,&tmp_te);
-                        if ((tmp_object != objectp) || (tmp_te != te) )
+                        if (te == -1) // all faces
                         {
-                                //AAARG someone has moved our list around!
-                                mSelectedObjects.getFirstTE(&tmp_object, &tmp_te);
-                                while ((tmp_object != objectp) || (tmp_te != te))
-                                {
-                                        mSelectedObjects.getNextTE(&tmp_object, &tmp_te);
-                                }
+                                LLToolDragAndDrop::dropTextureAllFaces(objectp,
+                                                                                                           item,
+                                                                                                           LLToolDragAndDrop::SOURCE_AGENT,
+                                                                                                           LLUUID::null);
+                        }
+                        else // one face
+                        {
+                                LLToolDragAndDrop::dropTextureOneFace(objectp,
+                                                                                                          te,
+                                                                                                          item,
+                                                                                                          LLToolDragAndDrop::SOURCE_AGENT,
+                                                                                                          LLUUID::null);
                         }
                 }
-                else
+                
+                else // not an inventory item
                 {
                         // Texture picker defaults aren't inventory items
                         // * Don't need to worry about permissions for them
                         // * Can just apply the texture and be done with it.
                         objectp->setTEImage(te, gImageList.getImage(imageid));
+
                         objectp->sendTEUpdate();
                 }
         }
 
+
         // 1 particle effect per object
-        if (mSelectType != SELECT_TYPE_HUD)
+        if (mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
         {
-                for (objectp = mSelectedObjects.getFirstObject(); objectp; objectp = mSelectedObjects.getNextObject())
+                for (objectp = mSelectedObjects->getFirstObject(); objectp; objectp = mSelectedObjects->getNextObject())
                 {
                         LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
                         effectp->setSourceObject(gAgent.getAvatarObject());     
@@ -1466,7 +1385,7 @@ void LLSelectMgr::selectionSetColor(const LLColor4 &color)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1475,7 +1394,7 @@ void LLSelectMgr::selectionSetColor(const LLColor4 &color)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1492,7 +1411,7 @@ void LLSelectMgr::selectionSetColorOnly(const LLColor4 &color)
         LLViewerObject* object;
         LLColor4 new_color = color;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1503,7 +1422,7 @@ void LLSelectMgr::selectionSetColorOnly(const LLColor4 &color)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1519,7 +1438,7 @@ void LLSelectMgr::selectionSetAlphaOnly(const F32 alpha)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1530,7 +1449,7 @@ void LLSelectMgr::selectionSetAlphaOnly(const F32 alpha)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1544,11 +1463,11 @@ void LLSelectMgr::selectionRevertColors()
         LLViewerObject* object;
         S32 te;
 
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
-                        LLSelectNode* nodep = mSelectedObjects.findNode(object);
+                        LLSelectNode* nodep = mSelectedObjects->findNode(object);
                         if (nodep && te < (S32)nodep->mSavedColors.size())
                         {
                                 LLColor4 color = nodep->mSavedColors[te];
@@ -1558,7 +1477,7 @@ void LLSelectMgr::selectionRevertColors()
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1573,11 +1492,11 @@ BOOL LLSelectMgr::selectionRevertTextures()
         S32 te;
 
         BOOL revert_successful = TRUE;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
-                        LLSelectNode* nodep = mSelectedObjects.findNode(object);
+                        LLSelectNode* nodep = mSelectedObjects->findNode(object);
                         if (nodep && te < (S32)nodep->mSavedTextures.size())
                         {
                                 LLUUID id = nodep->mSavedTextures[te];
@@ -1596,7 +1515,7 @@ BOOL LLSelectMgr::selectionRevertTextures()
         }
 
         // propagate texture changes to server
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1611,7 +1530,7 @@ void LLSelectMgr::selectionSetBumpmap(U8 bumpmap)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1620,7 +1539,7 @@ void LLSelectMgr::selectionSetBumpmap(U8 bumpmap)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1633,7 +1552,7 @@ void LLSelectMgr::selectionSetTexGen(U8 texgen)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1642,7 +1561,7 @@ void LLSelectMgr::selectionSetTexGen(U8 texgen)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1656,7 +1575,7 @@ void LLSelectMgr::selectionSetShiny(U8 shiny)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1665,7 +1584,7 @@ void LLSelectMgr::selectionSetShiny(U8 shiny)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1678,7 +1597,7 @@ void LLSelectMgr::selectionSetFullbright(U8 fullbright)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1687,7 +1606,7 @@ void LLSelectMgr::selectionSetFullbright(U8 fullbright)
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1718,7 +1637,7 @@ void LLSelectMgr::selectionSetMediaTypeAndURL(U8 media_type, const std::string&
                 media_flags = LLTextureEntry::MF_WEB_PAGE;
         }
 
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te) )
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te) )
         {
                 if (object->permModify())
                 {
@@ -1727,7 +1646,7 @@ void LLSelectMgr::selectionSetMediaTypeAndURL(U8 media_type, const std::string&
                 }
         }
 
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -1749,7 +1668,7 @@ LLPermissions* LLSelectMgr::findObjectPermissions(const LLViewerObject* object)
 {
         LLSelectNode* nodep;
 
-        for (nodep = mSelectedObjects.getFirstNode(); nodep; nodep = mSelectedObjects.getNextNode() )
+        for (nodep = mSelectedObjects->getFirstNode(); nodep; nodep = mSelectedObjects->getNextNode() )
         {
                 if((nodep->getObject() == object) && nodep->mValid)
                 {
@@ -1768,7 +1687,7 @@ BOOL LLSelectMgr::selectionGetTexUUID(LLUUID& id)
 {
         LLViewerObject* first_objectp;
         S32 first_te;
-        mSelectedObjects.getPrimaryTE(&first_objectp, &first_te);
+        mSelectedObjects->getPrimaryTE(&first_objectp, &first_te);
 
         // nothing selected
         if (!first_objectp)
@@ -1786,7 +1705,7 @@ BOOL LLSelectMgr::selectionGetTexUUID(LLUUID& id)
         BOOL identical = TRUE;
         LLViewerObject *objectp;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&objectp, &te); objectp; mSelectedObjects.getNextTE(&objectp, &te) )
+        for (mSelectedObjects->getFirstTE(&objectp, &te); objectp; mSelectedObjects->getNextTE(&objectp, &te) )
         {
                 if (objectp->getTEImage(te) != first_imagep)
                 {
@@ -1806,7 +1725,7 @@ BOOL LLSelectMgr::selectionGetColor(LLColor4 &color)
 {
         LLViewerObject* first_object;
         S32 first_te;
-        mSelectedObjects.getPrimaryTE(&first_object, &first_te);
+        mSelectedObjects->getPrimaryTE(&first_object, &first_te);
 
         // nothing selected
         if (!first_object)
@@ -1827,7 +1746,7 @@ BOOL LLSelectMgr::selectionGetColor(LLColor4 &color)
         BOOL identical = TRUE;
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te))
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te))
         {
                 if (!object->getTE(te) || (object->getTE(te)->getColor() != first_color))
                 {
@@ -1848,7 +1767,7 @@ BOOL LLSelectMgr::selectionGetBumpmap(U8 *bumpmap)
 {
         LLViewerObject* first_object;
         S32 first_te;
-        mSelectedObjects.getPrimaryTE(&first_object, &first_te);
+        mSelectedObjects->getPrimaryTE(&first_object, &first_te);
 
         // nothing selected
         if (!first_object)
@@ -1869,7 +1788,7 @@ BOOL LLSelectMgr::selectionGetBumpmap(U8 *bumpmap)
         BOOL identical = TRUE;
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te))
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te))
         {
                 if (!object->getTE(te) || (object->getTE(te)->getBumpmap() != first_value))
                 {
@@ -1889,7 +1808,7 @@ BOOL LLSelectMgr::selectionGetShiny(U8 *shiny)
 {
         LLViewerObject* first_object;
         S32 first_te;
-        mSelectedObjects.getPrimaryTE(&first_object, &first_te);
+        mSelectedObjects->getPrimaryTE(&first_object, &first_te);
 
         // nothing selected
         if (!first_object)
@@ -1910,7 +1829,7 @@ BOOL LLSelectMgr::selectionGetShiny(U8 *shiny)
         BOOL identical = TRUE;
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te))
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te))
         {
                 if (!object->getTE(te) || (object->getTE(te)->getShiny() != first_value))
                 {
@@ -1930,7 +1849,7 @@ BOOL LLSelectMgr::selectionGetFullbright(U8 *fullbright)
 {
         LLViewerObject* first_object;
         S32 first_te;
-        mSelectedObjects.getPrimaryTE(&first_object, &first_te);
+        mSelectedObjects->getPrimaryTE(&first_object, &first_te);
 
         // nothing selected
         if (!first_object)
@@ -1951,7 +1870,7 @@ BOOL LLSelectMgr::selectionGetFullbright(U8 *fullbright)
         BOOL identical = TRUE;
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te))
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te))
         {
                 if (!object->getTE(te) || (object->getTE(te)->getFullbright() != first_value))
                 {
@@ -1969,7 +1888,7 @@ bool LLSelectMgr::selectionGetMediaType(U8 *media_type)
 {
         LLViewerObject* first_object;
         S32 first_te;
-        mSelectedObjects.getPrimaryTE(&first_object, &first_te);
+        mSelectedObjects->getPrimaryTE(&first_object, &first_te);
 
         // nothing selected
         if (!first_object)
@@ -1990,7 +1909,7 @@ bool LLSelectMgr::selectionGetMediaType(U8 *media_type)
         bool identical = true;
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te))
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te))
         {
                 if (!object->getTE(te) || (object->getTE(te)->getMediaFlags() != first_value))
                 {
@@ -2011,7 +1930,7 @@ bool LLSelectMgr::selectionGetMediaType(U8 *media_type)
 void LLSelectMgr::selectionSetMaterial(U8 material)
 {
         LLViewerObject* object;
-        for (object = mSelectedObjects.getFirstObject(); object != NULL; object = mSelectedObjects.getNextObject() )
+        for (object = mSelectedObjects->getFirstObject(); object != NULL; object = mSelectedObjects->getNextObject() )
         {
                 if (object->permModify())
                 {
@@ -2027,7 +1946,7 @@ void LLSelectMgr::selectionSetMaterial(U8 material)
 BOOL LLSelectMgr::selectionAllPCode(LLPCode code)
 {
         LLViewerObject *object;
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (object->getPCode() != code)
                 {
@@ -2042,13 +1961,13 @@ BOOL LLSelectMgr::selectionAllPCode(LLPCode code)
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectionGetMaterial(U8 *out_material)
 {
-        LLViewerObject *object = mSelectedObjects.getFirstObject();
+        LLViewerObject *object = mSelectedObjects->getFirstObject();
         if (!object) return FALSE;
 
         U8 material = object->getMaterial();
 
         BOOL identical = TRUE;
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if ( material != object->getMaterial())
                 {
@@ -2063,13 +1982,13 @@ BOOL LLSelectMgr::selectionGetMaterial(U8 *out_material)
 
 BOOL LLSelectMgr::selectionGetClickAction(U8 *out_action)
 {
-        LLViewerObject *object = mSelectedObjects.getFirstObject();
+        LLViewerObject *object = mSelectedObjects->getFirstObject();
         if (!object) return FALSE;
 
         U8 action = object->getClickAction();
 
         BOOL identical = TRUE;
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if ( action != object->getClickAction())
                 {
@@ -2085,7 +2004,7 @@ BOOL LLSelectMgr::selectionGetClickAction(U8 *out_action)
 void LLSelectMgr::selectionSetClickAction(U8 action)
 {
         LLViewerObject* object = NULL;
-        for ( object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+        for ( object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 object->setClickAction(action);
         }
@@ -2118,7 +2037,7 @@ void LLSelectMgr::sendGodlikeRequest(const LLString& request, const LLString& pa
         }
 
         godlike_request_t data(request, param);
-        if(!getRootObjectCount())
+        if(!mSelectedObjects->getRootObjectCount())
         {
                 LLMessageSystem* msg = gMessageSystem;
                 msg->newMessage(message_type.c_str());
@@ -2158,8 +2077,8 @@ void LLSelectMgr::packGodlikeHead(void* user_data)
 // static
 void LLSelectMgr::packObjectIDAsParam(LLSelectNode* node, void *)
 {
-        char buf [MAX_STRING];
-        sprintf(buf, "%u", node->getObject()->getLocalID());
+        char buf [MAX_STRING];          /* Flawfinder: ignore */
+        snprintf(buf, MAX_STRING, "%u", node->getObject()->getLocalID());               /* Flawfinder: ignore */
         gMessageSystem->nextBlock("ParamList");
         gMessageSystem->addString("Parameter", buf);
 }
@@ -2172,7 +2091,7 @@ void LLSelectMgr::selectionResetRotation()
         LLQuaternion identity(0.f, 0.f, 0.f, 1.f);
 
         LLViewerObject* object;
-        for (object = mSelectedObjects.getFirstRootObject(); object; object = mSelectedObjects.getNextRootObject() )
+        for (object = mSelectedObjects->getFirstRootObject(); object; object = mSelectedObjects->getNextRootObject() )
         {
                 object->setRotation(identity);
                 if (object->mDrawable.notNull())
@@ -2188,7 +2107,7 @@ void LLSelectMgr::selectionRotateAroundZ(F32 degrees)
         LLQuaternion rot( degrees * DEG_TO_RAD, LLVector3(0,0,1) );
 
         LLViewerObject* object;
-        for (object = mSelectedObjects.getFirstRootObject(); object; object = mSelectedObjects.getNextRootObject() )
+        for (object = mSelectedObjects->getFirstRootObject(); object; object = mSelectedObjects->getNextRootObject() )
         {
                 object->setRotation( object->getRotationEdit() * rot );
                 if (object->mDrawable.notNull())
@@ -2207,7 +2126,7 @@ void LLSelectMgr::selectionTexScaleAutofit(F32 repeats_per_meter)
 {
         LLViewerObject* object;
         S32 te;
-        for (mSelectedObjects.getFirstTE(&object, &te); object; mSelectedObjects.getNextTE(&object, &te))
+        for (mSelectedObjects->getFirstTE(&object, &te); object; mSelectedObjects->getNextTE(&object, &te))
         {
                 if (!object->permModify())
                 {
@@ -2232,7 +2151,7 @@ void LLSelectMgr::selectionTexScaleAutofit(F32 repeats_per_meter)
                 object->setTEScale(te, new_s, new_t);
         }
 
-        for (object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject())
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject())
         {
                 if (object->permModify())
                 {
@@ -2299,7 +2218,7 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch)
 
         BOOL send = FALSE;
         
-        for (selectNode = mSelectedObjects.getFirstNode(); selectNode; selectNode = mSelectedObjects.getNextNode())
+        for (selectNode = mSelectedObjects->getFirstNode(); selectNode; selectNode = mSelectedObjects->getNextNode())
         {
                 object = selectNode->getObject();
                 if (!object->permModify())
@@ -2357,7 +2276,7 @@ void LLSelectMgr::selectionResetTexInfo(S32 selected_face)
         S32 start_face, end_face;
 
         LLViewerObject* object;
-        for (object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject())
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject())
         {
                 if (!object->permModify())
                 {
@@ -2392,259 +2311,12 @@ void LLSelectMgr::selectionResetTexInfo(S32 selected_face)
 }
 
 //-----------------------------------------------------------------------------
-// getFirstEditableObject()
-//-----------------------------------------------------------------------------
-LLViewerObject* LLSelectMgr::getFirstEditableObject(BOOL get_root)
-{
-        LLViewerObject* object = NULL;
-        for(LLViewerObject* cur = mSelectedObjects.getFirstObject(); cur; cur = mSelectedObjects.getNextObject())
-        {
-                if( cur->permModify() )
-                {
-                        object = cur;
-                        break;
-                }
-        }       
-
-        if (get_root && object)
-        {
-                LLViewerObject *parent;
-                while ((parent = (LLViewerObject*)object->getParent()))
-                {
-                        if (parent->isSelected())
-                        {
-                                object = parent;
-                        }
-                        else
-                        {
-                                break;
-                        }
-                }
-        }
-
-        return object;
-}
-
-//-----------------------------------------------------------------------------
-// getFirstMoveableObject()
-//-----------------------------------------------------------------------------
-LLViewerObject* LLSelectMgr::getFirstMoveableObject(BOOL get_root)
-{
-        LLViewerObject* object = NULL;
-        for(LLViewerObject* cur = mSelectedObjects.getFirstObject(); cur; cur = mSelectedObjects.getNextObject())
-        {
-                if( cur->permMove() )
-                {
-                        object = cur;
-                        break;
-                }
-        }       
-
-        if (get_root && object && !object->isJointChild())
-        {
-                LLViewerObject *parent;
-                while ((parent = (LLViewerObject*)object->getParent()))
-                {
-                        if (parent->isSelected())
-                        {
-                                object = parent;
-                        }
-                        else
-                        {
-                                break;
-                        }
-                }
-        }
-
-        return object;
-}
-
-//-----------------------------------------------------------------------------
-// getFirstEditableNode()
-//-----------------------------------------------------------------------------
-LLSelectNode* LLSelectMgr::getFirstEditableNode(BOOL get_root)
-{
-        LLSelectNode* selectNode = NULL;
-
-        if (get_root)
-        {
-                for(selectNode = mSelectedObjects.getFirstRootNode(); selectNode; selectNode = mSelectedObjects.getNextRootNode())
-                {
-                        if( selectNode->getObject()->permModify() )
-                        {
-                                return selectNode;
-                                break;
-                        }
-                }
-        }
-        for(selectNode = mSelectedObjects.getFirstNode(); selectNode; selectNode = mSelectedObjects.getNextNode())
-        {
-                if( selectNode->getObject()->permModify() )
-                {
-                        return selectNode;
-                        break;
-                }
-        }
-        
-        return NULL;
-}
-
-//-----------------------------------------------------------------------------
-// getFirstMoveableNode()
-//-----------------------------------------------------------------------------
-LLSelectNode* LLSelectMgr::getFirstMoveableNode(BOOL get_root)
-{
-        LLSelectNode* selectNode = NULL;
-
-        if (get_root)
-        {
-                for(selectNode = mSelectedObjects.getFirstRootNode(); selectNode; selectNode = mSelectedObjects.getNextRootNode())
-                {
-                        if( selectNode->getObject()->permMove() )
-                        {
-                                return selectNode;
-                                break;
-                        }
-                }
-        }
-        for(selectNode = mSelectedObjects.getFirstNode(); selectNode; selectNode = mSelectedObjects.getNextNode())
-        {
-                if( selectNode->getObject()->permMove() )
-                {
-                        return selectNode;
-                        break;
-                }
-        }
-        
-        return NULL;
-}
-
-//-----------------------------------------------------------------------------
-// getFirstDeleteableObject()
-//-----------------------------------------------------------------------------
-LLViewerObject* LLSelectMgr::getFirstDeleteableObject(BOOL get_root)
-{
-        //RN: don't currently support deletion of child objects, as that requires separating them first
-        // then derezzing to trash
-        get_root = TRUE;
-
-        LLViewerObject* object = NULL;
-        if (get_root)
-        {
-                for(LLViewerObject* current = getFirstRootObject();
-                        current != NULL;
-                        current = getNextRootObject())
-                {
-                        // you can delete an object if permissions allow it, you are
-                        // the owner, you are an officer in the group that owns the
-                        // object, or you are not the owner but it is on land you own
-                        // or land owned by your group. (whew!)
-                        if(   (current->permModify()) 
-                        || (current->permYouOwner())
-                        || (!current->permAnyOwner())                   // public
-                        || (current->isOverAgentOwnedLand())
-                        || (current->isOverGroupOwnedLand())
-                        )
-                        {
-
-                                if( !current->isAttachment() )
-                                {
-                                        object = current;
-                                        break;
-                                }
-                        }
-                }       
-        }
-        else
-        {
-                for(LLViewerObject* current = getFirstObject();
-                        current != NULL;
-                        current = getNextObject())
-                {
-                        // you can delete an object if permissions allow it, you are
-                        // the owner, you are an officer in the group that owns the
-                        // object, or you are not the owner but it is on land you own
-                        // or land owned by your group. (whew!)
-                        if(   (current->permModify()) 
-                        || (current->permYouOwner())
-                        || (!current->permAnyOwner())                   // public
-                        || (current->isOverAgentOwnedLand())
-                        || (current->isOverGroupOwnedLand())
-                        )
-                        {
-                                if( !current->isAttachment() )
-                                {
-                                        object = current;
-                                        break;
-                                }
-                        }
-                }       
-        }
-
-        return object;
-}
-
-//-----------------------------------------------------------------------------
-// getFirstCopyableObject()
-//-----------------------------------------------------------------------------
-LLViewerObject* LLSelectMgr::getFirstCopyableObject(BOOL get_root)
-{
-        LLViewerObject* object = NULL;
-        for(LLViewerObject* cur = mSelectedObjects.getFirstObject(); cur; cur = mSelectedObjects.getNextObject())
-        {
-                if( cur->permCopy() && !cur->isAttachment())
-                {
-                        object = cur;
-                        break;
-                }
-        }       
-
-        if (get_root && object)
-        {
-                LLViewerObject *parent;
-                while ((parent = (LLViewerObject*)object->getParent()))
-                {
-                        if (parent->isSelected())
-                        {
-                                object = parent;
-                        }
-                        else
-                        {
-                                break;
-                        }
-                }
-        }
-
-        return object;
-}
-
-//-----------------------------------------------------------------------------
-// areMultpleEditableObjectsSelected()
-//-----------------------------------------------------------------------------
-BOOL LLSelectMgr::areMultpleEditableObjectsSelected()
-{
-        S32 count = 0;
-        for( LLViewerObject* cur = mSelectedObjects.getFirstObject(); cur; cur = mSelectedObjects.getNextObject() )
-        {
-                if( cur->permModify() )
-                {
-                        count++;
-                        if( count > 1 )
-                        {
-                                return TRUE;
-                        }
-                }
-        }
-        return FALSE;
-}
-
-//-----------------------------------------------------------------------------
 // selectGetAllRootsValid()
 // Returns true if the viewer has information on all selected objects
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetAllRootsValid()
 {
-        for( LLSelectNode* node = getFirstRootNode(); node; node = getNextRootNode() )
+        for( LLSelectNode* node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
         
                 if( !node->mValid )
@@ -2667,7 +2339,7 @@ BOOL LLSelectMgr::selectGetAllRootsValid()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetAllValid()
 {
-        for( LLSelectNode* node = getFirstNode(); node; node = getNextNode() )
+        for( LLSelectNode* node = mSelectedObjects->getFirstNode(); node; node = mSelectedObjects->getNextNode() )
         {
         
                 if( !node->mValid )
@@ -2690,7 +2362,7 @@ BOOL LLSelectMgr::selectGetAllValid()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetModify()
 {
-        for( LLSelectNode* node = getFirstNode(); node; node = getNextNode() )
+        for( LLSelectNode* node = mSelectedObjects->getFirstNode(); node; node = mSelectedObjects->getNextNode() )
         {
                 if( !node->mValid )
                 {
@@ -2712,7 +2384,7 @@ BOOL LLSelectMgr::selectGetModify()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetRootsModify()
 {
-        for( LLSelectNode* node = getFirstRootNode(); node; node = getNextRootNode() )
+        for( LLSelectNode* node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if( !node->mValid )
                 {
@@ -2735,7 +2407,7 @@ BOOL LLSelectMgr::selectGetRootsModify()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetRootsTransfer()
 {
-        for(LLSelectNode* node = getFirstRootNode(); node; node = getNextRootNode())
+        for(LLSelectNode* node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode())
         {
                 if(!node->mValid)
                 {
@@ -2756,7 +2428,7 @@ BOOL LLSelectMgr::selectGetRootsTransfer()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetRootsCopy()
 {
-        for(LLSelectNode* node = getFirstRootNode(); node; node = getNextRootNode())
+        for(LLSelectNode* node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode())
         {
                 if(!node->mValid)
                 {
@@ -2777,8 +2449,8 @@ BOOL LLSelectMgr::selectGetRootsCopy()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetCreator(LLUUID& id, LLString& name)
 {
-        LLSelectNode* node = getFirstRootNode();
-        if(!node) node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
+        if(!node) node = mSelectedObjects->getFirstNode();
         if(!node) return FALSE;
         if(!node->mValid) return FALSE;
         LLViewerObject* obj = node->getObject();
@@ -2788,7 +2460,7 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& id, LLString& name)
         id = node->mPermissions->getCreator();
 
         BOOL identical = TRUE;
-        for ( node = getNextRootNode(); node; node = getNextRootNode() )
+        for ( node = mSelectedObjects->getNextRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if (!node->mValid)
                 {
@@ -2805,8 +2477,8 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& id, LLString& name)
 
         if (identical)
         {
-                char firstname[DB_FIRST_NAME_BUF_SIZE];
-                char lastname[DB_LAST_NAME_BUF_SIZE];
+                char firstname[DB_FIRST_NAME_BUF_SIZE];         /* Flawfinder: ignore */
+                char lastname[DB_LAST_NAME_BUF_SIZE];           /* Flawfinder: ignore */
                 gCacheName->getName(id, firstname, lastname);
                 name.assign( firstname );
                 name.append( " " );
@@ -2827,8 +2499,8 @@ BOOL LLSelectMgr::selectGetCreator(LLUUID& id, LLString& name)
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetOwner(LLUUID& id, LLString& name)
 {
-        LLSelectNode* node = getFirstRootNode();
-        if(!node) node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
+        if(!node) node = mSelectedObjects->getFirstNode();
         if(!node) return FALSE;
         if(!node->mValid) return FALSE;
         LLViewerObject* obj = node->getObject();
@@ -2840,7 +2512,7 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& id, LLString& name)
         node->mPermissions->getOwnership(id, group_owner);
 
         BOOL identical = TRUE;
-        for ( node = getNextRootNode(); node; node = getNextRootNode() )
+        for ( node = mSelectedObjects->getNextRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if (!node->mValid)
                 {
@@ -2868,8 +2540,8 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& id, LLString& name)
                 }
                 else if(!public_owner)
                 {
-                        char firstname[DB_FIRST_NAME_BUF_SIZE];
-                        char lastname[DB_LAST_NAME_BUF_SIZE];
+                        char firstname[DB_FIRST_NAME_BUF_SIZE];         /* Flawfinder: ignore */
+                        char lastname[DB_LAST_NAME_BUF_SIZE];           /* Flawfinder: ignore */
                         gCacheName->getName(id, firstname, lastname);
                         name.assign( firstname );
                         name.append( " " );
@@ -2895,8 +2567,8 @@ BOOL LLSelectMgr::selectGetOwner(LLUUID& id, LLString& name)
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetLastOwner(LLUUID& id, LLString& name)
 {
-        LLSelectNode* node = getFirstRootNode();
-        if(!node) node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
+        if(!node) node = mSelectedObjects->getFirstNode();
         if(!node) return FALSE;
         if(!node->mValid) return FALSE;
         LLViewerObject* obj = node->getObject();
@@ -2906,7 +2578,7 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& id, LLString& name)
         id = node->mPermissions->getLastOwner();
 
         BOOL identical = TRUE;
-        for ( node = getNextRootNode(); node; node = getNextRootNode() )
+        for ( node = mSelectedObjects->getNextRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if (!node->mValid)
                 {
@@ -2927,8 +2599,8 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& id, LLString& name)
         {
                 if(!public_owner)
                 {
-                        char firstname[DB_FIRST_NAME_BUF_SIZE];
-                        char lastname[DB_LAST_NAME_BUF_SIZE];
+                        char firstname[DB_FIRST_NAME_BUF_SIZE];         /* Flawfinder: ignore */
+                        char lastname[DB_LAST_NAME_BUF_SIZE];           /* Flawfinder: ignore */
                         gCacheName->getName(id, firstname, lastname);
                         name.assign( firstname );
                         name.append( " " );
@@ -2954,8 +2626,8 @@ BOOL LLSelectMgr::selectGetLastOwner(LLUUID& id, LLString& name)
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetGroup(LLUUID& id)
 {
-        LLSelectNode* node = getFirstRootNode();
-        if(!node) node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
+        if(!node) node = mSelectedObjects->getFirstNode();
         if(!node) return FALSE;
         if(!node->mValid) return FALSE;
         LLViewerObject* obj = node->getObject();
@@ -2965,7 +2637,7 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& id)
         id = node->mPermissions->getGroup();
 
         BOOL identical = TRUE;
-        for ( node = getNextRootNode(); node; node = getNextRootNode() )
+        for ( node = mSelectedObjects->getNextRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if (!node->mValid)
                 {
@@ -2990,8 +2662,8 @@ BOOL LLSelectMgr::selectGetGroup(LLUUID& id)
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectIsGroupOwned()
 {
-        LLSelectNode* node = getFirstRootNode();
-        if(!node) node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
+        if(!node) node = mSelectedObjects->getFirstNode();
         if(!node) return FALSE;
         if(!node->mValid) return FALSE;
         LLViewerObject* obj = node->getObject();
@@ -3002,7 +2674,7 @@ BOOL LLSelectMgr::selectIsGroupOwned()
 
         if(is_group_owned)
         {
-                for ( node = getNextRootNode(); node; node = getNextRootNode() )
+                for ( node = mSelectedObjects->getNextRootNode(); node; node = mSelectedObjects->getNextRootNode() )
                 {
                         if (!node->mValid)
                         {
@@ -3031,7 +2703,7 @@ BOOL LLSelectMgr::selectIsGroupOwned()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::selectGetPerm(U8 which_perm, U32* mask_on, U32* mask_off)
 {
-        LLSelectNode* node = getFirstRootNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
         if (!node) return FALSE;
         if (!node->mValid)      return FALSE;
 
@@ -3040,7 +2712,7 @@ BOOL LLSelectMgr::selectGetPerm(U8 which_perm, U32* mask_on, U32* mask_off)
         U32 mask_or             = 0x00000000;
         BOOL all_valid  = TRUE;
 
-        for ( node = getFirstRootNode(); node; node = getNextRootNode() )
+        for ( node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if (!node->mValid)
                 {
@@ -3094,17 +2766,17 @@ BOOL LLSelectMgr::selectGetPerm(U8 which_perm, U32* mask_on, U32* mask_off)
 
 BOOL LLSelectMgr::selectGetOwnershipCost(S32* out_cost)
 {
-        return mSelectedObjects.getOwnershipCost(*out_cost);
+        return mSelectedObjects->getOwnershipCost(*out_cost);
 }
 
 BOOL LLSelectMgr::selectGetPermissions(LLPermissions& perm)
 {
-        LLSelectNode* node = getFirstRootNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
         if (!node) return FALSE;
         if (!node->mValid)      return FALSE;
         BOOL valid = TRUE;
         perm = *(node->mPermissions);
-        for(node = getNextRootNode(); node != NULL; node = getNextRootNode())
+        for(node = mSelectedObjects->getNextRootNode(); node != NULL; node = mSelectedObjects->getNextRootNode())
         {
                 if(!node->mValid)
                 {
@@ -3124,9 +2796,9 @@ void LLSelectMgr::selectDelete()
         BOOL locked_but_deleteable_object = FALSE;
         BOOL no_copy_but_deleteable_object = FALSE;
         BOOL all_owned_by_you = TRUE;
-        for(LLViewerObject* obj = getFirstObject();
+        for(LLViewerObject* obj = mSelectedObjects->getFirstObject();
                 obj != NULL;
-                obj = getNextObject())
+                obj = mSelectedObjects->getNextObject())
         {
                 if( obj->isAttachment() )
                 {
@@ -3156,6 +2828,8 @@ void LLSelectMgr::selectDelete()
                 return;
         }
 
+        LLObjectSelectionHandle* selection_handlep = new LLObjectSelectionHandle(getSelection());
+
         if(locked_but_deleteable_object ||
            no_copy_but_deleteable_object ||
            !all_owned_by_you)
@@ -3172,49 +2846,49 @@ void LLSelectMgr::selectDelete()
                         //Locked only
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteLock",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 else if(!locked_but_deleteable_object && no_copy_but_deleteable_object && all_owned_by_you)
                 {
                         //No Copy only
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteNoCopy",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 else if(!locked_but_deleteable_object && !no_copy_but_deleteable_object && !all_owned_by_you)
                 {
                         //not owned only
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteNoOwn",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 else if(locked_but_deleteable_object && no_copy_but_deleteable_object && all_owned_by_you)
                 {
                         //locked and no copy
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteLockNoCopy",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 else if(locked_but_deleteable_object && !no_copy_but_deleteable_object && !all_owned_by_you)
                 {
                         //locked and not owned
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteLockNoOwn",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 else if(!locked_but_deleteable_object && no_copy_but_deleteable_object && !all_owned_by_you)
                 {
                         //no copy and not owned
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteNoCopyNoOwn",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 else
                 {
                         //locked, no copy and not owned
                         gViewerWindow->alertXml(  "ConfirmObjectDeleteLockNoCopyNoOwn",
                                                                   &LLSelectMgr::confirmDelete,
-                                                                  this);
+                                                                  selection_handlep);
                 }
                 
                 
@@ -3222,15 +2896,22 @@ void LLSelectMgr::selectDelete()
         }
         else
         {
-                confirmDelete(0, (void*)this);
+                confirmDelete(0, (void*)selection_handlep);
         }
 }
 
 // static
 void LLSelectMgr::confirmDelete(S32 option, void* data)
 {
-        LLSelectMgr* self = (LLSelectMgr*)data;
-        if(!self) return;
+        LLObjectSelectionHandle handle = *(LLObjectSelectionHandle*)data;
+        delete (LLObjectSelectionHandle*)data;
+
+        if (!handle->getObjectCount())
+        {
+                llwarns << "Nothing to delete!" << llendl;
+                return;
+        }
+
         switch(option)
         {
         case 0:
@@ -3239,19 +2920,19 @@ void LLSelectMgr::confirmDelete(S32 option, void* data)
                         LLUUID trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
                         // attempt to derez into the trash.
                         LLDeRezInfo* info = new LLDeRezInfo(DRD_TRASH, trash_id);
-                        self->sendListToRegions("DeRezObject",
+                        gSelectMgr->sendListToRegions("DeRezObject",
                                                                         packDeRezHeader,
                                                                         packObjectLocalID,
                                                                         (void*)info,
                                                                         SEND_ONLY_ROOTS);
                         // VEFFECT: Delete Object - one effect for all deletes
-                        if (self->mSelectType != SELECT_TYPE_HUD)
+                        if (gSelectMgr->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
                         {
                                 LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
-                                effectp->setPositionGlobal( self->getSelectionCenterGlobal() );
+                                effectp->setPositionGlobal( gSelectMgr->getSelectionCenterGlobal() );
                                 effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                                 F32 duration = 0.5f;
-                                duration += self->getObjectCount() / 64.f;
+                                duration += gSelectMgr->mSelectedObjects->getObjectCount() / 64.f;
                                 effectp->setDuration(duration);
                         }
 
@@ -3259,7 +2940,7 @@ void LLSelectMgr::confirmDelete(S32 option, void* data)
 
                         // Keep track of how many objects have been deleted.
                         F64 obj_delete_count = gViewerStats->getStat(LLViewerStats::ST_OBJECT_DELETE_COUNT);
-                        obj_delete_count += self->getObjectCount();
+                        obj_delete_count += gSelectMgr->mSelectedObjects->getObjectCount();
                         gViewerStats->setStat(LLViewerStats::ST_OBJECT_DELETE_COUNT, obj_delete_count );
                 }
                 break;
@@ -3289,7 +2970,7 @@ BOOL LLSelectMgr::selectIsForSale(S32& price)
         price = 0;
 
         LLSelectNode *node;
-        for (node = getFirstRootNode(); node; node = getNextRootNode() )
+        for (node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode() )
         {
                 if (node->mSaleInfo.isForSale())
                 {
@@ -3306,12 +2987,12 @@ BOOL LLSelectMgr::selectIsForSale(S32& price)
 // accumulated sale info.
 BOOL LLSelectMgr::selectGetSaleInfo(LLSaleInfo& sale_info)
 {
-        LLSelectNode* node = getFirstRootNode();
+        LLSelectNode* node = mSelectedObjects->getFirstRootNode();
         if (!node) return FALSE;
         if (!node->mValid)      return FALSE;
         BOOL valid = TRUE;
         sale_info = node->mSaleInfo;
-        for(node = getNextRootNode(); node != NULL; node = getNextRootNode())
+        for(node = mSelectedObjects->getNextRootNode(); node != NULL; node = mSelectedObjects->getNextRootNode())
         {
                 if(!node->mValid)
                 {
@@ -3325,12 +3006,12 @@ BOOL LLSelectMgr::selectGetSaleInfo(LLSaleInfo& sale_info)
 
 BOOL LLSelectMgr::selectGetAggregatePermissions(LLAggregatePermissions& ag_perm)
 {
-        LLSelectNode* node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstNode();
         if (!node) return FALSE;
         if (!node->mValid)      return FALSE;
         BOOL valid = TRUE;
         ag_perm = node->mAggregatePerm;
-        for(node = getNextNode(); node != NULL; node = getNextNode())
+        for(node = mSelectedObjects->getNextNode(); node != NULL; node = mSelectedObjects->getNextNode())
         {
                 if(!node->mValid)
                 {
@@ -3344,12 +3025,12 @@ BOOL LLSelectMgr::selectGetAggregatePermissions(LLAggregatePermissions& ag_perm)
 
 BOOL LLSelectMgr::selectGetAggregateTexturePermissions(LLAggregatePermissions& ag_perm)
 {
-        LLSelectNode* node = getFirstNode();
+        LLSelectNode* node = mSelectedObjects->getFirstNode();
         if (!node) return FALSE;
         if (!node->mValid)      return FALSE;
         BOOL valid = TRUE;
         ag_perm = node->getObject()->permYouOwner() ? node->mAggregateTexturePermOwner : node->mAggregateTexturePerm;
-        for(node = getNextNode(); node != NULL; node = getNextNode())
+        for(node = mSelectedObjects->getNextNode(); node != NULL; node = mSelectedObjects->getNextNode())
         {
                 if(!node->mValid)
                 {
@@ -3362,12 +3043,6 @@ BOOL LLSelectMgr::selectGetAggregateTexturePermissions(LLAggregatePermissions& a
 }
 
 
-// returns TRUE is any node is currenly worn as an attachment
-BOOL LLSelectMgr::selectionIsAttachment()
-{
-        return (mSelectType == SELECT_TYPE_ATTACHMENT || mSelectType == SELECT_TYPE_HUD);
-}
-
 //--------------------------------------------------------------------
 // Duplicate objects
 //--------------------------------------------------------------------
@@ -3383,7 +3058,7 @@ struct LLDuplicateData
 
 void LLSelectMgr::selectDuplicate(const LLVector3& offset, BOOL select_copy)
 {
-        if (selectionIsAttachment())
+        if (mSelectedObjects->isAttachment())
         {
                 //RN: do not duplicate attachments
                 make_ui_sound("UISndInvalidOp");
@@ -3403,7 +3078,7 @@ void LLSelectMgr::selectDuplicate(const LLVector3& offset, BOOL select_copy)
         }
         else
         {
-                for (LLSelectNode* node = getFirstRootNode(); node; node = getNextRootNode())
+                for (LLSelectNode* node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode())
                 {
                         node->mDuplicated = TRUE;
                         node->mDuplicatePos = node->getObject()->getPositionGlobal();
@@ -3414,7 +3089,7 @@ void LLSelectMgr::selectDuplicate(const LLVector3& offset, BOOL select_copy)
 
 void LLSelectMgr::repeatDuplicate()
 {
-        if (selectionIsAttachment())
+        if (mSelectedObjects->isAttachment())
         {
                 //RN: do not duplicate attachments
                 make_ui_sound("UISndInvalidOp");
@@ -3424,7 +3099,7 @@ void LLSelectMgr::repeatDuplicate()
         LLSelectNode* node;
         LLDynamicArray<LLViewerObject*> non_duplicated_objects;
 
-        for (node = getFirstRootNode(); node; node = getNextRootNode())
+        for (node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode())
         {
                 if (!node->mDuplicated)
                 {
@@ -3447,7 +3122,7 @@ void LLSelectMgr::repeatDuplicate()
         sendListToRegions("ObjectDuplicate", packDuplicateHeader, packDuplicate, &data, SEND_ONLY_ROOTS);
 
         // move current selection based on delta from duplication position and update duplication position
-        for (node = getFirstRootNode(); node; node = getNextRootNode())
+        for (node = mSelectedObjects->getFirstRootNode(); node; node = mSelectedObjects->getNextRootNode())
         {
                 if (node->mDuplicated)
                 {
@@ -3502,7 +3177,7 @@ void LLSelectMgr::selectDuplicateOnRay(const LLVector3 &ray_start_region,
                                                                            BOOL copy_rotates,
                                                                            BOOL select_copy)
 {
-        if (selectionIsAttachment())
+        if (mSelectedObjects->isAttachment())
         {
                 // do not duplicate attachments
                 make_ui_sound("UISndInvalidOp");
@@ -3714,7 +3389,7 @@ struct LLPermData
 };
 
 // TODO: Make this able to fail elegantly.
-void LLSelectMgr::setObjectPermissions(U8 field,
+void LLSelectMgr::selectionSetObjectPermissions(U8 field,
                                                                            BOOL set,
                                                                            U32 mask,
                                                                            BOOL override)
@@ -3751,7 +3426,7 @@ void LLSelectMgr::sendSelect()
 
 void LLSelectMgr::deselectAll()
 {
-        if (!mSelectedObjects.getNumNodes())
+        if (!mSelectedObjects->getNumNodes())
         {
                 return;
         }
@@ -3772,42 +3447,29 @@ void LLSelectMgr::deselectAll()
         updateSelectionCenter();
 }
 
-void LLSelectMgr::deselectTransient()
+void LLSelectMgr::deselectUnused()
 {
-        std::set<LLViewerObject*> objects_to_deselect;
-        LLSelectNode *nodep;
-        for (nodep = mSelectedObjects.getFirstNode(); nodep; nodep = mSelectedObjects.getNextNode())
-        {
-                if (nodep->isTransient())
-                {
-                        objects_to_deselect.insert(nodep->getObject());
-                }
-        }
-
-        std::set<LLViewerObject*>::iterator iter;
-        for (iter = objects_to_deselect.begin();
-                iter != objects_to_deselect.end();
-                ++iter)
+        // no more outstanding references to this selection
+        if (mSelectedObjects->getNumRefs() == 1)
         {
-                deselectObjectOnly(*iter);
+                deselectAll();
         }
-
-        gHUDManager->clearJoints();
-        updateSelectionCenter();
 }
 
 void LLSelectMgr::convertTransient()
 {
-        LLSelectNode *nodep;
-        for (nodep = mSelectedObjects.getFirstNode(); nodep; nodep = mSelectedObjects.getNextNode())
+        // use STL-style iteration to avoid recursive iteration problems
+        LLObjectSelection::iterator node_it;
+        for (node_it = mSelectedObjects->begin(); node_it != mSelectedObjects->end(); ++node_it)
         {
+                LLSelectNode *nodep = *node_it;
                 nodep->setTransient(FALSE);
         }
 }
 
 void LLSelectMgr::deselectAllIfTooFar()
 {
-        if (isEmpty() || mSelectType == SELECT_TYPE_HUD)
+        if (mSelectedObjects->isEmpty() || mSelectedObjects->mSelectType == SELECT_TYPE_HUD)
         {
                 return;
         }
@@ -3844,10 +3506,10 @@ void LLSelectMgr::deselectAllIfTooFar()
 }
 
 
-void LLSelectMgr::setObjectName(const LLString& name)
+void LLSelectMgr::selectionSetObjectName(const LLString& name)
 {
         // we only work correctly if 1 object is selected.
-        if(getRootObjectCount() == 1)
+        if(mSelectedObjects->getRootObjectCount() == 1)
         {
                 sendListToRegions("ObjectName",
                                                   packAgentAndSessionID,
@@ -3855,7 +3517,7 @@ void LLSelectMgr::setObjectName(const LLString& name)
                                                   (void*)name.c_str(),
                                                   SEND_ONLY_ROOTS);
         }
-        else if(getObjectCount() == 1)
+        else if(mSelectedObjects->getObjectCount() == 1)
         {
                 sendListToRegions("ObjectName",
                                                   packAgentAndSessionID,
@@ -3865,10 +3527,10 @@ void LLSelectMgr::setObjectName(const LLString& name)
         }
 }
 
-void LLSelectMgr::setObjectDescription(const LLString& desc)
+void LLSelectMgr::selectionSetObjectDescription(const LLString& desc)
 {
         // we only work correctly if 1 object is selected.
-        if(getRootObjectCount() == 1)
+        if(mSelectedObjects->getRootObjectCount() == 1)
         {
                 sendListToRegions("ObjectDescription",
                                                   packAgentAndSessionID,
@@ -3876,7 +3538,7 @@ void LLSelectMgr::setObjectDescription(const LLString& desc)
                                                   (void*)desc.c_str(),
                                                   SEND_ONLY_ROOTS);
         }
-        else if(getObjectCount() == 1)
+        else if(mSelectedObjects->getObjectCount() == 1)
         {
                 sendListToRegions("ObjectDescription",
                                                   packAgentAndSessionID,
@@ -3886,11 +3548,11 @@ void LLSelectMgr::setObjectDescription(const LLString& desc)
         }
 }
 
-void LLSelectMgr::setObjectCategory(const LLCategory& category)
+void LLSelectMgr::selectionSetObjectCategory(const LLCategory& category)
 {
         // for now, we only want to be able to set one root category at
         // a time.
-        if(getRootObjectCount() != 1) return;
+        if(mSelectedObjects->getRootObjectCount() != 1) return;
         sendListToRegions("ObjectCategory",
                                           packAgentAndSessionID,
                                           packObjectCategory,
@@ -3898,10 +3560,10 @@ void LLSelectMgr::setObjectCategory(const LLCategory& category)
                                           SEND_ONLY_ROOTS);
 }
 
-void LLSelectMgr::setObjectSaleInfo(const LLSaleInfo& sale_info)
+void LLSelectMgr::selectionSetObjectSaleInfo(const LLSaleInfo& sale_info)
 {
         // Only one sale info at a time for now
-        if(getRootObjectCount() != 1) return;
+        if(mSelectedObjects->getRootObjectCount() != 1) return;
         sendListToRegions("ObjectSaleInfo",
                                           packAgentAndSessionID,
                                           packObjectSaleInfo,
@@ -3915,16 +3577,17 @@ void LLSelectMgr::setObjectSaleInfo(const LLSaleInfo& sale_info)
 
 void LLSelectMgr::sendAttach(U8 attachment_point)
 {
-        LLViewerObject* attach_object = mSelectedObjects.getFirstRootObject();
+        LLViewerObject* attach_object = mSelectedObjects->getFirstRootObject();
 
-        if (!attach_object || !gAgent.getAvatarObject() || mSelectType != SELECT_TYPE_WORLD)
+        if (!attach_object || !gAgent.getAvatarObject() || mSelectedObjects->mSelectType != SELECT_TYPE_WORLD)
         {
                 return;
         }
 
         BOOL build_mode = gToolMgr->inEdit();
         // Special case: Attach to default location for this object.
-        if (0 == attachment_point)
+        if (0 == attachment_point ||
+                gAgent.getAvatarObject()->mAttachmentPoints.getIfThere(attachment_point))
         {
                 sendListToRegions(
                         "ObjectAttach",
@@ -3937,53 +3600,11 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
                         deselectAll();
                 }
         }
-        else
-        {
-                LLViewerJointAttachment* attachment = gAgent.getAvatarObject()->mAttachmentPoints.getIfThere(attachment_point);
-                if (attachment)
-                {
-                        LLQuaternion object_world_rot = attach_object->getRenderRotation();
-                        LLQuaternion attachment_pt__world_rot = attachment->getWorldRotation();
-                        LLQuaternion local_rot = object_world_rot * ~attachment_pt__world_rot;
-
-                        F32 x,y,z;
-                        local_rot.getEulerAngles(&x, &y, &z);
-                        // snap to nearest 90 degree rotation
-                        // make sure all euler angles are positive
-                        if (x < F_PI_BY_TWO) x += F_TWO_PI;
-                        if (y < F_PI_BY_TWO) y += F_TWO_PI;
-                        if (z < F_PI_BY_TWO) z += F_TWO_PI;
-
-                        // add 45 degrees so that rounding down becomes rounding off
-                        x += F_PI_BY_TWO / 2.f;
-                        y += F_PI_BY_TWO / 2.f;
-                        z += F_PI_BY_TWO / 2.f;
-                        // round down to nearest multiple of 90 degrees
-                        x -= fmodf(x, F_PI_BY_TWO);
-                        y -= fmodf(y, F_PI_BY_TWO);
-                        z -= fmodf(z, F_PI_BY_TWO);
-
-                        // pass the requested rotation on to the simulator
-                        local_rot.setQuat(x, y, z);
-                        attach_object->setRotation(local_rot);
-
-                        sendListToRegions(
-                                "ObjectAttach",
-                                packAgentIDAndSessionAndAttachment,
-                                packObjectIDAndRotation,
-                                &attachment_point,
-                                SEND_ONLY_ROOTS );
-                        if (!build_mode)
-                        {
-                                deselectAll();
-                        }
-                }
-        }
 }
 
 void LLSelectMgr::sendDetach()
 {
-        if (!mSelectedObjects.getNumNodes() || mSelectType == SELECT_TYPE_WORLD)
+        if (!mSelectedObjects->getNumNodes() || mSelectedObjects->mSelectType == SELECT_TYPE_WORLD)
         {
                 return;
         }
@@ -3999,7 +3620,7 @@ void LLSelectMgr::sendDetach()
 
 void LLSelectMgr::sendDropAttachment()
 {
-        if (!mSelectedObjects.getNumNodes() || mSelectType == SELECT_TYPE_WORLD)
+        if (!mSelectedObjects->getNumNodes() || mSelectedObjects->mSelectType == SELECT_TYPE_WORLD)
         {
                 return;
         }
@@ -4018,7 +3639,7 @@ void LLSelectMgr::sendDropAttachment()
 
 void LLSelectMgr::sendLink()
 {
-        if (!mSelectedObjects.getNumNodes())
+        if (!mSelectedObjects->getNumNodes())
         {
                 return;
         }
@@ -4033,7 +3654,7 @@ void LLSelectMgr::sendLink()
 
 void LLSelectMgr::sendDelink()
 {
-        if (!mSelectedObjects.getNumNodes())
+        if (!mSelectedObjects->getNumNodes())
         {
                 return;
         }
@@ -4055,7 +3676,7 @@ void LLSelectMgr::sendDelink()
 
 void LLSelectMgr::sendHinge(U8 type)
 {
-        if (!mSelectedObjects.getNumNodes())
+        if (!mSelectedObjects->getNumNodes())
         {
                 return;
         }
@@ -4071,7 +3692,7 @@ void LLSelectMgr::sendHinge(U8 type)
 
 void LLSelectMgr::sendDehinge()
 {
-        if (!mSelectedObjects.getNumNodes())
+        if (!mSelectedObjects->getNumNodes())
         {
                 return;
         }
@@ -4086,7 +3707,7 @@ void LLSelectMgr::sendDehinge()
 
 void LLSelectMgr::sendSelect()
 {
-        if (!mSelectedObjects.getNumNodes())
+        if (!mSelectedObjects->getNumNodes())
         {
                 return;
         }
@@ -4116,7 +3737,7 @@ void LLSelectMgr::selectionDump()
 {
         LLViewerObject *object;
 
-        for (object = getFirstObject(); object; object = getNextObject() )
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 object->dump();
         }
@@ -4125,7 +3746,7 @@ void LLSelectMgr::selectionDump()
 void LLSelectMgr::saveSelectedObjectColors()
 {
         LLSelectNode* selectNode;
-        for (selectNode = getFirstNode(); selectNode; selectNode = getNextNode() )
+        for (selectNode = mSelectedObjects->getFirstNode(); selectNode; selectNode = mSelectedObjects->getNextNode() )
         {
                 selectNode->saveColors();
         }
@@ -4136,7 +3757,7 @@ void LLSelectMgr::saveSelectedObjectTextures()
         LLSelectNode*           selectNode;
 
         // invalidate current selection so we update saved textures
-        for (selectNode = getFirstNode(); selectNode; selectNode = getNextNode() )
+        for (selectNode = mSelectedObjects->getFirstNode(); selectNode; selectNode = mSelectedObjects->getNextNode() )
         {
                 selectNode->mValid = FALSE;
         }
@@ -4152,13 +3773,13 @@ void LLSelectMgr::saveSelectedObjectTransform(EActionType action_type)
 {
         LLSelectNode*           selectNode;
 
-        if (isEmpty())
+        if (mSelectedObjects->isEmpty())
         {
                 // nothing selected, so nothing to save
                 return;
         }
 
-        for (selectNode = getFirstNode(); selectNode; selectNode = getNextNode() )
+        for (selectNode = mSelectedObjects->getFirstNode(); selectNode; selectNode = mSelectedObjects->getNextNode() )
         {
                 LLViewerObject*         object;
                 object = selectNode->getObject();
@@ -4168,7 +3789,10 @@ void LLSelectMgr::saveSelectedObjectTransform(EActionType action_type)
                         if (object->isRootEdit())
                         {
                                 LLXform* parent_xform = object->mDrawable->getXform()->getParent();
-                                selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition());
+                                if (parent_xform)
+                                {
+                                        selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition());
+                                }
                         }
                         else
                         {
@@ -4189,42 +3813,6 @@ void LLSelectMgr::saveSelectedObjectTransform(EActionType action_type)
                 selectNode->mSavedScale = object->getScale();
                 selectNode->saveTextureScaleRatios();
 
-                if (object->isAttachment() && 
-                        action_type != SELECT_ACTION_TYPE_PICK)
-                {
-                        LLSelectAction*         selectAction = new LLSelectAction();
-                        selectAction->mActionType = action_type;
-                        selectAction->mPosition = object->getPosition();
-                        selectAction->mRotation = object->getRotation();
-                        selectAction->mScale = object->getScale();
-                        selectAction->mObjectID = object->getID();
-                        selectAction->mIndividualSelection = selectNode->mIndividualSelection;
-
-                        mUndoQueue.push_back(selectAction);
-
-                        while ((mUndoQueue.size() > (U32)MAX_ACTION_QUEUE_SIZE))
-                        {
-                                LLSelectAction* action = mUndoQueue.front();
-                                mUndoQueue.pop_front();
-                                delete action;
-                        }
-        
-                        // remove this object from the redo queue
-                        std::deque<LLSelectAction*>::iterator it;
-                        for (it = mRedoQueue.begin(); it != mRedoQueue.end();)
-                        {
-                                if ((*it)->mObjectID == object->getID())
-                                {
-                                        LLSelectAction* actionp = *it;
-                                        it = mRedoQueue.erase(it);
-                                        delete actionp;
-                                }
-                                else
-                                {
-                                        ++it;
-                                }
-                        }
-                }
         }
         mSavedSelectionBBox = getBBoxOfSelection();
 }
@@ -4233,7 +3821,7 @@ void LLSelectMgr::selectionUpdatePhysics(BOOL physics)
 {
         LLViewerObject *object;
 
-        for (object = getFirstObject(); object; object = getNextObject() )
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (   !object->permModify()            // preemptive permissions check
                         || !(object->isRoot()                   // don't send for child objects
@@ -4249,7 +3837,7 @@ void LLSelectMgr::selectionUpdateTemporary(BOOL is_temporary)
 {
         LLViewerObject *object;
 
-        for (object = getFirstObject(); object; object = getNextObject() )
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (   !object->permModify()            // preemptive permissions check
                         || !(object->isRoot()                   // don't send for child objects
@@ -4265,7 +3853,7 @@ void LLSelectMgr::selectionUpdatePhantom(BOOL is_phantom)
 {
         LLViewerObject *object;
 
-        for (object = getFirstObject(); object; object = getNextObject() )
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (   !object->permModify()            // preemptive permissions check
                         || !(object->isRoot()                   // don't send for child objects
@@ -4281,7 +3869,7 @@ void LLSelectMgr::selectionUpdateCastShadows(BOOL cast_shadows)
 {
         LLViewerObject *object;
 
-        for (object = getFirstObject(); object; object = getNextObject() )
+        for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
         {
                 if (   !object->permModify()            // preemptive permissions check
                         || object->isJointChild())
@@ -4505,70 +4093,81 @@ void LLSelectMgr::sendListToRegions(const LLString& message_name,
         S32 packets_sent = 0;
         S32 objects_in_this_packet = 0;
 
+
+        //clear update override data (allow next update through)
+        for (node = mSelectedObjects->getFirstNode();
+                 node;
+                 node = mSelectedObjects->getNextNode())
+        {
+                node->mLastPositionLocal.setVec(0,0,0);
+                node->mLastRotation = LLQuaternion();
+                node->mLastScale.setVec(0,0,0);
+        }
+
         std::queue<LLSelectNode*> nodes_to_send;
         
         switch(send_type)
         {
         case SEND_ONLY_ROOTS:
-                node = mSelectedObjects.getFirstRootNode();
+                node = mSelectedObjects->getFirstRootNode();
                 while(node)
                 {
                         nodes_to_send.push(node);
-                        node = mSelectedObjects.getNextRootNode();
+                        node = mSelectedObjects->getNextRootNode();
                 }
                 break;
         case SEND_INDIVIDUALS:
-                node = mSelectedObjects.getFirstNode();
+                node = mSelectedObjects->getFirstNode();
                 while(node)
                 {
                         nodes_to_send.push(node);
-                        node = mSelectedObjects.getNextNode();
+                        node = mSelectedObjects->getNextNode();
                 }
                 break;
         case SEND_ROOTS_FIRST:
                 // first roots...
-                node = mSelectedObjects.getFirstNode();
+                node = mSelectedObjects->getFirstNode();
                 while(node)
                 {
                         if (node->getObject()->isRootEdit())
                         {
                                 nodes_to_send.push(node);
                         }
-                        node = mSelectedObjects.getNextNode();
+                        node = mSelectedObjects->getNextNode();
                 }
 
                 // then children...
-                node = mSelectedObjects.getFirstNode();
+                node = mSelectedObjects->getFirstNode();
                 while(node)
                 {
                         if (!node->getObject()->isRootEdit())
                         {
                                 nodes_to_send.push(node);
                         }
-                        node = mSelectedObjects.getNextNode();
+                        node = mSelectedObjects->getNextNode();
                 }
                 break;
         case SEND_CHILDREN_FIRST:
                 // first children...
-                node = mSelectedObjects.getFirstNode();
+                node = mSelectedObjects->getFirstNode();
                 while(node)
                 {
                         if (!node->getObject()->isRootEdit())
                         {
                                 nodes_to_send.push(node);
                         }
-                        node = mSelectedObjects.getNextNode();
+                        node = mSelectedObjects->getNextNode();
                 }
 
                 // ...then roots
-                node = mSelectedObjects.getFirstNode();
+                node = mSelectedObjects->getFirstNode();
                 while(node)
                 {
                         if (node->getObject()->isRootEdit())
                         {
                                 nodes_to_send.push(node);
                         }
-                        node = mSelectedObjects.getNextNode();
+                        node = mSelectedObjects->getNextNode();
                 }
                 break;
 
@@ -4720,14 +4319,14 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
 
                 msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id, i);
 
-                char name[DB_INV_ITEM_NAME_BUF_SIZE];
+                char name[DB_INV_ITEM_NAME_BUF_SIZE];           /* Flawfinder: ignore */
                 msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name, i);
-                char desc[DB_INV_ITEM_DESC_BUF_SIZE];
+                char desc[DB_INV_ITEM_DESC_BUF_SIZE];           /* Flawfinder: ignore */
                 msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, DB_INV_ITEM_DESC_BUF_SIZE, desc, i);
 
-                char touch_name[DB_INV_ITEM_NAME_BUF_SIZE];
+                char touch_name[DB_INV_ITEM_NAME_BUF_SIZE];             /* Flawfinder: ignore */
                 msg->getStringFast(_PREHASH_ObjectData, _PREHASH_TouchName, DB_INV_ITEM_NAME_BUF_SIZE, touch_name, i);
-                char sit_name[DB_INV_ITEM_DESC_BUF_SIZE];
+                char sit_name[DB_INV_ITEM_DESC_BUF_SIZE];               /* Flawfinder: ignore */
                 msg->getStringFast(_PREHASH_ObjectData, _PREHASH_SitName, DB_INV_ITEM_DESC_BUF_SIZE, sit_name, i);
 
                 //unpack TE IDs
@@ -4741,7 +4340,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
                         for (S32 buf_offset = 0; buf_offset < size; buf_offset += UUID_BYTES)
                         {
                                 LLUUID id;
-                                memcpy(id.mData, packed_buffer + buf_offset, UUID_BYTES);
+                                memcpy(id.mData, packed_buffer + buf_offset, UUID_BYTES);               /* Flawfinder: ignore */
                                 texture_ids.push_back(id);
                         }
                 }
@@ -4750,9 +4349,9 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
                 // Iterate through nodes at end, since it can be on both the regular AND hover list
                 BOOL found = FALSE;
                 LLSelectNode* node;
-                for (node = gSelectMgr->mSelectedObjects.getFirstNode();
+                for (node = gSelectMgr->mSelectedObjects->getFirstNode();
                          node;
-                         node = gSelectMgr->mSelectedObjects.getNextNode())
+                         node = gSelectMgr->mSelectedObjects->getNextNode())
                 {
                         if (node->getObject()->mID == id)
                         {
@@ -4874,10 +4473,10 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
         msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id );
 
         // unpack name & desc
-        char name[DB_INV_ITEM_NAME_BUF_SIZE];
+        char name[DB_INV_ITEM_NAME_BUF_SIZE];           /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, DB_INV_ITEM_NAME_BUF_SIZE, name);
 
-        char desc[DB_INV_ITEM_DESC_BUF_SIZE];
+        char desc[DB_INV_ITEM_DESC_BUF_SIZE];           /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, DB_INV_ITEM_DESC_BUF_SIZE, desc);
 
         // the reporter widget askes the server for info about picked objects
@@ -4887,8 +4486,8 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
                 LLFloaterReporter *reporterp = LLFloaterReporter::getReporter(report_type);
                 if (reporterp)
                 {
-                        char first_name[DB_FIRST_NAME_BUF_SIZE];
-                        char last_name[DB_LAST_NAME_BUF_SIZE];
+                        char first_name[DB_FIRST_NAME_BUF_SIZE];                /* Flawfinder: ignore */
+                        char last_name[DB_LAST_NAME_BUF_SIZE];          /* Flawfinder: ignore */
                         gCacheName->getName(owner_id, first_name, last_name);
                         LLString fullname(first_name);
                         fullname.append(" ");
@@ -4900,9 +4499,9 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
         // Now look through all of the hovered nodes
         BOOL found = FALSE;
         LLSelectNode* node;
-        for (node = gSelectMgr->mHoverObjects.getFirstNode();
+        for (node = gSelectMgr->mHoverObjects->getFirstNode();
                  node;
-                 node = gSelectMgr->mHoverObjects.getNextNode())
+                 node = gSelectMgr->mHoverObjects->getNextNode())
         {
                 if (node->getObject()->mID == id)
                 {
@@ -4985,7 +4584,7 @@ void LLSelectMgr::updateSilhouettes()
 
         if((cameraPos - mLastCameraPos).magVecSquared() > SILHOUETTE_UPDATE_THRESHOLD_SQUARED * currentCameraZoom * currentCameraZoom)
         {
-                for (node = mSelectedObjects.getFirstNode(); node; node = mSelectedObjects.getNextNode() )
+                for (node = mSelectedObjects->getFirstNode(); node; node = mSelectedObjects->getNextNode() )
                 {
                         if (node->getObject())
                         {
@@ -4998,7 +4597,7 @@ void LLSelectMgr::updateSilhouettes()
         
         LLDynamicArray<LLViewerObject*> changed_objects;
 
-        if (mSelectedObjects.getNumNodes())
+        if (mSelectedObjects->getNumNodes())
         {
                 //gGLSPipelineSelection.set();
 
@@ -5007,7 +4606,7 @@ void LLSelectMgr::updateSilhouettes()
 
                 for (S32 pass = 0; pass < 2; pass++)
                 {
-                        for (node = mSelectedObjects.getFirstNode(); node; node = mSelectedObjects.getNextNode() )
+                        for (node = mSelectedObjects->getFirstNode(); node; node = mSelectedObjects->getNextNode() )
                         {
                                 LLViewerObject* objectp = node->getObject();
 
@@ -5023,7 +4622,7 @@ void LLSelectMgr::updateSilhouettes()
                                         || objectp->isChanged(LLXform::SILHOUETTE)
                                         || (objectp->getParent() && objectp->getParent()->isChanged(LLXform::SILHOUETTE)))
                                 {
-                                        if (num_sils_genned++ < MAX_SILS_PER_FRAME && objectp->mDrawable->isVisible())
+                                        if (num_sils_genned++ < MAX_SILS_PER_FRAME)// && objectp->mDrawable->isVisible())
                                         {
                                                 generateSilhouette(node, gCamera->getOrigin());
                                                 changed_objects.put(objectp);
@@ -5077,7 +4676,7 @@ void LLSelectMgr::updateSilhouettes()
                 // remove highlight nodes not in roots list
                 LLDynamicArray<LLSelectNode*> remove_these_nodes;
                 LLDynamicArray<LLViewerObject*> remove_these_roots;
-                for (LLSelectNode* nodep = mHighlightedObjects.getFirstNode(); nodep; nodep = mHighlightedObjects.getNextNode())
+                for (LLSelectNode* nodep = mHighlightedObjects->getFirstNode(); nodep; nodep = mHighlightedObjects->getNextNode())
                 {
                         LLViewerObject* objectp = nodep->getObject();
                         if (objectp->isRoot() || !select_linked_set)
@@ -5106,7 +4705,7 @@ void LLSelectMgr::updateSilhouettes()
                 S32 i;
                 for (i = 0; i < remove_these_nodes.count(); i++)
                 {
-                        mHighlightedObjects.removeNode(remove_these_nodes[i]);
+                        mHighlightedObjects->removeNode(remove_these_nodes[i]);
                 }
 
                 // remove all root objects already being highlighted
@@ -5128,7 +4727,7 @@ void LLSelectMgr::updateSilhouettes()
                                 continue;
                         }
 
-                        mHighlightedObjects.addNode(rect_select_node);
+                        mHighlightedObjects->addNode(rect_select_node);
 
                         if (!select_linked_set)
                         {
@@ -5147,7 +4746,7 @@ void LLSelectMgr::updateSilhouettes()
 
                                         rect_select_node = new LLSelectNode(objectp->mChildList[i], TRUE);
                                         rect_select_node->selectAllTEs(TRUE);
-                                        mHighlightedObjects.addNode(rect_select_node);
+                                        mHighlightedObjects->addNode(rect_select_node);
                                 }
                         }
                 }
@@ -5158,7 +4757,7 @@ void LLSelectMgr::updateSilhouettes()
                 //BOOL subtracting_from_selection = (gKeyboard->currentMask(TRUE) == MASK_CONTROL);
                 for (S32 pass = 0; pass < 2; pass++)
                 {
-                        for (node = mHighlightedObjects.getFirstNode(); node; node = mHighlightedObjects.getNextNode() )
+                        for (node = mHighlightedObjects->getFirstNode(); node; node = mHighlightedObjects->getNextNode() )
                         {
                                 LLViewerObject* objectp = node->getObject();
 
@@ -5207,7 +4806,7 @@ void LLSelectMgr::updateSilhouettes()
         }
         else
         {
-                mHighlightedObjects.deleteAllNodes();
+                mHighlightedObjects->deleteAllNodes();
         }
 
         for (S32 i = 0; i < changed_objects.count(); i++)
@@ -5254,13 +4853,12 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                 glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (depth *0.5f), 0.f, 0.f);
                 glScalef(cur_zoom, cur_zoom, cur_zoom);
         }
-        if (mSelectedObjects.getNumNodes())
+        if (mSelectedObjects->getNumNodes())
         {
-                glPushAttrib(GL_FOG_BIT);
                 LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
                 for (S32 pass = 0; pass < 2; pass++)
                 {
-                        for (node = mSelectedObjects.getFirstNode(); node; node = mSelectedObjects.getNextNode() )
+                        for (node = mSelectedObjects->getFirstNode(); node; node = mSelectedObjects->getNextNode() )
                         {
                                 LLViewerObject* objectp = node->getObject();
                                 if (objectp->isHUDAttachment() != for_hud)
@@ -5288,16 +4886,15 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                                 }
                         }
                 }
-                glPopAttrib();
         }
 
-        if (mHighlightedObjects.getNumNodes())
+        if (mHighlightedObjects->getNumNodes())
         {
                 // render silhouettes for highlighted objects
                 BOOL subtracting_from_selection = (gKeyboard->currentMask(TRUE) == MASK_CONTROL);
                 for (S32 pass = 0; pass < 2; pass++)
                 {
-                        for (node = mHighlightedObjects.getFirstNode(); node; node = mHighlightedObjects.getNextNode() )
+                        for (node = mHighlightedObjects->getFirstNode(); node; node = mHighlightedObjects->getNextNode() )
                         {
                                 LLViewerObject* objectp = node->getObject();
                                 if (objectp->isHUDAttachment() != for_hud)
@@ -5706,12 +5303,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
         }
 
         BOOL is_hud_object = objectp->isHUDAttachment();
-
-        if (!drawable->isVisible() && !is_hud_object)
-        {
-                return;
-        }
-
+        
         if (mSilhouetteVertices.size() == 0 || mSilhouetteNormals.size() != mSilhouetteVertices.size())
         {
                 return;
@@ -5742,7 +5334,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                 else
                 {
                         LLVector3 view_vector = gCamera->getOrigin() - objectp->getRenderPosition();
-                        silhouette_thickness = drawable->mDistanceWRTCamera * LLSelectMgr::sHighlightThickness * (gCamera->getView() / gCamera->getDefaultFOV());
+                        silhouette_thickness = view_vector.magVec() * LLSelectMgr::sHighlightThickness * (gCamera->getView() / gCamera->getDefaultFOV());
                 }               
                 F32 animationTime = (F32)LLFrameTimer::getElapsedSeconds();
 
@@ -5768,7 +5360,6 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                                 S32 i = 0;
                                 for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++)
                                 {
-//                                      S32 first_i = i;
                                         for(; i < mSilhouetteSegments[seg_num]; i++)
                                         {
                                                 u_coord += u_divisor * LLSelectMgr::sHighlightUScale;
@@ -5777,11 +5368,6 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                                                 glTexCoord2f( u_coord, v_coord );
                                                 glVertex3fv( mSilhouetteVertices[i].mV );
                                         }
-
-                                        /*u_coord += u_divisor * LLSelectMgr::sHighlightUScale;
-                                        glColor4f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], 0.4f);
-                                        glTexCoord2f( u_coord, v_coord );
-                                        glVertex3fv( mSilhouetteVertices[first_i].mV );*/
                                 }
                         }
             glEnd();
@@ -5789,7 +5375,6 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                 }
 
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-                //glAlphaFunc(GL_GREATER, LLSelectMgr::sHighlightAlphaTest);
                 glBegin(GL_TRIANGLES);
                 {
                         S32 i = 0;
@@ -5908,7 +5493,11 @@ void LLSelectMgr::updateSelectionCenter()
         const F32 MOVE_SELECTION_THRESHOLD = 1.f;               //  Movement threshold in meters for updating selection
                                                                                                         //  center (tractor beam)
 
-        LLViewerObject* object = mSelectedObjects.getFirstObject();
+        //override any object updates received
+        //for selected objects
+        gSelectMgr->overrideObjectUpdates();
+
+        LLViewerObject* object = mSelectedObjects->getFirstObject();
         if (!object)
         {
                 // nothing selected, probably grabbing
@@ -5925,9 +5514,9 @@ void LLSelectMgr::updateSelectionCenter()
         }
         else
         {
-                mSelectType = getSelectTypeForObject(object);
+                mSelectedObjects->mSelectType = getSelectTypeForObject(object);
 
-                if (mSelectType == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+                if (mSelectedObjects->mSelectType == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
                 {
                         mPauseRequest = gAgent.getAvatarObject()->requestPause();
                 }
@@ -5936,7 +5525,7 @@ void LLSelectMgr::updateSelectionCenter()
                         mPauseRequest = NULL;
                 }
 
-                if (mSelectType != SELECT_TYPE_HUD && gAgent.getAvatarObject())
+                if (mSelectedObjects->mSelectType != SELECT_TYPE_HUD && gAgent.getAvatarObject())
                 {
                         // reset hud ZOOM
                         gAgent.getAvatarObject()->mHUDTargetZoom = 1.f;
@@ -5952,11 +5541,11 @@ void LLSelectMgr::updateSelectionCenter()
                 gHUDManager->clearJoints();
                 LLDynamicArray < LLViewerObject *> jointed_objects;
 
-                for (object = mSelectedObjects.getFirstObject(); object; object = mSelectedObjects.getNextObject() )
+                for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() )
                 {
                         LLViewerObject *myAvatar = gAgent.getAvatarObject();
                         LLViewerObject *root = object->getRootEdit();
-                        if (mSelectType == SELECT_TYPE_WORLD && // not an attachment
+                        if (mSelectedObjects->mSelectType == SELECT_TYPE_WORLD && // not an attachment
                                 !root->isChild(myAvatar) && // not the object you're sitting on
                                 !object->isAvatar()) // not another avatar
                         {
@@ -5981,9 +5570,9 @@ void LLSelectMgr::updateSelectionCenter()
                 }
         }
         
-        if ( !(gAgentID == LLUUID::null) ) 
+        if ( !(gAgentID == LLUUID::null) && gToolMgr) 
         {
-                LLTool          *tool = gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) );
+                LLTool          *tool = gToolMgr->getCurrentTool();
                 if (mShowSelection)
                 {
                         LLVector3d select_center_global;
@@ -6010,7 +5599,7 @@ void LLSelectMgr::updateSelectionCenter()
         }
 
         // give up edit menu if no objects selected
-        if (gEditMenuHandler == this && getObjectCount() == 0)
+        if (gEditMenuHandler == this && mSelectedObjects->getObjectCount() == 0)
         {
                 gEditMenuHandler = NULL;
         }
@@ -6020,7 +5609,7 @@ void LLSelectMgr::updatePointAt()
 {
         if (mShowSelection)
         {
-                if (getObjectCount())
+                if (mSelectedObjects->getObjectCount())
                 {                                       
                         LLVector3 select_offset;
                         LLViewerObject *click_object = gObjectList.findObject(gLastHitObjectID);
@@ -6036,8 +5625,8 @@ void LLSelectMgr::updatePointAt()
                         else
                         {
                                 // didn't click on an object this time, revert to pointing at center of first object
-                                gAgent.setPointAt(POINTAT_TARGET_SELECT, getFirstObject());
-                                gAgent.setLookAt(LOOKAT_TARGET_SELECT, getFirstObject());
+                                gAgent.setPointAt(POINTAT_TARGET_SELECT, mSelectedObjects->getFirstObject());
+                                gAgent.setLookAt(LOOKAT_TARGET_SELECT, mSelectedObjects->getFirstObject());
                         }
                 }
                 else
@@ -6067,7 +5656,7 @@ LLBBox LLSelectMgr::getBBoxOfSelection() const
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::canUndo()
 {
-        return getFirstEditableObject() != NULL;
+        return mSelectedObjects->getFirstEditableObject() != NULL;
 }
 
 //-----------------------------------------------------------------------------
@@ -6085,7 +5674,7 @@ void LLSelectMgr::undo()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::canRedo()
 {
-        return getFirstEditableObject() != NULL;
+        return mSelectedObjects->getFirstEditableObject() != NULL;
 }
 
 //-----------------------------------------------------------------------------
@@ -6103,7 +5692,7 @@ void LLSelectMgr::redo()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::canDoDelete()
 {
-        return getFirstDeleteableObject() != NULL;
+        return mSelectedObjects->getFirstDeleteableObject() != NULL;
 }
 
 //-----------------------------------------------------------------------------
@@ -6119,7 +5708,7 @@ void LLSelectMgr::doDelete()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::canDeselect()
 {
-        return !isEmpty();
+        return !mSelectedObjects->isEmpty();
 }
 
 //-----------------------------------------------------------------------------
@@ -6134,7 +5723,7 @@ void LLSelectMgr::deselect()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::canDuplicate()
 {
-        return getFirstCopyableObject() != NULL;
+        return mSelectedObjects->getFirstCopyableObject() != NULL;
 }
 //-----------------------------------------------------------------------------
 // duplicate()
@@ -6144,125 +5733,6 @@ void LLSelectMgr::duplicate()
         LLVector3 offset(0.5f, 0.5f, 0.f);
         selectDuplicate(offset, TRUE);
 }
-//-----------------------------------------------------------------------------
-// undoRedo()
-//-----------------------------------------------------------------------------
-U32 LLSelectMgr::undoRedo(std::deque<LLSelectAction*> &queue_src, std::deque<LLSelectAction*> &queue_dst, const LLUUID &object_id)
-{
-        if (queue_src.size() == 0)
-        {
-                return 0;
-        }
-
-        U32 update_type = 0;
-        std::deque<LLSelectAction*> temp_queue;
-        LLSelectAction* src_actionp = queue_src.back();
-
-        while (src_actionp->mObjectID != object_id)
-        {
-                temp_queue.push_back(src_actionp);
-                queue_src.pop_back();
-                if (!queue_src.size())
-                {
-                        // put everything back
-                        LLSelectAction* actionp;
-                        while (temp_queue.size())
-                        {
-                                actionp = temp_queue.back();
-                                temp_queue.pop_back();
-                                queue_src.push_back(actionp);
-                        }
-                        return 0;
-                }
-                src_actionp = queue_src.back();
-        }
-
-        if(src_actionp)
-        {
-                LLSelectAction* dst_actionp = new LLSelectAction();
-                dst_actionp->mActionType = src_actionp->mActionType;
-                dst_actionp->mObjectID = src_actionp->mObjectID;
-                dst_actionp->mIndividualSelection = src_actionp->mIndividualSelection;
-
-                LLViewerObject* object = gObjectList.findObject(src_actionp->mObjectID);
-                if (object && object->mDrawable.notNull())
-                {
-                        LLVector3 old_position_local = object->getPosition();
-
-                        switch(src_actionp->mActionType)
-                        {
-                        case SELECT_ACTION_TYPE_MOVE:
-                                dst_actionp->mPosition = object->mDrawable->getPosition();
-                                object->setPosition(src_actionp->mPosition, TRUE);
-                                if (object->isRootEdit() && src_actionp->mIndividualSelection)
-                                {
-                                        // counter-translate children
-                                        LLVector3 parent_offset = (src_actionp->mPosition - old_position_local) * ~object->getRotation();
-
-                                        // counter-translate child objects if we are moving the root as an individual
-                                        for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++)
-                                        {
-                                                LLViewerObject* childp = object->mChildList[child_num];
-                                                childp->setPosition(childp->getPosition() - parent_offset);
-                                        }
-                                }
-                                update_type |= UPD_POSITION;
-                                break;
-                        case SELECT_ACTION_TYPE_ROTATE:
-                                dst_actionp->mPosition = object->mDrawable->getPosition();
-                                dst_actionp->mRotation = object->mDrawable->getRotation();
-                                object->setRotation(src_actionp->mRotation, TRUE);
-                                object->setPosition(src_actionp->mPosition, TRUE);
-                                if (object->isRootEdit() && src_actionp->mIndividualSelection)
-                                {
-                                        // counter-translate and rotate children
-                                        LLVector3 parent_offset = (src_actionp->mPosition - old_position_local) * ~object->getRotation();
-
-                                        for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++)
-                                        {
-                                                LLViewerObject* childp = object->mChildList[child_num];
-                                                LLQuaternion delta_rot_inv = dst_actionp->mRotation * ~src_actionp->mRotation;
-                                                childp->setPosition((childp->getPosition() * delta_rot_inv) - parent_offset);
-                                                childp->setRotation(childp->getRotation() * delta_rot_inv );
-                                        }
-                                }
-                                update_type |= UPD_ROTATION | UPD_POSITION;
-                                break;
-                        case SELECT_ACTION_TYPE_SCALE:
-                                dst_actionp->mPosition = object->mDrawable->getPosition();
-                                dst_actionp->mScale = object->getScale();
-                                object->setScale(src_actionp->mScale, TRUE);
-                                object->setPosition(src_actionp->mPosition, TRUE);
-                                update_type |= UPD_SCALE | UPD_POSITION;
-                                break;
-                        default:
-                                // do nothing
-                                break;
-                        }
-                }
-                queue_src.pop_back();
-                delete src_actionp;
-                queue_dst.push_back(dst_actionp);
-                while (queue_dst.size() > (U32)MAX_ACTION_QUEUE_SIZE)
-                {
-                        LLSelectAction* action = queue_dst.front();
-                        queue_dst.pop_front();
-                        delete action;
-                }
-
-        }
-
-        // put everything back
-        LLSelectAction* actionp;
-        while (temp_queue.size())
-        {
-                actionp = temp_queue.back();
-                temp_queue.pop_back();
-                queue_src.push_back(actionp);
-        }
-
-        return update_type;
-}
 
 ESelectType LLSelectMgr::getSelectTypeForObject(LLViewerObject* object)
 {
@@ -6287,7 +5757,7 @@ ESelectType LLSelectMgr::getSelectTypeForObject(LLViewerObject* object)
 void LLSelectMgr::validateSelection()
 {
         LLViewerObject* objectp;
-        for (objectp = getFirstObject(); objectp; objectp = getNextObject())
+        for (objectp = mSelectedObjects->getFirstObject(); objectp; objectp = mSelectedObjects->getNextObject())
         {
                 if (!canSelectObject(objectp))
                 {
@@ -6323,64 +5793,71 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
         if (object->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH) return FALSE;
 
         ESelectType selection_type = getSelectTypeForObject(object);
-        if (getObjectCount() > 0 && mSelectType != selection_type) return FALSE;
+        if (mSelectedObjects->getObjectCount() > 0 && mSelectedObjects->mSelectType != selection_type) return FALSE;
 
         return TRUE;
 }
 
-LLSelectNodeList::LLSelectNodeList() : std::list<LLSelectNode*>()
+LLObjectSelection::LLObjectSelection() : 
+        std::list<LLSelectNode*>(), 
+        LLRefCount(),
+        mCurrentNode(end()),
+        mCurrentTE(-1),
+        mSelectType(SELECT_TYPE_WORLD)
 {
-        mCurrentTE = -1;
-        mCurrentNode = end();
 }
 
-LLSelectNodeList::~LLSelectNodeList()
+LLObjectSelection::~LLObjectSelection()
 {
         std::for_each(begin(), end(), DeletePointer());
 }
 
-void LLSelectNodeList::updateEffects()
+void LLObjectSelection::updateEffects()
 {
 }
 
-S32 LLSelectNodeList::getNumNodes()
+S32 LLObjectSelection::getNumNodes()
 {
         return size();
 }
 
-void LLSelectNodeList::addNode(LLSelectNode *nodep)
+void LLObjectSelection::addNode(LLSelectNode *nodep)
 {
         push_front(nodep);
         mSelectNodeMap[nodep->getObject()] = nodep;
 }
 
-void LLSelectNodeList::addNodeAtEnd(LLSelectNode *nodep)
+void LLObjectSelection::addNodeAtEnd(LLSelectNode *nodep)
 {
         push_back(nodep);
         mSelectNodeMap[nodep->getObject()] = nodep;
 }
 
-void LLSelectNodeList::removeNode(LLSelectNode *nodep)
+void LLObjectSelection::removeNode(LLSelectNode *nodep)
 {
-        std::list<LLSelectNode*>::iterator iter;
-        for (iter = begin(); iter != end(); ++iter)
+        std::list<LLSelectNode*>::iterator iter = begin();
+        while(iter != end())
         {
                 if ((*iter) == nodep)
                 {
                         mSelectNodeMap.erase(nodep->getObject());
-                        erase(iter++);
+                        iter = erase(iter);
+                }
+                else
+                {
+                        ++iter;
                 }
         }
 }
 
-void LLSelectNodeList::deleteAllNodes()
+void LLObjectSelection::deleteAllNodes()
 {
         std::for_each(begin(), end(), DeletePointer());
         clear();
         mSelectNodeMap.clear();
 }
 
-LLSelectNode* LLSelectNodeList::findNode(LLViewerObject* objectp)
+LLSelectNode* LLObjectSelection::findNode(LLViewerObject* objectp)
 {
         std::map<LLViewerObject*, LLSelectNode*>::iterator found_it = mSelectNodeMap.find(objectp);
         if (found_it != mSelectNodeMap.end())
@@ -6393,7 +5870,7 @@ LLSelectNode* LLSelectNodeList::findNode(LLViewerObject* objectp)
 //-----------------------------------------------------------------------------
 // getFirstNode()
 //-----------------------------------------------------------------------------
-LLSelectNode *LLSelectNodeList::getFirstNode()
+LLSelectNode *LLObjectSelection::getFirstNode()
 {
         mCurrentNode = begin();//getFirstData();
 
@@ -6414,7 +5891,7 @@ LLSelectNode *LLSelectNodeList::getFirstNode()
 //-----------------------------------------------------------------------------
 // getCurrentNode()
 //-----------------------------------------------------------------------------
-LLSelectNode *LLSelectNodeList::getCurrentNode()
+LLSelectNode *LLObjectSelection::getCurrentNode()
 {
         while (mCurrentNode != end() && !(*mCurrentNode)->getObject())
         {
@@ -6432,7 +5909,7 @@ LLSelectNode *LLSelectNodeList::getCurrentNode()
 //-----------------------------------------------------------------------------
 // getNextNode()
 //-----------------------------------------------------------------------------
-LLSelectNode *LLSelectNodeList::getNextNode()
+LLSelectNode *LLObjectSelection::getNextNode()
 {
         ++mCurrentNode;
 
@@ -6454,7 +5931,7 @@ LLSelectNode *LLSelectNodeList::getNextNode()
 //-----------------------------------------------------------------------------
 // getFirstObject()
 //-----------------------------------------------------------------------------
-LLViewerObject* LLSelectNodeList::getFirstObject()
+LLViewerObject* LLObjectSelection::getFirstObject()
 {
         mCurrentNode = begin();
 
@@ -6476,7 +5953,7 @@ LLViewerObject* LLSelectNodeList::getFirstObject()
 //-----------------------------------------------------------------------------
 // getNextObject()
 //-----------------------------------------------------------------------------
-LLViewerObject* LLSelectNodeList::getNextObject()
+LLViewerObject* LLObjectSelection::getNextObject()
 {
         ++mCurrentNode;// = getNextData();
 
@@ -6499,7 +5976,7 @@ LLViewerObject* LLSelectNodeList::getNextObject()
 //-----------------------------------------------------------------------------
 // getPrimaryTE()
 //-----------------------------------------------------------------------------
-void LLSelectNodeList::getPrimaryTE(LLViewerObject* *object, S32 *te)
+void LLObjectSelection::getPrimaryTE(LLViewerObject* *object, S32 *te)
 {
         // initialize object and te
         *te = 0;
@@ -6554,7 +6031,7 @@ void LLSelectNodeList::getPrimaryTE(LLViewerObject* *object, S32 *te)
 //-----------------------------------------------------------------------------
 // getFirstTE()
 //-----------------------------------------------------------------------------
-void LLSelectNodeList::getFirstTE(LLViewerObject* *object, S32 *te)
+void LLObjectSelection::getFirstTE(LLViewerObject* *object, S32 *te)
 {
         // start with first face
         mCurrentTE = 0;
@@ -6608,7 +6085,7 @@ void LLSelectNodeList::getFirstTE(LLViewerObject* *object, S32 *te)
 //-----------------------------------------------------------------------------
 // getNextFace()
 //-----------------------------------------------------------------------------
-void LLSelectNodeList::getNextTE(LLViewerObject* *object, S32 *te)
+void LLObjectSelection::getNextTE(LLViewerObject* *object, S32 *te)
 {
         // try next face
         mCurrentTE++;
@@ -6651,7 +6128,7 @@ void LLSelectNodeList::getNextTE(LLViewerObject* *object, S32 *te)
         return;
 }
 
-void LLSelectNodeList::getCurrentTE(LLViewerObject* *object, S32 *te)
+void LLObjectSelection::getCurrentTE(LLViewerObject* *object, S32 *te)
 {
         if (mCurrentNode != end())
         {
@@ -6667,7 +6144,7 @@ void LLSelectNodeList::getCurrentTE(LLViewerObject* *object, S32 *te)
 //-----------------------------------------------------------------------------
 // getFirstRootNode()
 //-----------------------------------------------------------------------------
-LLSelectNode *LLSelectNodeList::getFirstRootNode()
+LLSelectNode *LLObjectSelection::getFirstRootNode()
 {
         LLSelectNode *cur_node = getFirstNode();
 
@@ -6686,7 +6163,7 @@ LLSelectNode *LLSelectNodeList::getFirstRootNode()
 //-----------------------------------------------------------------------------
 // getNextRootNode()
 //-----------------------------------------------------------------------------
-LLSelectNode *LLSelectNodeList::getNextRootNode()
+LLSelectNode *LLObjectSelection::getNextRootNode()
 {
         LLSelectNode *cur_node = getNextNode();
 
@@ -6704,7 +6181,7 @@ LLSelectNode *LLSelectNodeList::getNextRootNode()
 //-----------------------------------------------------------------------------
 // getFirstRootObject()
 //-----------------------------------------------------------------------------
-LLViewerObject *LLSelectNodeList::getFirstRootObject()
+LLViewerObject *LLObjectSelection::getFirstRootObject()
 {
         LLSelectNode *node = getFirstRootNode();
 
@@ -6722,7 +6199,7 @@ LLViewerObject *LLSelectNodeList::getFirstRootObject()
 //-----------------------------------------------------------------------------
 // getNextRootObject()
 //-----------------------------------------------------------------------------
-LLViewerObject *LLSelectNodeList::getNextRootObject()
+LLViewerObject *LLObjectSelection::getNextRootObject()
 {
         LLSelectNode *node = getNextRootNode();
 
@@ -6739,7 +6216,7 @@ LLViewerObject *LLSelectNodeList::getNextRootObject()
 //-----------------------------------------------------------------------------
 // isEmpty()
 //-----------------------------------------------------------------------------
-BOOL LLSelectNodeList::isEmpty()
+BOOL LLObjectSelection::isEmpty()
 {
         return (size() == 0);
 }
@@ -6747,7 +6224,7 @@ BOOL LLSelectNodeList::isEmpty()
 //-----------------------------------------------------------------------------
 // getOwnershipCost()
 //-----------------------------------------------------------------------------
-BOOL LLSelectNodeList::getOwnershipCost(S32 &cost)
+BOOL LLObjectSelection::getOwnershipCost(S32 &cost)
 {
         S32 count = 0;
         for( LLSelectNode* nodep = getFirstNode(); nodep; nodep = getNextNode() )
@@ -6759,3 +6236,341 @@ BOOL LLSelectNodeList::getOwnershipCost(S32 &cost)
 
         return (count > 0);
 }
+
+
+
+//-----------------------------------------------------------------------------
+// getObjectCount()
+//-----------------------------------------------------------------------------
+S32 LLObjectSelection::getObjectCount()
+{
+        return getNumNodes();
+}
+
+
+//-----------------------------------------------------------------------------
+// getTECount()
+//-----------------------------------------------------------------------------
+S32 LLObjectSelection::getTECount()
+{
+        S32 count = 0;
+
+        LLSelectNode* nodep;
+        for (nodep = getFirstNode(); nodep; nodep = getNextNode() )
+        {
+                if (nodep->getObject())
+                {
+                        S32 num_tes = nodep->getObject()->getNumTEs();
+                        for (S32 te = 0; te < num_tes; te++)
+                        {
+                                if (nodep->isTESelected(te))
+                                {
+                                        count++;
+                                }
+                        }
+                }
+        }
+
+        return count;
+}
+
+//-----------------------------------------------------------------------------
+// getRootObjectCount()
+//-----------------------------------------------------------------------------
+S32 LLObjectSelection::getRootObjectCount()
+{
+        LLSelectNode *nodep;
+
+        S32 count = 0;
+        for(nodep = getFirstRootNode(); nodep; nodep = getNextRootNode())
+        {
+                ++count;
+        }
+        return count;
+}
+
+bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func)
+{
+        bool result = true;
+        LLViewerObject* object;
+        for (object = getFirstObject(); object != NULL; object = getNextObject())
+        {
+                result = result && func->apply(object);
+        }
+        return result;
+}
+
+bool LLObjectSelection::applyToRootObjects(LLSelectedObjectFunctor* func)
+{
+        bool result = true;
+        LLViewerObject* object;
+        for (object = getFirstRootObject(); 
+                 object != NULL; 
+                 object = getNextRootObject())
+        {
+                result = result && func->apply(object);
+        }
+        return result;
+}
+
+bool LLObjectSelection::applyToNodes(LLSelectedNodeFunctor *func)
+{
+        bool result = true;
+        LLSelectNode* node;
+        for (node = getFirstNode(); node != NULL; node = getNextNode())
+        {
+                result = result && func->apply(node);
+        }
+        return result;
+}
+
+//-----------------------------------------------------------------------------
+// contains()
+//-----------------------------------------------------------------------------
+BOOL LLObjectSelection::contains(LLViewerObject* object)
+{
+        return findNode(object) != NULL;
+}
+
+
+//-----------------------------------------------------------------------------
+// contains()
+//-----------------------------------------------------------------------------
+BOOL LLObjectSelection::contains(LLViewerObject* object, S32 te)
+{
+        LLSelectNode *nodep;
+        if (te == SELECT_ALL_TES)
+        {
+                // ...all faces
+                for (nodep = getFirstNode(); nodep; nodep = getNextNode() )
+                {
+                        if (nodep->getObject() == object)
+                        {
+                                BOOL all_selected = TRUE;
+                                for (S32 i = 0; i < SELECT_MAX_TES; i++)
+                                {
+                                        all_selected = all_selected && nodep->isTESelected(i);
+                                }
+                                return all_selected;
+                        }
+                }
+                return FALSE;
+        }
+        else
+        {
+                // ...one face
+                for (nodep = getFirstNode(); nodep; nodep = getNextNode() )
+                {
+                        if (nodep->getObject() == object && nodep->isTESelected(te))
+                        {
+                                return TRUE;
+                        }
+                }
+                return FALSE;
+        }
+}
+
+// returns TRUE is any node is currenly worn as an attachment
+BOOL LLObjectSelection::isAttachment()
+{
+        return (mSelectType == SELECT_TYPE_ATTACHMENT || mSelectType == SELECT_TYPE_HUD);
+}
+
+//-----------------------------------------------------------------------------
+// getFirstMoveableNode()
+//-----------------------------------------------------------------------------
+LLSelectNode* LLObjectSelection::getFirstMoveableNode(BOOL get_root)
+{
+        LLSelectNode* selectNode = NULL;
+
+        if (get_root)
+        {
+                for(selectNode = getFirstRootNode(); selectNode; selectNode = getNextRootNode())
+                {
+                        if( selectNode->getObject()->permMove() )
+                        {
+                                return selectNode;
+                                break;
+                        }
+                }
+        }
+        for(selectNode = getFirstNode(); selectNode; selectNode = getNextNode())
+        {
+                if( selectNode->getObject()->permMove() )
+                {
+                        return selectNode;
+                        break;
+                }
+        }
+        
+        return NULL;
+}
+
+//-----------------------------------------------------------------------------
+// getFirstCopyableObject()
+//-----------------------------------------------------------------------------
+LLViewerObject* LLObjectSelection::getFirstCopyableObject(BOOL get_root)
+{
+        LLViewerObject* object = NULL;
+        for(LLViewerObject* cur = getFirstObject(); cur; cur = getNextObject())
+        {
+                if( cur->permCopy() && !cur->isAttachment())
+                {
+                        object = cur;
+                        break;
+                }
+        }       
+
+        if (get_root && object)
+        {
+                LLViewerObject *parent;
+                while ((parent = (LLViewerObject*)object->getParent()))
+                {
+                        if (parent->isSelected())
+                        {
+                                object = parent;
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+        }
+
+        return object;
+}
+
+
+//-----------------------------------------------------------------------------
+// getFirstDeleteableObject()
+//-----------------------------------------------------------------------------
+LLViewerObject* LLObjectSelection::getFirstDeleteableObject(BOOL get_root)
+{
+        //RN: don't currently support deletion of child objects, as that requires separating them first
+        // then derezzing to trash
+        get_root = TRUE;
+
+        LLViewerObject* object = NULL;
+        if (get_root)
+        {
+                for(LLViewerObject* current = getFirstRootObject();
+                        current != NULL;
+                        current = getNextRootObject())
+                {
+                        // you can delete an object if permissions allow it, you are
+                        // the owner, you are an officer in the group that owns the
+                        // object, or you are not the owner but it is on land you own
+                        // or land owned by your group. (whew!)
+                        if(   (current->permModify()) 
+                        || (current->permYouOwner())
+                        || (!current->permAnyOwner())                   // public
+                        || (current->isOverAgentOwnedLand())
+                        || (current->isOverGroupOwnedLand())
+                        )
+                        {
+
+                                if( !current->isAttachment() )
+                                {
+                                        object = current;
+                                        break;
+                                }
+                        }
+                }       
+        }
+        else
+        {
+                for(LLViewerObject* current = getFirstObject();
+                        current != NULL;
+                        current = getNextObject())
+                {
+                        // you can delete an object if permissions allow it, you are
+                        // the owner, you are an officer in the group that owns the
+                        // object, or you are not the owner but it is on land you own
+                        // or land owned by your group. (whew!)
+                        if(   (current->permModify()) 
+                        || (current->permYouOwner())
+                        || (!current->permAnyOwner())                   // public
+                        || (current->isOverAgentOwnedLand())
+                        || (current->isOverGroupOwnedLand())
+                        )
+                        {
+                                if( !current->isAttachment() )
+                                {
+                                        object = current;
+                                        break;
+                                }
+                        }
+                }       
+        }
+
+        return object;
+}
+
+
+//-----------------------------------------------------------------------------
+// getFirstEditableObject()
+//-----------------------------------------------------------------------------
+LLViewerObject* LLObjectSelection::getFirstEditableObject(BOOL get_root)
+{
+        LLViewerObject* object = NULL;
+        for(LLViewerObject* cur = getFirstObject(); cur; cur = getNextObject())
+        {
+                if( cur->permModify() )
+                {
+                        object = cur;
+                        break;
+                }
+        }       
+
+        if (get_root && object)
+        {
+                LLViewerObject *parent;
+                while ((parent = (LLViewerObject*)object->getParent()))
+                {
+                        if (parent->isSelected())
+                        {
+                                object = parent;
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+        }
+
+        return object;
+}
+
+//-----------------------------------------------------------------------------
+// getFirstMoveableObject()
+//-----------------------------------------------------------------------------
+LLViewerObject* LLObjectSelection::getFirstMoveableObject(BOOL get_root)
+{
+        LLViewerObject* object = NULL;
+        for(LLViewerObject* cur = getFirstObject(); cur; cur = getNextObject())
+        {
+                if( cur->permMove() )
+                {
+                        object = cur;
+                        break;
+                }
+        }       
+
+        if (get_root && object && !object->isJointChild())
+        {
+                LLViewerObject *parent;
+                while ((parent = (LLViewerObject*)object->getParent()))
+                {
+                        if (parent->isSelected())
+                        {
+                                object = parent;
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+        }
+
+        return object;
+}
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index fe54360..4b9a550 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -110,11 +110,12 @@ typedef enum e_selection_type
         SELECT_TYPE_HUD
 }ESelectType;
 
-class LLSelectNodeList : public std::list<LLSelectNode*>
+class LLObjectSelection : public std::list<LLSelectNode*>, public LLRefCount
 {
+        friend class LLSelectMgr;
 public:
-        LLSelectNodeList();
-        virtual ~LLSelectNodeList();
+        LLObjectSelection();
+        virtual ~LLObjectSelection();
 
         void updateEffects();
 
@@ -129,6 +130,8 @@ public:
         LLSelectNode *getFirstRootNode();
         LLSelectNode *getNextRootNode();
 
+        LLSelectNode*   getFirstMoveableNode(BOOL get_root = FALSE);
+
         // iterate through objects
         LLViewerObject* getFirstObject();
         LLViewerObject* getNextObject();
@@ -137,6 +140,12 @@ public:
         LLViewerObject *getFirstRootObject();
         LLViewerObject *getNextRootObject();
 
+        LLViewerObject* getFirstEditableObject(BOOL get_root = FALSE);
+        LLViewerObject* getFirstCopyableObject(BOOL get_root = FALSE);
+        LLViewerObject* getFirstDeleteableObject(BOOL get_root = FALSE);
+        LLViewerObject* getFirstMoveableObject(BOOL get_root = FALSE);
+        LLViewerObject* getPrimaryObject() { return mPrimaryObject; }
+
         // iterate through texture entries
         void getPrimaryTE(LLViewerObject* *object, S32 *te);
         void getFirstTE(LLViewerObject* *object, S32 *te);
@@ -149,24 +158,37 @@ public:
         void deleteAllNodes();                  // Delete all nodes
         S32 getNumNodes();
         LLSelectNode* findNode(LLViewerObject* objectp);
+
+        // count members
+        S32 getObjectCount();
+        S32 getTECount();
+        S32 getRootObjectCount();
+
+        BOOL contains(LLViewerObject* object);
+        BOOL contains(LLViewerObject* object, S32 te);
+
+        // returns TRUE is any node is currenly worn as an attachment
+        BOOL isAttachment();
+
+        // Apply functors to various subsets of the selected objects
+        // Returns the AND of all apply() calls.
+        bool applyToRootObjects(LLSelectedObjectFunctor* func);
+        bool applyToObjects(LLSelectedObjectFunctor* func);
+        bool applyToNodes(LLSelectedNodeFunctor* func);
+
+        ESelectType getSelectType() { return mSelectType; }
+
 private:
-        const LLSelectNodeList &operator=(const LLSelectNodeList &);
+        const LLObjectSelection &operator=(const LLObjectSelection &);
 
-        std::list<LLSelectNode*>::iterator mCurrentNode;
-        S32 mCurrentTE;
-        std::map<LLViewerObject*, LLSelectNode*> mSelectNodeMap;
+        LLPointer<LLViewerObject>                                       mPrimaryObject;
+        std::list<LLSelectNode*>::iterator                      mCurrentNode;
+        S32                                                                                     mCurrentTE;
+        std::map<LLViewerObject*, LLSelectNode*>        mSelectNodeMap;
+        ESelectType                                                                     mSelectType;
 };
 
-struct LLSelectAction
-{
-public:
-        EActionType     mActionType;
-        LLVector3       mPosition;
-        LLVector3       mScale;
-        LLQuaternion    mRotation;
-        LLUUID          mObjectID;
-        BOOL            mIndividualSelection;
-};
+typedef LLHandle<LLObjectSelection> LLObjectSelectionHandle;
 
 class LLSelectMgr : public LLEditMenuHandler
 {
@@ -187,6 +209,7 @@ public:
         static LLColor4                         sHighlightChildColor;
         static LLColor4                         sHighlightInspectColor;
         static LLColor4                         sContextSilhouetteColor;
+
 public:
         LLSelectMgr();
         ~LLSelectMgr();
@@ -207,115 +230,91 @@ public:
         virtual void duplicate();
         virtual BOOL canDuplicate();
 
-        // Apply functors to various subsets of the selected objects
-        // Returns the AND of all apply() calls.
-        bool applyToRootObjects(LLSelectedObjectFunctor* func);
-        bool applyToObjects(LLSelectedObjectFunctor* func);
-        bool applyToNodes(LLSelectedNodeFunctor* func);
-
         void updateEffects(); // Update HUD effects
+        void overrideObjectUpdates();
 
         void setForceSelection(BOOL force) { mForceSelection = force; }
 
+        ////////////////////////////////////////////////////////////////
+        // Selection methods
+        ////////////////////////////////////////////////////////////////
+
+        ////////////////////////////////////////////////////////////////
+        // Add
+        ////////////////////////////////////////////////////////////////
+
         // For when you want just a child object.
-        void selectObjectOnly(LLViewerObject* object, S32 face = SELECT_ALL_TES);
+        LLObjectSelectionHandle selectObjectOnly(LLViewerObject* object, S32 face = SELECT_ALL_TES);
 
         // This method is meant to select an object, and then select all
         // of the ancestors and descendents. This should be the normal behavior.
-        void selectObjectAndFamily(LLViewerObject* object, BOOL add_to_end = FALSE);
+        LLObjectSelectionHandle selectObjectAndFamily(LLViewerObject* object, BOOL add_to_end = FALSE);
 
         // Same as above, but takes a list of objects.  Used by rectangle select.
-        void selectObjectAndFamily(const LLDynamicArray<LLViewerObject*>& object_list, BOOL send_to_sim = TRUE);
+        LLObjectSelectionHandle selectObjectAndFamily(const LLDynamicArray<LLViewerObject*>& object_list, BOOL send_to_sim = TRUE);
 
-        void deselectObjectOnly(LLViewerObject* object, BOOL send_to_sim = TRUE);
+        // converts all objects currently highlighted to a selection, and returns it
+        LLObjectSelectionHandle selectHighlightedObjects();
 
-        void deselectObjectAndFamily(LLViewerObject* object, BOOL send_to_sim = TRUE);
+        LLObjectSelectionHandle setHoverObject(LLViewerObject *objectp);
 
-        void deselectTransient(); // deselect "temporarily" selected objects (via pie menu)
-        void convertTransient(); // converts temporarily selected objects to full-fledged selections
+        void highlightObjectOnly(LLViewerObject *objectp);
+        void highlightObjectAndFamily(LLViewerObject *objectp);
+        void highlightObjectAndFamily(const LLDynamicArray<LLViewerObject*>& list);
+
+        ////////////////////////////////////////////////////////////////
+        // Remove
+        ////////////////////////////////////////////////////////////////
+
+        void deselectObjectOnly(LLViewerObject* object, BOOL send_to_sim = TRUE);
+        void deselectObjectAndFamily(LLViewerObject* object, BOOL send_to_sim = TRUE);
 
         // Send deselect messages to simulator, then clear the list
         void deselectAll();
 
+        // deselect only if nothing else currently referencing the selection
+        void deselectUnused();
+
         // Deselect if the selection center is too far away from the agent.
         void deselectAllIfTooFar();
 
-        BOOL selectionRemoveObject(const LLUUID &id);
-
-        BOOL contains(LLViewerObject* object);
-        BOOL contains(LLViewerObject* object, S32 te);
-
-        ESelectType getSelectType() { return mSelectType; }
-
-        // count members
-        S32 getObjectCount();
-        S32 getTECount();
-        S32 getRootObjectCount();
-
-        BOOL isEmpty()                          { return !mSelectedObjects.getNumNodes(); }
-
-        BOOL shouldShowSelection()      { return mShowSelection; }
-
-        LLSelectNodeList &getHoverObjects() { return mHoverObjects; }
-        LLSelectNodeList &getSelectedObjects() { return mSelectedObjects; }
-
-        // iterate through objects
-        LLViewerObject* getFirstObject()        { return mSelectedObjects.getFirstObject(); }
-        LLViewerObject* getNextObject()         { return mSelectedObjects.getNextObject(); }
-
-        // iterate through root objects
-        LLViewerObject *getFirstRootObject()    { return mSelectedObjects.getFirstRootObject(); }
-        LLViewerObject *getNextRootObject()             { return mSelectedObjects.getNextRootObject(); }
-
-        LLViewerObject* getFirstHighlightedObject() { return mHighlightedObjects.getFirstObject(); }
-        LLViewerObject* getNextHighlightedObject() { return mHighlightedObjects.getNextObject(); }
-
-        // iterate through tes
-        void getPrimaryTE(LLViewerObject* *object, S32 *te) { mSelectedObjects.getPrimaryTE(object, te); }
-        void getFirstTE(LLViewerObject* *object, S32 *te)       { mSelectedObjects.getFirstTE(object, te); }
-        void getNextTE(LLViewerObject* *object, S32 *te)        { mSelectedObjects.getNextTE(object, te); };
-
-        void setHoverObject(LLViewerObject *objectp);
-        
-        void addGridObject(LLViewerObject* objectp);
-        void clearGridObjects();
-        void setGridMode(EGridMode mode);
-        EGridMode getGridMode() { return mGridMode; }
-        void getGrid(LLVector3& origin, LLQuaternion& rotation, LLVector3 &scale);
+        // Removes all highlighted objects from current selection
+        void deselectHighlightedObjects();
 
-        void highlightObjectOnly(LLViewerObject *objectp);
-        void highlightObjectAndFamily(LLViewerObject *objectp);
-        void highlightObjectAndFamily(const LLDynamicArray<LLViewerObject*>& list);
         void unhighlightObjectOnly(LLViewerObject *objectp);
         void unhighlightObjectAndFamily(LLViewerObject *objectp);
         void unhighlightAll();
-        void selectHighlightedObjects();
-        void deselectHighlightedObjects();
 
-        LLSelectNode *findSelectNode(LLViewerObject *objectp);
-        LLSelectNode *getFirstRootNode()        { return mSelectedObjects.getFirstRootNode(); }
-        LLSelectNode *getNextRootNode()         { return mSelectedObjects.getNextRootNode(); }
-        LLSelectNode* getFirstNode()    { return mSelectedObjects.getFirstNode(); }
-        LLSelectNode* getNextNode()             { return mSelectedObjects.getNextNode(); }
+        BOOL removeObjectFromSelections(const LLUUID &id);
+
+        ////////////////////////////////////////////////////////////////
+        // Selection accessors
+        ////////////////////////////////////////////////////////////////
+        LLObjectSelectionHandle getHoverObjects() { return mHoverObjects; }
+        LLObjectSelectionHandle getSelection() { return mSelectedObjects; }
+        // right now this just renders the selection with root/child colors instead of a single color
+        LLObjectSelectionHandle getEditSelection() { convertTransient(); return mSelectedObjects; }
+        LLObjectSelectionHandle getHighlightedObjects() { return mHighlightedObjects; }
 
         LLSelectNode *getHoverNode();
 
+        ////////////////////////////////////////////////////////////////
+        // Grid manipulation
+        ////////////////////////////////////////////////////////////////
+        void                    addGridObject(LLViewerObject* objectp);
+        void                    clearGridObjects();
+        void                    setGridMode(EGridMode mode);
+        EGridMode               getGridMode() { return mGridMode; }
+        void                    getGrid(LLVector3& origin, LLQuaternion& rotation, LLVector3 &scale);
+
         BOOL getTEMode()                        { return mTEMode; }
         void setTEMode(BOOL b)  { mTEMode = b; }
 
-        LLViewerObject* getFirstCopyableObject(BOOL get_root = FALSE);
-        LLViewerObject* getFirstEditableObject(BOOL get_root = FALSE);
-        LLViewerObject* getFirstMoveableObject(BOOL get_root = FALSE);
-        LLViewerObject* getFirstDeleteableObject(BOOL get_root = FALSE);
-
-        LLSelectNode*   getFirstEditableNode(BOOL get_root = FALSE);
-        LLSelectNode*   getFirstMoveableNode(BOOL get_root = FALSE);
+        BOOL shouldShowSelection()      { return mShowSelection; }
 
         LLBBox getBBoxOfSelection() const;
         LLBBox getSavedBBoxOfSelection() const { return mSavedSelectionBBox; }
 
-        BOOL areMultpleEditableObjectsSelected();
-
         void dump();
         void cleanup();
 
@@ -323,17 +322,18 @@ public:
         void renderSilhouettes(BOOL for_hud);
         void enableSilhouette(BOOL enable) { mRenderSilhouettes = enable; }
         
-        // Utility functions to operate on the list
-
-        void                    saveSelectedObjectTransform(EActionType action_type);
-        void                    saveSelectedObjectColors();
-        void                    saveSelectedObjectTextures();
-
-        void                    selectionUpdatePhysics(BOOL use_physics);
-        void                    selectionUpdateTemporary(BOOL is_temporary);
-        void                    selectionUpdatePhantom(BOOL is_ghost);
-        void                    selectionUpdateCastShadows(BOOL cast_shadows);
-        void                    selectionDump();
+        ////////////////////////////////////////////////////////////////
+        // Utility functions that operate on the current selection
+        ////////////////////////////////////////////////////////////////
+        void saveSelectedObjectTransform(EActionType action_type);
+        void saveSelectedObjectColors();
+        void saveSelectedObjectTextures();
+
+        void selectionUpdatePhysics(BOOL use_physics);
+        void selectionUpdateTemporary(BOOL is_temporary);
+        void selectionUpdatePhantom(BOOL is_ghost);
+        void selectionUpdateCastShadows(BOOL cast_shadows);
+        void selectionDump();
 
         BOOL selectionAllPCode(LLPCode code);           // all objects have this PCode
         BOOL selectionGetMaterial(U8 *material);        // all objects have same material
@@ -362,11 +362,11 @@ public:
         void selectionSetMediaTypeAndURL( U8 media_type, const std::string& media_url );
         void selectionSetClickAction(U8 action);
 
-        void setObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE);
-        void setObjectName(const LLString& name);
-        void setObjectDescription(const LLString& desc);
-        void setObjectCategory(const LLCategory& category);
-        void setObjectSaleInfo(const LLSaleInfo& sale_info);
+        void selectionSetObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE);
+        void selectionSetObjectName(const LLString& name);
+        void selectionSetObjectDescription(const LLString& desc);
+        void selectionSetObjectCategory(const LLCategory& category);
+        void selectionSetObjectSaleInfo(const LLSaleInfo& sale_info);
 
         void selectionTexScaleAutofit(F32 repeats_per_meter);
         void selectionResetTexInfo(S32 te);                                             // sets S,T to 1
@@ -433,23 +433,20 @@ public:
         // with the aggregate permissions for texture inventory items of the selection.
         BOOL selectGetAggregateTexturePermissions(LLAggregatePermissions& ag_perm);
 
-        // returns TRUE is any node is currenly worn as an attachment
-        BOOL selectionIsAttachment();
-
         LLPermissions* findObjectPermissions(const LLViewerObject* object);
 
         void selectDelete();                                                    // Delete on simulator
-        void    selectForceDelete();                    // just delete, no into trash
+        void selectForceDelete();                       // just delete, no into trash
         void selectDuplicate(const LLVector3& offset, BOOL select_copy);        // Duplicate on simulator
         void repeatDuplicate();
-        void            selectDuplicateOnRay(const LLVector3 &ray_start_region,
-                                                                           const LLVector3 &ray_end_region,
-                                                                           BOOL bypass_raycast,
-                                                                           BOOL ray_end_is_intersection,
-                                                                           const LLUUID &ray_target_id,
-                                                                           BOOL copy_centers,
-                                                                           BOOL copy_rotates,
-                                                                           BOOL select_copy);
+        void selectDuplicateOnRay(const LLVector3 &ray_start_region,
+                                                                const LLVector3 &ray_end_region,
+                                                                BOOL bypass_raycast,
+                                                                BOOL ray_end_is_intersection,
+                                                                const LLUUID &ray_target_id,
+                                                                BOOL copy_centers,
+                                                                BOOL copy_rotates,
+                                                                BOOL select_copy);
 
         void sendMultipleUpdate(U32 type);      // Position, rotation, scale all in one
         void sendOwner(const LLUUID& owner_id, const LLUUID& group_id, BOOL override = FALSE);
@@ -490,7 +487,7 @@ public:
         void demoteSelectionToIndividuals();
 
 private:
-        
+        void convertTransient(); // converts temporarily selected objects to full-fledged selections
         ESelectType getSelectTypeForObject(LLViewerObject* object);
         void addAsFamily(LLDynamicArray<LLViewerObject*>& objects, BOOL add_to_end = FALSE);
         void generateSilhouette(LLSelectNode *nodep, const LLVector3& view_point);
@@ -501,7 +498,6 @@ private:
                                                         void (*pack_body)(LLSelectNode* node, void *user_data), 
                                                         void *user_data,
                                                         ESendType send_type);
-        U32 undoRedo(std::deque<LLSelectAction*> &queue_src, std::deque<LLSelectAction*> &queue_dst, const LLUUID &object_id);
 
         static void packAgentID(        void *);
         static void packAgentAndSessionID(void* user_data);
@@ -536,22 +532,19 @@ private:
         static void confirmDelete(S32 option, void* data);
         
 private:
-        LLPointer<LLViewerImage> mSilhouetteImagep;
-
-        LLSelectNodeList                mSelectedObjects;
-
-        LLSelectNodeList                mHoverObjects;
-
+        LLPointer<LLViewerImage>                                mSilhouetteImagep;
+        LLObjectSelectionHandle                                 mSelectedObjects;
+        LLObjectSelectionHandle                                 mHoverObjects;
+        LLObjectSelectionHandle                                 mHighlightedObjects;
         std::set<LLPointer<LLViewerObject> >    mRectSelectedObjects;
         
-        LLSelectNodeList                mGridObjects;
+        LLObjectSelection               mGridObjects;
         LLQuaternion                    mGridRotation;
         LLVector3                               mGridOrigin;
         LLVector3                               mGridScale;
         EGridMode                               mGridMode;
         BOOL                                    mGridValid;
 
-        LLSelectNodeList                mHighlightedObjects;
 
         BOOL                                    mTEMode;                        // render te
         LLVector3d                              mSelectionCenterGlobal;
@@ -563,15 +556,10 @@ private:
         BOOL                                    mRenderSilhouettes;     // do we render the silhouette
         LLBBox                                  mSavedSelectionBBox;
 
-        ESelectType                             mSelectType;
-
         LLFrameTimer                    mEffectsTimer;
         BOOL                                    mForceSelection;
 
-        std::deque<LLSelectAction*>     mUndoQueue;
-        std::deque<LLSelectAction*>     mRedoQueue;
-
-        LLAnimPauseRequest      mPauseRequest;
+        LLAnimPauseRequest              mPauseRequest;
 };
 
 
@@ -614,9 +602,12 @@ public:
         LLCategory              mCategory;
         S16                             mInventorySerial;
         LLVector3               mSavedPositionLocal;    // for interactively modifying object position
+        LLVector3               mLastPositionLocal;
         LLVector3d              mSavedPositionGlobal;   // for interactively modifying object position
         LLVector3               mSavedScale;                    // for interactively modifying object scale
+        LLVector3               mLastScale;
         LLQuaternion    mSavedRotation;                 // for interactively modifying object rotation
+        LLQuaternion    mLastRotation;
         BOOL                    mDuplicated;
         LLVector3d              mDuplicatePos;
         LLQuaternion    mDuplicateRot;
diff --git a/linden/indra/newview/llsky.cpp b/linden/indra/newview/llsky.cpp
index f4e305c..2888d95 100644
--- a/linden/indra/newview/llsky.cpp
+++ b/linden/indra/newview/llsky.cpp
@@ -366,7 +366,7 @@ void LLSky::updateCull()
 
         if (mVOStarsp.notNull() && mVOStarsp->mDrawable.notNull())
         {
-                gPipeline.markVisible(mVOStarsp->mDrawable);
+                gPipeline.markVisible(mVOStarsp->mDrawable, *gCamera);
         }
         else
         {
@@ -391,10 +391,10 @@ void LLSky::updateSky()
         }
         if (mVOStarsp)
         {
-                if (mVOStarsp->mDrawable)
-                {
-                        gPipeline.markRebuild(mVOStarsp->mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-                }
+                //if (mVOStarsp->mDrawable)
+                //{
+                //      gPipeline.markRebuild(mVOStarsp->mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
+                //}
         }
 }
 
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index fd9eec0..24ac1ca 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -29,25 +29,21 @@
 
 #include "llspatialpartition.h"
 
-#include "llglheaders.h"
-
+#include "llviewerwindow.h"
 #include "llviewerobjectlist.h"
 #include "llvovolume.h"
 #include "llviewercamera.h"
 #include "llface.h"
 #include "viewer.h"
-
+#include "llagent.h"
+#include "llviewerregion.h"
 #include "llcamera.h"
 #include "pipeline.h"
 
-static BOOL sIgnoreOcclusion = TRUE;
 static GLuint sBoxList = 0;
 
-const S32 SG_LOD_SWITCH_STAGGER = 4;
-const F32 SG_MAX_OBJ_RAD = 1.f;
-const F32 SG_OCCLUSION_FUDGE = 1.1f;
-const S32 SG_MOVE_PERIOD = 32;
-const S32 SG_LOD_PERIOD = 16;
+const F32 SG_OCCLUSION_FUDGE = 1.01f;
+//const S32 SG_LOD_PERIOD = 16;
 
 #define SG_DISCARD_TOLERANCE 0.25f
 
@@ -57,11 +53,12 @@ const S32 SG_LOD_PERIOD = 16;
 #define assert_octree_valid(x)
 #endif
 
+static U32 sZombieGroups = 0;
+
 static F32 sLastMaxTexPriority = 1.f;
 static F32 sCurMaxTexPriority = 1.f;
 
 //static counter for frame to switch LOD on
-S32 LLSpatialGroup::sLODSeed = 0;
 
 void sg_assert(BOOL expr)
 {
@@ -144,30 +141,22 @@ S32 LLSphereAABB(const LLVector3& center, const LLVector3& size, const LLVector3
 
 LLSpatialGroup::~LLSpatialGroup()
 {
-        LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
-        if (!safeToDelete())
+        if (isState(DEAD))
         {
-#ifdef LL_RELEASE_FOR_DOWNLOAD
-                llwarns << "Spatial Group deleted while being tracked " << ((void*) mState) << llendl;
-#else
-                llerrs << "Spatial Group deleted while being tracked " << ((void*) mState) << llendl;
-#endif
+                sZombieGroups--;
         }
 
-#if LL_OCTREE_PARANOIA_CHECK
-        for (U32 i = 0; i < mSpatialPartition->mOccludedList.size(); i++)
-        {
-                if (mSpatialPartition->mOccludedList[i] == this)
-                {
-                        llerrs << "Spatial Group deleted while being tracked STATE ERROR " << ((void*) mState) << llendl;
-                }
-        }
-#endif
+        LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
+        clearDrawMap();
 }
 
-BOOL LLSpatialGroup::safeToDelete()
+void LLSpatialGroup::clearDrawMap()
 {
-        return gQuit || !isState(IN_QUEUE | ACTIVE_OCCLUSION | RESHADOW_QUEUE);
+        for (LLSpatialGroup::draw_map_t::iterator i = mDrawMap.begin(); i != mDrawMap.end(); ++i)
+        {
+                std::for_each(i->second.begin(), i->second.end(), DeletePointer());
+        }
+        mDrawMap.clear();
 }
 
 class LLRelightPainter : public LLSpatialGroup::OctreeTraveler
@@ -212,13 +201,13 @@ public:
 
 BOOL LLSpatialGroup::isVisible()
 {
-        if (sIgnoreOcclusion)
+        if (LLPipeline::sUseOcclusion)
         {
-                return !isState(CULLED); 
+                return !isState(CULLED | OCCLUDED);
         }
         else
         {
-                return !isState(CULLED | OCCLUDED);
+                return !isState(CULLED); 
         }
 }
 
@@ -254,6 +243,90 @@ void LLSpatialGroup::validate()
 #endif
 }
 
+void validate_draw_info(LLDrawInfo& params)
+{
+#if LL_DEBUG
+/*      if (params.mVertexBuffer.isNull())
+        {
+                llerrs << "Draw batch has no vertex buffer." << llendl;
+        }
+        
+        //bad range
+        if (params.mStart >= params.mEnd)
+        {
+                llerrs << "Draw batch has invalid range." << llendl;
+        }
+        
+        if (params.mEnd >= params.mVertexBuffer->getNumVerts())
+        {
+                llerrs << "Draw batch has buffer overrun error." << llendl;
+        }
+        
+        if (params.mOffset + params.mCount > params.mVertexBuffer->getNumIndices())
+        {
+                llerrs << "Draw batch has index buffer ovverrun error." << llendl;
+        }
+        
+        //bad indices
+        U32* indicesp = (U32*) params.mVertexBuffer->getIndicesPointer();
+        if (indicesp)
+        {
+                for (U32 i = params.mOffset; i < params.mOffset+params.mCount; i++)
+                {
+                        if (indicesp[i] < params.mStart)
+                        {
+                                llerrs << "Draw batch has vertex buffer index out of range error (index too low)." << llendl;
+                        }
+                        
+                        if (indicesp[i] > params.mEnd)
+                        {
+                                llerrs << "Draw batch has vertex buffer index out of range error (index too high)." << llendl;
+                        }
+                }
+        }*/
+#endif
+}
+
+void LLSpatialGroup::validateDrawMap()
+{
+/*      for (draw_map_t::iterator i = mDrawMap.begin(); i != mDrawMap.end(); ++i)
+        {
+                std::vector<LLDrawInfo*>& draw_vec = i->second;
+                for (std::vector<LLDrawInfo*>::iterator j = draw_vec.begin(); j != draw_vec.end(); ++j)
+                {
+                        LLDrawInfo& params = **j;
+                        
+                        validate_draw_info(params);
+                }
+        }*/
+}
+
+void LLSpatialGroup::makeStatic()
+{
+#if !LL_DARWIN
+        if (isState(GEOM_DIRTY | ALPHA_DIRTY))
+        {
+                return;
+        }
+        
+        if (mSpatialPartition->mRenderByGroup && mBufferUsage != GL_STATIC_DRAW_ARB)
+        {
+                mBufferUsage = GL_STATIC_DRAW_ARB;
+                if (mVertexBuffer.notNull())
+                {
+                        mVertexBuffer->makeStatic();
+                }
+                
+                for (buffer_map_t::iterator i = mBufferMap.begin(); i != mBufferMap.end(); ++i)
+                {
+                        i->second->makeStatic();
+                }
+                
+                mBuilt = 1.f;
+        }
+#endif
+}
+
 BOOL LLSpatialGroup::updateInGroup(LLDrawable *drawablep, BOOL immediate)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
@@ -261,10 +334,16 @@ BOOL LLSpatialGroup::updateInGroup(LLDrawable *drawablep, BOOL immediate)
         drawablep->updateSpatialExtents();
         validate_drawable(drawablep);
 
-        if (mOctreeNode->isInside(drawablep) && mOctreeNode->contains(drawablep))
+        OctreeNode* parent = mOctreeNode->getOctParent();
+        
+        if (mOctreeNode->isInside(drawablep->getPositionGroup()) && 
+                (mOctreeNode->contains(drawablep) ||
+                 (drawablep->getBinRadius() > mOctreeNode->getSize().mdV[0] &&
+                                parent && parent->getElementCount() >= LL_OCTREE_MAX_CAPACITY)))
         {
                 unbound();
                 setState(OBJECT_DIRTY);
+                setState(GEOM_DIRTY);
                 validate_drawable(drawablep);
                 return TRUE;
         }
@@ -284,11 +363,82 @@ BOOL LLSpatialGroup::addObject(LLDrawable *drawablep, BOOL add_all, BOOL from_oc
         {
                 drawablep->setSpatialGroup(this, 0);
                 validate_drawable(drawablep);
+                setState(OBJECT_DIRTY | GEOM_DIRTY);
+                mLastAddTime = gFrameTimeSeconds;
+                if (drawablep->isSpatialBridge())
+                {
+                        mBridgeList.push_back((LLSpatialBridge*) drawablep);
+                }
+                setState(IMAGE_DIRTY);
         }
 
         return TRUE;
 }
 
+void LLSpatialGroup::rebuildGeom()
+{
+        LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
+        if (!isDead())
+        {
+                mSpatialPartition->rebuildGeom(this);
+        }
+}
+
+void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
+{
+        if (group->changeLOD())
+        {
+                group->mLastUpdateDistance = group->mDistance;
+                group->mLastUpdateViewAngle = group->mViewAngle;
+        }
+
+        if (group->isDead() || !group->isState(LLSpatialGroup::GEOM_DIRTY))
+        {
+                return;
+        }
+
+        LLFastTimer ftm(LLFastTimer::FTM_REBUILD_VBO);  
+
+        group->clearDrawMap();
+        
+        //get geometry count
+        group->mIndexCount = 0;
+        group->mVertexCount = 0;
+
+        addGeometryCount(group, group->mVertexCount, group->mIndexCount);
+
+        if (group->mVertexCount > 0 && group->mIndexCount > 0)
+        { //create vertex buffer containing volume geometry for this node
+                group->mBuilt = 1.f;
+                if (group->mVertexBuffer.isNull() || (group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs))
+                {
+                        //LLFastTimer ftm(LLFastTimer::FTM_REBUILD_NONE_VB);
+                        group->mVertexBuffer = createVertexBuffer(mVertexDataMask, group->mBufferUsage);
+                        group->mVertexBuffer->allocateBuffer(group->mVertexCount, group->mIndexCount, true);
+                        stop_glerror();
+                }
+                else
+                {
+                        //LLFastTimer ftm(LLFastTimer::FTM_REBUILD_NONE_VB);
+                        group->mVertexBuffer->resizeBuffer(group->mVertexCount, group->mIndexCount);
+                        stop_glerror();
+                }
+                
+                {
+                        LLFastTimer ftm((LLFastTimer::EFastTimerType) ((U32) LLFastTimer::FTM_REBUILD_VOLUME_VB + mPartitionType));
+                        getGeometry(group);
+                }
+        }
+        else
+        {
+                group->mVertexBuffer = NULL;
+                group->mBufferMap.clear();
+        }
+
+        group->mLastUpdateTime = gFrameTimeSeconds;
+        group->clearState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::MATRIX_DIRTY);
+}
+
 BOOL LLSpatialGroup::boundObjects(BOOL empty, LLVector3& minOut, LLVector3& maxOut)
 {       
         const OctreeState* node = mOctreeNode->getOctState();
@@ -304,7 +454,7 @@ BOOL LLSpatialGroup::boundObjects(BOOL empty, LLVector3& minOut, LLVector3& maxO
 
         LLVector3& newMin = mObjectExtents[0];
         LLVector3& newMax = mObjectExtents[1];
-
+        
         if (isState(OBJECT_DIRTY))
         { //calculate new bounding box
                 clearState(OBJECT_DIRTY);
@@ -390,11 +540,28 @@ void LLSpatialGroup::unbound()
         }
 }
 
+LLSpatialGroup* LLSpatialGroup::getParent()
+{
+        if (isDead())
+        {
+                return NULL;
+        }
+
+        OctreeNode* parent = mOctreeNode->getOctParent();
+
+        if (parent)
+        {
+                return (LLSpatialGroup*) parent->getListener(0);
+        }
+
+        return NULL;
+}
+
 BOOL LLSpatialGroup::removeObject(LLDrawable *drawablep, BOOL from_octree)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
         unbound();
-        if (!from_octree)
+        if (mOctreeNode && !from_octree)
         {
                 if (!mOctreeNode->remove(drawablep))
                 {
@@ -404,6 +571,18 @@ BOOL LLSpatialGroup::removeObject(LLDrawable *drawablep, BOOL from_octree)
         else
         {
                 drawablep->setSpatialGroup(NULL, -1);
+                setState(GEOM_DIRTY);
+                if (drawablep->isSpatialBridge())
+                {
+                        for (bridge_list_t::iterator i = mBridgeList.begin(); i != mBridgeList.end(); ++i)
+                        {
+                                if (*i == drawablep)
+                                {
+                                        mBridgeList.erase(i);
+                                        break;
+                                }
+                        }
+                }
         }
         return TRUE;
 }
@@ -420,6 +599,8 @@ void LLSpatialGroup::shift(const LLVector3 &offset)
         mObjectBounds[0] += offset;
         mObjectExtents[0] += offset;
         mObjectExtents[1] += offset;
+
+        setState(GEOM_DIRTY | MATRIX_DIRTY | OCCLUSION_DIRTY);
 }
 
 class LLSpatialSetState : public LLSpatialGroup::OctreeTraveler
@@ -533,30 +714,160 @@ void LLSpatialGroup::clearState(U32 state, S32 mode)
 //              Octree Listener Implementation
 //======================================
 
-LLSpatialGroup::LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part)
-: mState(0), mOctreeNode(node), mSpatialPartition(part)
+LLSpatialGroup::LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part) :
+        mState(0),
+        mBuilt(0.f),
+        mOctreeNode(node),
+        mSpatialPartition(part),
+        mVertexBuffer(NULL), 
+        mBufferUsage(GL_STATIC_DRAW_ARB),
+        mDistance(0.f),
+        mDepth(0.f),
+        mLastUpdateDistance(-1.f), 
+        mLastUpdateTime(gFrameTimeSeconds),
+        mLastAddTime(gFrameTimeSeconds),
+        mLastRenderTime(gFrameTimeSeconds),
+        mViewAngle(0.f),
+        mLastUpdateViewAngle(-1.f)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
+
         sg_assert(mOctreeNode->getListenerCount() == 0);
         mOctreeNode->addListener(this);
-        setState(DIRTY);
+        setState(SG_INITIAL_STATE_MASK);
 
         mBounds[0] = LLVector3(node->getCenter());
         mBounds[1] = LLVector3(node->getSize());
 
-        sLODSeed = (sLODSeed+1)%SG_LOD_PERIOD;
-        mLODHash = sLODSeed;
+        part->mLODSeed = (part->mLODSeed+1)%part->mLODPeriod;
+        mLODHash = part->mLODSeed;
+        
+        mRadius = 1;
+        mPixelArea = 1024.f;
+}
+
+void LLSpatialGroup::updateDistance(LLCamera &camera)
+{
+#if !LL_RELEASE_FOR_DOWNLOAD
+        if (isState(LLSpatialGroup::OBJECT_DIRTY))
+        {
+                llerrs << "Spatial group dirty on distance update." << llendl;
+        }
+#endif
+        if (!getData().empty())
+        {
+                mRadius = mSpatialPartition->mRenderByGroup ? mObjectBounds[1].magVec() :
+                                                (F32) mOctreeNode->getSize().magVec();
+                mDistance = mSpatialPartition->calcDistance(this, camera);
+                mPixelArea = mSpatialPartition->calcPixelArea(this, camera);
+        }
+}
+
+F32 LLSpatialPartition::calcDistance(LLSpatialGroup* group, LLCamera& camera)
+{
+        LLVector3 eye = group->mObjectBounds[0] - camera.getOrigin();
+
+        F32 dist = 0.f;
+
+        if (group->mDrawMap.find(LLRenderPass::PASS_ALPHA) != group->mDrawMap.end())
+        {
+                LLVector3 v = eye;
+                dist = eye.normVec();
+
+                if (!group->isState(LLSpatialGroup::ALPHA_DIRTY))
+                {
+                        LLVector3 view_angle = LLVector3(eye * LLVector3(1,0,0),
+                                                                                        eye * LLVector3(0,1,0),
+                                                                                        eye * LLVector3(0,0,1));
+
+                        if ((view_angle-group->mLastUpdateViewAngle).magVec() > 0.64f)
+                        {
+                                group->mViewAngle = view_angle;
+                                group->mLastUpdateViewAngle = view_angle;
+                                //for occasional alpha sorting within the group
+                                //NOTE: If there is a trivial way to detect that alpha sorting here would not change the render order,
+                                //not setting this node to dirty would be a very good thing
+                                group->setState(LLSpatialGroup::ALPHA_DIRTY);
+                        }               
+                }
+
+                //calculate depth of node for alpha sorting
+
+                LLVector3 at = camera.getAtAxis();
+
+                //front of bounding box
+                for (U32 i = 0; i < 3; i++)
+                {
+                        v.mV[i] -= group->mObjectBounds[1].mV[i]*0.25f * at.mV[i];
+                }
+
+                group->mDepth = v * at;
+
+                F32 water_height = gAgent.getRegion()->getWaterHeight();
+                //figure out if this node is above or below water
+                if (group->mObjectBounds[0].mV[2] < water_height)
+                {
+                        group->setState(LLSpatialGroup::BELOW_WATER);
+                }
+                else
+                {
+                        group->clearState(LLSpatialGroup::BELOW_WATER);
+                }
+        }
+        else
+        {
+                dist = eye.magVec();
+        }
+
+        if (dist < 16.f)
+        {
+                dist /= 16.f;
+                dist *= dist;
+                dist *= 16.f;
+        }
+
+        return dist;
+}
+
+F32 LLSpatialPartition::calcPixelArea(LLSpatialGroup* group, LLCamera& camera)
+{
+        return LLPipeline::calcPixelArea(group->mObjectBounds[0], group->mObjectBounds[1], camera);
 }
 
 BOOL LLSpatialGroup::changeLOD()
 {
-        return LLDrawable::getCurrentFrame()%SG_LOD_PERIOD == mLODHash;
+        if (isState(ALPHA_DIRTY))
+        { ///an alpha sort is going to happen, update distance and LOD
+                return TRUE;
+        }
+
+        if (mSpatialPartition->mSlopRatio > 0.f)
+        {
+                F32 ratio = (mDistance - mLastUpdateDistance)/(llmax(mLastUpdateDistance, mRadius));
+
+                if (fabsf(ratio) >= mSpatialPartition->mSlopRatio)
+                {
+                        return TRUE;
+                }
+
+                if (mDistance > mRadius)
+                {
+                        return FALSE;
+                }
+        }
+        
+        if (LLDrawable::getCurrentFrame()%mSpatialPartition->mLODPeriod == mLODHash)
+        {
+                return TRUE;
+        }
+        
+        return FALSE;
 }
 
-void LLSpatialGroup::handleInsertion(const TreeNode* node, LLDrawable* drawable)
+void LLSpatialGroup::handleInsertion(const TreeNode* node, LLDrawable* drawablep)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
-        addObject(drawable, FALSE, TRUE);
+        addObject(drawablep, FALSE, TRUE);
         unbound();
         setState(OBJECT_DIRTY);
 }
@@ -571,29 +882,13 @@ void LLSpatialGroup::handleRemoval(const TreeNode* node, LLDrawable* drawable)
 void LLSpatialGroup::handleDestruction(const TreeNode* node)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
-        
-        if (mOctreeNode)
-        {
-                OctreeState* state = mOctreeNode->getOctState();
-                for (OctreeState::element_iter i = state->getData().begin(); i != state->getData().end(); ++i)
-                {
-                        LLDrawable* drawable = *i;
-                        if (!drawable->isDead())
-                        {
-                                drawable->setSpatialGroup(NULL, -1);
-                        }
-                }
-        }
-        
-        if (safeToDelete())
-        {
-        delete this;
-        }
-        else
-        {
-                setState(DEAD);
-                mOctreeNode = NULL;
-        }
+        setState(DEAD);
+        clearDrawMap();
+        mOcclusionVerts = NULL;
+        mVertexBuffer = NULL;
+        mBufferMap.clear();
+        sZombieGroups++;
+        mOctreeNode = NULL;
 }
 
 void LLSpatialGroup::handleStateChange(const TreeNode* node)
@@ -611,7 +906,8 @@ void LLSpatialGroup::handleChildAddition(const OctreeNode* parent, OctreeNode* c
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
         if (child->getListenerCount() == 0)
         {
-                (new LLSpatialGroup(child, mSpatialPartition))->setState(mState & SG_STATE_INHERIT_MASK);
+                LLSpatialGroup* group = new LLSpatialGroup(child, mSpatialPartition);
+                group->setState(mState & SG_STATE_INHERIT_MASK);
         }
         else
         {
@@ -626,6 +922,31 @@ void LLSpatialGroup::handleChildRemoval(const OctreeNode* parent, const OctreeNo
         unbound();
 }
 
+void LLSpatialGroup::destroyGL() 
+{
+        setState(LLSpatialGroup::GEOM_DIRTY | 
+                                        LLSpatialGroup::OCCLUSION_DIRTY |
+                                        LLSpatialGroup::IMAGE_DIRTY);
+        mLastUpdateTime = gFrameTimeSeconds;
+        mVertexBuffer = NULL;
+        mBufferMap.clear();
+
+        mOcclusionVerts = NULL;
+        mReflectionMap = NULL;
+        clearDrawMap();
+
+        for (LLSpatialGroup::element_iter i = getData().begin(); i != getData().end(); ++i)
+        {
+                LLDrawable* drawable = *i;
+                for (S32 j = 0; j < drawable->getNumFaces(); j++)
+                {
+                        LLFace* facep = drawable->getFace(j);
+                        facep->mVertexBuffer = NULL;
+                        facep->mLastVertexBuffer = NULL;
+                }
+        }
+}
+
 BOOL LLSpatialGroup::rebound()
 {
         if (!isState(DIRTY))
@@ -635,7 +956,7 @@ BOOL LLSpatialGroup::rebound()
         
         LLVector3 oldBounds[2];
         
-        if (isState(QUERY_OUT))
+        if (mSpatialPartition->isVolatile() && isState(QUERY_OUT))
         {       //a query has been issued, if our bounding box changes significantly
                 //we need to discard the issued query
                 oldBounds[0] = mBounds[0];
@@ -700,7 +1021,7 @@ BOOL LLSpatialGroup::rebound()
                 mBounds[1] = (newMax - newMin)*0.5f;
         }
         
-        if (isState(QUERY_OUT))
+        if (mSpatialPartition->isVolatile() && isState(QUERY_OUT))
         {
                 for (U32 i = 0; i < 3 && !isState(DISCARD_QUERY); i++)
                 {
@@ -713,6 +1034,8 @@ BOOL LLSpatialGroup::rebound()
                 }
         }
         
+        setState(OCCLUSION_DIRTY);
+        
         clearState(DIRTY);
 
         return TRUE;
@@ -720,9 +1043,21 @@ BOOL LLSpatialGroup::rebound()
 
 //==============================================
 
-LLSpatialPartition::LLSpatialPartition()
+LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL is_volatile, U32 buffer_usage)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
+        mDrawableType = 0;
+        mPartitionType = LLPipeline::PARTITION_NONE;
+        mVolatile = is_volatile;
+        mLODSeed = 0;
+        mLODPeriod = 1;
+        mVertexDataMask = data_mask;
+        mBufferUsage = buffer_usage;
+        mDepthMask = FALSE;
+        mSlopRatio = 0.25f;
+        mRenderByGroup = TRUE;
+        mImageEnabled = FALSE;
+
         mOctree = new LLSpatialGroup::OctreeNode(LLVector3d(0,0,0), 
                                                                                         LLVector3d(1,1,1), 
                                                                                         new LLSpatialGroup::OctreeRoot(), NULL);
@@ -733,19 +1068,25 @@ LLSpatialPartition::LLSpatialPartition()
 LLSpatialPartition::~LLSpatialPartition()
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
+        
+        for (U32 i = 0; i < mOcclusionQueries.size(); i++)
+        {
+                glDeleteQueriesARB(1, (GLuint*)(&(mOcclusionQueries[i])));
+        }
+        
         delete mOctree;
         mOctree = NULL;
 }
 
 
-LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep)
+LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep, BOOL was_visible)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
         const F32 MAX_MAG = 1000000.f*1000000.f; // 1 million
                         
         if (drawablep->getPositionGroup().magVecSquared() > MAX_MAG)
         {
-#ifndef LL_RELEASE_FOR_DOWNLOAD
+#if 0 //ndef LL_RELEASE_FOR_DOWNLOAD
                 llwarns << "LLSpatialPartition::put Object out of range!" << llendl;
                 llinfos << drawablep->getPositionGroup() << llendl;
 
@@ -770,7 +1111,13 @@ LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep)
 
         LLSpatialGroup::OctreeNode* node = mOctree->getNodeAt(drawablep);
         
-        return (LLSpatialGroup*) node->getListener(0);
+        LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
+        if (was_visible && group->isState(LLSpatialGroup::QUERY_OUT))
+        {
+                group->setState(LLSpatialGroup::DISCARD_QUERY);
+        }
+
+        return group;
 }
 
 BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp)
@@ -793,14 +1140,16 @@ void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
         LLFastTimer t(LLFastTimer::FTM_UPDATE_MOVE);
-        
+                
+        BOOL was_visible = curp ? curp->isVisible() : FALSE;
+
         if (curp && curp->mSpatialPartition != this)
         {
                 //keep drawable from being garbage collected
                 LLPointer<LLDrawable> ptr = drawablep;
                 if (curp->mSpatialPartition->remove(drawablep, curp))
                 {
-                        put(drawablep);
+                        put(drawablep, was_visible);
                         return;
                 }
                 else
@@ -823,7 +1172,7 @@ void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL
                 OCT_ERRS << "Move couldn't find existing spatial group!" << llendl;
         }
 
-        put(drawablep);
+        put(drawablep, was_visible);
 }
 
 class LLSpatialShift : public LLSpatialGroup::OctreeTraveler
@@ -848,13 +1197,9 @@ void LLSpatialPartition::shift(const LLVector3 &offset)
 
 BOOL LLSpatialPartition::checkOcclusion(LLSpatialGroup* group, LLCamera* camera)
 {
-        if (sIgnoreOcclusion)
-        {
-                return FALSE;
-        }
-        
-        if (!group->isState(LLSpatialGroup::ACTIVE_OCCLUSION | LLSpatialGroup::OCCLUDED) &&
-                !earlyFail(camera, group))
+        if (LLPipeline::sUseOcclusion &&
+                !group->isState(LLSpatialGroup::ACTIVE_OCCLUSION | LLSpatialGroup::OCCLUDED) &&
+                (!camera || !earlyFail(camera, group)))
         {
                 group->setState(LLSpatialGroup::ACTIVE_OCCLUSION);
                 mQueryQueue.push(group);
@@ -872,8 +1217,8 @@ public:
 
         virtual bool earlyFail(const LLSpatialGroup* group)
         {
-                if (mRes &&     //never occlusion cull the root node
-                        !sIgnoreOcclusion &&                    //never occlusion cull selection
+                if (group->mOctreeNode->getParent() &&  //never occlusion cull the root node
+                        LLPipeline::sUseOcclusion &&                    //never occlusion cull selection
                         group->isState(LLSpatialGroup::OCCLUDED))
                 {
                         return true;
@@ -950,22 +1295,19 @@ public:
                                 group->mSpatialPartition->checkOcclusion(group, mCamera);
                         }
                 }
+
+                if (LLPipeline::sDynamicReflections &&
+                        group->mOctreeNode->getSize().mdV[0] == 16.0 && 
+                        group->mDistance < 64.f &&
+                        group->mLastAddTime < gFrameTimeSeconds - 2.f)
+                {
+                        group->mSpatialPartition->markReimage(group);
+                }
         }
         
-        virtual void processDrawable(LLDrawable* drawable)
+        virtual void processGroup(LLSpatialGroup* group)
         {
-                if (!drawable->isDead())
-                {
-                        const LLVector3* extents = drawable->getSpatialExtents();
-                        
-                        F32 objRad = drawable->getRadius();
-                        objRad *= objRad;
-                        F32 distSqr = ((extents[0]+extents[1])*0.5f - mCamera->getOrigin()).magVecSquared();
-                        if (objRad/distSqr > SG_MIN_DIST_RATIO)
-                        {
-                                gPipeline.markNotCulled(drawable, *mCamera);
-                        }
-                }               
+                gPipeline.markNotCulled(group, *mCamera);
         }
         
         virtual void visit(const LLSpatialGroup::OctreeState* branch) 
@@ -976,10 +1318,7 @@ public:
                 
                 if (checkObjects(branch, group))
                 {
-                        for (LLSpatialGroup::OctreeState::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
-                        {
-                                processDrawable(*i);
-                        }
+                        processGroup(group);
                 }
         }
 
@@ -998,34 +1337,32 @@ public:
         virtual void lateFail(LLSpatialGroup* group) { }
         virtual void preprocess(LLSpatialGroup* group) { }
 
-        virtual void processDrawable(LLDrawable* drawable)
+        virtual void processGroup(LLSpatialGroup* group)
         {
-                if (!drawable->isDead())
+                LLSpatialGroup::OctreeState* branch = group->mOctreeNode->getOctState();
+
+                for (LLSpatialGroup::OctreeState::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
                 {
-                        if (drawable->isSpatialBridge())
-                        {
-                                drawable->setVisible(*mCamera, mResults, TRUE);
-                        }
-                        else
+                        LLDrawable* drawable = *i;
+                        
+                        if (!drawable->isDead())
                         {
-                                mResults->push_back(drawable);
-                        }
-                }               
+                                if (drawable->isSpatialBridge())
+                                {
+                                        drawable->setVisible(*mCamera, mResults, TRUE);
+                                }
+                                else
+                                {
+                                        mResults->push_back(drawable);
+                                }
+                        }               
+                }
         }
         
         std::vector<LLDrawable*>* mResults;
 };
 
 
-void drawBox(const LLVector3& c, const LLVector3& r)
-{
-        glPushMatrix();
-        glTranslatef(c.mV[0], c.mV[1], c.mV[2]);
-        glScalef(r.mV[0], r.mV[1], r.mV[2]);
-        glCallList(sBoxList);
-        glPopMatrix();
-}
-
 void genBoxList()
 {
         if (sBoxList != 0)
@@ -1077,6 +1414,83 @@ void genBoxList()
         glEndList();
 }
 
+void drawBox(const LLVector3& c, const LLVector3& r)
+{
+        genBoxList();
+
+        glPushMatrix();
+        glTranslatef(c.mV[0], c.mV[1], c.mV[2]);
+        glScalef(r.mV[0], r.mV[1], r.mV[2]);
+        glCallList(sBoxList);
+        glPopMatrix();
+}
+
+void drawBoxOutline(const LLVector3& pos, const LLVector3& size)
+{
+        LLVector3 v1 = size.scaledVec(LLVector3( 1, 1,1));
+        LLVector3 v2 = size.scaledVec(LLVector3(-1, 1,1));
+        LLVector3 v3 = size.scaledVec(LLVector3(-1,-1,1));
+        LLVector3 v4 = size.scaledVec(LLVector3( 1,-1,1));
+
+        glBegin(GL_LINE_LOOP); //top
+        glVertex3fv((pos+v1).mV);
+        glVertex3fv((pos+v2).mV);
+        glVertex3fv((pos+v3).mV);
+        glVertex3fv((pos+v4).mV);
+        glEnd();
+
+        glBegin(GL_LINE_LOOP); //bottom
+        glVertex3fv((pos-v1).mV);
+        glVertex3fv((pos-v2).mV);
+        glVertex3fv((pos-v3).mV);
+        glVertex3fv((pos-v4).mV);
+        glEnd();
+
+
+        glBegin(GL_LINES);
+
+        //right
+        glVertex3fv((pos+v1).mV);
+        glVertex3fv((pos-v3).mV);
+                        
+        glVertex3fv((pos+v4).mV);
+        glVertex3fv((pos-v2).mV);
+
+        //left
+        glVertex3fv((pos+v2).mV);
+        glVertex3fv((pos-v4).mV);
+
+        glVertex3fv((pos+v3).mV);
+        glVertex3fv((pos-v1).mV);
+
+        glEnd();
+}
+
+class LLOctreeDirty : public LLOctreeTraveler<LLDrawable>
+{
+public:
+        virtual void visit(const LLOctreeState<LLDrawable>* state)
+        {
+                LLSpatialGroup* group = (LLSpatialGroup*) state->getListener(0);
+                group->destroyGL();
+
+                for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+                {
+                        LLDrawable* drawable = *i;
+                        if (drawable->getVObj() && !group->mSpatialPartition->mRenderByGroup)
+                        {
+                                gPipeline.markRebuild(drawable, LLDrawable::REBUILD_ALL, TRUE);
+                        }
+                }
+
+                for (LLSpatialGroup::bridge_list_t::iterator i = group->mBridgeList.begin(); i != group->mBridgeList.end(); ++i)
+                {
+                        LLSpatialBridge* bridge = *i;
+                        traverse(bridge->mOctree);
+                }
+        }
+};
+
 void LLSpatialPartition::restoreGL()
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
@@ -1099,6 +1513,14 @@ void LLSpatialPartition::restoreGL()
         genBoxList();
 }
 
+void LLSpatialPartition::resetVertexBuffers()
+{
+        LLOctreeDirty dirty;
+        dirty.traverse(mOctree);
+
+        mOcclusionIndices = NULL;
+}
+
 S32 LLSpatialPartition::cull(LLCamera &camera, std::vector<LLDrawable *>* results, BOOL for_select)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
@@ -1115,11 +1537,11 @@ S32 LLSpatialPartition::cull(LLCamera &camera, std::vector<LLDrawable *>* result
         }
         else
         {
+                LLFastTimer ftm(LLFastTimer::FTM_FRUSTUM_CULL);         
                 LLOctreeCull culler(&camera);
                 culler.traverse(mOctree);
         }
         
-        sIgnoreOcclusion = !(gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery);
         return 0;
 }
 
@@ -1174,9 +1596,10 @@ public:
 BOOL earlyFail(LLCamera* camera, LLSpatialGroup* group)
 {
         LLVector3 c = group->mBounds[0];
-        LLVector3 r = group->mBounds[1] * (SG_OCCLUSION_FUDGE*2.f) + LLVector3(0.01f,0.01f,0.01f);
+        LLVector3 r = group->mBounds[1]*SG_OCCLUSION_FUDGE + LLVector3(0.2f,0.2f,0.2f);
     
-        if (group->isState(LLSpatialGroup::CULLED) || !camera->AABBInFrustum(c, r))
+        //if (group->isState(LLSpatialGroup::CULLED)) // || 
+        if (!camera->AABBInFrustum(c, r))
         {
                 return TRUE;
         }
@@ -1197,6 +1620,100 @@ BOOL earlyFail(LLCamera* camera, LLSpatialGroup* group)
         return TRUE;
 }
 
+void LLSpatialPartition::markReimage(LLSpatialGroup* group)
+{
+        if (mImageEnabled && group->isState(LLSpatialGroup::IMAGE_DIRTY))
+        {       
+                if (!group->isState(LLSpatialGroup::IN_IMAGE_QUEUE))
+                {
+                        group->setState(LLSpatialGroup::IN_IMAGE_QUEUE);
+                        mImageQueue.push(group);
+                }
+        }
+}
+
+void LLSpatialPartition::processImagery(LLCamera* camera)
+{
+        if (!mImageEnabled)
+        {
+                return;
+        }
+
+        U32 process_count = 1;
+
+        while (process_count > 0 && !mImageQueue.empty())
+        {
+                LLPointer<LLSpatialGroup> group = mImageQueue.front();
+                mImageQueue.pop();
+        
+                group->clearState(LLSpatialGroup::IN_IMAGE_QUEUE);
+
+                if (group->isDead())
+                {
+                        continue;
+                }
+
+                if (LLPipeline::sDynamicReflections)
+                {
+                        process_count--;
+                        LLVector3 origin = group->mBounds[0];
+                        
+                        LLCamera cube_cam;
+                        cube_cam.setOrigin(origin);
+                        cube_cam.setFar(64.f);
+
+                        LLPointer<LLCubeMap> cube_map = group->mReflectionMap;
+                        group->mReflectionMap = NULL;
+                        if (cube_map.isNull())
+                        {
+                                cube_map = new LLCubeMap();
+                                cube_map->initGL();
+                        }
+
+                        if (gPipeline.mCubeBuffer == NULL)
+                        {
+                                gPipeline.mCubeBuffer = new LLCubeMap();
+                                gPipeline.mCubeBuffer->initGL();
+                        }
+
+                        gPipeline.generateReflectionMap(gPipeline.mCubeBuffer, cube_cam, 128);
+                        gPipeline.blurReflectionMap(gPipeline.mCubeBuffer, cube_map, 64);
+                        group->mReflectionMap = cube_map;
+                        group->setState(LLSpatialGroup::GEOM_DIRTY);
+                }
+
+                group->clearState(LLSpatialGroup::IMAGE_DIRTY);
+        }
+}
+
+void validate_occlusion_list(std::vector<LLPointer<LLSpatialGroup> >& occluded_list)
+{
+#if !LL_RELEASE_FOR_DOWNLOAD
+        for (U32 i = 0; i < occluded_list.size(); i++)
+        {
+                LLSpatialGroup* group = occluded_list[i];
+                for (U32 j = i+1; j < occluded_list.size(); j++)
+                {
+                        if (occluded_list[i] == occluded_list[j])
+                        {
+                                llerrs << "Duplicate node in occlusion list." << llendl;
+                        }
+                }
+
+                LLSpatialGroup::OctreeNode* parent = group->mOctreeNode->getOctParent();
+                while (parent)
+                {
+                        LLSpatialGroup* parent_group = (LLSpatialGroup*) parent->getListener(0);
+                        if (parent_group->isState(LLSpatialGroup::OCCLUDED))
+                        {
+                                llerrs << "Child node of occluded node in occlusion list (redundant query)." << llendl;
+                        }
+                        parent = parent->getOctParent();
+                }
+        }
+#endif
+}
+
 void LLSpatialPartition::processOcclusion(LLCamera* camera)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
@@ -1217,12 +1734,12 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
         const U32 MAX_PUSHED = mOcclusionQueue.size();
         U32 count = 0;
         U32 pcount = 0;
-
+        
         while (pcount < MAX_PUSHED && count < MAX_PULLED && !mOcclusionQueue.empty())
         {
-                LLFastTimer t(LLFastTimer::FTM_OCCLUSION);
+                LLFastTimer t(LLFastTimer::FTM_OCCLUSION);
 
-                LLSpatialGroup* group = mOcclusionQueue.front();
+                LLPointer<LLSpatialGroup> group = mOcclusionQueue.front();
                 if (!group->isState(LLSpatialGroup::IN_QUEUE))
                 {
                         OCT_ERRS << "Spatial Group State Error.  Group in queue not tagged as such." << llendl;
@@ -1233,10 +1750,6 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
 
                 if (group->isDead())
                 {
-                        if (group->safeToDelete())
-                        {
-                                delete group;
-                        }
                         continue;
                 }
 
@@ -1250,22 +1763,14 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
                 {
                         LLSpatialGroup* child = (LLSpatialGroup*) group->mOctreeNode->getChild(i)->getListener(0);
 
-                        if (!child->isState(LLSpatialGroup::OCCLUDED | LLSpatialGroup::CULLED)
-                                && !child->isState(LLSpatialGroup::IN_QUEUE | LLSpatialGroup::ACTIVE_OCCLUSION))
+                        //if (!child->isState(LLSpatialGroup::OCCLUDED | LLSpatialGroup::CULLED)
+                        if (!child->isState(LLSpatialGroup::IN_QUEUE | LLSpatialGroup::ACTIVE_OCCLUSION))
                         {
                                 child->setState(LLSpatialGroup::IN_QUEUE);
                                 mOcclusionQueue.push(child);
                         }
                 }
-
-                /*if (group->isState(LLSpatialGroup::QUERY_PENDING))
-                { //already on the pending group, put it back
-                        group->setState(LLSpatialGroup::IN_QUEUE);
-                        mOcclusionQueue.push(group);
-                        pcount++;
-                        continue;
-                }*/
-
+                
                 if (earlyFail(camera, group))
                 {
                         sg_assert(!group->isState(LLSpatialGroup::OCCLUDED));
@@ -1284,7 +1789,6 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
                                 sg_assert(mOccludedList[i] != group);
                         }
 #endif
-                        //group->setState(LLSpatialGroup::QUERY_PENDING);
                         group->setState(LLSpatialGroup::ACTIVE_OCCLUSION);
                         mQueryQueue.push(group);
                         count++;
@@ -1296,7 +1800,7 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
         {
                 LLFastTimer t(LLFastTimer::FTM_OCCLUSION_READBACK);
 
-                if (mOccludedList[i]->isDead() || !mOccludedList[i]->isState(LLSpatialGroup::ACTIVE_OCCLUSION))
+                if (mOccludedList[i]->isDead() || mOccludedList[i]->isState(LLSpatialGroup::DEACTIVATE_OCCLUSION))
                 {
                         continue;
                 }
@@ -1347,8 +1851,7 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
                                                 LLSpatialGroup* parent = (LLSpatialGroup*) oct_parent->getListener(0);
                                                 
                                                 if (checkOcclusion(parent, camera))
-                                                {       //force a guess on the parent and siblings
-                                                        
+                                                {       //force a guess on the parent and siblings              
                                                         for (U32 i = 0; i < parent->mOctreeNode->getChildCount(); i++)
                                                         {
                                                                 LLSpatialGroup* child = (LLSpatialGroup*) parent->mOctreeNode->getChild(i)->getListener(0);
@@ -1356,13 +1859,17 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
                                                         }
                                                 }
                                         }
+
+                                        //take children off the active list
+                                        mOccludedList[i]->setState(LLSpatialGroup::DEACTIVATE_OCCLUSION, LLSpatialGroup::STATE_MODE_BRANCH);
+                                        mOccludedList[i]->clearState(LLSpatialGroup::DEACTIVATE_OCCLUSION);
                                 }
                                 mOccludedList[i]->setState(LLSpatialGroup::OCCLUDED, LLSpatialGroup::STATE_MODE_DIFF);
                         }
                         else
                         {
                                 //take children off the active list
-                                mOccludedList[i]->setState(LLSpatialGroup::DEACTIVATE_OCCLUSION, LLSpatialGroup::STATE_MODE_DIFF);
+                                mOccludedList[i]->setState(LLSpatialGroup::DEACTIVATE_OCCLUSION, LLSpatialGroup::STATE_MODE_BRANCH);
                                                         
                                 //keep this node on the active list
                                 mOccludedList[i]->clearState(LLSpatialGroup::DEACTIVATE_OCCLUSION);
@@ -1383,15 +1890,13 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
                         mOccludedList[i]->isState(LLSpatialGroup::DEACTIVATE_OCCLUSION)) //parent is occluded
                 {
                         LLSpatialGroup* groupp = mOccludedList[i];
-                        mOccludedList.erase(mOccludedList.begin()+i);
-                        groupp->clearState(LLSpatialGroup::ACTIVE_OCCLUSION);
-                        groupp->clearState(LLSpatialGroup::DEACTIVATE_OCCLUSION);
-                        groupp->clearState(LLSpatialGroup::OCCLUDING);
-
-                        if (groupp->isDead() && groupp->safeToDelete())
+                        if (!groupp->isDead())
                         {
-                                delete groupp;
+                                groupp->clearState(LLSpatialGroup::ACTIVE_OCCLUSION);
+                                groupp->clearState(LLSpatialGroup::DEACTIVATE_OCCLUSION);
+                                groupp->clearState(LLSpatialGroup::OCCLUDING);
                         }
+                        mOccludedList.erase(mOccludedList.begin()+i);
                 }
                 else
                 {
@@ -1399,11 +1904,13 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
                 }
         }
 
+        validate_occlusion_list(mOccludedList);
+
         //pump some non-culled items onto the occlusion list
         //count = MAX_PULLED;
         while (!mQueryQueue.empty())
         {
-                LLSpatialGroup* group = mQueryQueue.front();
+                LLPointer<LLSpatialGroup> group = mQueryQueue.front();
                 mQueryQueue.pop();
         //group->clearState(LLSpatialGroup::QUERY_PENDING);
                 mOccludedList.push_back(group);
@@ -1418,12 +1925,161 @@ void LLSpatialPartition::processOcclusion(LLCamera* camera)
         }
 }
 
+class LLOcclusionIndexBuffer : public LLVertexBuffer
+{
+public:
+        LLOcclusionIndexBuffer(U32 size)
+                : LLVertexBuffer(0, GL_STREAM_DRAW_ARB)
+        {
+                allocateBuffer(0, size, TRUE);
+
+                LLStrider<U32> idx;
+
+                getIndexStrider(idx);
+
+                //12 triangles' indices
+                idx[0] = 1; idx[1] = 0; idx[2] = 2; //front
+                idx[3] = 3; idx[4] = 2; idx[5] = 0;
+
+                idx[6] = 4; idx[7] = 5; idx[8] = 1; //top
+                idx[9] = 0; idx[10] = 1; idx[11] = 5; 
+
+                idx[12] = 5; idx[13] = 4; idx[14] = 6; //back
+                idx[15] = 7; idx[16] = 6; idx[17] = 4;
+
+                idx[18] = 6; idx[19] = 7; idx[20] = 3; //bottom
+                idx[21] = 2; idx[22] = 3; idx[23] = 7;
+
+                idx[24] = 0; idx[25] = 5; idx[26] = 3; //left
+                idx[27] = 6; idx[28] = 3; idx[29] = 5;
+
+                idx[30] = 4; idx[31] = 1; idx[32] = 7; //right
+                idx[33] = 2; idx[34] = 7; idx[35] = 1;
+        }
+
+        //virtual BOOL useVBOs() const { return FALSE; }
+
+        void setBuffer(U32 data_mask)
+        {
+                if (useVBOs())
+                {
+                        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, mGLIndices);
+                        sIBOActive = TRUE;
+                        unmapBuffer();
+                }
+                else if (sIBOActive)
+                {
+                        glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+                        sIBOActive = FALSE;
+                }
+                
+                sGLRenderIndices = mGLIndices;
+        }
+};
+
+class LLOcclusionVertexBuffer : public LLVertexBuffer
+{
+public:
+        LLOcclusionVertexBuffer(S32 usage)
+                : LLVertexBuffer(MAP_VERTEX, usage)
+        {
+                allocateBuffer(8, 0, TRUE);
+        }
+
+        //virtual BOOL useVBOs() const { return FALSE; }
+
+        void setBuffer(U32 data_mask)
+        {
+                if (useVBOs())
+                {
+                        glBindBufferARB(GL_ARRAY_BUFFER_ARB, mGLBuffer);
+                        sVBOActive = TRUE;
+                        unmapBuffer();
+                }
+                else if (sVBOActive)
+                {
+                        glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+                        sVBOActive = FALSE;
+                }
+                
+                if (data_mask)
+                {
+                        glVertexPointer(3,GL_FLOAT, 0, useVBOs() ? 0 : mMappedData);
+                }
+                
+                sGLRenderBuffer = mGLBuffer;
+        }
+};
+
+void LLSpatialPartition::buildOcclusion()
+{
+        if (mOccludedList.empty())
+        {
+                return;
+        }
+
+        BOOL reset_all = FALSE;
+        if (mOcclusionIndices.isNull())
+        {
+                mOcclusionIndices = new LLOcclusionIndexBuffer(36);
+                reset_all = TRUE;
+        }
+        
+        //fill occlusion vertex buffers
+        for (U32 i = 0; i < mOccludedList.size(); i++)
+        {
+                LLSpatialGroup* group = mOccludedList[i];
+
+                if (group->isState(LLSpatialGroup::OCCLUSION_DIRTY) || reset_all)
+                {
+                        LLFastTimer ftm(LLFastTimer::FTM_REBUILD_OCCLUSION_VB);
+
+                        if (group->mOcclusionVerts.isNull())
+                        {
+                                group->mOcclusionVerts = new LLOcclusionVertexBuffer(GL_STREAM_DRAW_ARB);
+                        }
+        
+                        group->clearState(LLSpatialGroup::OCCLUSION_DIRTY);
+                        
+                        LLStrider<LLVector3> vert;
+
+                        group->mOcclusionVerts->getVertexStrider(vert);
+
+                        LLVector3 r = group->mBounds[1]*SG_OCCLUSION_FUDGE + LLVector3(0.1f,0.1f,0.1f);
+
+                        for (U32 k = 0; k < 3; k++)
+                        {
+                                r.mV[k] = llmin(group->mBounds[1].mV[k]+0.25f, r.mV[k]);
+                        }
+
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(-1,1,1)); //   0 - left top front
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(1,1,1));  //   1 - right top front
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(1,-1,1)); //   2 - right bottom front
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(-1,-1,1)); //  3 - left bottom front
+
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(1,1,-1)); //  4 - left top back
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(-1,1,-1)); //   5 - right top back
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(-1,-1,-1)); //  6 - right bottom back
+                        *vert++ = group->mBounds[0] + r.scaledVec(LLVector3(1,-1,-1)); // 7 -left bottom back
+                }
+        }
+
+/*      for (U32 i = 0; i < mOccludedList.size(); i++)
+        {
+                LLSpatialGroup* group = mOccludedList[i];
+                if (!group->mOcclusionVerts.isNull() && group->mOcclusionVerts->isLocked())
+                {
+                        LLFastTimer ftm(LLFastTimer::FTM_REBUILD_OCCLUSION_VB);
+                        group->mOcclusionVerts->setBuffer(0);
+                }
+        }*/
+}
+
 void LLSpatialPartition::doOcclusion(LLCamera* camera)
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 
-        sIgnoreOcclusion = gUseWireframe;
-        LLFastTimer t(LLFastTimer::FTM_RENDER_OCCLUSION);
+        LLFastTimer t(LLFastTimer::FTM_RENDER_OCCLUSION);
 
 #if LL_OCTREE_PARANOIA_CHECK  
         LLSpatialGroup* check = (LLSpatialGroup*) mOctree->getListener(0);
@@ -1432,9 +2088,16 @@ void LLSpatialPartition::doOcclusion(LLCamera* camera)
 
         stop_glerror();
         
+        U32 num_verts = mOccludedList.size() * 8;
+
+        if (num_verts == 0)
+        {
+                return;
+        }
+
         //actually perform the occlusion queries
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-        glDisable(GL_TEXTURE_2D);
+        LLGLDisable(GL_TEXTURE_2D);
         gPipeline.disableLights();
         LLGLEnable cull_face(GL_CULL_FACE);
         LLGLDisable blend(GL_BLEND);
@@ -1443,25 +2106,16 @@ void LLSpatialPartition::doOcclusion(LLCamera* camera)
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
         glColor4f(1,1,1,1);
 
-        //sort occlusion queries front to back
-        /*for (U32 i = 0; i < mOccludedList.size(); i++)
-        {
-                LLSpatialGroup* group = mOccludedList[i];
-                
-                LLVector3 v = group->mOctreeNode->getCenter()-camera->getOrigin();
-                group->mDistance = v*v;
-        }
-
-        std::sort(mOccludedList.begin(), mOccludedList.end(), dist_greater());
+        mOcclusionIndices->setBuffer(0);
 
-        glClearStencil(0);
-        glClear(GL_STENCIL_BUFFER_BIT);
-        LLGLEnable stencil(GL_STENCIL_TEST);
-        glStencilFunc(GL_GREATER, 1, 0xFFFFFFFF);
-        glStencilOp(GL_KEEP, GL_SET, GL_KEEP);*/
-
-        genBoxList();
+        U32* indicesp = (U32*) mOcclusionIndices->getIndicesPointer();
 
+        glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        glDisableClientState(GL_COLOR_ARRAY);
+#if !LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkClientArrays(LLVertexBuffer::MAP_VERTEX);
+#endif
         for (U32 i = 0; i < mOccludedList.size(); i++)
         {
 #if LL_OCTREE_PARANOIA_CHECK
@@ -1482,32 +2136,10 @@ void LLSpatialPartition::doOcclusion(LLCamera* camera)
                 }
                 else
                 { //early rejection criteria passed, send some geometry to the query
-                        LLVector3 c;
-                        LLVector3 r;
-                        
-                        sg_assert(!group->isState(LLSpatialGroup::DIRTY));
-
-                        c = group->mBounds[0];
-                        r = group->mBounds[1]*SG_OCCLUSION_FUDGE + LLVector3(0.01f,0.01f,0.01f);
-                        for (U32 k = 0; k < 3; k++)
-                        {
-                                r.mV[k] = llmin(group->mBounds[1].mV[k]+0.25f, r.mV[k]);
-                        }
-                        
-#if LL_OCTREE_PARANOIA_CHECK
-                        LLVector3 e = camera->getOrigin();
-                        LLVector3 min = c - r;
-                        LLVector3 max = c + r;
-                        BOOL outside = FALSE;
-                        for (U32 j = 0; j < 3; j++)
-                        {
-                                outside = outside || (e.mV[j] < min.mV[j] || e.mV[j] > max.mV[j]);
-                        }
-                        sg_assert(outside);
-#endif
-                                        
+                        group->mOcclusionVerts->setBuffer(LLVertexBuffer::MAP_VERTEX);
                         glBeginQueryARB(GL_SAMPLES_PASSED_ARB, mOcclusionQueries[i]);                                   
-                        drawBox(c,r);
+                        glDrawRangeElements(GL_TRIANGLES, 0, 7, 36,
+                                                        GL_UNSIGNED_INT, indicesp);
                         glEndQueryARB(GL_SAMPLES_PASSED_ARB);
 
                         group->setState(LLSpatialGroup::QUERY_OUT);
@@ -1516,10 +2148,11 @@ void LLSpatialPartition::doOcclusion(LLCamera* camera)
         }
         stop_glerror();
         
+        gPipeline.mTrianglesDrawn += mOccludedList.size()*12;
+
         glFlush();
 
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-        glEnable(GL_TEXTURE_2D);
 }
 
 class LLOctreeGet : public LLSpatialGroup::OctreeTraveler
@@ -1618,6 +2251,8 @@ S32 LLSpatialPartition::getDrawables(const LLVector3& pos, F32 rad,
 
 S32 LLSpatialPartition::getObjects(const LLVector3& pos, F32 rad, LLDrawable::drawable_set_t &results)
 {
+        LLSpatialGroup* group = (LLSpatialGroup*) mOctree->getListener(0);
+        group->rebound();
         return getDrawables(pos, rad, results, FALSE);
 }
 
@@ -1626,182 +2261,363 @@ S32 LLSpatialPartition::getLights(const LLVector3& pos, F32 rad, LLDrawable::dra
         return getDrawables(pos, rad, results, TRUE);
 }
 
-class LLOctreeRenderNonOccluded : public LLOctreeTraveler<LLDrawable>
+void pushVerts(LLDrawInfo* params, U32 mask)
 {
-public:
-        LLOctreeRenderNonOccluded() {}
-        
-        virtual void traverse(const LLSpatialGroup::OctreeNode* node)
+        params->mVertexBuffer->setBuffer(mask);
+        U32* indicesp = (U32*) params->mVertexBuffer->getIndicesPointer();
+        glDrawRangeElements(params->mParticle ? GL_POINTS : GL_TRIANGLES, params->mStart, params->mEnd, params->mCount,
+                                        GL_UNSIGNED_INT, indicesp+params->mOffset);
+}
+
+void pushVerts(LLSpatialGroup* group, U32 mask)
+{
+        LLDrawInfo* params = NULL;
+
+        for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
         {
-                const LLSpatialGroup::OctreeState* state = node->getOctState();
-                LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
+                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                {
+                        params = *j;
+                        pushVerts(params, mask);
+                }
+        }
+}
+
+void pushVertsColorCoded(LLSpatialGroup* group, U32 mask)
+{
+        LLDrawInfo* params = NULL;
+
+        LLColor4 colors[] = {
+                LLColor4::green,
+                LLColor4::green1,
+                LLColor4::green2,
+                LLColor4::green3,
+                LLColor4::green4,
+                LLColor4::green5,
+                LLColor4::green6
+        };
                 
-                if (!group->isState(LLSpatialGroup::OCCLUDED | LLSpatialGroup::CULLED))
+        static const U32 col_count = sizeof(colors)/sizeof(LLColor4);
+
+        U32 col = 0;
+
+        for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
+        {
+                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
                 {
-                        state->accept(this);
+                        params = *j;
+                        glColor4f(colors[col].mV[0], colors[col].mV[1], colors[col].mV[2], 0.5f);
+                        params->mVertexBuffer->setBuffer(mask);
+                        U32* indicesp = (U32*) params->mVertexBuffer->getIndicesPointer();
+                        glDrawRangeElements(params->mParticle ? GL_POINTS : GL_TRIANGLES, params->mStart, params->mEnd, params->mCount,
+                                                        GL_UNSIGNED_INT, indicesp+params->mOffset);
+                        col = (col+1)%col_count;
+                }
+        }
+}
 
-                        for (U32 i = 0; i < state->getChildCount(); i++)
+void renderOctree(LLSpatialGroup* group)
+{
+        //render solid object bounding box, color
+        //coded by buffer usage and activity
+        LLGLDepthTest depth(GL_TRUE, GL_FALSE);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+        LLVector4 col;
+        if (group->mBuilt > 0.f)
+        {
+                group->mBuilt -= 2.f * gFrameIntervalSeconds;
+                if (group->mBufferUsage == GL_STATIC_DRAW_ARB)
+                {
+                        col.setVec(1.0f, 0, 0, group->mBuilt*0.5f);
+                }
+                else 
+                {
+                        col.setVec(0.1f,0.1f,1,0.1f);
+                        //col.setVec(1.0f, 1.0f, 0, sinf(group->mBuilt*3.14159f)*0.5f);
+                }
+
+                if (group->mBufferUsage != GL_STATIC_DRAW_ARB)
+                {
+                        if (group->mBufferUsage == GL_DYNAMIC_DRAW_ARB)
                         {
-                                traverse(state->getChild(i));
+                                glColor4f(1,0,0,group->mBuilt);
                         }
-                        
-                        /*if (state->getElementCount() == 0)
+                        else
                         {
-                                return;
-                        }*/
+                                glColor4f(1,1,0,group->mBuilt);
+                        }
 
-                        //draw tight fit bounding box for spatial group
-                        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCTREE))
+                        LLGLDepthTest gl_depth(FALSE, FALSE);
+                        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+                        for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
                         {
-                                if (node->getElementCount() == 0)
-                                {
-                                        return;
-                                }
-                                
-                                if (node->hasLeafState())
-                                {
-                                        glColor4f(1,1,1,1);
-                                }
-                                else
+                                LLDrawable* drawable = *i;
+                                for (S32 j = 0; j < drawable->getNumFaces(); j++)
                                 {
-                                        glColor4f(0,1,1,1);
+                                        LLFace* face = drawable->getFace(j);
+                                        if (gFrameTimeSeconds - face->mLastUpdateTime < 0.5f && face->mVertexBuffer.notNull())
+                                        { 
+                                                face->mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX);
+                                                //drawBox((face->mExtents[0] + face->mExtents[1])*0.5f,
+                                                //              (face->mExtents[1]-face->mExtents[0])*0.5f);
+                                                glDrawElements(GL_TRIANGLES, face->getIndicesCount(), GL_UNSIGNED_INT, 
+                                                        ((U32*) face->mVertexBuffer->getIndicesPointer())+face->getIndicesStart());
+                                        }
                                 }
+                        }
+                        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+                }
+        }
+        else
+        {
+                if (group->mBufferUsage == GL_STATIC_DRAW_ARB && !group->getData().empty() 
+                        && group->mSpatialPartition->mRenderByGroup)
+                {
+                        col.setVec(0.8f, 0.4f, 0.1f, 0.1f);
+                }
+                else
+                {
+                        col.setVec(0.1f, 0.1f, 1.f, 0.1f);
+                }
+        }
 
+        glColor4fv(col.mV);
+        drawBox(group->mObjectBounds[0], group->mObjectBounds[1]*1.01f+LLVector3(0.001f, 0.001f, 0.001f));
+        glDepthMask(GL_TRUE);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-                                LLVector3 pos; 
-                                LLVector3 size;
-                                
-                                pos = group->mObjectBounds[0];
-                                size = group->mObjectBounds[1];
-                                
-                                LLVector3 v1 = size.scaledVec(LLVector3( 1, 1,1));
-                                LLVector3 v2 = size.scaledVec(LLVector3(-1, 1,1));
-                                LLVector3 v3 = size.scaledVec(LLVector3(-1,-1,1));
-                                LLVector3 v4 = size.scaledVec(LLVector3( 1,-1,1));
-
-                                glBegin(GL_LINE_LOOP); //top
-                                glVertex3fv((pos+v1).mV);
-                                glVertex3fv((pos+v2).mV);
-                                glVertex3fv((pos+v3).mV);
-                                glVertex3fv((pos+v4).mV);
-                                glEnd();
-
-                                glBegin(GL_LINE_LOOP); //bottom
-                                glVertex3fv((pos-v1).mV);
-                                glVertex3fv((pos-v2).mV);
-                                glVertex3fv((pos-v3).mV);
-                                glVertex3fv((pos-v4).mV);
-                                glEnd();
-
-
-                                glBegin(GL_LINES);
-
-                                //right
-                                glVertex3fv((pos+v1).mV);
-                                glVertex3fv((pos-v3).mV);
-                                                
-                                glVertex3fv((pos+v4).mV);
-                                glVertex3fv((pos-v2).mV);
-
-                                //left
-                                glVertex3fv((pos+v2).mV);
-                                glVertex3fv((pos-v4).mV);
-
-                                glVertex3fv((pos+v3).mV);
-                                glVertex3fv((pos-v1).mV);
+        //draw opaque outline
+        glColor4f(col.mV[0], col.mV[1], col.mV[2], 1.f);
+        drawBoxOutline(group->mObjectBounds[0], group->mObjectBounds[1]);
 
-                                glEnd();
+        if (group->mOctreeNode->hasLeafState())
+        {
+                glColor4f(1,1,1,1);
+        }
+        else
+        {
+                glColor4f(0,1,1,1);
+        }
+                                        
+        drawBoxOutline(group->mBounds[0],group->mBounds[1]);
+        
+//      LLSpatialGroup::OctreeNode* node = group->mOctreeNode;
+//      glColor4f(0,1,0,1);
+//      drawBoxOutline(LLVector3(node->getCenter()), LLVector3(node->getSize()));
+}
 
-                                LLVector3 nc = LLVector3(node->getCenter());
-                                LLVector3 ns = LLVector3(node->getSize());
+void renderVisibility(LLSpatialGroup* group)
+{
+        LLGLEnable blend(GL_BLEND);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        LLGLEnable cull(GL_CULL_FACE);
+        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+        {
+                LLGLDepthTest depth_under(GL_TRUE, GL_FALSE, GL_GREATER);
+                glColor4f(0, 0.5f, 0, 0.5f);
+                pushVerts(group, LLVertexBuffer::MAP_VERTEX);
+        }
 
-                                LLVector3 nv1 = ns.scaledVec(LLVector3( 1, 1,1));
-                                LLVector3 nv2 = ns.scaledVec(LLVector3(-1, 1,1));
-                                LLVector3 nv3 = ns.scaledVec(LLVector3(-1,-1,1));
-                                LLVector3 nv4 = ns.scaledVec(LLVector3( 1,-1,1));
+        {
+                LLGLDepthTest depth_over(GL_TRUE, GL_FALSE, GL_LEQUAL);
+                pushVertsColorCoded(group, LLVertexBuffer::MAP_VERTEX);
 
-                                
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-                                /*if (node->getElementCount() > 0)
-                                {
-                                        //spokes
-                                    glColor4f(1,1,0,1);
-                                        glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,0);
-                                        glVertex3fv(nc.mV);
-
-                                        glColor4f(1,1,0,1); glVertex3fv((pos+v1).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos-v1).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos+v2).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos-v2).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos+v3).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos-v3).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos+v4).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                        glColor4f(1,1,0,1); glVertex3fv((pos-v4).mV); glColor4f(1,1,0,0);       glVertex3fv(pos.mV);
-                                }*/
+                pushVertsColorCoded(group, LLVertexBuffer::MAP_VERTEX);
+        }
+}
 
-                                
+void renderBoundingBox(LLDrawable* drawable)
+{
+        if (drawable->isSpatialBridge())
+        {
+                glColor4f(1,0.5f,0,1);
+        }
+        else if (drawable->getVOVolume())
+        {
+                if (drawable->isRoot())
+                {
+                        glColor4f(1,1,0,1);
+                }
+                else
+                {
+                        glColor4f(0,1,0,1);
+                }
+        }
+        else if (drawable->getVObj())
+        {
+                switch (drawable->getVObj()->getPCode())
+                {
+                        case LLViewerObject::LL_VO_SURFACE_PATCH:
+                                        glColor4f(0,1,1,1);
+                                        break;
+                        case LLViewerObject::LL_VO_CLOUDS:
+                                        glColor4f(0.5f,0.5f,0.5f,1.0f);
+                                        break;
+                        case LLViewerObject::LL_VO_PART_GROUP:
+                                        glColor4f(0,0,1,1);
+                                        break;
+                        case LLViewerObject::LL_VO_WATER:
+                                        glColor4f(0,0.5f,1,1);
+                                        break;
+                        case LL_PCODE_LEGACY_TREE:
+                                        glColor4f(0,0.5f,0,1);
+                        default:
+                                        glColor4f(1,0,1,1);
+                                        break;
+                }
+        }
+        else 
+        {
+                glColor4f(1,0,0,1);
+        }
 
-                                /*glColor4f(0,1,0,1);
-                                glBegin(GL_LINE_LOOP); //top
-                                glVertex3fv((nc+nv1).mV);
-                                glVertex3fv((nc+nv2).mV);
-                                glVertex3fv((nc+nv3).mV);
-                                glVertex3fv((nc+nv4).mV);
-                                glEnd();
+        const LLVector3* ext;
+        LLVector3 pos, size;
 
-                                glBegin(GL_LINE_LOOP); //bottom
-                                glVertex3fv((nc-nv1).mV);
-                                glVertex3fv((nc-nv2).mV);
-                                glVertex3fv((nc-nv3).mV);
-                                glVertex3fv((nc-nv4).mV);
-                                glEnd();
+        //render face bounding boxes
+        for (S32 i = 0; i < drawable->getNumFaces(); i++)
+        {
+                LLFace* facep = drawable->getFace(i);
 
+                ext = facep->mExtents;
 
-                                glBegin(GL_LINES);
+                if (ext[0].isExactlyZero() && ext[1].isExactlyZero())
+                {
+                        continue;
+                }
+                pos = (ext[0] + ext[1]) * 0.5f;
+                size = (ext[1] - ext[0]) * 0.5f;
+                drawBoxOutline(pos,size);
+        }
 
-                                //right
-                                glVertex3fv((nc+nv1).mV);
-                                glVertex3fv((nc-nv3).mV);
-                                                
-                                glVertex3fv((nc+nv4).mV);
-                                glVertex3fv((nc-nv2).mV);
+        //render drawable bounding box
+        ext = drawable->getSpatialExtents();
 
-                                //left
-                                glVertex3fv((nc+nv2).mV);
-                                glVertex3fv((nc-nv4).mV);
+        pos = (ext[0] + ext[1]) * 0.5f;
+        size = (ext[1] - ext[0]) * 0.5f;
+        
+        drawBoxOutline(pos,size);
+}
 
-                                glVertex3fv((nc+nv3).mV);
-                                glVertex3fv((nc-nv1).mV);
-                                glEnd();*/
+void renderTexturePriority(LLDrawable* drawable)
+{
+        for (int face=0; face<drawable->getNumFaces(); ++face)
+        {
+                LLFace *facep = drawable->getFace(face);
+                
+                LLVector4 cold(0,0,0.25f);
+                LLVector4 hot(1,0.25f,0.25f);
+        
+                LLVector4 boost_cold(0,0,0,0);
+                LLVector4 boost_hot(0,1,0,1);
+                
+                LLGLDisable blend(GL_BLEND);
+                
+                //LLViewerImage* imagep = facep->getTexture();
+                //if (imagep)
+                {
+        
+                        //F32 vsize = LLVOVolume::getTextureVirtualSize(facep);
+                        //F32 vsize = imagep->mMaxVirtualSize;
+                        F32 vsize = facep->getPixelArea();
 
-                                glLineWidth(1);
-                                
-                                glDepthMask(GL_FALSE);
-                                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                                glColor4f(0.1f,0.1f,1,0.1f);
-                                drawBox(group->mObjectBounds[0], group->mObjectBounds[1]*1.01f+LLVector3(0.001f, 0.001f, 0.001f));
-                                glDepthMask(GL_TRUE);
-                                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                        if (vsize > sCurMaxTexPriority)
+                        {
+                                sCurMaxTexPriority = vsize;
                         }
+                        
+                        F32 t = vsize/sLastMaxTexPriority;
+                        
+                        LLVector4 col = lerp(cold, hot, t);
+                        glColor4fv(col.mV);
                 }
-                /*else
+                //else
+                //{
+                //      glColor4f(1,0,1,1);
+                //}
+
+                
+                
+                LLVector3 center = (facep->mExtents[1]+facep->mExtents[0])*0.5f;
+                LLVector3 size = (facep->mExtents[1]-facep->mExtents[0])*0.5f + LLVector3(0.01f, 0.01f, 0.01f);
+                drawBox(center, size);
+                
+                /*S32 boost = imagep->getBoostLevel();
+                if (boost)
+                {
+                        F32 t = (F32) boost / (F32) (LLViewerImage::BOOST_MAX_LEVEL-1);
+                        LLVector4 col = lerp(boost_cold, boost_hot, t);
+                        LLGLEnable blend_on(GL_BLEND);
+                        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                        glColor4fv(col.mV);
+                        drawBox(center, size);
+                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                }*/
+        }
+}
+
+void renderPoints(LLDrawable* drawablep)
+{
+        LLGLDepthTest depth(GL_FALSE, GL_FALSE);
+        glBegin(GL_POINTS);
+        glColor3f(1,1,1);
+        LLVector3 center(drawablep->getPositionGroup());
+        for (S32 i = 0; i < drawablep->getNumFaces(); i++)
+        {
+                glVertex3fv(drawablep->getFace(i)->mCenterLocal.mV);
+        }
+        glEnd();
+}
+
+void renderTextureAnim(LLDrawInfo* params)
+{
+        if (!params->mTextureMatrix)
+        {
+                return;
+        }
+        
+        LLGLEnable blend(GL_BLEND);
+        glColor4f(1,1,0,0.5f);
+        pushVerts(params, LLVertexBuffer::MAP_VERTEX);
+}
+
+class LLOctreeRenderNonOccluded : public LLOctreeTraveler<LLDrawable>
+{
+public:
+        LLOctreeRenderNonOccluded() {}
+        
+        virtual void traverse(const LLSpatialGroup::OctreeNode* node)
+        {
+                const LLSpatialGroup::OctreeState* state = node->getOctState();
+                LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
+                
+        
+                if ((!gPipeline.sUseOcclusion || !group->isState(LLSpatialGroup::OCCLUDED)) &&
+                        !group->isState(LLSpatialGroup::CULLED))
                 {
-                        //occlusion paranoia check
-                        const LLSpatialGroup::OctreeNode* parent = node;
-                        while (parent != NULL)
+                        state->accept(this);
+
+                        for (U32 i = 0; i < state->getChildCount(); i++)
                         {
-                                LLSpatialGroup* grp = (LLSpatialGroup*) parent->getListener(0);
-                                if (grp->isState(LLSpatialGroup::ACTIVE_OCCLUSION))
-                                {
-                                        return;
-                                }
-                                parent = (const LLSpatialGroup::OctreeNode*) parent->getParent();
+                                traverse(state->getChild(i));
+                        }
+                        
+                        //draw tight fit bounding boxes for spatial group
+                        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCTREE))
+                        {       
+                                renderOctree(group);
                         }
 
-                        glColor4f(1,0,1,1);
-                        drawBox(group->mBounds[0], group->mBounds[1]);
-                }*/
+                        //render visibility wireframe
+                        if (group->mSpatialPartition->mRenderByGroup &&
+                                gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCCLUSION) &&
+                                !group->isState(LLSpatialGroup::GEOM_DIRTY))
+                        {
+                                renderVisibility(group);
+                        }
+                }
         }
 
         virtual void visit(const LLSpatialGroup::OctreeState* branch)
@@ -1816,276 +2632,37 @@ public:
                 LLVector3 nodeCenter = group->mBounds[0];
                 LLVector3 octCenter = LLVector3(group->mOctreeNode->getCenter());
 
-                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCTREE))
-                {
-                        glBegin(GL_LINES);
-                        glColor4f(1,0.5f,0,1);
-                        glVertex3fv(nodeCenter.mV);
-                        glColor4f(0,1,1,0);
-                        glVertex3fv(octCenter.mV);
-                        glEnd();
-                }
-
                 for (LLSpatialGroup::OctreeState::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
                 {
                         LLDrawable* drawable = *i;
-                        
-                        if (drawable->isSpatialBridge())
-                        {
-                                LLSpatialBridge* bridge = (LLSpatialBridge*) drawable;
-                                glPushMatrix();
-                                glMultMatrixf((F32*)bridge->mDrawable->getWorldMatrix().mMatrix);
-                                traverse(bridge->mOctree);
-                                glPopMatrix();
-                        }
-                        
-                        if (!drawable->isVisible())
-                        {
-                                continue;
-                        }
-                                
+                                                
                         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_BBOXES))
                         {
-                                if (drawable->isSpatialBridge())
-                                {
-                                        glColor4f(1,0.5f,0,1);
-                                }
-                                else if (drawable->getVOVolume())
-                                {
-                                        if (drawable->isRoot())
-                                        {
-                                                glColor4f(1,1,0,1);
-                                        }
-                                        else
-                                        {
-                                                glColor4f(0,1,0,1);
-                                        }
-                                }
-                                else if (drawable->getVObj())
-                                {
-                                        switch (drawable->getVObj()->getPCode())
-                                        {
-                                                case LLViewerObject::LL_VO_SURFACE_PATCH:
-                                                                glColor4f(0,1,1,1);
-                                                                break;
-                                                case LLViewerObject::LL_VO_CLOUDS:
-                                                                glColor4f(0.5f,0.5f,0.5f,1.0f);
-                                                                break;
-                                                case LLViewerObject::LL_VO_PART_GROUP:
-                                                                glColor4f(0,0,1,1);
-                                                                break;
-                                                case LLViewerObject::LL_VO_WATER:
-                                                                glColor4f(0,0.5f,1,1);
-                                                                break;
-                                                case LL_PCODE_LEGACY_TREE:
-                                                                glColor4f(0,0.5f,0,1);
-                                                default:
-                                                                glColor4f(1,0,1,1);
-                                                                break;
-                                        }
-                                }
-                                else 
-                                {
-                                        glColor4f(1,0,0,1);
-                                }
-                                
-                                                                                
-                                const LLVector3* ext = drawable->getSpatialExtents();
-                                
-                                LLVector3 pos = (ext[0] + ext[1]) * 0.5f;
-                                LLVector3 size = (ext[1] - ext[0]) * 0.5f;
-                                
-                                LLVector3 v1 = size.scaledVec(LLVector3( 1, 1,1));
-                                LLVector3 v2 = size.scaledVec(LLVector3(-1, 1,1));
-                                LLVector3 v3 = size.scaledVec(LLVector3(-1,-1,1));
-                                LLVector3 v4 = size.scaledVec(LLVector3( 1,-1,1));
-
-                                glBegin(GL_LINE_LOOP); //top
-                                glVertex3fv((pos+v1).mV);
-                                glVertex3fv((pos+v2).mV);
-                                glVertex3fv((pos+v3).mV);
-                                glVertex3fv((pos+v4).mV);
-                                glEnd();
-
-                                glBegin(GL_LINE_LOOP); //bottom
-                                glVertex3fv((pos-v1).mV);
-                                glVertex3fv((pos-v2).mV);
-                                glVertex3fv((pos-v3).mV);
-                                glVertex3fv((pos-v4).mV);
-                                glEnd();
-
-
-                                glBegin(GL_LINES);
-
-                                //right
-                                glVertex3fv((pos+v1).mV);
-                                glVertex3fv((pos-v3).mV);
-                                                
-                                glVertex3fv((pos+v4).mV);
-                                glVertex3fv((pos-v2).mV);
-
-                                //left
-                                glVertex3fv((pos+v2).mV);
-                                glVertex3fv((pos-v4).mV);
-
-                                glVertex3fv((pos+v3).mV);
-                                glVertex3fv((pos-v1).mV);
-
-                                glEnd();
-
-                                //render space partition trace
-                                glBegin(GL_LINE_STRIP);
-                                glColor4f(1,0,0,1);
-                                glVertex3fv(pos.mV);
-                                glColor4f(0,1,0,1);
-                                glVertex3dv(drawable->getPositionGroup().mdV);
-                                glColor4f(0,0,1,1);
-                                glVertex3fv(nodeCenter.mV);
-                                glColor4f(1,1,0,1);
-                                glVertex3fv(octCenter.mV);
-                                glEnd();
+                                renderBoundingBox(drawable);                    
                         }
                         
-                        if (drawable->getVOVolume() && gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_FACE_CHAINS | LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
+                        if (drawable->getVOVolume() && gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
                         {
-                                glLineWidth(3);
-                                
-                                for (int face=0; face<drawable->getNumFaces(); ++face)
-                                {
-                                        LLFace *facep = drawable->getFace(face);
-                                        
-                                        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_FACE_CHAINS))
-                                        {
-                                                LLGLDepthTest depth(GL_FALSE);
-                                                if (facep->mNextFace)
-                                                {
-                                                        glBegin(GL_LINE_STRIP);
-
-                                                        if (facep->isState(LLFace::GLOBAL))
-                                                        {
-                                                                glColor4f(0,1,0,1);
-                                                        }
-                                                        else
-                                                        {
-                                                                glColor4f(1,0.5f,0.25f,1);
-                                                        }
-                                                        
-                                                        if (drawable->isActive())
-                                                        {
-                                                                glVertex3fv(facep->mCenterLocal.mV);
-                                                                glVertex3fv(facep->mNextFace->mCenterLocal.mV);
-                                                        }
-                                                        else
-                                                        {
-                                                                glVertex3fv(facep->mCenterAgent.mV);
-                                                                glVertex3fv(facep->mNextFace->mCenterAgent.mV);
-                                                        }
-                                                        
-                                                        glEnd();
-                                                }
-                                                else
-                                                {
-                                                        glPointSize(5);
-                                                        glBegin(GL_POINTS);
-                                                        
-                                                        if (!facep->isState(LLFace::GLOBAL))
-                                                        {
-                                                                glColor4f(1,0.75f,0,1);
-                                                                glVertex3fv(facep->mCenterLocal.mV);
-                                                        }
-                                                        else
-                                                        {
-                                                                glColor4f(0,0.75f,1,1);
-                                                                glVertex3fv(facep->mCenterAgent.mV);
-                                                        }
-                                                        
-                                                        glEnd();
-                                                        glPointSize(1);
-                                                }
-                                        }
-                                        
-                                        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
-                                        {
-                                                LLVector4 cold(0,0,0.25f);
-                                                LLVector4 hot(1,0.25f,0.25f);
-                                        
-                                                LLVector4 boost_cold(0,0,0,0);
-                                                LLVector4 boost_hot(0,1,0,1);
-                                                
-                                                LLGLDisable blend(GL_BLEND);
-                                                
-                                                LLViewerImage* imagep = facep->getTexture();
-                                                if (imagep)
-                                                {
-                                        
-                                                        //F32 vsize = LLVOVolume::getTextureVirtualSize(facep);
-                                                        F32 vsize = imagep->mMaxVirtualSize;
-                                                        
-                                                        if (vsize > sCurMaxTexPriority)
-                                                        {
-                                                                sCurMaxTexPriority = vsize;
-                                                        }
-                                                        
-                                                        F32 t = vsize/sLastMaxTexPriority;
-                                                        
-                                                        LLVector4 col = lerp(cold, hot, t);
-                                                        glColor4fv(col.mV);
-                                                }
-                                                else
-                                                {
-                                                        glColor4f(1,0,1,1);
-                                                }
-                                                
-                                                LLVector3 center = (facep->mExtents[1]+facep->mExtents[0])*0.5f;
-                                                LLVector3 size = (facep->mExtents[1]-facep->mExtents[0])*0.5f + LLVector3(0.01f, 0.01f, 0.01f);
-                                                drawBox(center, size);
-                                                
-                                                S32 boost = imagep->getBoostLevel();
-                                                if (boost)
-                                                {
-                                                        F32 t = (F32) boost / (F32) (LLViewerImage::BOOST_MAX_LEVEL-1);
-                                                        LLVector4 col = lerp(boost_cold, boost_hot, t);
-                                                        LLGLEnable blend_on(GL_BLEND);
-                                                        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                                                        glColor4fv(col.mV);
-                                                        drawBox(center, size);
-                                                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-                                                }
-                                                        
-                                        }
-                                }
+                                renderTexturePriority(drawable);
                         }
-                        
+
                         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_POINTS))
                         {
-                                glPointSize(4);
-                                glColor4f(1,1,1,1);
-                                glBegin(GL_POINTS);
-                                S32 num_faces = drawable->getNumFaces();
-                                for (S32 i = 0; i < num_faces; i++)
+                                renderPoints(drawable);
+                        }
+                }
+                
+                for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
+                {
+                        std::vector<LLDrawInfo*>& draw_vec = i->second;
+                        for (std::vector<LLDrawInfo*>::iterator j = draw_vec.begin(); j != draw_vec.end(); ++j)
+                        {
+                                LLDrawInfo* draw_info = *j;
+                                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_ANIM))
                                 {
-                                        LLStrider<LLVector3> vertices;
-                                        drawable->getFace(i)->getVertices(vertices);
-                                        
-                                        LLFace* face = drawable->getFace(i);
-                                        
-                                        for (S32 v = 0; v < (S32)drawable->getFace(i)->getGeomCount(); v++)
-                                        {
-                                                if (!face->getDrawable()->isActive())
-                                                {
-                                                        //glVertex3fv(vertices[v].mV);
-                                                }
-                                                else
-                                                {
-                                                        glVertex3fv((vertices[v]*face->getRenderMatrix()).mV);
-                                                }
-                                        }
+                                        renderTextureAnim(draw_info);
                                 }
-                                glEnd();
-                                glPointSize(1);
                         }
-                        
-                        glLineWidth(1);
                 }
         }
 };
@@ -2096,8 +2673,8 @@ void LLSpatialPartition::renderDebug()
                                                                           LLPipeline::RENDER_DEBUG_OCCLUSION |
                                                                           LLPipeline::RENDER_DEBUG_BBOXES |
                                                                           LLPipeline::RENDER_DEBUG_POINTS |
-                                                                          LLPipeline::RENDER_DEBUG_FACE_CHAINS |
-                                                                          LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
+                                                                          LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY |
+                                                                          LLPipeline::RENDER_DEBUG_TEXTURE_ANIM))
         {
                 return;
         }
@@ -2105,7 +2682,7 @@ void LLSpatialPartition::renderDebug()
         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
         {
                 //sLastMaxTexPriority = lerp(sLastMaxTexPriority, sCurMaxTexPriority, gFrameIntervalSeconds);
-                sLastMaxTexPriority = sCurMaxTexPriority;
+                sLastMaxTexPriority = (F32) gCamera->getScreenPixelArea();
                 sCurMaxTexPriority = 0.f;
         }
 
@@ -2119,78 +2696,50 @@ void LLSpatialPartition::renderDebug()
                 
         LLOctreeRenderNonOccluded render_debug;
         render_debug.traverse(mOctree);
-        
-        LLGLDisable cull_face(GL_CULL_FACE);
 
-        {
-                LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-                
-                //draw frustum
-                glColor4f(0,0,1,0.5f);
-                glBegin(GL_QUADS);
-                //glVertex3fv(gCamera->mAgentFrustum[0].mV);
-                //glVertex3fv(gCamera->mAgentFrustum[1].mV);
-                //glVertex3fv(gCamera->mAgentFrustum[2].mV);
-                //glVertex3fv(gCamera->mAgentFrustum[3].mV);
+        LLGLDisable cull_face(GL_CULL_FACE);
         
-                //glVertex3fv(gCamera->mAgentFrustum[4].mV);
-                //glVertex3fv(gCamera->mAgentFrustum[5].mV);
-                //glVertex3fv(gCamera->mAgentFrustum[6].mV);
-                //glVertex3fv(gCamera->mAgentFrustum[7].mV);
-
-                glVertex3fv(gCamera->mAgentFrustum[0].mV);
-                glVertex3fv(gCamera->mAgentFrustum[1].mV);
-                glVertex3fv(gCamera->mAgentFrustum[5].mV);
-                glVertex3fv(gCamera->mAgentFrustum[4].mV);
-
-                glVertex3fv(gCamera->mAgentFrustum[1].mV);
-                glVertex3fv(gCamera->mAgentFrustum[2].mV);
-                glVertex3fv(gCamera->mAgentFrustum[6].mV);
-                glVertex3fv(gCamera->mAgentFrustum[5].mV);
-
-                glVertex3fv(gCamera->mAgentFrustum[2].mV);
-                glVertex3fv(gCamera->mAgentFrustum[3].mV);
-                glVertex3fv(gCamera->mAgentFrustum[7].mV);
-                glVertex3fv(gCamera->mAgentFrustum[6].mV);
-
-                glVertex3fv(gCamera->mAgentFrustum[3].mV);
-                glVertex3fv(gCamera->mAgentFrustum[0].mV);
-                glVertex3fv(gCamera->mAgentFrustum[4].mV);
-                glVertex3fv(gCamera->mAgentFrustum[7].mV);
-
-                glEnd();
-        }
-
-        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCCLUSION))
+        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCCLUSION) && !mOccludedList.empty() &&
+                mOcclusionIndices.notNull())
         {
                 LLGLDisable fog(GL_FOG);
                 LLGLDepthTest gls_depth(GL_FALSE);
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                mOcclusionIndices->setBuffer(0);
+                U32* indicesp = (U32*) mOcclusionIndices->getIndicesPointer();
+
+                LLGLEnable blend(GL_BLEND);
+                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                LLGLEnable cull(GL_CULL_FACE);
+                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-                for (std::vector<LLSpatialGroup*>::iterator i = mOccludedList.begin(); i != mOccludedList.end(); ++i)
+                for (U32 i = 0; i < mOccludedList.size(); i++)
                 {       //draw occluded nodes
-                        LLSpatialGroup* node = *i;
-                        if (node->isDead())
+                        LLSpatialGroup* node = mOccludedList[i];
+                        if (node->isDead() ||
+                                !node->isState(LLSpatialGroup::OCCLUDED) ||
+                                node->mOcclusionVerts.isNull())
                         {
                                 continue;
                         }
-                        if (!node->isState(LLSpatialGroup::OCCLUDED))
+                        
+                        node->mOcclusionVerts->setBuffer(LLVertexBuffer::MAP_VERTEX);
                         {
-                                continue;
+                                LLGLDepthTest depth_under(GL_TRUE, GL_FALSE, GL_GREATER);
+                                glColor4f(0.5, 0.5f, 0, 0.25f);
+                                glDrawRangeElements(GL_TRIANGLES, 0, 7, 36,
+                                                        GL_UNSIGNED_INT, indicesp);
                         }
-                        else
+
                         {
-                                glColor4f(0.25f,0.125f,0.1f,0.125f);
+                                LLGLDepthTest depth_over(GL_TRUE, GL_FALSE, GL_LEQUAL);
+                                glColor4f(0.0,1.0f,1.0f,1.0f);
+                                glDrawRangeElements(GL_TRIANGLES, 0, 7, 36,
+                                                        GL_UNSIGNED_INT, indicesp);
                         }
-                        LLVector3 c;
-                        LLVector3 r;
-
-                        c = node->mBounds[0];
-                        r = node->mBounds[1]*SG_OCCLUSION_FUDGE + LLVector3(0.01f,0.01f,0.01f);;
-                        
-                        drawBox(c,r);
                 }
-                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
         }       
 }
 
@@ -2272,3 +2821,27 @@ LLDrawable*	LLSpatialPartition::pickDrawable(const LLVector3& start, const LLVec
         collision.setVec(pick.mEnd);
         return ret;
 }
+
+LLDrawInfo::LLDrawInfo(U32 start, U32 end, U32 count, U32 offset, 
+                                           LLViewerImage* texture, LLVertexBuffer* buffer,
+                                           BOOL fullbright, U8 bump, BOOL particle, F32 part_size)
+:
+        mVertexBuffer(buffer),
+        mTexture(texture),
+        mTextureMatrix(NULL),
+        mStart(start),
+        mEnd(end),
+        mCount(count),
+        mOffset(offset), 
+        mFullbright(fullbright),
+        mBump(bump),
+        mParticle(particle),
+        mPartSize(part_size),
+        mVSize(0.f)
+{
+}
+
+LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage)
+{
+        return new LLVertexBuffer(type_mask, usage);
+}
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index 737029a..5804a57 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -33,26 +33,77 @@
 #include "llmemory.h"
 #include "lldrawable.h"
 #include "lloctree.h"
+#include "llvertexbuffer.h"
 #include "llgltypes.h"
+#include "llcubemap.h"
 
 #include <queue>
 
-class LLCullInfo
+#define SG_STATE_INHERIT_MASK (CULLED | OCCLUDED)
+#define SG_INITIAL_STATE_MASK (OCCLUSION_DIRTY | DIRTY | GEOM_DIRTY)
+
+class LLSpatialPartition;
+class LLSpatialBridge;
+
+class LLDrawInfo
 {
 public:
-        LLVector3 mPos;
-        F32 mRadius;
-        LLPointer<LLDrawable> mDrawablep;
-};
+        LLDrawInfo(U32 start, U32 end, U32 count, U32 offset, 
+                                LLViewerImage* image, LLVertexBuffer* buffer, 
+                                BOOL fullbright = FALSE, U8 bump = 0, BOOL particle = FALSE, F32 part_size = 0);
+        
+        LLPointer<LLVertexBuffer> mVertexBuffer;
+        LLPointer<LLViewerImage> mTexture;
+        LLPointer<LLCubeMap> mReflectionMap;
+        LLColor4U mGlowColor;
+        const LLMatrix4* mTextureMatrix;
+        U32 mStart;
+        U32 mEnd;
+        U32 mCount;
+        U32 mOffset;
+        BOOL mFullbright;
+        U8 mBump;
+        BOOL mParticle;
+        F32 mPartSize;
+        F32 mVSize;
+        
+        struct CompareTexture
+        {
+                bool operator()(const LLDrawInfo& lhs, const LLDrawInfo& rhs)
+                {
+                        return lhs.mTexture > rhs.mTexture;
+                }
+        };
 
-#define SG_STATE_INHERIT_MASK (CULLED | OCCLUDED)
-class LLSpatialPartition;
+        struct CompareTexturePtr
+        {
+                bool operator()(const LLDrawInfo* const& lhs, const LLDrawInfo* const& rhs)
+                {
+                
+                        return lhs == NULL || rhs == NULL || lhs->mTexture > rhs->mTexture;
+                }
+        };
+
+        struct CompareBump
+        {
+                bool operator()(const LLDrawInfo* const& lhs, const LLDrawInfo* const& rhs)
+                {
+                        return lhs == NULL || rhs == NULL || lhs->mBump > rhs->mBump;
+                }
+        };
+};
 
 class LLSpatialGroup : public LLOctreeListener<LLDrawable>
 {
         friend class LLSpatialPartition;
 public:
 
+        typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t;
+        typedef std::set<LLPointer<LLSpatialGroup> > sg_set_t;
+        typedef std::vector<LLPointer<LLSpatialBridge> > bridge_list_t;
+        typedef std::map<U32, std::vector<LLDrawInfo*> > draw_map_t;
+        typedef std::map<LLPointer<LLViewerImage>, LLPointer<LLVertexBuffer> > buffer_map_t;
+
         typedef LLOctreeListener<LLDrawable>    BaseType;
         typedef LLOctreeListener<LLDrawable>    OctreeListener;
         typedef LLTreeNode<LLDrawable>                  TreeNode;
@@ -60,6 +111,24 @@ public:
         typedef LLOctreeRoot<LLDrawable>                OctreeRoot;
         typedef LLOctreeState<LLDrawable>               OctreeState;
         typedef LLOctreeTraveler<LLDrawable>    OctreeTraveler;
+        typedef LLOctreeState<LLDrawable>::element_iter element_iter;
+        typedef LLOctreeState<LLDrawable>::element_list element_list;
+
+        struct CompareDistanceGreater
+        {
+                bool operator()(const LLSpatialGroup* const& lhs, const LLSpatialGroup* const& rhs)
+                {
+                        return lhs->mDistance > rhs->mDistance;
+                }
+        };
+
+        struct CompareDepthGreater
+        {
+                bool operator()(const LLSpatialGroup* const& lhs, const LLSpatialGroup* const& rhs)
+                {
+                        return lhs->mDepth > rhs->mDepth;
+                }
+        };
 
         typedef enum
         {
@@ -75,10 +144,17 @@ public:
                 RESHADOW_QUEUE                  = 0x00000200,
                 DIRTY                                   = 0x00000400,
                 OBJECT_DIRTY                    = 0x00000800,
-                DISCARD_QUERY                   = 0x00001000,
-                QUERY_OUT                               = 0x00002000,
-                OCCLUDING                               = 0x00004000,
-                SKIP_FRUSTUM_CHECK              = 0x00008000,
+                GEOM_DIRTY                              = 0x00001000,
+                MATRIX_DIRTY                    = 0x00002000,
+                ALPHA_DIRTY                             = 0x00004000,
+                DISCARD_QUERY                   = 0x00008000,
+                QUERY_OUT                               = 0x00010000,
+                OCCLUDING                               = 0x00020000,
+                SKIP_FRUSTUM_CHECK              = 0x00040000,
+                OCCLUSION_DIRTY                 = 0x00080000,
+                BELOW_WATER                             = 0x00100000,
+                IN_IMAGE_QUEUE                  = 0x00200000,
+                IMAGE_DIRTY                             = 0x00400000,
         } eSpatialState;
 
         typedef enum
@@ -89,20 +165,21 @@ public:
         } eSetStateMode;
 
         LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part);
-        BOOL safeToDelete();
         virtual ~LLSpatialGroup();
 
-        S32 getCount() const                                    { return mObjects.size(); }
         BOOL isDead()                                                   { return isState(DEAD); }
         BOOL isState(U32 state) const                   { return mState & state ? TRUE : FALSE; }
         U32 getState()                                                  { return mState; }
         void setState(U32 state)                                { mState |= state; }
         void clearState(U32 state)                              { mState &= ~state; }
         
+        void clearDrawMap();
         void validate();
-
+        void validateDrawMap();
+        
         void setState(U32 state, S32 mode);
 
+        LLSpatialGroup* getParent();
 
         void clearState(U32 state, S32 mode);
         BOOL addObject(LLDrawable *drawablep, BOOL add_all = FALSE, BOOL from_octree = FALSE);
@@ -113,8 +190,16 @@ public:
         BOOL boundObjects(BOOL empty, LLVector3& newMin, LLVector3& newMax);
         void unbound();
         BOOL rebound();
+        void destroyGL();
+        
+        void updateDistance(LLCamera& camera);
         BOOL changeLOD();
-                
+        void rebuildGeom();
+        void makeStatic();
+        
+        void dirtyGeom() { setState(GEOM_DIRTY); }
+        element_list& getData() { return mOctreeNode->getOctState()->getData(); }
+
          //LISTENER FUNCTIONS
         virtual void handleInsertion(const TreeNode* node, LLDrawable* face);
         virtual void handleRemoval(const TreeNode* node, LLDrawable* face);
@@ -124,12 +209,15 @@ public:
         virtual void handleChildRemoval(const OctreeNode* parent, const OctreeNode* child);
 
 protected:
-        std::vector<LLCullInfo> mObjects;
         U32 mState;
         S32 mLODHash;
         static S32 sLODSeed;
 
 public:
+        bridge_list_t mBridgeList;
+        buffer_map_t mBufferMap; //used by volume buffers to store unique buffers per texture
+
+        F32 mBuilt;
         OctreeNode* mOctreeNode;
         LLSpatialPartition* mSpatialPartition;
         LLVector3 mBounds[2];
@@ -137,69 +225,130 @@ public:
         LLVector3 mObjectExtents[2];
         LLVector3 mObjectBounds[2];
 
+        LLPointer<LLVertexBuffer> mVertexBuffer;
+        LLPointer<LLVertexBuffer> mOcclusionVerts;
+        LLPointer<LLCubeMap>    mReflectionMap;
+
+        U32 mBufferUsage;
+        draw_map_t mDrawMap;
+        
+        U32 mVertexCount;
+        U32 mIndexCount;
+        F32 mDistance;
+        F32 mDepth;
+        F32 mLastUpdateDistance;
+        F32 mLastUpdateTime;
+        F32 mLastAddTime;
+        F32 mLastRenderTime;
+        
+        LLVector3 mViewAngle;
+        LLVector3 mLastUpdateViewAngle;
+        
+        F32 mPixelArea;
+        F32 mRadius;
 };
 
-class LLSpatialPartition
+class LLGeometryManager
 {
 public:
-        LLSpatialPartition();
+        std::vector<LLFace*> mFaceList;
+        virtual ~LLGeometryManager() { }
+        virtual void rebuildGeom(LLSpatialGroup* group) = 0;
+        virtual void getGeometry(LLSpatialGroup* group) = 0;
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32 &index_count);
+        virtual LLVertexBuffer* createVertexBuffer(U32 type_mask, U32 usage);
+};
+
+class LLSpatialPartition: public LLGeometryManager
+{
+public:
+        LLSpatialPartition(U32 data_mask, BOOL is_volatile = FALSE, U32 mBufferUsage = GL_STATIC_DRAW_ARB);
         virtual ~LLSpatialPartition();
 
-        LLSpatialGroup *put(LLDrawable *drawablep);
+        LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE);
         BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp);
         
         LLDrawable*     pickDrawable(const LLVector3& start, const LLVector3& end, LLVector3& collision);
         
         // If the drawable moves, move it here.
         virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE);
-        void shift(const LLVector3 &offset);
+        virtual void shift(const LLVector3 &offset);
+
+        virtual F32 calcDistance(LLSpatialGroup* group, LLCamera& camera);
+        virtual F32 calcPixelArea(LLSpatialGroup* group, LLCamera& camera);
+
+        virtual void rebuildGeom(LLSpatialGroup* group);
 
         S32 cull(LLCamera &camera, std::vector<LLDrawable *>* results = NULL, BOOL for_select = FALSE); // Cull on arbitrary frustum
         BOOL checkOcclusion(LLSpatialGroup* group, LLCamera* camera);
+        void markReimage(LLSpatialGroup* group);
+        void processImagery(LLCamera* camera);
         void processOcclusion(LLCamera* camera);
+        void buildOcclusion();
         void doOcclusion(LLCamera* camera);
         BOOL isVisible(const LLVector3& v);
-        
+        BOOL isVolatile() const { return mVolatile; }
+
+        virtual LLSpatialBridge* asBridge() { return NULL; }
+        virtual BOOL isBridge() { return asBridge() != NULL; }
+
         S32 getObjects(const LLVector3& pos,  F32 rad,  LLDrawable::drawable_set_t &results );
         S32 getLights(const LLVector3& pos,  F32 rad,  LLDrawable::drawable_set_t &results );
         
         void renderDebug();
         void restoreGL();
+        void resetVertexBuffers();
         
 protected:
         S32 getDrawables(const LLVector3& pos,  F32 rad,  LLDrawable::drawable_set_t &results, BOOL get_lights );
         
-        LLSpatialGroup *mLastAddedGroupp;
-
-        typedef std::set<LLSpatialGroup*> spatial_group_set_t;
+        typedef std::set<LLPointer<LLSpatialGroup> > spatial_group_set_t;
         spatial_group_set_t mSpatialGroups;
 
         //things that might be occluded
-        std::queue<LLSpatialGroup*> mOcclusionQueue;
+        typedef std::queue<LLPointer<LLSpatialGroup> > spatial_group_queue_t;
+        spatial_group_queue_t mOcclusionQueue;
+
+        //things that need an image update
+        spatial_group_queue_t mImageQueue;
 
         //things awaiting query
-        std::queue<LLSpatialGroup*> mQueryQueue;
+        spatial_group_queue_t mQueryQueue;
 
         std::vector<LLGLuint> mOcclusionQueries;        
 
 public:
         LLSpatialGroup::OctreeNode* mOctree;
 
-        //things that are occluded
-        std::vector<LLSpatialGroup*> mOccludedList;
-
-        std::queue<LLSpatialGroup*> mReshadowQueue;
+        U32 mBufferUsage;
+        BOOL mRenderByGroup;
+        BOOL mImageEnabled;
+        U32 mLODSeed;
+        U32 mLODPeriod;
+        U32 mVertexDataMask;
+        F32 mSlopRatio; //percentage distance must change before drawables receive LOD update (default is 0.25);
+        BOOL mVolatile; //if TRUE, occlusion queries will be discarded when nodes change size
+        BOOL mDepthMask; //if TRUE, objects in this partition will be written to depth during alpha rendering
+        U32 mDrawableType;
+        U32 mPartitionType;
+
+        //index buffer for occlusion verts
+        LLPointer<LLVertexBuffer> mOcclusionIndices;
 
+        //things that are occluded
+        std::vector<LLPointer<LLSpatialGroup> > mOccludedList;
 };
 
 // class for creating bridges between spatial partitions
 class LLSpatialBridge : public LLDrawable, public LLSpatialPartition
 {
 public:
-        LLSpatialBridge(LLDrawable* root);
+        typedef std::vector<LLPointer<LLSpatialBridge> > bridge_vector_t;
+        
+        LLSpatialBridge(LLDrawable* root, U32 data_mask);
         virtual ~LLSpatialBridge();
         
-        virtual BOOL            isSpatialBridge() const         { return TRUE; }
+        virtual BOOL isSpatialBridge() const            { return TRUE; }
 
         virtual void updateSpatialExtents();
         virtual void updateBinRadius();
@@ -212,11 +361,123 @@ public:
         virtual void shiftPos(const LLVector3& vec);
         virtual void cleanupReferences();
         virtual LLSpatialPartition* asPartition()               { return this; }
-        LLCamera transformCamera(LLCamera& camera);
+        virtual LLSpatialBridge* asBridge()                             { return this; }
+        
+        virtual LLCamera transformCamera(LLCamera& camera);
         
         LLDrawable* mDrawable;
 };
 
+//spatial partition for water (implemented in LLVOWater.cpp)
+class LLWaterPartition : public LLSpatialPartition
+{
+public:
+        LLWaterPartition();
+        virtual void getGeometry(LLSpatialGroup* group) {  }
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { }
+};
+
+//spatial partition for terrain (impelmented in LLVOSurfacePatch.cpp)
+class LLTerrainPartition : public LLSpatialPartition
+{
+public:
+        LLTerrainPartition();
+        virtual void getGeometry(LLSpatialGroup* group);
+        virtual LLVertexBuffer* createVertexBuffer(U32 type_mask, U32 usage);
+};
+
+//spatial partition for trees
+class LLTreePartition : public LLSpatialPartition
+{
+public:
+        LLTreePartition();
+        virtual void getGeometry(LLSpatialGroup* group) { }
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { }
+
+};
+
+//spatial partition for particles (implemented in LLVOPartGroup.cpp)
+class LLParticlePartition : public LLSpatialPartition
+{
+public:
+        LLParticlePartition();
+        virtual void getGeometry(LLSpatialGroup* group);
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count);
+        virtual F32 calcPixelArea(LLSpatialGroup* group, LLCamera& camera);
+protected:
+        U32 mRenderPass;
+};
+
+//spatial partition for grass (implemented in LLVOGrass.cpp)
+class LLGrassPartition : public LLParticlePartition
+{
+public:
+        LLGrassPartition();
+};
+
+//spatial partition for clouds (implemented in LLVOClouds.cpp)
+class LLCloudPartition : public LLParticlePartition
+{
+public:
+        LLCloudPartition();
+};
+
+//class for wrangling geometry out of volumes (implemented in LLVOVolume.cpp)
+class LLVolumeGeometryManager: public LLGeometryManager
+{
+public:
+        virtual ~LLVolumeGeometryManager() { }
+        virtual void rebuildGeom(LLSpatialGroup* group);
+        virtual void getGeometry(LLSpatialGroup* group);
+        void registerFace(LLSpatialGroup* group, LLFace* facep, U32 type);
+};
+
+//spatial partition that uses volume geometry manager (implemented in LLVOVolume.cpp)
+class LLVolumePartition : public LLSpatialPartition, public LLVolumeGeometryManager
+{
+public:
+        LLVolumePartition();
+        virtual void rebuildGeom(LLSpatialGroup* group) { LLVolumeGeometryManager::rebuildGeom(group); }
+        virtual void getGeometry(LLSpatialGroup* group) { LLVolumeGeometryManager::getGeometry(group); }
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { LLVolumeGeometryManager::addGeometryCount(group, vertex_count, index_count); }
+};
+
+//spatial bridge that uses volume geometry manager (implemented in LLVOVolume.cpp)
+class LLVolumeBridge : public LLSpatialBridge, public LLVolumeGeometryManager
+{
+public:
+        LLVolumeBridge(LLDrawable* drawable);
+        virtual void rebuildGeom(LLSpatialGroup* group) { LLVolumeGeometryManager::rebuildGeom(group); }
+        virtual void getGeometry(LLSpatialGroup* group) { LLVolumeGeometryManager::getGeometry(group); }
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { LLVolumeGeometryManager::addGeometryCount(group, vertex_count, index_count); }
+};
+
+class LLHUDBridge : public LLVolumeBridge
+{
+public:
+        LLHUDBridge(LLDrawable* drawablep);
+        virtual void shiftPos(const LLVector3& vec);
+        virtual F32 calcPixelArea(LLSpatialGroup* group, LLCamera& camera);
+};
+
+//spatial partition that holds nothing but spatial bridges
+class LLBridgePartition : public LLSpatialPartition
+{
+public:
+        LLBridgePartition();
+        virtual void getGeometry(LLSpatialGroup* group) { }
+        virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) {  }
+};
+
+class LLHUDPartition : public LLBridgePartition
+{
+public:
+        LLHUDPartition();
+        virtual void shift(const LLVector3 &offset);
+};
+
+void validate_draw_info(LLDrawInfo& params);
+
 extern const F32 SG_BOX_SIDE;
 extern const F32 SG_BOX_OFFSET;
 extern const F32 SG_BOX_RAD;
diff --git a/linden/indra/newview/llsphere.cpp b/linden/indra/newview/llsphere.cpp
index 44eaeff..5c49e6e 100644
--- a/linden/indra/newview/llsphere.cpp
+++ b/linden/indra/newview/llsphere.cpp
@@ -32,7 +32,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llsphere.h"
 #include "llerror.h"
-
+#include "llvertexbuffer.h"
 #include "llglheaders.h"
 
 GLUquadricObj *gQuadObj2 = NULL;
@@ -167,11 +167,13 @@ void LLSphere::render(F32 pixel_area)
         {
                 level_of_detail = 3;
         }
+        LLVertexBuffer::unbind();
         glCallList(mDList[level_of_detail]);
 }
 
 
 void LLSphere::render()
 {
+        LLVertexBuffer::unbind();
         glCallList(mDList[0]);
 }
diff --git a/linden/indra/newview/llsprite.cpp b/linden/indra/newview/llsprite.cpp
index 601810c..fb56f4d 100644
--- a/linden/indra/newview/llsprite.cpp
+++ b/linden/indra/newview/llsprite.cpp
@@ -94,14 +94,7 @@ void LLSprite::updateFace(LLFace &face)
         // First, figure out how many vertices/indices we need.
         U32 num_vertices, num_indices;
         U32 vertex_count = 0;
-
-
-        LLStrider<LLVector3> verticesp;
-        LLStrider<LLVector3> normalsp;
-        LLStrider<LLVector2> tex_coordsp;
-        U32 *indicesp;
-        S32 index_offset;
-
+        
         // Get the total number of vertices and indices
         if (mFollow)
         {
@@ -114,14 +107,7 @@ void LLSprite::updateFace(LLFace &face)
                 num_indices = 12;
         }
 
-        // Setup face
-        face.setPrimType(LLTriangles);
         face.setSize(num_vertices, num_indices);
-        index_offset = face.getGeometry(verticesp,normalsp,tex_coordsp, indicesp);
-        if (-1 == index_offset)
-        {
-                return;
-        }
         
         if (mFollow) 
         {
@@ -206,7 +192,30 @@ void LLSprite::updateFace(LLFace &face)
         }
 
         face.setFaceColor(mColor);
-        
+
+        LLStrider<LLVector3> verticesp;
+        LLStrider<LLVector3> normalsp;
+        LLStrider<LLVector2> tex_coordsp;
+        LLStrider<U32> indicesp;
+        S32 index_offset;
+
+        // Setup face
+        if (face.mVertexBuffer.isNull())
+        {       
+                face.mVertexBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | 
+                                                                                                LLVertexBuffer::MAP_TEXCOORD,
+                                                                                                GL_STREAM_DRAW_ARB);
+                face.mVertexBuffer->allocateBuffer(4, 12, TRUE);
+                face.setGeomIndex(0);
+                face.setIndicesIndex(0);
+        }
+                
+        index_offset = face.getGeometry(verticesp,normalsp,tex_coordsp, indicesp);
+        if (-1 == index_offset)
+        {
+                return;
+        }
+
         *tex_coordsp = LLVector2(0.f, 0.f);
         *verticesp = mC;
         tex_coordsp++;
@@ -251,6 +260,7 @@ void LLSprite::updateFace(LLFace &face)
                 *indicesp++ = 3 + index_offset;
         }
 
+        //face.mVertexBuffer->setBuffer(0);
         face.mCenterAgent = mPosition;
 }
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 916db16..cfdf899 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -44,9 +44,9 @@
 #include "audiosettings.h"
 #include "llcachename.h"
 #include "llviewercontrol.h"
-#include "llcrypto.h"
 #include "lldir.h"
 #include "lleconomy.h"
+#include "llerrorcontrol.h"
 #include "llfiltersd2xmlrpc.h"
 #include "llfocusmgr.h"
 #include "imageids.h"
@@ -64,6 +64,7 @@
 #include "llversion.h"
 #include "llvfs.h"
 #include "llwindow.h"           // for shell_open
+#include "llxorcipher.h"        // saved password, MAC address
 #include "message.h"
 #include "v3math.h"
 
@@ -81,7 +82,6 @@
 #include "lleventnotifier.h"
 #include "llface.h"
 #include "llfeaturemanager.h"
-#include "llfloateraccounthistory.h"
 #include "llfloaterchat.h"
 #include "llfloatergesture.h"
 #include "llfloaterland.h"
@@ -118,6 +118,8 @@
 #include "llsky.h"
 #include "llstatview.h"
 #include "llsurface.h"
+#include "lltexturecache.h"
+#include "lltexturefetch.h"
 #include "lltoolmgr.h"
 #include "llui.h"
 #include "llurlwhitelist.h"
@@ -145,10 +147,13 @@
 #include "viewer.h"
 #include "llmediaengine.h"
 #include "llfasttimerview.h"
-#include "llmozlib.h"
 #include "llweb.h"
 #include "llfloaterhtml.h"
 
+#if LL_LIBXUL_ENABLED
+#include "llmozlib.h"
+#endif // LL_LIBXUL_ENABLED
+
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -183,7 +188,6 @@ const char* SCREEN_LAST_FILENAME = "screen_last.bmp";
 //
 // Imported globals
 //
-extern LLPointer<LLImageGL> gStartImageGL;
 extern S32 gStartImageWidth;
 extern S32 gStartImageHeight;
 extern std::string gSerialNumber;
@@ -192,6 +196,8 @@ extern std::string gSerialNumber;
 // local globals
 //
 
+LLPointer<LLImageGL> gStartImageGL;
+
 static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;
 
@@ -250,7 +256,13 @@ public:
         }
 };
 
-
+void update_texture_fetch()
+{
+        gTextureCache->update(1); // unpauses the texture cache thread
+        gImageDecodeThread->update(1); // unpauses the image thread
+        gTextureFetch->update(1); // unpauses the texture fetch thread
+        gImageList.updateImages(0.10f);
+}
 
 // Returns FALSE to skip other idle processing. Should only return
 // TRUE when all initialization done.
@@ -301,8 +313,6 @@ BOOL idle_startup()
 
         static BOOL samename = FALSE;
 
-        static BOOL did_precache = FALSE;
-        
         BOOL do_normal_idle = FALSE;
 
         // HACK: These are things from the main loop that usually aren't done
@@ -391,14 +401,22 @@ BOOL idle_startup()
                 std::string message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message_template.msg");
 
                 FILE* found_template = NULL;
-                found_template = LLFile::fopen(message_template_path.c_str(), "r");
+                found_template = LLFile::fopen(message_template_path.c_str(), "r");             /* Flawfinder: ignore */
                 if (found_template)
                 {
                         fclose(found_template);
 
+                        U32 port = gAgent.mViewerPort;
+
+                        if ((NET_USE_OS_ASSIGNED_PORT == port) &&   // if nothing specified on command line (-port)
+                            (gSavedSettings.getBOOL("ConnectionPortEnabled")))
+                          {
+                            port = gSavedSettings.getU32("ConnectionPort");
+                          }
+
                         if(!start_messaging_system(
                                    message_template_path,
-                                   gAgent.mViewerPort,
+                                   port,
                                    LL_VERSION_MAJOR,
                                    LL_VERSION_MINOR,
                                    LL_VERSION_PATCH,
@@ -432,7 +450,6 @@ BOOL idle_startup()
                                                                   invalid_message_callback,
                                                                   NULL);
 
-                        gErrorStream.setUTCTimestamp(gLogUTC);
                         if (gSavedSettings.getBOOL("LogMessages") || gLogMessages)
                         {
                                 llinfos << "Message logging activated!" << llendl;
@@ -476,12 +493,13 @@ BOOL idle_startup()
                 #if LL_LIBXUL_ENABLED
                 set_startup_status(0.48f, "Initializing embedded web browser...", gAgent.mMOTD.c_str());
                 display_startup();
+                llinfos << "Initializing embedded web browser..." << llendl;
 
                 #if LL_DARWIN
                         // For Mac OS, we store both the shared libraries and the runtime files (chrome/, plugins/, etc) in
                         // Second Life.app/Contents/MacOS/.  This matches the way Firefox is distributed on the Mac.
                         std::string profileBaseDir(gDirUtilp->getExecutableDir());
-                #else
+                #elif LL_WINDOWS
                         std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
                         profileBaseDir += gDirUtilp->getDirDelimiter();
                         #ifdef LL_DEBUG
@@ -489,8 +507,28 @@ BOOL idle_startup()
                         #else
                         profileBaseDir += "mozilla";
                         #endif
+                #elif LL_LINUX
+                        std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+                        profileBaseDir += gDirUtilp->getDirDelimiter();
+                        profileBaseDir += "mozilla-runtime-linux-i686";
+                #else
+                        std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
+                        profileBaseDir += gDirUtilp->getDirDelimiter();
+                        profileBaseDir += "mozilla";
                 #endif
-                LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) ); 
+
+#if LL_LINUX
+                // Yuck, Mozilla init plays with the locale - push/pop
+                // the locale to protect it, as exotic/non-C locales
+                // causes our code lots of general critical weirdness
+                // and crashness. (SL-35450)
+                char *saved_locale = setlocale(LC_ALL, NULL);
+#endif // LL_LINUX
+                LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) );
+#if LL_LINUX
+                if (saved_locale)
+                        setlocale(LC_ALL, saved_locale);
+#endif // LL_LINUX
 
                 std::ostringstream codec;
                 codec << "[Second Life " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD << "]";
@@ -556,7 +594,7 @@ BOOL idle_startup()
                                 lastname = gCmdLineLastName;
 
                                 LLMD5 pass((unsigned char*)gCmdLinePassword.c_str());
-                                char md5pass[33];
+                                char md5pass[33];               /* Flawfinder: ignore */
                                 pass.hex_digest(md5pass);
                                 password = md5pass;
 
@@ -728,7 +766,7 @@ BOOL idle_startup()
                         if (gUserServerChoice == USERSERVER_OTHER)
                         {
                                 gUserServer.setHostByName( server_label.c_str() );
-                                snprintf(gUserServerName, MAX_STRING, "%s", server_label.c_str());
+                                snprintf(gUserServerName, MAX_STRING, "%s", server_label.c_str());              /* Flawfinder: ignore */
                         }
                 }
 
@@ -814,11 +852,12 @@ BOOL idle_startup()
                 case USERSERVER_SHAKTI:
                 case USERSERVER_DURGA:
                 case USERSERVER_SOMA:
+                case USERSERVER_VAAK:
                 case USERSERVER_GANGA:
                 case USERSERVER_UMA:
                 {
                                 const char* host_name = gUserServerDomainName[gUserServerChoice].mName;
-                                sprintf(gUserServerName,"%s", host_name);
+                                snprintf(gUserServerName, MAX_STRING, "%s", host_name);         /* Flawfinder: ignore */
                                 llinfos << "Resolving " <<
                                         gUserServerDomainName[gUserServerChoice].mLabel <<
                                         " userserver domain name " << host_name << llendl;
@@ -892,7 +931,7 @@ BOOL idle_startup()
                 }
 
                 write_debug("Userserver: ");
-                char tmp_str[256];
+                char tmp_str[256];              /* Flawfinder: ignore */
                 gUserServer.getIPString(tmp_str, 256);
                 write_debug(tmp_str);
                 write_debug("\n");
@@ -1128,7 +1167,7 @@ BOOL idle_startup()
                         start << "home";
                 }
 
-                char hashed_mac_string[MD5HEX_STR_SIZE];
+                char hashed_mac_string[MD5HEX_STR_SIZE];                /* Flawfinder: ignore */
                 LLMD5 hashed_mac;
                 hashed_mac.update( gMACAddress, MAC_ADDRESS_BYTES );
                 hashed_mac.finalize();
@@ -1442,7 +1481,7 @@ BOOL idle_startup()
                         const char* look_at_str = gUserAuthp->getResponse("look_at");
                         if (look_at_str)
                         {
-                                LLMemoryStream mstr((U8*)look_at_str, strlen(look_at_str));
+                                LLMemoryStream mstr((U8*)look_at_str, strlen(look_at_str));             /* Flawfinder: ignore */
                                 LLSD sd = LLSDNotationParser::parse(mstr);
                                 agent_start_look_at = ll_vector3_from_sd(sd);
                         }
@@ -1464,7 +1503,7 @@ BOOL idle_startup()
                         const char* home_location = gUserAuthp->getResponse("home");
                         if(home_location)
                         {
-                                LLMemoryStream mstr((U8*)home_location, strlen(home_location));
+                                LLMemoryStream mstr((U8*)home_location, strlen(home_location));         /* Flawfinder: ignore */
                                 LLSD sd = LLSDNotationParser::parse(mstr);
                                 S32 region_x = sd["region_handle"][0].asInteger();
                                 S32 region_y = sd["region_handle"][1].asInteger();
@@ -1582,6 +1621,8 @@ BOOL idle_startup()
                                 args["[ERROR_MESSAGE]"] = emsg.str();
                                 gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
                                 gStartupState = STATE_LOGIN_SHOW;
+                                gAutoLogin = FALSE;
+                                show_connect_box = TRUE;
                         }
                 }
                 else
@@ -1597,6 +1638,8 @@ BOOL idle_startup()
                         args["[ERROR_MESSAGE]"] = emsg.str();
                         gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
                         gStartupState = STATE_LOGIN_SHOW;
+                        gAutoLogin = FALSE;
+                        show_connect_box = TRUE;
                 }
                 return do_normal_idle;
         }
@@ -1629,6 +1672,9 @@ BOOL idle_startup()
                 //
                 // Initialize classes w/graphics stuff.
                 //
+                gImageList.doPrefetchImages();
+                update_texture_fetch();
+                
                 LLSurface::initClasses();
 
                 LLFace::initClass();
@@ -1690,7 +1736,7 @@ BOOL idle_startup()
                         // Move the progress view in front of the UI
                         gViewerWindow->moveProgressViewToFront();
 
-                        gErrorStream.setFixedBuffer(gDebugView->mDebugConsolep);
+                        LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
                         // set initial visibility of debug console
                         gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));
                         gDebugView->mStatViewp->setVisible(gSavedSettings.getBOOL("ShowDebugStats"));
@@ -1791,7 +1837,7 @@ BOOL idle_startup()
                 llinfos << "Decoding images..." << llendl;
                 // For all images pre-loaded into viewer cache, decode them.
                 // Need to do this AFTER we init the sky
-                gImageList.decodeAllImages();
+                gImageList.decodeAllImages(2.f);
                 gStartupState++;
 
                 // JC - Do this as late as possible to increase likelihood Purify
@@ -2298,11 +2344,11 @@ BOOL idle_startup()
                 // JC - 7/20/2002
                 gViewerWindow->sendShapeToSim();
 
+                // Ignore stipend information for now.  Money history is on the web site.
                 // if needed, show the money history window
-                if (stipend_since_login && !gNoRender)
-                {
-                        LLFloaterAccountHistory::show(NULL);
-                }
+                //if (stipend_since_login && !gNoRender)
+                //{
+                //}
 
                 if (!gAgent.isFirstLogin())
                 {
@@ -2360,18 +2406,6 @@ BOOL idle_startup()
         if (STATE_PRECACHE == gStartupState)
         {
                 do_normal_idle = TRUE;
-                if (!did_precache)
-                {
-                        did_precache = TRUE;
-                        // Don't preload map information!  The amount of data for all the
-                        // map items (icons for classifieds, avatar locations, etc.) is
-                        // huge, and not throttled.  This overflows the downstream
-                        // pipe during startup, when lots of information is being sent.
-                        // The problem manifests itself as invisible avatars on login. JC
-                        //gWorldMap->setCurrentLayer(0); // pre-load layer 0 of the world map
-
-                        gImageList.doPreloadImages(); // pre-load some images from static VFS
-                }
                 
                 F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY;
                 // wait precache-delay and for agent's avatar or a lot longer.
@@ -2382,6 +2416,7 @@ BOOL idle_startup()
                 }
                 else
                 {
+                        update_texture_fetch();
                         set_startup_status(0.50f + 0.50f * timeout_frac, "Precaching...",
                                                            gAgent.mMOTD.c_str());
                 }
@@ -2410,6 +2445,7 @@ BOOL idle_startup()
                 }
                 else
                 {
+                        update_texture_fetch();
                         set_startup_status(0.f + 0.25f * wearables_time / MAX_WEARABLES_TIME,
                                                          "Downloading clothing...",
                                                          gAgent.mMOTD.c_str());
@@ -2512,34 +2548,6 @@ BOOL idle_startup()
 // local function definition
 //
 
-void unsupported_graphics_callback(S32 option, void* userdata)
-{
-        if (0 == option)
-        {
-                llinfos << "User cancelled after driver check" << llendl;
-                std::string help_path;
-                help_path = gDirUtilp->getExpandedFilename(LL_PATH_HELP,
-                        "unsupported_card.html");
-                app_force_quit( help_path.c_str() );
-        }
-
-        LLPanelLogin::giveFocus();
-}
-
-void check_driver_callback(S32 option, void* userdata)
-{
-        if (0 == option)
-        {
-                llinfos << "User cancelled after driver check" << llendl;
-                std::string help_path;
-                help_path = gDirUtilp->getExpandedFilename(LL_PATH_HELP,
-                        "graphics_driver_update.html");
-                app_force_quit( help_path.c_str() );
-        }
-
-        LLPanelLogin::giveFocus();
-}
-
 void login_show()
 {
         LLPanelLogin::show(     gViewerWindow->getVirtualWindowRect(),
@@ -2547,7 +2555,7 @@ void login_show()
                                                 login_callback, NULL );
 
         // Make sure all the UI textures are present and decoded.
-        gImageList.decodeAllImages();
+        gImageList.decodeAllImages(2.f);
 
         if( USERSERVER_OTHER == gUserServerChoice )
         {
@@ -2569,6 +2577,7 @@ void login_show()
         LLPanelLogin::addServer( gUserServerDomainName[USERSERVER_GANGA].mLabel,        USERSERVER_GANGA );
         LLPanelLogin::addServer( gUserServerDomainName[USERSERVER_UMA].mLabel,  USERSERVER_UMA );
         LLPanelLogin::addServer( gUserServerDomainName[USERSERVER_SOMA].mLabel, USERSERVER_SOMA );
+        LLPanelLogin::addServer( gUserServerDomainName[USERSERVER_VAAK].mLabel, USERSERVER_VAAK );
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
@@ -2628,7 +2637,7 @@ LLString load_password_from_disk()
 
         std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
                                                                                                            "password.dat");
-        FILE* fp = LLFile::fopen(filepath.c_str(), "rb");
+        FILE* fp = LLFile::fopen(filepath.c_str(), "rb");               /* Flawfinder: ignore */
         if (!fp)
         {
                 return hashed_password;
@@ -2675,7 +2684,7 @@ void save_password_to_disk(const char* hashed_password)
         }
         else
         {
-                FILE* fp = LLFile::fopen(filepath.c_str(), "wb");
+                FILE* fp = LLFile::fopen(filepath.c_str(), "wb");               /* Flawfinder: ignore */
                 if (!fp)
                 {
                         return;
@@ -2889,7 +2898,7 @@ void update_dialog_callback(S32 option, void *userdata)
         }
 
 #if LL_WINDOWS
-        char ip[MAX_STRING];
+        char ip[MAX_STRING];            /* Flawfinder: ignore */
 
         update_exe_path = gDirUtilp->getTempFilename();
         if (update_exe_path.empty())
@@ -2934,7 +2943,7 @@ void update_dialog_callback(S32 option, void *userdata)
                 // Figure out the program name.
                 const char* data_dir = gDirUtilp->getAppRODataDir().c_str();
                 // Roll back from the end, stopping at the first '\'
-                const char* program_name = data_dir + strlen(data_dir);
+                const char* program_name = data_dir + strlen(data_dir);         /* Flawfinder: ignore */
                 while ( (data_dir != --program_name) &&
                                 *(program_name) != '\\');
                 
@@ -2981,7 +2990,7 @@ void update_dialog_callback(S32 option, void *userdata)
         remove_marker_file(); // In case updater fails
         
         // Run the auto-updater.
-        system(update_exe_path.c_str());
+        system(update_exe_path.c_str());                /* Flawfinder: ignore */
         
 #elif LL_LINUX
         OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
@@ -3019,8 +3028,8 @@ void use_circuit_callback(void**, S32 result)
 void register_viewer_callbacks(LLMessageSystem* msg)
 {
         msg->setHandlerFuncFast(_PREHASH_LayerData,                             process_layer_data );
-        msg->setHandlerFuncFast(_PREHASH_ImageData,                             LLViewerImage::receiveImage );
-        msg->setHandlerFuncFast(_PREHASH_ImagePacket,                           LLViewerImage::receiveImagePacket );
+        msg->setHandlerFuncFast(_PREHASH_ImageData,                             LLViewerImageList::receiveImageHeader );
+        msg->setHandlerFuncFast(_PREHASH_ImagePacket,                           LLViewerImageList::receiveImagePacket );
         msg->setHandlerFuncFast(_PREHASH_ObjectUpdate,                          process_object_update );
         msg->setHandlerFunc("ObjectUpdateCompressed",                           process_compressed_object_update );
         msg->setHandlerFunc("ObjectUpdateCached",                                       process_cached_object_update );
@@ -3136,14 +3145,6 @@ void register_viewer_callbacks(LLMessageSystem* msg)
 
         msg->setHandlerFuncFast(_PREHASH_GrantGodlikePowers, process_grant_godlike_powers);
 
-        msg->setHandlerFuncFast(_PREHASH_MoneySummaryReply,
-                                                LLFloaterAccountHistory::processMoneySummaryReply);
-        msg->setHandlerFuncFast(_PREHASH_MoneyDetailsReply,
-                                                LLFloaterAccountHistory::processMoneyDetailsReply);
-        msg->setHandlerFuncFast(_PREHASH_MoneyTransactionsReply,
-                                                LLFloaterAccountHistory::processMoneyTransactionsReply);
-
-        // ASDF
         msg->setHandlerFuncFast(_PREHASH_GroupAccountSummaryReply,
                                                         LLGroupMoneyPlanningTabEventHandler::processGroupAccountSummaryReply);
         msg->setHandlerFuncFast(_PREHASH_GroupAccountDetailsReply,
@@ -3869,7 +3870,7 @@ void dialog_choose_gender_first_start()
 // location_id = 1 => home position
 void init_start_screen(S32 location_id)
 {
-        if (gStartImageGL)
+        if (gStartImageGL.notNull())
         {
                 gStartImageGL = NULL;
                 llinfos << "re-initializing start screen" << llendl;
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index c2c822e..26f5bc6 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -28,10 +28,13 @@
 #ifndef LL_LLSTARTUP_H
 #define LL_LLSTARTUP_H
 
+#include "llimagegl.h"
+
 // functions
 BOOL idle_startup();
 void cleanup_app();
 LLString load_password_from_disk();
+void release_start_screen();
 
 // constants, variables,  & enumerations
 extern const char* SCREEN_HOME_FILENAME;
@@ -78,6 +81,7 @@ enum EStartupState{
 // exorted symbol
 extern S32 gStartupState;
 extern bool gQuickTimeInitialized;
+extern LLPointer<LLImageGL> gStartImageGL;
 
 class LLStartUp
 {
diff --git a/linden/indra/newview/llstatbar.cpp b/linden/indra/newview/llstatbar.cpp
index b23840a..4b7067c 100644
--- a/linden/indra/newview/llstatbar.cpp
+++ b/linden/indra/newview/llstatbar.cpp
@@ -143,17 +143,17 @@ void LLStatBar::draw()
         LLFontGL::sMonospace->renderUTF8(mLabel, 0, 0, mRect.getHeight(), LLColor4(1.f, 1.f, 1.f, 1.f),
                                                         LLFontGL::LEFT, LLFontGL::TOP);
 
-        char value_format[64];
-        char value_str[256];
+        char value_format[64];          /* Flawfinder: ignore */
+        char value_str[256];            /* Flawfinder: ignore */
         if (!mUnitLabel.empty())
         {
-                sprintf(value_format, "%%.%df%%s", mPrecision);
-                sprintf(value_str, value_format, mValue, mUnitLabel.c_str());
+                snprintf(value_format, sizeof(value_format), "%%.%df%%s", mPrecision);          /* Flawfinder: ignore */
+                snprintf(value_str, sizeof(value_str), value_format, mValue, mUnitLabel.c_str());               /* Flawfinder: ignore */
         }
         else
         {
-                sprintf(value_format, "%%.%df", mPrecision);
-                sprintf(value_str, value_format, mValue);
+                snprintf(value_format, sizeof(value_format), "%%.%df", mPrecision);             /* Flawfinder: ignore */
+                snprintf(value_str, sizeof(value_str), value_format, mValue);           /* Flawfinder: ignore */
         }
 
         // Draw the value.
@@ -161,10 +161,10 @@ void LLStatBar::draw()
                 LLColor4(1.f, 1.f, 1.f, 0.5f),
                 LLFontGL::RIGHT, LLFontGL::TOP);
 
-        sprintf(value_format, "%%.%df", mPrecision);
+        snprintf(value_format, sizeof(value_format), "%%.%df", mPrecision);             /* Flawfinder: ignore */
         if (mDisplayBar)
         {
-                char tick_label[256];
+                char tick_label[256];           /* Flawfinder: ignore */
 
                 // Draw the tick marks.
                 F32 tick_value;
@@ -188,7 +188,7 @@ void LLStatBar::draw()
                         right = left + tick_width;
                         gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
 
-                        sprintf(tick_label, value_format, tick_value);
+                        snprintf(tick_label, sizeof(tick_label), value_format, tick_value);             /* Flawfinder: ignore */
                         // draw labels for the tick marks
                         LLFontGL::sMonospace->renderUTF8(tick_label, 0, left - 1, bar_top - bar_height - tick_height,
                                                                                          LLColor4(1.f, 1.f, 1.f, 0.5f),
diff --git a/linden/indra/newview/llstatgraph.cpp b/linden/indra/newview/llstatgraph.cpp
index b2dec08..e85dc8d 100644
--- a/linden/indra/newview/llstatgraph.cpp
+++ b/linden/indra/newview/llstatgraph.cpp
@@ -91,10 +91,10 @@ void LLStatGraph::draw()
 
                 if (mUpdateTimer.getElapsedTimeF32() > 0.5f)
                 {
-                        char format_str[256];
-                        char tmp_str[256];
-                        sprintf(format_str, "%%s%%.%df%%s", mPrecision);
-                        sprintf(tmp_str, format_str, mLabel.c_str(), mValue, mUnits.c_str());
+                        char format_str[256];           /* Flawfinder: ignore */
+                        char tmp_str[256];              /* Flawfinder: ignore */
+                        snprintf(format_str, sizeof(format_str), "%%s%%.%df%%s", mPrecision);           /* Flawfinder: ignore */
+                        sprintf(tmp_str, format_str, mLabel.c_str(), mValue, mUnits.c_str());           /* Flawfinder: ignore */
                         setToolTip(tmp_str);
 
                         mUpdateTimer.reset();
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index a358f1e..22c0a2a 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -209,7 +209,13 @@ void LLStatusBar::draw()
 {
         refresh();
 
-        LLView::draw();
+        if (mBgVisible)
+        {
+                gl_drop_shadow(0, mRect.getHeight(), mRect.getWidth(), 0, 
+                                LLUI::sColorsGroup->getColor("ColorDropShadow"), 
+                                LLUI::sConfigGroup->getS32("DropShadowFloater") );
+        }
+        LLPanel::draw();
 }
 
 
@@ -262,6 +268,12 @@ void LLStatusBar::refresh()
         const S32 MENU_RIGHT = gMenuBarView->getRightmostMenuEdge();
         S32 x = MENU_RIGHT + MENU_PARCEL_SPACING;
         S32 y = 0;
+        
+        // reshape menu bar to its content's width
+        if (MENU_RIGHT != gMenuBarView->getRect().getWidth())
+        {
+                gMenuBarView->reshape(MENU_RIGHT, gMenuBarView->getRect().getHeight());
+        }
 
         LLViewerRegion *region = gAgent.getRegion();
         LLParcel *parcel = gParcelMgr->getAgentParcel();
@@ -448,6 +460,7 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
         mSGBandwidth->setVisible(visible);
         mSGPacketLoss->setVisible(visible);
         mBtnBuyCurrency->setVisible(visible);
+        setBackgroundVisible(visible);
 }
 
 void LLStatusBar::debitBalance(S32 debit)
@@ -484,8 +497,8 @@ void LLStatusBar::setBalance(S32 balance)
 
 void LLStatusBar::setHealth(S32 health)
 {
-        char buffer[MAX_STRING];
-        sprintf(buffer, "%d%%", health);
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
+        snprintf(buffer, MAX_STRING, "%d%%", health);           /* Flawfinder: ignore */
         //llinfos << "Setting health to: " << buffer << llendl;
         mTextHealth->setText(buffer);
 
diff --git a/linden/indra/newview/llstatview.cpp b/linden/indra/newview/llstatview.cpp
index e288879..64ad5aa 100644
--- a/linden/indra/newview/llstatview.cpp
+++ b/linden/indra/newview/llstatview.cpp
@@ -50,7 +50,7 @@ LLStatView::LLStatView(const LLString& name, const LLString& label, const LLStri
         {
                 open = gSavedSettings.getBOOL(mSetting);
         }
-        setDisplayChildren(open);
+        setDisplayChildren(open);               /* Flawfinder: ignore */
 }
 
 LLStatView::~LLStatView()
@@ -59,7 +59,7 @@ LLStatView::~LLStatView()
         if (mSetting.length() > 0)
         {
                 BOOL open = getDisplayChildren();
-                gSavedSettings.setBOOL(mSetting, open);
+                gSavedSettings.setBOOL(mSetting, open);         /* Flawfinder: ignore */
         }
 }
 
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index c1b22c9..191c079 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -50,7 +50,7 @@
 #include "noise.h"
 #include "llviewercamera.h"
 #include "llglheaders.h"
-#include "lldrawpool.h"
+#include "lldrawpoolterrain.h"
 #include "lldrawable.h"
 
 extern LLPipeline gPipeline;
@@ -120,7 +120,7 @@ LLSurface::~LLSurface()
         mNumberOfPatches = 0;
         destroyPatchData();
 
-        LLDrawPool *poolp = gPipeline.findPool(LLDrawPool::POOL_TERRAIN, mSTexturep);
+        LLDrawPoolTerrain *poolp = (LLDrawPoolTerrain*) gPipeline.findPool(LLDrawPool::POOL_TERRAIN, mSTexturep);
         if (!poolp)
         {
                 llwarns << "No pool for terrain on destruction!" << llendl;
@@ -331,7 +331,6 @@ void LLSurface::setOriginGlobal(const LLVector3d &origin_global)
                 LLVector3d water_origin_global(x, y, z);
 
                 mWaterObjp->setPositionGlobal(water_origin_global);
-                gPipeline.markMoved(mWaterObjp->mDrawable);
         }
 }
 
@@ -621,45 +620,45 @@ void LLSurface::updatePatchVisibilities(LLAgent &agent)
         }
 }
 
-
-
-BOOL LLSurface::idleUpdate()
+BOOL LLSurface::idleUpdate(F32 max_update_time)
 {
         if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_TERRAIN))
         {
-                return TRUE;
+                return FALSE;
         }
         
         // Perform idle time update of non-critical stuff.
         // In this case, texture and normal updates.
         LLTimer update_timer;
-        LLSurfacePatch *patchp = NULL;
+        BOOL did_update = FALSE;
 
         // If the Z height data has changed, we need to rebuild our
         // property line vertex arrays.
-        if (mDirtyPatchList.count() > 0)
+        if (mDirtyPatchList.size() > 0)
         {
                 getRegion()->dirtyHeights();
         }
 
-        S32 i = 0;
-        while (i < mDirtyPatchList.count())
+        // Always call updateNormals() / updateVerticalStats()
+        //  every frame to avoid artifacts
+        for(std::set<LLSurfacePatch *>::iterator iter = mDirtyPatchList.begin();
+                iter != mDirtyPatchList.end(); )
         {
-                patchp = mDirtyPatchList[i];
+                std::set<LLSurfacePatch *>::iterator curiter = iter++;
+                LLSurfacePatch *patchp = *curiter;
                 patchp->updateNormals();
                 patchp->updateVerticalStats();
-
-                if ((update_timer.getElapsedTimeF32() < 0.05f) && patchp->updateTexture())
-                {
-                        patchp->clearDirty();
-                        mDirtyPatchList.remove(i);
-                }
-                else
+                if (max_update_time == 0.f || update_timer.getElapsedTimeF32() < max_update_time)
                 {
-                        i++;
+                        if (patchp->updateTexture())
+                        {
+                                did_update = TRUE;
+                                patchp->clearDirty();
+                                mDirtyPatchList.erase(curiter);
+                        }
                 }
         }
-        return TRUE;
+        return did_update;
 }
 
 // TODO -- move this to LLViewerRegion class
@@ -1229,10 +1228,7 @@ void LLSurface::dirtyAllPatches()
 void LLSurface::dirtySurfacePatch(LLSurfacePatch *patchp)
 {
         // Put surface patch on dirty surface patch list
-        if (-1 == mDirtyPatchList.find(patchp))
-        {
-                mDirtyPatchList.put(patchp);
-        }
+        mDirtyPatchList.insert(patchp);
 }
 
 
diff --git a/linden/indra/newview/llsurface.h b/linden/indra/newview/llsurface.h
index 12c1afc..73fe6e6 100644
--- a/linden/indra/newview/llsurface.h
+++ b/linden/indra/newview/llsurface.h
@@ -41,7 +41,6 @@
 
 #include "llvowater.h"
 #include "llpatchvertexarray.h"
-#include "lldarray.h"
 #include "llviewerimage.h"
 
 class LLTimer;
@@ -115,7 +114,7 @@ public:
         LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const;
 
         // Update methods (called during idle, normally)
-        BOOL idleUpdate();
+        BOOL idleUpdate(F32 max_update_time);
 
         void renderSurfaceBounds();
         
@@ -200,7 +199,7 @@ protected:
         // Array of grid normals, mGridsPerEdge * mGridsPerEdge
         LLVector3 *mNorm;
 
-        LLDynamicArray<LLSurfacePatch *> mDirtyPatchList;
+        std::set<LLSurfacePatch *> mDirtyPatchList;
 
 
         // The textures should never be directly initialized - use the setter methods!
diff --git a/linden/indra/newview/llsurfacepatch.cpp b/linden/indra/newview/llsurfacepatch.cpp
index d19d930..66d100f 100644
--- a/linden/indra/newview/llsurfacepatch.cpp
+++ b/linden/indra/newview/llsurfacepatch.cpp
@@ -813,7 +813,7 @@ void LLSurfacePatch::connectNeighbor(LLSurfacePatch *neighbor_patchp, const U32
 
 void LLSurfacePatch::updateVisibility()
 {
-        if (mVObjp == (LLVOSurfacePatch*)NULL)
+        if (mVObjp.isNull())
         {
                 return;
         }
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 63d167d..d8a97cf 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -55,8 +55,6 @@
 
 // SJB: We really always want to use the GL cache;
 // let GL page textures in and out of video RAM instead of trying to do so by hand.
-// const U32 USE_AVATAR_GL_CACHE_THRESHOLD = 1024 * 1024 * 35; // 35 MB
-BOOL gUseAvatarGLCache = TRUE; //FALSE;
 
 LLGradientPaletteList gGradientPaletteList;
 
@@ -237,8 +235,6 @@ BOOL LLTexLayerSetBuffer::render()
 {
         U8* baked_bump_data = NULL;
 
-//      gUseAvatarGLCache = ( gImageList.getMaxResidentTexMem() > USE_AVATAR_GL_CACHE_THRESHOLD );
-
         // do we need to upload, and do we have sufficient data to create an uploadable composite?
         // When do we upload the texture if gAgent.mNumPendingQueries is non-zero?
         BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal());
@@ -773,7 +769,6 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height )
                 glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE );
                 glBlendFunc( GL_ONE, GL_ZERO );
 
-                if( gUseAvatarGLCache )
                 {
                         LLImageGL* image_gl = gTexStaticImageList.getImageGL( getInfo()->mStaticAlphaFileName, TRUE );
                         if( image_gl )
@@ -787,29 +782,6 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height )
                                 success = FALSE;
                         }
                 }
-                else
-                {
-                        LLImageRaw* image_raw = gTexStaticImageList.getImageRaw( getInfo()->mStaticAlphaFileName );
-                        if( image_raw )
-                        {
-                                GLenum format = GL_ALPHA;
-                                if( mAvatar->bindScratchTexture(format) )
-                                {
-                                        glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, image_raw->getWidth(), image_raw->getHeight(), format, GL_UNSIGNED_BYTE, image_raw->getData() );
-                                        stop_glerror();
-
-                                        gl_rect_2d_simple_tex( width, height );
-                                }
-                                else
-                                {
-                                        success = FALSE;
-                                }
-                        }
-                        else
-                        {
-                                success = FALSE;
-                        }
-                }
                 LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
 
                 glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
@@ -1286,23 +1258,6 @@ BOOL LLTexLayer::parseData( LLXmlTreeNode* node )
 //-----------------------------------------------------------------------------
 
 
-BOOL LLTexLayer::loadStaticImageRaw()
-{
-        if( mStaticImageRaw.isNull() && !mStaticImageInvalid)
-        {
-                mStaticImageRaw = gTexStaticImageList.getImageRaw( getInfo()->mStaticImageFileName );  
-                // We now have something in one of our caches
-                LLTexLayerSet::sHasCaches |= mStaticImageRaw.notNull() ? TRUE : FALSE;
-                if( mStaticImageRaw.isNull() )
-                {
-                        llwarns << "Unable to load static file: " << getInfo()->mStaticImageFileName << llendl;
-                        mStaticImageInvalid = TRUE; // don't try again.
-                        return FALSE;
-                }
-        }
-        return TRUE;
-}
-
 void LLTexLayer::deleteCaches()
 {
         for( alpha_list_t::iterator iter = mParamAlphaList.begin();
@@ -1375,7 +1330,6 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
 
         if( (getInfo()->mLocalTexture != -1) && !getInfo()->mUseLocalTextureAlphaOnly )
         {
-                if( gUseAvatarGLCache )
                 {
                         LLImageGL* image_gl = NULL;
                         if( mTexLayerSet->getAvatar()->getLocalTextureGL( getInfo()->mLocalTexture, &image_gl ) )
@@ -1401,29 +1355,10 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                                 success = FALSE;
                         }
                 }
-                else
-                {
-                        LLPointer<LLImageRaw> image_raw = new LLImageRaw;
-                        if( mTexLayerSet->getAvatar()->getLocalTextureRaw( getInfo()->mLocalTexture, image_raw ) )
-                        {
-                                success &= renderImageRaw( image_raw->getData(),
-                                                                                   image_raw->getWidth(),
-                                                                                   image_raw->getHeight(),
-                                                                                   image_raw->getComponents(), 
-                                                                                   width, 
-                                                                                   height, 
-                                                                                   FALSE );
-                        }
-                        else
-                        {
-                                success = FALSE;
-                        }
-                }
         }
 
         if( !getInfo()->mStaticImageFileName.empty() )
         {
-                if( gUseAvatarGLCache )
                 {
                         LLImageGL* image_gl = gTexStaticImageList.getImageGL( getInfo()->mStaticImageFileName, getInfo()->mStaticImageIsMask );
                         if( image_gl )
@@ -1437,26 +1372,6 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                                 success = FALSE;
                         }
                 }
-                else
-                {
-                        // Don't load the image file until we actually need it the first time.  Like now.
-                        if (!loadStaticImageRaw())
-                        {
-                                success = FALSE;
-                        }
-                        if( mStaticImageRaw.notNull() )
-                        {
-                                success &= renderImageRaw( 
-                                        mStaticImageRaw->getData(),
-                                        mStaticImageRaw->getWidth(),
-                                        mStaticImageRaw->getHeight(),
-                                        mStaticImageRaw->getComponents(), width, height, getInfo()->mStaticImageIsMask );
-                        }
-                        else
-                        {
-                                success = FALSE;
-                        }
-                }
         }
 
         if( ((-1 == getInfo()->mLocalTexture) ||
@@ -1610,7 +1525,6 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
         // Accumulate the alpha component of the texture
         if( getInfo()->mLocalTexture != -1 )
         {
-                if( gUseAvatarGLCache )
                 {
                         LLImageGL* image_gl = NULL;
                         if( mTexLayerSet->getAvatar()->getLocalTextureGL( getInfo()->mLocalTexture, &image_gl ) )
@@ -1635,30 +1549,10 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
                                 success = FALSE;
                         }
                 }
-                else
-                {
-                        LLPointer<LLImageRaw> image_raw = new LLImageRaw;
-                        if( mTexLayerSet->getAvatar()->getLocalTextureRaw( getInfo()->mLocalTexture,  image_raw ) )
-                        {
-                                if(image_raw->getComponents() == 4)
-                                {
-                                        success &= renderImageRaw( 
-                                                image_raw->getData(),
-                                                image_raw->getWidth(),
-                                                image_raw->getHeight(),
-                                                image_raw->getComponents(), width, height, FALSE );
-                                }
-                        }
-                        else
-                        {
-                                success = FALSE;
-                        }
-                }
         }
 
         if( !getInfo()->mStaticImageFileName.empty() )
         {
-                if( gUseAvatarGLCache )
                 {
                         LLImageGL* image_gl = gTexStaticImageList.getImageGL( getInfo()->mStaticImageFileName, getInfo()->mStaticImageIsMask );
                         if( image_gl )
@@ -1677,31 +1571,6 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
                                 success = FALSE;
                         }
                 }
-                else
-                {
-                        // Don't load the image file until we actually need it the first time.  Like now.
-                        if (!loadStaticImageRaw())
-                        {
-                                success = FALSE;
-                        }
-
-                        if( mStaticImageRaw.notNull() )
-                        {
-                                if(     (mStaticImageRaw->getComponents() == 4) ||
-                                        ( (mStaticImageRaw->getComponents() == 1) && getInfo()->mStaticImageIsMask ) )
-                                {
-                                        success &= renderImageRaw( 
-                                                mStaticImageRaw->getData(),
-                                                mStaticImageRaw->getWidth(),
-                                                mStaticImageRaw->getHeight(),
-                                                mStaticImageRaw->getComponents(), width, height, getInfo()->mStaticImageIsMask );
-                                }
-                        }
-                        else
-                        {
-                                success = FALSE;
-                        }
-                }
         }
 
         // Draw a rectangle with the layer color to multiply the alpha by that color's alpha.
@@ -2106,8 +1975,7 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
                 if(     !mCachedProcessedImageGL ||
                         (mCachedProcessedImageGL->getWidth() != image_tga_width) ||
                         (mCachedProcessedImageGL->getHeight() != image_tga_height) ||
-                        (weight_changed && !(gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))) ||
-                        (!gUseAvatarGLCache) )
+                        (weight_changed && !(gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))) )
                 {
 //                      llinfos << "Building Cached Alpha: " << mName << ": (" << mStaticImageRaw->getWidth() << ", " << mStaticImageRaw->getHeight() << ") " << effective_weight << llendl;
                         mCachedEffectiveWeight = effective_weight;
@@ -2149,7 +2017,6 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
 
                 if( mCachedProcessedImageGL )
                 {
-                        if( gUseAvatarGLCache ) // 64 MB
                         {
                                 if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
                                 {
@@ -2187,94 +2054,6 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
                                 }
                                 stop_glerror();
                         }
-                        else
-                        {
-                                if( (mCachedProcessedImageGL->getWidth() != VOAVATAR_SCRATCH_TEX_WIDTH) ||
-                                        (mCachedProcessedImageGL->getHeight() != VOAVATAR_SCRATCH_TEX_HEIGHT) )
-                                {
-                                        if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-                                        {
-                                                mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw);
-                                                
-                                                LLGLSNoAlphaTest gls_no_alpha_test;
-                                                
-                                                mCachedProcessedImageGL->bind();
-                                                mCachedProcessedImageGL->setClamp(TRUE, TRUE);
-
-                                                gGradientPaletteList.setHardwarePalette( getInfo()->mDomain, effective_weight );
-                                                gl_rect_2d_simple_tex( width, height );
-                                                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-                                                mCachedProcessedImageGL->destroyGLTexture();
-                                        }
-                                        else
-                                        {
-                                                // Create the GL texture, bind it and draw a rect, and then immediately destroy it.
-                                                mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw);
-
-                                                LLGLSNoAlphaTest gls_no_alpha_test;
-                                                
-                                                mCachedProcessedImageGL->bind();
-                                                mCachedProcessedImageGL->setClamp(TRUE, TRUE);
-
-                                                gl_rect_2d_simple_tex( width, height );
-
-                                                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-
-                                                mCachedProcessedImageGL->destroyGLTexture();
-                                        }
-                                        stop_glerror();
-                                }
-                                else
-                                {
-                                        if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-                                        {
-                                                // Write into a pre-existing GL Image, and then bind and render that.
-                                                // Faster than creating a new GL Image and then destroying it.
-                                                if( mTexLayer->getTexLayerSet()->getAvatar()->bindScratchTexture( GL_COLOR_INDEX ) )
-                                                {
-                                                        glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0,
-                                                                mCachedProcessedImageGL->getWidth(),
-                                                                mCachedProcessedImageGL->getHeight(),
-                                                                GL_COLOR_INDEX, GL_UNSIGNED_BYTE,
-                                                                mStaticImageRaw->getData() );
-                                                        stop_glerror();
-
-                                                        LLGLSNoAlphaTest gls_no_alpha_test;
-                                                        gGradientPaletteList.setHardwarePalette( getInfo()->mDomain, effective_weight );
-                                                        gl_rect_2d_simple_tex( width, height );
-
-                                                        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-                                                }
-                                                else
-                                                {
-                                                        success = FALSE;
-                                                }
-                                        }
-                                        else
-                                        {
-                                                // Write into a pre-existing GL Image, and then bind and render that.
-                                                // Faster than creating a new GL Image and then destroying it.
-                                                if( mTexLayer->getTexLayerSet()->getAvatar()->bindScratchTexture( GL_ALPHA ) )
-                                                {
-                                                        glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0,
-                                                                mCachedProcessedImageGL->getWidth(),
-                                                                mCachedProcessedImageGL->getHeight(),
-                                                                GL_ALPHA, GL_UNSIGNED_BYTE,
-                                                                mStaticImageRaw->getData() );
-                                                        stop_glerror();
-
-                                                        LLGLSNoAlphaTest gls_no_alpha_test;
-                                                        gl_rect_2d_simple_tex( width, height );
-
-                                                        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-                                                }
-                                                else
-                                                {
-                                                        success = FALSE;
-                                                }
-                                        }
-                                }
-                        }
                 }
 
                 // Don't keep the cache for other people's avatars
@@ -2625,7 +2404,6 @@ LLStringTable LLTexStaticImageList::sImageNames(16384);
 
 LLTexStaticImageList::LLTexStaticImageList()
         :
-        mRawBytes( 0 ),
         mGLBytes( 0 ),
         mTGABytes( 0 )
 {}
@@ -2638,36 +2416,31 @@ LLTexStaticImageList::~LLTexStaticImageList()
 void LLTexStaticImageList::dumpByteCount()
 {
         llinfos << "Avatar Static Textures " <<
-                " Raw:" << (mRawBytes / 1024) <<
                 "KB GL:" << (mGLBytes / 1024) <<
                 "KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
 }
 
 void LLTexStaticImageList::deleteCachedImages()
 {
-        if( mRawBytes || mGLBytes || mTGABytes )
+        if( mGLBytes || mTGABytes )
         {
                 llinfos << "Clearing Static Textures " <<
-                        " Raw:" << (mRawBytes / 1024) <<
                         "KB GL:" << (mGLBytes / 1024) <<
                         "KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
 
                 //mStaticImageLists uses LLPointers, clear() will cause deletion
                 
-                mStaticImageListRaw.clear();
                 mStaticImageListTGA.clear();
                 mStaticImageListGL.clear();
                 
-                mRawBytes = 0;
                 mGLBytes = 0;
                 mTGABytes = 0;
         }
 }
 
-// Note: in general, for a given image image we'll call either getImageTga(), getImageRaw() or getImageGL().
+// Note: in general, for a given image image we'll call either getImageTga() or getImageGL().
 // We call getImageTga() if the image is used as an alpha gradient.
-// Otherwise, we call getImageRaw() if we have 32 MB or less of video RAM or less and getImageGL() if we have
-// more video RAM than that.
+// Otherwise, we call getImageGL()
 
 // Returns an LLImageTGA that contains the encoded data from a tga file named file_name.
 // Caches the result to speed identical subsequent requests.
@@ -2699,34 +2472,6 @@ LLImageTGA* LLTexStaticImageList::getImageTGA(const LLString& file_name)
 
 
 
-// Returns an LLImageRaw that contains the decoded data from a tga file named file_name.
-// Caches the result to speed identical subsequent requests.
-LLImageRaw* LLTexStaticImageList::getImageRaw(const LLString& file_name)
-{
-        LLPointer<LLImageRaw> image_raw;
-        const char *namekey = sImageNames.addString(file_name);
-        image_raw_map_t::iterator iter = mStaticImageListRaw.find(namekey);
-        if( iter != mStaticImageListRaw.end() )
-        {
-                image_raw = iter->second;
-        }
-        else
-        {
-                image_raw = new LLImageRaw();
-                if( loadImageRaw( file_name, image_raw ) )
-                {
-                        mStaticImageListRaw[ namekey ] = image_raw;
-                        mRawBytes += image_raw->getDataSize();
-                }
-                else
-                {
-                        image_raw = NULL;
-                }
-        }
-
-        return image_raw;
-}
-
 // Returns a GL Image (without a backing ImageRaw) that contains the decoded data from a tga file named file_name.
 // Caches the result to speed identical subsequent requests.
 LLImageGL* LLTexStaticImageList::getImageGL(const LLString& file_name, BOOL is_mask )
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 3db6f96..5d12da5 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -341,9 +341,6 @@ public:
         BOOL                                    hasAlphaParams() { return (!mParamAlphaList.empty());}
 
 protected:
-        BOOL                                    loadStaticImageRaw();
-
-protected:
         LLTexLayerSet*                  mTexLayerSet;
         LLPointer<LLImageRaw>   mStaticImageRaw;
 
@@ -517,15 +514,12 @@ private:
 private:
         static LLStringTable sImageNames;
 
-        typedef std::map< const char *, LLPointer<LLImageRaw> > image_raw_map_t;
         typedef std::map< const char *, LLPointer<LLImageGL> > image_gl_map_t;
         typedef std::map< const char *, LLPointer<LLImageTGA> > image_tga_map_t;
-        image_raw_map_t mStaticImageListRaw;
         image_gl_map_t mStaticImageListGL;
         image_tga_map_t mStaticImageListTGA;
 
 public:
-        S32 mRawBytes;
         S32 mGLBytes;
         S32 mTGABytes;
 };
diff --git a/linden/indra/newview/lltexturebar.cpp b/linden/indra/newview/lltexturebar.cpp
deleted file mode 100644
index d3be39e..0000000
--- a/linden/indra/newview/lltexturebar.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/** 
- * @file lltexturebar.cpp
- * @brief LLTextureBar class implementation
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lltexturebar.h"
-#include "llviewerimage.h"
-#include "lltexturetable.h"
-#include "llfontgl.h"
-#include "llui.h"
-#include "llassetstorage.h"
-#include "llglheaders.h"
-#include "llviewerimagelist.h"
-
-#include "lltexlayer.h"
-
-// colors used for highlighting textures
-const F32 select_colors[][4] = {        {1.0f, 1.0f, 1.0f, 0.7f}, // default = white
-                                                                        {1.0f, 1.0f, 0.3f, 1.0f}, // selected = yellow
-                                                                        {0.3f, 1.0f, 1.0f, 1.0f}, // flagged = cyan
-                                                                        {1.0f, 0.3f, 1.0f, 1.0f}, // boosted = magenta
-                                                                        {0.5f, 0.5f, 1.0f, 1.0f}, // blue
-                                                                        {0.5f, 1.0f, 0.5f, 1.0f}, // green
-                                                                        {1.0f, 0.5f, 0.5f, 1.0f},  // updated this frame = red
-                                                                        {1.0f, 0.8f, 0.8f, 1.0f},  // nodiscard = pale red
-                                                                        {0.8f, 1.0f, 0.8f, 1.0f},  // fullres = pale green
-                                                                        {0.8f, 0.8f, 0.8f, 0.7f}   // 0 priority = grey
-};
-
-LLTextureBar::LLTextureBar(const std::string& name, const LLRect& r)
-        : LLView(name, r, FALSE)
-{
-        mHilite = 0;
-}
-
-static LLString title_string1("Tex UUID Area  DDis(Req)  DecodePri(Req)       [decode]          pkts/max");
-static LLString title_string2("W x H (Dis) Mem");
-
-static S32 pip_base = 480;
-static S32 pip_width = 6;
-
-EWidgetType LLTextureBar::getWidgetType() const
-{
-        return WIDGET_TYPE_TEXTURE_BAR;
-}
-
-LLString LLTextureBar::getWidgetTag() const
-{
-        return LL_TEXTURE_BAR_TAG;
-}
-
-
-void LLTextureBar::draw()
-{
-        if (!mImagep)
-        {
-                return;
-        }
-
-        S32 color;
-        if (mHilite)
-        {
-                color = llclamp(mHilite,0,4);
-        }
-        else if (mImagep->getBoostLevel())
-        {
-                color = 3;
-        }
-        else if (mImagep->mDontDiscard)
-        {
-                color = 7;
-        }
-        else if (!mImagep->getUseMipMaps())
-        {
-                color = 8;
-        }
-        else if (mImagep->getDecodePriority() == 0.0f)
-        {
-                color = 9;
-        }
-        else
-        {
-                color = 0;
-        }
-
-        // We need to draw:
-        // The texture UUID or name
-        // The progress bar for the texture, highlighted if it's being download
-        // Various numerical stats.
-        char tex_str[256];
-        S32 left, right;
-        S32 top = 0;
-        S32 bottom = top + 6;
-
-        // Get the name or UUID of the image.
-        gTextureTable.getName(mImagep->mID);
-        
-        // Name, pixel_area, requested pixel area, decode priority
-        char uuid_str[255];
-        mImagep->mID.toString(uuid_str);
-        uuid_str[8] = 0;
-        sprintf(tex_str, "%s %7.0f %d(%d) %8.2f(%8.2f)",
-                        uuid_str,
-                        mImagep->mMaxVirtualSize,
-                        mImagep->mDesiredDiscardLevel,
-                        mImagep->mRequestedDiscardLevel,
-                        mImagep->getDecodePriority(),
-                        mImagep->mRequestedDownloadPriority);
-                        
-
-        LLGLSUIDefault gls_ui;
-        LLFontGL::sMonospace->renderUTF8(tex_str, 0, 0, mRect.getHeight(),
-                                                                         select_colors[color],
-                                                                         LLFontGL::LEFT, LLFontGL::TOP);
-
-        LLGLSNoTexture gls_no_texture;
-        F32 last_event;
-        LLColor4 clr;
-        
-        // Draw the packet pip
-        last_event = mImagep->mLastPacketTimer.getElapsedTimeF32();
-        if (last_event < 1.f)
-        {
-                clr = LLColor4::white; clr.setAlpha(1.f - last_event);
-                glColor4fv(clr.mV);
-                gl_rect_2d(pip_base, top, pip_base + pip_width, bottom);
-        }
-        else
-        {
-                last_event = mImagep->mRequestTime.getElapsedTimeF32() * 1.f/5.f;
-                if (last_event < 1.f)
-                {
-                        clr = LLColor4::green; clr.setAlpha(1.f - last_event);
-                        glColor4fv(clr.mV);
-                        gl_rect_2d(pip_base, top, pip_base + pip_width, bottom);
-                }
-        }
-        
-        // Draw the decode pip
-        if (mImagep->getDiscardLevel() < 0)
-                last_event = 1.f;
-        else
-                last_event = mImagep->mLastDecodeTime.getElapsedTimeF32();
-        if (last_event < 1.f)
-        {
-                clr = LLColor4::yellow; clr.setAlpha(1.f - last_event);
-                glColor4fv(clr.mV);
-                gl_rect_2d(pip_base + pip_width*2, top, pip_base + pip_width*3, bottom);
-        }
-
-        // we don't want to show bind/resident pips for textures using the default texture
-        if (mImagep->getHasGLTexture())
-        {
-                BOOL miss = FALSE;
-                // Draw the bound pip
-                last_event = mImagep->sLastFrameTime - mImagep->mLastBindTime;
-                if (last_event < 1.f)
-                {
-                        clr = LLColor4::magenta1; clr.setAlpha(1.f - last_event);
-                        glColor4fv(clr.mV);
-                        gl_rect_2d(pip_base + pip_width*4, top, pip_base + pip_width*5, bottom);
-
-                        miss = mImagep->getMissed();
-                }
-
-                // Draw the miss pip
-                if (miss)
-                {
-                        clr = LLColor4::red;
-                        glColor4fv(clr.mV);
-                        gl_rect_2d(pip_base + pip_width*6, top, pip_base + pip_width*7, bottom);
-                }
-        }
-
-        // Draw the progress bar.
-        S32 bar_width = 100;
-        S32 bar_left = 280;
-        left = bar_left;
-        right = left + bar_width;
-
-        glColor4f(0.f, 0.f, 0.f, 0.75f);
-        gl_rect_2d(left, top, right, bottom);
-
-        F32 data_progress = 0.0f;
-        F32 decode_progress = mImagep->getDecodeProgress(&data_progress);
-        
-        if (data_progress > 0.0f)
-        {
-                // Decoded bytes
-                right = left + llfloor(decode_progress * (F32)bar_width);
-
-                if (left < right)
-                {
-                        if (mImagep->getDiscardLevel() >= 0)
-                        {
-                                glColor4f(0.f, 0.f, 1.f, 0.75f);
-                        }
-                        else
-                        {
-                                glColor4f(0.5f, 0.0f, 0.5f, 0.75f);
-                        }
-                        gl_rect_2d(left, top, right, bottom);
-                }
-
-                // Downloaded bytes
-                left = right;
-                right = left + llfloor((data_progress - decode_progress) * (F32)bar_width);
-
-                if (left < right)
-                {
-                        glColor4f(1.f, 0.f, 0.f, 0.75f);
-                        gl_rect_2d(left, top, right, bottom);
-                }
-        }
-
-        {
-                LLGLSUIDefault gls_ui;
-                // draw the packet data
-                {
-                        LLString num_str = llformat("%3d/%3d", mImagep->mLastPacket+1, mImagep->mPackets);
-                        LLFontGL::sMonospace->renderUTF8(num_str, 0, bar_left + 100, mRect.getHeight(), select_colors[color],
-                                                                                         LLFontGL::LEFT, LLFontGL::TOP);
-                }
-                
-                // draw the image size at the end
-                {
-                        LLString num_str = llformat("%4d x %4d (%d) %7d", mImagep->getWidth(), mImagep->getHeight(),
-                                                                                mImagep->getDiscardLevel(), mImagep->mTextureMemory);
-                        LLFontGL::sMonospace->renderUTF8(num_str, 0, pip_base + pip_width*8, mRect.getHeight(), select_colors[color],
-                                                                                        LLFontGL::LEFT, LLFontGL::TOP);
-                }
-        }
-
-}
-
-BOOL LLTextureBar::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-        return FALSE;
-}
-
-LLRect LLTextureBar::getRequiredRect()
-{
-        LLRect rect;
-
-        rect.mTop = 8;
-
-        return rect;
-}
-
-//==============================================================================
-
-LLGLTexMemBar::LLGLTexMemBar(const std::string& name)
-        : LLView(name, FALSE)
-{
-        S32 line_height = (S32)(LLFontGL::sMonospace->getLineHeight() + .5f);
-        setRect(LLRect(0,0,100,line_height * 4));
-        updateRect();
-}
-
-EWidgetType LLGLTexMemBar::getWidgetType() const
-{
-        return WIDGET_TYPE_TEX_MEM_BAR;
-}
-
-LLString LLGLTexMemBar::getWidgetTag() const
-{
-        return LL_GL_TEX_MEM_BAR_TAG;
-}
-
-
-extern F32 texmem_lower_bound_scale;
-
-void LLGLTexMemBar::draw()
-{
-        S32 bound_mem = LLViewerImage::sBoundTextureMemory;
-        S32 max_bound_mem = LLViewerImage::sMaxBoundTextureMem;
-        S32 total_mem = LLViewerImage::sTotalTextureMemory;
-        S32 max_total_mem = LLViewerImage::sMaxTotalTextureMem;
-        F32 discard_bias = LLViewerImage::sDesiredDiscardBias;
-        S32 line_height = (S32)(LLFontGL::sMonospace->getLineHeight() + .5f);
-        
-        //----------------------------------------------------------------------------
-        LLGLSUIDefault gls_ui;
-        F32 text_color[] = {1.f, 1.f, 1.f, 0.75f};
-        
-        std::string text;
-        text = llformat("GL Tot: %d/%d MB Bound: %d/%d MB Discard Bias: %.2f",
-                                        total_mem/(1024*1024),
-                                        max_total_mem/(1024*1024),
-                                        bound_mem/(1024*1024),
-                                        max_bound_mem/(1024*1024),
-                                        discard_bias);
-
-        LLFontGL::sMonospace->renderUTF8(text, 0, 0, line_height*3,
-                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
-
-        //----------------------------------------------------------------------------
-        S32 bar_left = 350;
-        S32 bar_width = 200;
-        S32 top = line_height*3 - 2;
-        S32 bottom = top - 6;
-        S32 left = bar_left;
-        S32 right = left + bar_width;
-
-        F32 bar_scale = (F32)bar_width / (max_bound_mem * 1.5f);
-        
-        LLGLSNoTexture gls_no_texture;
-        
-        glColor4f(0.5f, 0.5f, 0.5f, 0.75f);
-        gl_rect_2d(left, top, right, bottom);
-
-        
-        left = bar_left;
-        right = left + llfloor(bound_mem * bar_scale);
-        if (bound_mem < llfloor(max_bound_mem * texmem_lower_bound_scale))
-        {
-                glColor4f(0.f, 1.f, 0.f, 0.75f);
-        }
-        else if (bound_mem < max_bound_mem)
-        {
-                glColor4f(1.f, 1.f, 0.f, 0.75f);
-        }
-        else
-        {
-                glColor4f(1.f, 0.f, 0.f, 0.75f);
-        }
-        gl_rect_2d(left, top, right, bottom);
-
-        bar_scale = (F32)bar_width / (max_total_mem * 1.5f);
-        
-        top = bottom - 2;
-        bottom = top - 6;
-        left = bar_left;
-        right = left + llfloor(total_mem * bar_scale);
-        if (total_mem < llfloor(max_total_mem * texmem_lower_bound_scale))
-        {
-                glColor4f(0.f, 1.f, 0.f, 0.75f);
-        }
-        else if (total_mem < max_total_mem)
-        {
-                glColor4f(1.f, 1.f, 0.f, 0.75f);
-        }
-        else
-        {
-                glColor4f(1.f, 0.f, 0.f, 0.75f);
-        }
-        gl_rect_2d(left, top, right, bottom);
-        
-        //----------------------------------------------------------------------------
-        text = llformat("TexStaticImageList Raw: %d GL: %d TGA: %d",
-                                        gTexStaticImageList.mRawBytes, gTexStaticImageList.mGLBytes, gTexStaticImageList.mTGABytes);
-
-        LLGLEnable tex(GL_TEXTURE_2D);
-        LLFontGL::sMonospace->renderUTF8(text, 0, 0, line_height*2,
-                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
-        
-
-        //----------------------------------------------------------------------------
-
-        S32 x = 0;
-        LLFontGL::sMonospace->renderUTF8(title_string1, 0, x, line_height,
-                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
-        S32 dx = 24;
-        x = pip_base - dx;
-        LLFontGL::sMonospace->renderUTF8("pkt", 0, x, line_height, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP);
-        x += dx;
-        LLFontGL::sMonospace->renderUTF8("dec", 0, x, line_height, LLColor4::yellow, LLFontGL::LEFT, LLFontGL::TOP);
-        x += dx;
-        LLFontGL::sMonospace->renderUTF8("bnd", 0, x, line_height, LLColor4::magenta1, LLFontGL::LEFT, LLFontGL::TOP);
-        x += dx;
-        LLFontGL::sMonospace->renderUTF8("mis", 0, x, line_height, LLColor4::red, LLFontGL::LEFT, LLFontGL::TOP);
-        x += dx;
-        LLFontGL::sMonospace->renderUTF8(title_string2, 0, x, line_height,
-                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
-}
-
-BOOL LLGLTexMemBar::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-        return FALSE;
-}
-
-LLRect LLGLTexMemBar::getRequiredRect()
-{
-        LLRect rect;
-        rect.mTop = 8;
-        return rect;
-}
-
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
new file mode 100644
index 0000000..084211a
--- /dev/null
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -0,0 +1,1409 @@
+/** 
+ * @file texturecache.cpp
+ * @brief Object which handles local texture caching
+ *
+ * Copyright (c) 2000-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lltexturecache.h"
+
+#include "llapr.h"
+#include "lldir.h"
+#include "llimage.h"
+#include "lllfsthread.h"
+#include "llviewercontrol.h"
+
+#define USE_LFS_READ 0
+#define USE_LFS_WRITE 0
+
+// Note: first 4 bytes store file size, rest is j2c data
+const S32 TEXTURE_CACHE_ENTRY_SIZE = FIRST_PACKET_SIZE; //1024;
+
+class LLTextureCacheWorker : public LLWorkerClass
+{
+        friend class LLTextureCache;
+
+private:
+        enum e_state
+        {
+                INIT = 0,
+                LOCAL = 1,
+                CACHE = 2,
+                HEADER = 3,
+                BODY = 4
+        };
+
+        class ReadResponder : public LLLFSThread::Responder
+        {
+        public:
+                ReadResponder(LLTextureCache* cache, handle_t handle) : mCache(cache), mHandle(handle) {}
+                ~ReadResponder() {}
+                void completed(S32 bytes)
+                {
+                        mCache->lockWorkers();
+                        LLTextureCacheWorker* reader = mCache->getReader(mHandle);
+                        if (reader) reader->ioComplete(bytes);
+                        mCache->unlockWorkers();
+                }
+                LLTextureCache* mCache;
+                LLTextureCacheWorker::handle_t mHandle;
+        };
+
+        class WriteResponder : public LLLFSThread::Responder
+        {
+        public:
+                WriteResponder(LLTextureCache* cache, handle_t handle) : mCache(cache), mHandle(handle) {}
+                ~WriteResponder() {}
+                void completed(S32 bytes)
+                {
+                        mCache->lockWorkers();
+                        LLTextureCacheWorker* writer = mCache->getWriter(mHandle);
+                        if (writer) writer->ioComplete(bytes);
+                        mCache->unlockWorkers();
+                }
+                LLTextureCache* mCache;
+                LLTextureCacheWorker::handle_t mHandle;
+        };
+        
+public:
+        LLTextureCacheWorker(LLTextureCache* cache, U32 priority, const LLUUID& id,
+                                                 U8* data, S32 datasize, S32 offset,
+                                                 S32 imagesize, // for writes
+                                                 LLTextureCache::Responder* responder)
+                : LLWorkerClass(cache, "LLTextureCacheWorker"),
+                  mCache(cache),
+                  mPriority(priority),
+                  mID(id),
+                  mState(INIT),
+                  mReadData(NULL),
+                  mWriteData(data),
+                  mDataSize(datasize),
+                  mOffset(offset),
+                  mImageSize(imagesize),
+                  mImageFormat(IMG_CODEC_J2C),
+                  mImageLocal(FALSE),
+                  mResponder(responder),
+                  mFileHandle(LLLFSThread::nullHandle()),
+                  mBytesToRead(0),
+                  mBytesRead(0)
+        {
+                mPriority &= LLWorkerThread::PRIORITY_LOWBITS;
+        }
+        ~LLTextureCacheWorker()
+        {
+                llassert_always(!haveWork());
+                delete[] mReadData;
+        }
+
+        bool doRead();
+        bool doWrite();
+        virtual bool doWork(S32 param); // Called from LLWorkerThread::processRequest()
+
+        handle_t read() { addWork(0, LLWorkerThread::PRIORITY_HIGH | mPriority); return mRequestHandle; }
+        handle_t write() { addWork(1, LLWorkerThread::PRIORITY_HIGH | mPriority); return mRequestHandle; }
+        bool complete() { return checkWork(); }
+        void ioComplete(S32 bytes)
+        {
+                mBytesRead = bytes;
+                setPriority(LLWorkerThread::PRIORITY_HIGH | mPriority);
+        }
+        
+private:
+        virtual void startWork(S32 param); // called from addWork() (MAIN THREAD)
+        virtual void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
+        virtual void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
+
+private:
+        LLTextureCache* mCache;
+        U32 mPriority;
+        LLUUID mID;
+        e_state mState;
+        
+        U8* mReadData;
+        U8* mWriteData;
+        S32 mDataSize;
+        S32 mOffset;
+        S32 mImageSize;
+        S32 mImageFormat;
+        BOOL mImageLocal;
+        LLPointer<LLTextureCache::Responder> mResponder;
+        LLLFSThread::handle_t mFileHandle;
+        S32 mBytesToRead;
+        LLAtomicS32 mBytesRead;
+};
+
+//virtual
+void LLTextureCacheWorker::startWork(S32 param)
+{
+}
+
+bool LLTextureCacheWorker::doRead()
+{
+        S32 local_size = 0;
+        std::string local_filename;
+        
+        if (mState == INIT)
+        {
+                std::string filename = mCache->getLocalFileName(mID);
+                local_filename = filename + ".j2c";
+                local_size = ll_apr_file_size(local_filename, mCache->getFileAPRPool());
+                if (local_size == 0)
+                {
+                        local_filename = filename + ".tga";
+                        local_size = ll_apr_file_size(local_filename, mCache->getFileAPRPool());
+                        if (local_size > 0)
+                        {
+                                mImageFormat = IMG_CODEC_TGA;
+                                mDataSize = local_size; // Only a complete .tga file is valid
+                        }
+                }
+                if (local_size > 0)
+                {
+                        mState = LOCAL;
+                }
+                else
+                {
+                        mState = CACHE;
+                }
+        }
+
+        if (mState == LOCAL)
+        {
+#if USE_LFS_READ
+                if (mFileHandle == LLLFSThread::nullHandle())
+                {
+                        mImageLocal = TRUE;
+                        mImageSize = local_size;
+                        if (!mDataSize || mDataSize + mOffset > local_size)
+                        {
+                                mDataSize = local_size - mOffset;
+                        }
+                        if (mDataSize <= 0)
+                        {
+                                // no more data to read
+                                mDataSize = 0;
+                                return true;
+                        }
+                        mReadData = new U8[mDataSize];
+                        mBytesRead = -1;
+                        mBytesToRead = mDataSize;
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mPriority);
+                        mFileHandle = LLLFSThread::sLocal->read(local_filename, mReadData, mOffset, mDataSize,
+                                                                                                        new ReadResponder(mCache, mRequestHandle));
+                        return false;
+                }
+                else
+                {
+                        if (mBytesRead >= 0)
+                        {
+                                if (mBytesRead != mBytesToRead)
+                                {
+                                        llwarns << "Error reading file from local cache: " << local_filename
+                                                        << " Bytes: " << mDataSize << " Offset: " << mOffset
+                                                        << " / " << mDataSize << llendl;
+                                        mDataSize = 0; // failed
+                                        delete[] mReadData;
+                                        mReadData = NULL;
+                                }
+                                return true;
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+#else
+                if (!mDataSize || mDataSize > local_size)
+                {
+                        mDataSize = local_size;
+                }
+                mReadData = new U8[mDataSize];
+                S32 bytes_read = ll_apr_file_read_ex(local_filename, mCache->getFileAPRPool(),
+                                                                                         mReadData, mOffset, mDataSize);
+                if (bytes_read != mDataSize)
+                {
+                        llwarns << "Error reading file from local cache: " << local_filename
+                                        << " Bytes: " << mDataSize << " Offset: " << mOffset
+                                        << " / " << mDataSize << llendl;
+                        mDataSize = 0;
+                        delete[] mReadData;
+                        mReadData = NULL;
+                }
+                else
+                {
+                        mImageSize = local_size;
+                        mImageLocal = TRUE;
+                }
+                return true;
+#endif
+        }
+
+        S32 idx = -1;
+        
+        if (mState == CACHE)
+        {
+                llassert_always(mImageSize == 0);
+                idx = mCache->getHeaderCacheEntry(mID, false, &mImageSize);
+                if (idx >= 0 && mImageSize > mOffset)
+                {
+                        llassert_always(mImageSize > 0);
+                        if (!mDataSize || mDataSize > mImageSize)
+                        {
+                                mDataSize = mImageSize;
+                        }
+                        mState = mOffset < TEXTURE_CACHE_ENTRY_SIZE ? HEADER : BODY;
+                }
+                else
+                {
+                        mDataSize = 0; // no data
+                        return true;
+                }
+        }
+
+        if (mState == HEADER)
+        {
+#if USE_LFS_READ
+                if (mFileHandle == LLLFSThread::nullHandle())
+                {
+                        llassert_always(idx >= 0);
+                        llassert_always(mOffset < TEXTURE_CACHE_ENTRY_SIZE);
+                        S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
+                        S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                        llassert_always(mReadData == NULL);
+                        mReadData = new U8[size];
+                        mBytesRead = -1;
+                        mBytesToRead = size;
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mPriority);
+                        mFileHandle = LLLFSThread::sLocal->read(mCache->mHeaderDataFileName,
+                                                                                                        mReadData, offset, mBytesToRead,
+                                                                                                        new ReadResponder(mCache, mRequestHandle));
+                        return false;
+                }
+                else
+                {
+                        if (mBytesRead >= 0)
+                        {
+                                if (mBytesRead != mBytesToRead)
+                                {
+                                        llwarns << "LLTextureCacheWorker: "  << mID
+                                                        << " incorrect number of bytes read from header: " << mBytesRead
+                                                        << " != " << mBytesToRead << llendl;
+                                        mDataSize = -1; // failed
+                                        return true;
+                                }
+                                if (mDataSize <= TEXTURE_CACHE_ENTRY_SIZE)
+                                {
+                                        return true; // done
+                                }
+                                else
+                                {
+                                        mFileHandle = LLLFSThread::nullHandle();
+                                        mState = BODY;
+                                }
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+#else
+                llassert_always(idx >= 0);
+                llassert_always(mOffset < TEXTURE_CACHE_ENTRY_SIZE);
+                S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
+                S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                mReadData = new U8[size];
+                S32 bytes_read = ll_apr_file_read_ex(mCache->mHeaderDataFileName, mCache->getFileAPRPool(),
+                                                                                         mReadData, offset, size);
+                if (bytes_read != size)
+                {
+                        llwarns << "LLTextureCacheWorker: "  << mID
+                                        << " incorrect number of bytes read from header: " << bytes_read
+                                        << " / " << size << llendl;
+                        mDataSize = -1; // failed
+                        return true;
+                }
+                if (mDataSize <= TEXTURE_CACHE_ENTRY_SIZE)
+                {
+                        return true; // done
+                }
+                else
+                {
+                        mState = BODY;
+                }
+#endif
+        }
+
+        if (mState == BODY)
+        {
+#if USE_LFS_READ
+                if (mFileHandle == LLLFSThread::nullHandle())
+                {
+                        std::string filename = mCache->getTextureFileName(mID);
+                        S32 filesize = ll_apr_file_size(filename, mCache->getFileAPRPool());
+                        if (filesize > mOffset)
+                        {
+                                S32 datasize = TEXTURE_CACHE_ENTRY_SIZE + filesize;
+                                mDataSize = llmin(datasize, mDataSize);
+                                S32 data_offset = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                                data_offset = llmax(data_offset, 0);
+                                S32 file_size = mDataSize - data_offset;
+                                S32 file_offset = mOffset - TEXTURE_CACHE_ENTRY_SIZE;
+                                file_offset = llmax(file_offset, 0);
+
+                                llassert_always(mDataSize > 0);
+                                U8* data = new U8[mDataSize];
+                                if (data_offset > 0)
+                                {
+                                        llassert_always(mReadData);
+                                        llassert_always(data_offset <= mDataSize);
+                                        memcpy(data, mReadData, data_offset);
+                                        delete[] mReadData;
+                                        mReadData = NULL;
+                                }
+                                llassert_always(mReadData == NULL);
+                                mReadData = data;
+
+                                mBytesRead = -1;
+                                mBytesToRead = file_size;
+                                setPriority(LLWorkerThread::PRIORITY_LOW | mPriority);
+                                llassert_always(data_offset + mBytesToRead <= mDataSize);
+                                mFileHandle = LLLFSThread::sLocal->read(filename,
+                                                                                                                mReadData + data_offset, file_offset, mBytesToRead,
+                                                                                                                new ReadResponder(mCache, mRequestHandle));
+                                return false;
+                        }
+                        else
+                        {
+                                mDataSize = TEXTURE_CACHE_ENTRY_SIZE;
+                                return true; // done
+                        }
+                }
+                else
+                {
+                        if (mBytesRead >= 0)
+                        {
+                                if (mBytesRead != mBytesToRead)
+                                {
+                                        llwarns << "LLTextureCacheWorker: "  << mID
+                                                        << " incorrect number of bytes read from body: " << mBytesRead
+                                                        << " != " << mBytesToRead << llendl;
+                                        mDataSize = -1; // failed
+                                }
+                                return true;
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+#else
+                std::string filename = mCache->getTextureFileName(mID);
+                S32 filesize = ll_apr_file_size(filename, mCache->getFileAPRPool());
+                S32 bytes_read = 0;
+                if (filesize > mOffset)
+                {
+                        S32 datasize = TEXTURE_CACHE_ENTRY_SIZE + filesize;
+                        mDataSize = llmin(datasize, mDataSize);
+                        S32 data_offset = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                        data_offset = llmax(data_offset, 0);
+                        S32 file_size = mDataSize - data_offset;
+                        S32 file_offset = mOffset - TEXTURE_CACHE_ENTRY_SIZE;
+                        file_offset = llmax(file_offset, 0);
+                        
+                        U8* data = new U8[mDataSize];
+                        if (data_offset > 0)
+                        {
+                                llassert_always(mReadData);
+                                memcpy(data, mReadData, data_offset);
+                                delete[] mReadData;
+                        }
+                        mReadData = data;
+                        bytes_read = ll_apr_file_read_ex(filename, mCache->getFileAPRPool(),
+                                                                                         mReadData + data_offset,
+                                                                                         file_offset, file_size);
+                        if (bytes_read != file_size)
+                        {
+                                llwarns << "LLTextureCacheWorker: "  << mID
+                                                << " incorrect number of bytes read from body: " << bytes_read
+                                                << " / " << file_size << llendl;
+                                mDataSize = -1; // failed
+                                return true;
+                        }
+                }
+                else
+                {
+                        mDataSize = TEXTURE_CACHE_ENTRY_SIZE;
+                }
+                
+                return true;
+#endif
+        }
+        
+        return false;
+}
+
+bool LLTextureCacheWorker::doWrite()
+{
+        S32 idx = -1;
+
+        if (mState == INIT)
+        {
+                llassert_always(mOffset == 0); // Currently don't support offsets
+                mState = CACHE;
+        }
+
+        // No LOCAL state for write()
+        
+        if (mState == CACHE)
+        {
+                S32 cur_imagesize = 0;
+                S32 offset = mOffset;
+                idx = mCache->getHeaderCacheEntry(mID, false, &cur_imagesize);
+                if (idx >= 0 && cur_imagesize > 0)
+                {
+                        offset = TEXTURE_CACHE_ENTRY_SIZE; // don't re-write header
+                }
+                idx = mCache->getHeaderCacheEntry(mID, true, &mImageSize); // touch entry
+                if (idx >= 0)
+                {
+                        llassert_always(cur_imagesize <= 0 || mImageSize == cur_imagesize);
+                        mState = offset < TEXTURE_CACHE_ENTRY_SIZE ? HEADER : BODY;
+                }
+                else
+                {
+                        mDataSize = -1; // failed
+                        return true;
+                }
+        }
+        
+        if (mState == HEADER)
+        {
+#if USE_LFS_WRITE
+                if (mFileHandle == LLLFSThread::nullHandle())
+                {
+                        llassert_always(idx >= 0);
+                        llassert_always(mOffset < TEXTURE_CACHE_ENTRY_SIZE);
+                        S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
+                        S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                        mBytesRead = -1;
+                        mBytesToRead = size;
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mPriority);
+                        mFileHandle = LLLFSThread::sLocal->write(mCache->mHeaderDataFileName,
+                                                                                                         mWriteData, offset, mBytesToRead,
+                                                                                                         new WriteResponder(mCache, mRequestHandle));
+                        return false;
+                }
+                else
+                {
+                        if (mBytesRead >= 0)
+                        {
+                                if (mBytesRead != mBytesToRead)
+                                {
+                                        llwarns << "LLTextureCacheWorker: "  << mID
+                                                        << " incorrect number of bytes written to header: " << mBytesRead
+                                                        << " != " << mBytesToRead << llendl;
+                                        mDataSize = -1; // failed
+                                        return true;
+                                }
+                                if (mDataSize <=  mBytesToRead)
+                                {
+                                        return true; // done
+                                }
+                                else
+                                {
+                                        mFileHandle = LLLFSThread::nullHandle();
+                                        mState = BODY;
+                                }
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+#else
+                llassert_always(idx >= 0);
+                llassert_always(mOffset < TEXTURE_CACHE_ENTRY_SIZE);
+                S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
+                S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                S32 bytes_written = ll_apr_file_write_ex(mCache->mHeaderDataFileName, mCache->getFileAPRPool(),
+                                                                                                 mWriteData, offset, size);
+
+                if (bytes_written <= 0)
+                {
+                        llwarns << "LLTextureCacheWorker: missing entry: " << mID << llendl;
+                        mDataSize = -1; // failed
+                        return true;
+                }
+
+                if (mDataSize <= size)
+                {
+                        return true; // done
+                }
+                else
+                {
+                        mState = BODY;
+                }
+#endif
+        }
+        
+        if (mState == BODY)
+        {
+#if USE_LFS_WRITE
+                if (mFileHandle == LLLFSThread::nullHandle())
+                {
+                        S32 data_offset = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                        data_offset = llmax(data_offset, 0);
+                        S32 file_size = mDataSize - data_offset;
+                        S32 file_offset = mOffset - TEXTURE_CACHE_ENTRY_SIZE;
+                        file_offset = llmax(file_offset, 0);
+                        if (file_size > 0 && mCache->appendToTextureEntryList(mID, file_size))
+                        {
+                                std::string filename = mCache->getTextureFileName(mID);
+                                mBytesRead = -1;
+                                mBytesToRead = file_size;
+                                setPriority(LLWorkerThread::PRIORITY_LOW | mPriority);
+                                mFileHandle = LLLFSThread::sLocal->write(filename,
+                                                                                                                 mWriteData + data_offset, file_offset, mBytesToRead,
+                                                                                                                 new WriteResponder(mCache, mRequestHandle));
+                                return false;
+                        }
+                        else
+                        {
+                                mDataSize = 0; // no data written
+                                return true; // done
+                        }
+                }
+                else
+                {
+                        if (mBytesRead >= 0)
+                        {
+                                if (mBytesRead != mBytesToRead)
+                                {
+                                        llwarns << "LLTextureCacheWorker: "  << mID
+                                                        << " incorrect number of bytes written to body: " << mBytesRead
+                                                        << " != " << mBytesToRead << llendl;
+                                        mDataSize = -1; // failed
+                                }
+                                return true;
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+#else
+                S32 data_offset = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
+                data_offset = llmax(data_offset, 0);
+                S32 file_size = mDataSize - data_offset;
+                S32 file_offset = mOffset - TEXTURE_CACHE_ENTRY_SIZE;
+                file_offset = llmax(file_offset, 0);
+                S32 bytes_written = 0;
+                if (file_size > 0 && mCache->appendToTextureEntryList(mID, file_size))
+                {
+                        std::string filename = mCache->getTextureFileName(mID);
+                        bytes_written = ll_apr_file_write_ex(filename, mCache->getFileAPRPool(),
+                                                                                                 mWriteData + data_offset,
+                                                                                                 file_offset, file_size);
+                        if (bytes_written <= 0)
+                        {
+                                mDataSize = -1; // failed
+                        }
+                }
+                else
+                {
+                        mDataSize = 0; // no data written
+                }
+
+                return true;
+#endif
+        }
+        
+        return false;
+}
+
+//virtual
+bool LLTextureCacheWorker::doWork(S32 param)
+{
+        bool res = false;
+        if (param == 0) // read
+        {
+                res = doRead();
+        }
+        else if (param == 1) // write
+        {
+                res = doWrite();
+        }
+        else
+        {
+                llassert_always(0);
+        }
+        return res;
+}
+
+//virtual (WORKER THREAD)
+void LLTextureCacheWorker::finishWork(S32 param, bool completed)
+{
+        if (mResponder.notNull())
+        {
+                bool success = (completed && mDataSize > 0);
+                if (param == 0)
+                {
+                        // read
+                        if (success)
+                        {
+                                mResponder->setData(mReadData, mDataSize, mImageSize, mImageFormat, mImageLocal);
+                                mReadData = NULL; // responder owns data
+                                mDataSize = 0;
+                        }
+                        else
+                        {
+                                delete[] mReadData;
+                                mReadData = NULL;
+                                
+                        }
+                }
+                else
+                {
+                        // write
+                        mWriteData = NULL; // we never owned data
+                        mDataSize = 0;
+                }
+                mCache->addCompleted(mResponder, success);
+        }
+}
+
+//virtual (MAIN THREAD)
+void LLTextureCacheWorker::endWork(S32 param, bool aborted)
+{
+        if (aborted)
+        {
+                // Let the destructor handle any cleanup
+                return;
+        }
+        switch(param)
+        {
+          default:
+          case 0: // read
+          case 1: // write
+          {
+                  if (mDataSize < 0)
+                  {
+                          // failed
+                          mCache->removeFromCache(mID);
+                  }
+                  break;
+          }
+        }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+LLTextureCache::LLTextureCache(bool threaded)
+        : LLWorkerThread("TextureCache", threaded),
+          mWorkersMutex(getAPRPool()),
+          mHeaderMutex(getAPRPool()),
+          mListMutex(getAPRPool()),
+          mFileAPRPool(NULL),
+          mReadOnly(FALSE),
+          mTexturesSizeTotal(0),
+          mDoPurge(FALSE)
+{
+        apr_pool_create(&mFileAPRPool, NULL);
+}
+
+LLTextureCache::~LLTextureCache()
+{
+        apr_pool_destroy(mFileAPRPool);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+//virtual
+S32 LLTextureCache::update(U32 max_time_ms)
+{
+        S32 res;
+        res = LLWorkerThread::update(max_time_ms);
+
+        mListMutex.lock();
+        handle_list_t priorty_list = mPrioritizeWriteList; // copy list
+        mPrioritizeWriteList.clear();
+        responder_list_t completed_list = mCompletedList; // copy list
+        mCompletedList.clear();
+        mListMutex.unlock();
+        
+        lockWorkers();
+        
+        for (handle_list_t::iterator iter1 = priorty_list.begin();
+                 iter1 != priorty_list.end(); ++iter1)
+        {
+                handle_t handle = *iter1;
+                handle_map_t::iterator iter2 = mWriters.find(handle);
+                if(iter2 != mWriters.end())
+                {
+                        LLTextureCacheWorker* worker = iter2->second;
+                        worker->setPriority(LLWorkerThread::PRIORITY_HIGH | worker->mPriority);
+                }
+        }
+
+        for (responder_list_t::iterator iter1 = completed_list.begin();
+                 iter1 != completed_list.end(); ++iter1)
+        {
+                Responder *responder = iter1->first;
+                bool success = iter1->second;
+                responder->completed(success);
+        }
+        
+        unlockWorkers();
+        
+        return res;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+std::string LLTextureCache::getLocalFileName(const LLUUID& id)
+{
+        // Does not include extension
+        std::string idstr = id.asString();
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", idstr);
+        return filename;
+}
+
+std::string LLTextureCache::getTextureFileName(const LLUUID& id)
+{
+        std::string idstr = id.asString();
+        std::string delem = gDirUtilp->getDirDelimiter();
+        std::string filename = mTexturesDirName + delem + idstr[0] + delem + idstr;
+        return filename;
+}
+
+bool LLTextureCache::appendToTextureEntryList(const LLUUID& id, S32 bodysize)
+{
+        bool res = false;
+        bool purge = false;
+        // Append UUID to end of texture entries
+        {
+                LLMutexLock lock(&mHeaderMutex);
+                size_map_t::iterator iter = mTexturesSizeMap.find(id);
+                if (iter == mTexturesSizeMap.end() || iter->second < bodysize)
+                {
+                        llassert_always(bodysize > 0);
+                        Entry* entry = new Entry(id, bodysize, time(NULL));
+                        ll_apr_file_write_ex(mTexturesDirEntriesFileName, getFileAPRPool(),
+                                                                 (U8*)entry, -1, 1*sizeof(Entry));
+                        delete entry;
+                        if (iter != mTexturesSizeMap.end())
+                        {
+                                mTexturesSizeTotal -= iter->second;
+                        }
+                        mTexturesSizeTotal += bodysize;
+                        mTexturesSizeMap[id] = bodysize;
+                        if (mTexturesSizeTotal > sCacheMaxTexturesSize)
+                        {
+                                purge = true;
+                        }
+                        res = true;
+                }
+        }
+        if (purge)
+        {
+                mDoPurge = TRUE;
+        }
+        return res;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+//static
+const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB
+F32 LLTextureCache::sHeaderCacheVersion = 1.0f;
+U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE;
+S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
+const char* entries_filename = "texture.entries";
+const char* cache_filename = "texture.cache";
+const char* textures_dirname = "textures";
+
+void LLTextureCache::setDirNames(ELLPath location)
+{
+        std::string delem = gDirUtilp->getDirDelimiter();
+        mHeaderEntriesFileName = gDirUtilp->getExpandedFilename(location, entries_filename);
+        mHeaderDataFileName = gDirUtilp->getExpandedFilename(location, cache_filename);
+        mTexturesDirName = gDirUtilp->getExpandedFilename(location, textures_dirname);
+        mTexturesDirEntriesFileName = mTexturesDirName + delem + entries_filename;
+}
+
+void LLTextureCache::purgeCache(ELLPath location)
+{
+        if (!mReadOnly)
+        {
+                setDirNames(location);
+        
+                ll_apr_file_remove(mHeaderEntriesFileName, NULL);
+                ll_apr_file_remove(mHeaderDataFileName, NULL);
+        }
+        purgeAllTextures(true);
+}
+
+S64 LLTextureCache::initCache(ELLPath location, S64 max_size, BOOL read_only)
+{
+        mReadOnly = read_only;
+        
+        S64 header_size = (max_size * 2) / 10;
+        S64 max_entries = header_size / TEXTURE_CACHE_ENTRY_SIZE;
+        sCacheMaxEntries = (S32)(llmin((S64)sCacheMaxEntries, max_entries));
+        header_size = sCacheMaxEntries * TEXTURE_CACHE_ENTRY_SIZE;
+        max_size -= header_size;
+        if (sCacheMaxTexturesSize > 0)
+                sCacheMaxTexturesSize = llmin(sCacheMaxTexturesSize, max_size);
+        else
+                sCacheMaxTexturesSize = max_size;
+        max_size -= sCacheMaxTexturesSize;
+        
+        llinfos << "TEXTURE CACHE: Headers: " << sCacheMaxEntries
+                        << " Textures size: " << sCacheMaxTexturesSize/(1024*1024) << " MB" << llendl;
+
+        setDirNames(location);
+        
+        if (!mReadOnly)
+        {
+                LLFile::mkdir(mTexturesDirName.c_str());
+                const char* subdirs = "0123456789abcdef";
+                for (S32 i=0; i<16; i++)
+                {
+                        std::string dirname = mTexturesDirName + gDirUtilp->getDirDelimiter() + subdirs[i];
+                        LLFile::mkdir(dirname.c_str());
+                }
+        }
+        readHeaderCache();
+        purgeTextures(true); // calc mTexturesSize and make some room in the texture cache if we need it
+
+        return max_size; // unused cache space
+}
+
+struct lru_data
+{
+        lru_data(U32 t, S32 i, const LLUUID& id) { time=t; index=i; uuid=id; }
+        U32 time;
+        S32 index;
+        LLUUID uuid;
+        struct Compare
+        {
+                // lhs < rhs
+                typedef const lru_data* lru_data_ptr;
+                bool operator()(const lru_data_ptr& a, const lru_data_ptr& b) const
+                {
+                        if (!(a->time < b->time))
+                                return true;
+                        else if (!(b->time < a->time))
+                                return false;
+                        else
+                                return a->index < b->index;
+                }
+        };                              
+};
+
+// Called from either the main thread or the worker thread
+void LLTextureCache::readHeaderCache(apr_pool_t* poolp)
+{
+        LLMutexLock lock(&mHeaderMutex);
+        mHeaderEntriesInfo.mVersion = 0.f;
+        mHeaderEntriesInfo.mEntries = 0;
+        if (ll_apr_file_exists(mHeaderEntriesFileName, poolp))
+        {
+                ll_apr_file_read_ex(mHeaderEntriesFileName, poolp,
+                                                        (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo));
+        }
+        if (mHeaderEntriesInfo.mVersion != sHeaderCacheVersion)
+        {
+                if (!mReadOnly)
+                {
+                        // Info with 0 entries
+                        mHeaderEntriesInfo.mVersion = sHeaderCacheVersion;
+                        ll_apr_file_write_ex(mHeaderEntriesFileName, poolp,
+                                                                 (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo));
+                }
+        }
+        else
+        {
+                S32 num_entries = mHeaderEntriesInfo.mEntries;
+                if (num_entries)
+                {
+                        Entry* entries = new Entry[num_entries];
+                        ll_apr_file_read_ex(mHeaderEntriesFileName, poolp,
+                                                                (U8*)entries, sizeof(EntriesInfo), num_entries*sizeof(Entry));
+                        typedef std::set<lru_data*, lru_data::Compare> lru_set_t;
+                        lru_set_t lru;
+                        for (S32 i=0; i<num_entries; i++)
+                        {
+                                if (entries[i].mSize >= 0) // -1 indicates erased entry, skip
+                                {
+                                        const LLUUID& id = entries[i].mID;
+                                        lru.insert(new lru_data(entries[i].mTime, i, id));
+                                        mHeaderIDMap[id] = i;
+                                }
+                        }
+                        mLRU.clear();
+                        S32 lru_entries = sCacheMaxEntries / 10;
+                        for (lru_set_t::iterator iter = lru.begin(); iter != lru.end(); ++iter)
+                        {
+                                lru_data* data = *iter;
+                                mLRU[data->index] = data->uuid;
+                                if (--lru_entries <= 0)
+                                        break;
+                        }
+                        for_each(lru.begin(), lru.end(), DeletePointer());
+                        delete[] entries;
+                }
+        }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void LLTextureCache::purgeAllTextures(bool purge_directories)
+{
+        if (!mReadOnly)
+        {
+                const char* subdirs = "0123456789abcdef";
+                std::string delem = gDirUtilp->getDirDelimiter();
+                std::string mask = delem + "*";
+                for (S32 i=0; i<16; i++)
+                {
+                        std::string dirname = mTexturesDirName + delem + subdirs[i];
+                        gDirUtilp->deleteFilesInDir(dirname.c_str(),mask);
+                        if (purge_directories)
+                        {
+                                LLFile::rmdir(dirname.c_str());
+                        }
+                }
+                ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
+                if (purge_directories)
+                {
+                        LLFile::rmdir(mTexturesDirName.c_str());
+                }
+        }
+        mTexturesSizeMap.clear();
+}
+
+void LLTextureCache::purgeTextures(bool validate)
+{
+        if (mReadOnly)
+        {
+                return;
+        }
+
+        LLMutexLock lock(&mHeaderMutex);
+        
+        S32 filesize = ll_apr_file_size(mTexturesDirEntriesFileName, NULL);
+        S32 num_entries = filesize / sizeof(Entry);
+        if (num_entries * (S32)sizeof(Entry) != filesize)
+        {
+                llwarns << "Bad cache file: " << mTexturesDirEntriesFileName << " Purging." << llendl;
+                purgeAllTextures(false);
+                return;
+        }
+        if (num_entries == 0)
+        {
+                return; // nothing to do
+        }
+        
+        Entry* entries = new Entry[num_entries];
+        S32 bytes_read = ll_apr_file_read_ex(mTexturesDirEntriesFileName, NULL,
+                                                                                 (U8*)entries, 0, num_entries*sizeof(Entry));
+        if (bytes_read != filesize)
+        {
+                llwarns << "Bad cache file (2): " << mTexturesDirEntriesFileName << " Purging." << llendl;
+                purgeAllTextures(false);
+                return;
+        }
+        
+        llinfos << "TEXTURE CACHE: Reading Entries..." << llendl;
+        
+        std::map<LLUUID, S32> entry_idx_map;
+        S64 total_size = 0;
+        for (S32 idx=0; idx<num_entries; idx++)
+        {
+                const LLUUID& id = entries[idx].mID;
+//              llinfos << "Entry: " << id << " Size: " << entries[i].mSize << " Time: " << entries[i].mTime << llendl;
+                std::map<LLUUID, S32>::iterator iter = entry_idx_map.find(id);
+                if (iter != entry_idx_map.end())
+                {
+                        // Newer entry replacing older entry
+                        S32 pidx = iter->second;
+                        total_size -= entries[pidx].mSize;
+                        entries[pidx].mSize = 0; // flag: skip older entry
+                }
+                entry_idx_map[id] = idx;
+                total_size += entries[idx].mSize;
+        }
+
+        U32 validate_idx = 0;
+        if (validate)
+        {
+                validate_idx = gSavedSettings.getU32("CacheValidateCounter");
+                U32 next_idx = (++validate_idx) % 256;
+                gSavedSettings.setU32("CacheValidateCounter", next_idx);
+                llinfos << "TEXTURE CACHE: Validating: " << validate_idx << llendl;
+        }
+        
+        S64 min_cache_size = (sCacheMaxTexturesSize * 9) / 10;
+        S32 purge_count = 0;
+        S32 next_idx = 0;
+        for (S32 idx=0; idx<num_entries; idx++)
+        {
+                if (entries[idx].mSize == 0)
+                {
+                        continue;
+                }
+                bool purge_entry = false;
+                std::string filename = getTextureFileName(entries[idx].mID);
+                if (total_size >= min_cache_size)
+                {
+                        purge_entry = true;
+                }
+                else if (validate)
+                {
+                        // make sure file exists and is the correct size
+                        S32 uuididx = entries[idx].mID.mData[0];
+                        if (uuididx == validate_idx)
+                        {
+//                              llinfos << "Validating: " << filename << "Size: " << entries[idx].mSize << llendl;
+                                S32 bodysize = ll_apr_file_size(filename, NULL);
+                                if (bodysize != entries[idx].mSize)
+                                {
+                                        llwarns << "TEXTURE CACHE BODY HAS BAD SIZE: " << bodysize << " != " << entries[idx].mSize
+                                                        << filename << llendl;
+                                        purge_entry = true;
+                                }
+                        }
+                }
+                if (purge_entry)
+                {
+                        purge_count++;
+//                      llinfos << "PURGING: " << filename << llendl;
+                        ll_apr_file_remove(filename, NULL);
+                        total_size -= entries[idx].mSize;
+                        entries[idx].mSize = 0;
+                }
+                else
+                {
+                        if (next_idx != idx)
+                        {
+                                entries[next_idx] = entries[idx];
+                        }
+                        ++next_idx;
+                }
+        }
+        num_entries = next_idx;
+
+        llinfos << "TEXTURE CACHE: Writing Entries: " << num_entries << llendl;
+        
+        ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
+        ll_apr_file_write_ex(mTexturesDirEntriesFileName, NULL,
+                                                 (U8*)&entries[0], 0, num_entries*sizeof(Entry));
+        
+        mTexturesSizeTotal = 0;
+        mTexturesSizeMap.clear();
+        for (S32 idx=0; idx<num_entries; idx++)
+        {
+                mTexturesSizeMap[entries[idx].mID] = entries[idx].mSize;
+                mTexturesSizeTotal += entries[idx].mSize;
+        }
+        llassert(mTexturesSizeTotal == total_size);
+        
+        delete[] entries;
+        
+        llinfos << "TEXTURE CACHE:"
+                        << " PURGED: " << purge_count
+                        << " ENTRIES: " << num_entries
+                        << " CACHE SIZE: " << total_size / 1024*1024 << " MB"
+                        << llendl;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// call lockWorkers() first!
+LLTextureCacheWorker* LLTextureCache::getReader(handle_t handle)
+{
+        LLTextureCacheWorker* res = NULL;
+        handle_map_t::iterator iter = mReaders.find(handle);
+        if (iter != mReaders.end())
+        {
+                res = iter->second;
+        }
+        return res;
+}
+
+LLTextureCacheWorker* LLTextureCache::getWriter(handle_t handle)
+{
+        LLTextureCacheWorker* res = NULL;
+        handle_map_t::iterator iter = mWriters.find(handle);
+        if (iter != mWriters.end())
+        {
+                res = iter->second;
+        }
+        return res;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// Called from work thread
+S32 LLTextureCache::getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize)
+{
+        bool retry = false;
+        S32 idx = -1;
+
+        {
+                LLMutexLock lock(&mHeaderMutex);
+                id_map_t::iterator iter = mHeaderIDMap.find(id);
+                if (iter != mHeaderIDMap.end())
+                {
+                        idx = iter->second;
+                }
+                else if (touch && !mReadOnly)
+                {
+                        if (mHeaderEntriesInfo.mEntries < sCacheMaxEntries)
+                        {
+                                // Add an entry
+                                idx = mHeaderEntriesInfo.mEntries++;
+                                mHeaderIDMap[id] = idx;
+                                // Update Info
+                                ll_apr_file_write_ex(mHeaderEntriesFileName, getFileAPRPool(),
+                                                                        (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo));
+                        }
+                        else if (!mLRU.empty())
+                        {
+                                idx = mLRU.begin()->first; // will be erased below
+                                const LLUUID& oldid = mLRU.begin()->second;
+                                mHeaderIDMap.erase(oldid);
+                                mTexturesSizeMap.erase(oldid);
+                                mHeaderIDMap[id] = idx;
+                        }
+                        else
+                        {
+                                idx = -1;
+                                retry = true;
+                        }
+                }
+                if (idx >= 0)
+                {
+                        if (touch && !mReadOnly)
+                        {
+                                // Update the lru entry
+                                mLRU.erase(idx);
+                                llassert_always(imagesize && *imagesize > 0);
+                                Entry* entry = new Entry(id, *imagesize, time(NULL));
+                                S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
+                                ll_apr_file_write_ex(mHeaderEntriesFileName, getFileAPRPool(),
+                                                                         (U8*)entry, offset, sizeof(Entry));
+                                delete entry;
+                        }
+                        else if (imagesize)
+                        {
+                                // Get the image size
+                                Entry entry;
+                                S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
+                                ll_apr_file_read_ex(mHeaderEntriesFileName, getFileAPRPool(),
+                                                                        (U8*)&entry, offset, sizeof(Entry));
+                                *imagesize = entry.mSize;
+                        }
+                }
+        }
+        if (retry)
+        {
+                readHeaderCache(getFileAPRPool()); // updates the lru
+                llassert_always(!mLRU.empty() || mHeaderEntriesInfo.mEntries < sCacheMaxEntries);
+                idx = getHeaderCacheEntry(id, touch, imagesize); // assert above ensures no inf. recursion
+        }
+        return idx;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// Calls from texture pipeline thread (i.e. LLTextureFetch)
+
+LLTextureCache::handle_t LLTextureCache::readFromCache(const LLUUID& id, U32 priority,
+                                                                                                           S32 offset, S32 size, ReadResponder* responder)
+{
+        // Note: checking to see if an entry exists can cause a stall,
+        //  so let the thread handle it
+        LLMutexLock lock(&mWorkersMutex);
+        LLTextureCacheWorker* worker = new LLTextureCacheWorker(this, priority, id,
+                                                                                                                        NULL, size, offset, 0,
+                                                                                                                        responder);
+        handle_t handle = worker->read();
+        mReaders[handle] = worker;
+        return handle;
+}
+
+bool LLTextureCache::readComplete(handle_t handle, bool abort)
+{
+        lockWorkers();
+        handle_map_t::iterator iter = mReaders.find(handle);
+        llassert_always(iter != mReaders.end());
+        LLTextureCacheWorker* worker = iter->second;
+        bool res = worker->complete();
+        if (res || abort)
+        {
+                mReaders.erase(handle);
+                unlockWorkers();
+                worker->scheduleDelete();
+                return true;
+        }
+        else
+        {
+                unlockWorkers();
+                return false;
+        }
+}
+
+LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 priority,
+                                                                                                          U8* data, S32 datasize, S32 imagesize,
+                                                                                                          WriteResponder* responder)
+{
+        if (mReadOnly)
+        {
+                return LLWorkerThread::nullHandle();
+        }
+        if (mDoPurge)
+        {
+                // NOTE: This may cause an occasional hiccup,
+                //  but it really needs to be done on the control thread
+                //  (i.e. here)
+                purgeTextures(false);
+                mDoPurge = FALSE;
+        }
+        if (datasize >= TEXTURE_CACHE_ENTRY_SIZE)
+        {
+                LLMutexLock lock(&mWorkersMutex);
+                llassert_always(imagesize > 0);
+                LLTextureCacheWorker* worker = new LLTextureCacheWorker(this, priority, id,
+                                                                                                                                data, datasize, 0,
+                                                                                                                                imagesize, responder);
+                handle_t handle = worker->write();
+                mWriters[handle] = worker;
+                return handle;
+        }
+        return LLWorkerThread::nullHandle();
+}
+
+bool LLTextureCache::writeComplete(handle_t handle, bool abort)
+{
+        lockWorkers();
+        handle_map_t::iterator iter = mWriters.find(handle);
+        llassert_always(iter != mWriters.end());
+        LLTextureCacheWorker* worker = iter->second;
+        if (worker->complete() || abort)
+        {
+                mWriters.erase(handle);
+                unlockWorkers();
+                worker->scheduleDelete();
+                return true;
+        }
+        else
+        {
+                unlockWorkers();
+                return false;
+        }
+}
+
+void LLTextureCache::prioritizeWrite(handle_t handle)
+{
+        // Don't prioritize yet, we might be working on this now
+        //   which could create a deadlock
+        LLMutexLock lock(&mListMutex);  
+        mPrioritizeWriteList.push_back(handle);
+}
+
+void LLTextureCache::addCompleted(Responder* responder, bool success)
+{
+        LLMutexLock lock(&mListMutex);
+        mCompletedList.push_back(std::make_pair(responder,success));
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+// Called from MAIN thread (endWork())
+
+bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
+{
+        if (mReadOnly)
+        {
+                return false;
+        }
+        LLMutexLock lock(&mHeaderMutex);
+        id_map_t::iterator iter = mHeaderIDMap.find(id);
+        if (iter != mHeaderIDMap.end())
+        {
+                S32 idx = iter->second;
+                if (idx >= 0)
+                {
+                        Entry* entry = new Entry(id, -1, time(NULL));
+                        S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
+                        ll_apr_file_write_ex(mHeaderEntriesFileName, NULL,
+                                                                 (U8*)entry, offset, sizeof(Entry));
+                        delete entry;
+                        mLRU[idx] = id;
+                        mHeaderIDMap.erase(id);
+                        mTexturesSizeMap.erase(id);
+                        return true;
+                }
+        }
+        return false;
+}
+
+void LLTextureCache::removeFromCache(const LLUUID& id)
+{
+        llwarns << "Removing texture from cache: " << id << llendl;
+        if (!mReadOnly)
+        {
+                removeHeaderCacheEntry(id);
+                ll_apr_file_remove(getTextureFileName(id), NULL);
+        }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+LLTextureCache::ReadResponder::ReadResponder()
+        : mImageSize(0),
+          mImageLocal(FALSE)
+{
+}
+
+void LLTextureCache::ReadResponder::setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal)
+{
+        if (mFormattedImage.notNull())
+        {
+                llassert_always(mFormattedImage->getCodec() == imageformat);
+                mFormattedImage->appendData(data, datasize);
+        }
+        else
+        {
+                mFormattedImage = LLImageFormatted::createFromType(imageformat);
+                mFormattedImage->setData(data,datasize);
+        }
+        mImageSize = imagesize;
+        mImageLocal = imagelocal;
+}
+
+//////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
new file mode 100644
index 0000000..ec20066
--- /dev/null
+++ b/linden/indra/newview/lltexturecache.h
@@ -0,0 +1,175 @@
+/** 
+ * @file lltexturecache.h
+ * @brief Object for managing texture cachees.
+ *
+ * Copyright (c) 2000-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#ifndef LL_LLTEXTURECACHE_
+#define LL_LLTEXTURECACHE_H
+
+#include "lldir.h"
+#include "llstl.h"
+#include "llstring.h"
+#include "lluuid.h"
+
+#include "llworkerthread.h"
+
+class LLTextureCacheWorker;
+
+class LLTextureCache : public LLWorkerThread
+{
+        friend class LLTextureCacheWorker;
+
+public:
+
+        class Responder : public LLResponder
+        {
+        public:
+                virtual void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal) = 0;
+        };
+        
+        class ReadResponder : public Responder
+        {
+        public:
+                ReadResponder();
+                void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal);
+                void setImage(LLImageFormatted* image) { mFormattedImage = image; }
+        protected:
+                LLPointer<LLImageFormatted> mFormattedImage;
+                S32 mImageSize;
+                BOOL mImageLocal;
+        };
+
+        class WriteResponder : public Responder
+        {
+                void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal)
+                {
+                        // not used
+                }
+        };
+        
+        LLTextureCache(bool threaded);
+        ~LLTextureCache();
+
+        /*virtual*/ S32 update(U32 max_time_ms);        
+        
+        void purgeCache(ELLPath location);
+        S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
+
+        handle_t readFromCache(const LLUUID& id, U32 priority, S32 offset, S32 size,
+                                                   ReadResponder* responder);
+        bool readComplete(handle_t handle, bool abort);
+        handle_t writeToCache(const LLUUID& id, U32 priority, U8* data, S32 datasize, S32 imagesize,
+                                                  WriteResponder* responder);
+        bool writeComplete(handle_t handle, bool abort = false);
+        void prioritizeWrite(handle_t handle);
+
+        void removeFromCache(const LLUUID& id);
+
+        // For LLTextureCacheWorker::Responder
+        LLTextureCacheWorker* getReader(handle_t handle);
+        LLTextureCacheWorker* getWriter(handle_t handle);
+        void lockWorkers() { mWorkersMutex.lock(); }
+        void unlockWorkers() { mWorkersMutex.unlock(); }
+
+        // debug
+        S32 getNumReads() { return mReaders.size(); }
+        S32 getNumWrites() { return mWriters.size(); }
+
+protected:
+        // Accessed by LLTextureCacheWorker
+        apr_pool_t* getFileAPRPool() { return mFileAPRPool; }
+        bool appendToTextureEntryList(const LLUUID& id, S32 size);
+        std::string getLocalFileName(const LLUUID& id);
+        std::string getTextureFileName(const LLUUID& id);
+        void addCompleted(Responder* responder, bool success);
+        
+private:
+        void setDirNames(ELLPath location);
+        void readHeaderCache(apr_pool_t* poolp = NULL);
+        void purgeAllTextures(bool purge_directories);
+        void purgeTextures(bool validate);
+        S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL);
+        bool removeHeaderCacheEntry(const LLUUID& id);
+        void lockHeaders() { mHeaderMutex.lock(); }
+        void unlockHeaders() { mHeaderMutex.unlock(); }
+        
+private:
+        // Internal
+        LLMutex mWorkersMutex;
+        LLMutex mHeaderMutex;
+        LLMutex mListMutex;
+        apr_pool_t* mFileAPRPool;
+        
+        typedef std::map<handle_t, LLTextureCacheWorker*> handle_map_t;
+        handle_map_t mReaders;
+        handle_map_t mWriters;
+
+        typedef std::vector<handle_t> handle_list_t;
+        handle_list_t mPrioritizeWriteList;
+
+        typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
+        responder_list_t mCompletedList;
+        
+        BOOL mReadOnly;
+        
+        // Entries
+        struct EntriesInfo
+        {
+                F32 mVersion;
+                U32 mEntries;
+        };
+        struct Entry
+        {
+                Entry() {}
+                Entry(const LLUUID& id, S32 size, U32 time) : mID(id), mSize(size), mTime(time) {}
+                LLUUID mID; // 128 bits
+                S32 mSize; // total size of image if known (NOT size cached)
+                U32 mTime; // seconds since 1/1/1970
+        };
+
+        // HEADERS (Include first mip)
+        std::string mHeaderEntriesFileName;
+        std::string mHeaderDataFileName;
+        EntriesInfo mHeaderEntriesInfo;
+        typedef std::map<S32,LLUUID> index_map_t;
+        index_map_t mLRU; // index, id; stored as a map for fast removal
+        typedef std::map<LLUUID,S32> id_map_t;
+        id_map_t mHeaderIDMap;
+
+        // BODIES (TEXTURES minus headers)
+        std::string mTexturesDirName;
+        std::string mTexturesDirEntriesFileName;
+        typedef std::map<LLUUID,S32> size_map_t;
+        size_map_t mTexturesSizeMap;
+        S64 mTexturesSizeTotal;
+        LLAtomic32<BOOL> mDoPurge;
+        
+        // Statics
+        static F32 sHeaderCacheVersion;
+        static U32 sCacheMaxEntries;
+        static S64 sCacheMaxTexturesSize;
+};
+
+#endif // LL_LLTEXTURECACHE_H
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 9edd0ad..666b5d2 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -114,6 +114,7 @@ public:
                                                 EAcceptance *accept,
                                                 LLString& tooltip_msg);
         virtual void    draw();
+        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
 
         // LLFloater overrides
         virtual void    onClose(bool app_quitting);
@@ -175,6 +176,7 @@ protected:
         BOOL                            mCanApplyImmediately;
         BOOL                            mNoCopyTextureSelected;
         F32                                     mContextConeOpacity;
+        LLSaveFolderState       mSavedFolderState;
 };
 
 LLFloaterTexturePicker::LLFloaterTexturePicker( 
@@ -229,12 +231,16 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
                 filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
                 filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
 
-                mInventoryPanel->setAutoSelectOverride(true);
                 mInventoryPanel->setFilterTypes(filter_types);
-                mInventoryPanel->setFilterPermMask(getFilterPermMask());
+                //mInventoryPanel->setFilterPermMask(getFilterPermMask());  //Commented out due to no-copy texture loss.
+                mInventoryPanel->setFilterPermMask(immediate_filter_perm_mask);
                 mInventoryPanel->setSelectCallback(onSelectionChange, this);
                 mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
                 mInventoryPanel->setAllowMultiSelect(FALSE);
+
+                // store this filter as the default one
+                mInventoryPanel->getRootFolder()->getFilter()->markDefault();
+
                 // Commented out to stop opening all folders with textures
                 // mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_TEXTURE);
                 
@@ -262,6 +268,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
         updateFilterPermMask();
 
         setCanMinimize(FALSE);
+
+        mSavedFolderState.setApply(FALSE);
 }
 
 LLFloaterTexturePicker::~LLFloaterTexturePicker()
@@ -315,7 +323,7 @@ void LLFloaterTexturePicker::setCanApplyImmediately(BOOL b)
 
 void LLFloaterTexturePicker::stopUsingPipette()
 {
-        if (gToolMgr && gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolPipette)
+        if (gToolMgr && gToolMgr->getCurrentTool() == gToolPipette)
         {
                 gToolMgr->clearTransientTool();
         }
@@ -338,7 +346,8 @@ void LLFloaterTexturePicker::updateImageStats()
                 }
                 if (gAgent.isGodlike())
                 {
-                        LLString tstring = "Pick: " + mTexturep->getID().getString();
+                        LLString tstring = "Pick: ";
+                        tstring.append(mTexturep->getID().asString());
                         setTitle(tstring);
                 }
         }
@@ -368,7 +377,8 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
                 if (mod)  item_perm_mask |= PERM_MODIFY;
                 if (xfer) item_perm_mask |= PERM_TRANSFER;
                 
-                PermissionMask filter_perm_mask = getFilterPermMask();
+                //PermissionMask filter_perm_mask = getFilterPermMask();  Commented out due to no-copy texture loss.
+                PermissionMask filter_perm_mask = mImmediateFilterPermMask;
                 if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
                 {
                         if (drop)
@@ -395,6 +405,41 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
         return handled;
 }
 
+BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+{
+        LLFolderView* root_folder = mInventoryPanel->getRootFolder();
+
+        if (!called_from_parent && root_folder &&
+                mSearchEdit && mSearchEdit->hasFocus() &&
+                (key == KEY_RETURN || key == KEY_DOWN) && mask == MASK_NONE)
+        {
+                if (!root_folder->getCurSelectedItem())
+                {
+                        LLFolderViewItem* itemp = root_folder->getItemByID(gAgent.getInventoryRootID());
+                        if (itemp)
+                        {
+                                root_folder->setSelection(itemp, FALSE, FALSE);
+                        }
+                }
+                root_folder->scrollToShowSelection();
+
+                // move focus to inventory proper
+                root_folder->setFocus(TRUE);
+                
+                // treat this as a user selection of the first filtered result
+                commitIfImmediateSet();
+
+                return TRUE;
+        }
+
+        if (root_folder->hasFocus() && key == KEY_UP)
+        {
+                mSearchEdit->focusFirstItem(TRUE);
+        }
+
+        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+}
+
 // virtual
 void LLFloaterTexturePicker::onClose(bool app_quitting)
 {
@@ -469,7 +514,7 @@ void LLFloaterTexturePicker::draw()
         childSetEnabled("show_folders_check", mActive && mCanApplyImmediately && !mNoCopyTextureSelected);
         childSetEnabled("Select", mActive);
         childSetEnabled("Pipette", gToolMgr != NULL && mActive);
-        childSetValue("Pipette", gToolMgr && gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolPipette);
+        childSetValue("Pipette", gToolMgr && gToolMgr->getCurrentTool() == gToolPipette);
 
         //RN: reset search bar to reflect actual search query (all caps, for example)
         mSearchEdit->setText(mInventoryPanel->getFilterSubString());
@@ -747,60 +792,43 @@ void LLFloaterTexturePicker::onApplyImmediateCheck(LLUICtrl* ctrl, void *user_da
 
 void LLFloaterTexturePicker::updateFilterPermMask()
 {
-        mInventoryPanel->setFilterPermMask( getFilterPermMask() );
+        //mInventoryPanel->setFilterPermMask( getFilterPermMask() );  Commented out due to no-copy texture loss.
 }
 
 void LLFloaterTexturePicker::onSearchEdit(const LLString& search_string, void* user_data )
 {
         LLFloaterTexturePicker* picker = (LLFloaterTexturePicker*)user_data;
 
-        std::string filter_text = search_string;
-
-        if (filter_text.empty()&& picker->mInventoryPanel->getFilterSubString().empty())
-        {
-                // current filter and new filter empty, do nothing
-                return;
-        }
-        std::string upper_case_search_string = filter_text;
+        std::string upper_case_search_string = search_string;
         LLString::toUpper(upper_case_search_string);
 
-        picker->mInventoryPanel->setFilterSubString(upper_case_search_string);
-
-        LLFolderView* root_folder = picker->mInventoryPanel->getRootFolder();
-
-        //if (search_string.size())
-        //{
-        //      LLSelectFirstFilteredItem filter;
-        //      root_folder->applyFunctorRecursively(filter);
-        //      //...and scroll to show it
-        //      root_folder->scrollToShowSelection();
-        //}
-
-        KEY key = gKeyboard->currentKey();
-
-        if ((key == KEY_RETURN || key == KEY_DOWN) && gKeyboard->currentMask(FALSE) == MASK_NONE)
+        if (upper_case_search_string.empty())
         {
-                if (search_string.size())
+                if (picker->mInventoryPanel->getFilterSubString().empty())
                 {
-                        LLSelectFirstFilteredItem filter;
-                        root_folder->applyFunctorRecursively(filter);
-                        //...and scroll to show it
-                        root_folder->scrollToShowSelection();
+                        // current filter and new filter empty, do nothing
+                        return;
                 }
 
-                if (!root_folder->getCurSelectedItem())
+                picker->mSavedFolderState.setApply(TRUE);
+                picker->mInventoryPanel->getRootFolder()->applyFunctorRecursively(picker->mSavedFolderState);
+                // add folder with current item to list of previously opened folders
+                LLOpenFoldersWithSelection opener;
+                picker->mInventoryPanel->getRootFolder()->applyFunctorRecursively(opener);
+                picker->mInventoryPanel->getRootFolder()->scrollToShowSelection();
+
+        }
+        else if (picker->mInventoryPanel->getFilterSubString().empty())
+        {
+                // first letter in search term, save existing folder open state
+                if (!picker->mInventoryPanel->getRootFolder()->isFilterActive())
                 {
-                        LLFolderViewItem* itemp = root_folder->getItemByID(gAgent.getInventoryRootID());
-                        if (itemp)
-                        {
-                                root_folder->setSelection(itemp, FALSE, FALSE);
-                        }
+                        picker->mSavedFolderState.setApply(FALSE);
+                        picker->mInventoryPanel->getRootFolder()->applyFunctorRecursively(picker->mSavedFolderState);
                 }
-
-                // move focus to inventory proper
-                root_folder->setFocus(TRUE);
-                root_folder->scrollToShowSelection();
         }
+
+        picker->mInventoryPanel->setFilterSubString(upper_case_search_string);
 }
 
 //static 
@@ -1039,7 +1067,7 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
         // Show the dialog
         if( floaterp )
         {
-                floaterp->open( );
+                floaterp->open( );              /* Flawfinder: ignore */
         }
         else
         {
@@ -1060,7 +1088,7 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
                 mFloaterHandle = floaterp->getHandle();
 
                 gFloaterView->getParentFloater(this)->addDependentFloater(floaterp);
-                floaterp->open();
+                floaterp->open();               /* Flawfinder: ignore */
         }
 
         if (take_focus)
@@ -1270,8 +1298,9 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
         if (mod)  item_perm_mask |= PERM_MODIFY;
         if (xfer) item_perm_mask |= PERM_TRANSFER;
         
-        PermissionMask filter_perm_mask = mCanApplyImmediately ? 
-                        mImmediateFilterPermMask : mNonImmediateFilterPermMask;
+//      PermissionMask filter_perm_mask = mCanApplyImmediately ?                        commented out due to no-copy texture loss.
+//                      mImmediateFilterPermMask : mNonImmediateFilterPermMask;
+        PermissionMask filter_perm_mask = mImmediateFilterPermMask;
         if ( (item_perm_mask & filter_perm_mask) == filter_perm_mask )
         {
                 if(mDragCallback)
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 9344bbf..54b3f28 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1,6 +1,6 @@
 /** 
- * @file llviewerimage.cpp
- * @brief Object which handles a received image (and associated texture(s))
+ * @file lltexturecache.cpp
+ * @brief Object which fetches textures from the cache and/or network
  *
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
@@ -31,96 +31,290 @@
 
 #include "lltexturefetch.h"
 
-#include "llworkerthread.h"
+#include "llcurl.h"
+#include "llhttpclient.h"
 #include "llimage.h"
-#include "llvfs.h"
+#include "llimageworker.h"
+#include "llworkerthread.h"
 
+#include "llagent.h"
+#include "lltexturecache.h"
+#include "llviewerimagelist.h"
 #include "llviewerimage.h"
+#include "llviewerregion.h"
 #include "viewer.h"
 
 //////////////////////////////////////////////////////////////////////////////
 
+//static
 class LLTextureFetchWorker : public LLWorkerClass
 {
-        friend class LLTextureFetchImpl;
-
-public:
-        // From LLWorkerClass
-        static void initClass(bool threaded, bool runalways);
-        static void updateClass();
-        static void cleanupClass();
-
-        // New methods
-        static LLTextureFetchWorker* getWorker(const LLUUID& id, const LLHost& host,
-                                                                                   F32 mPriority, S32 discard,
-                                                                                   BOOL needs_aux = FALSE);
-        static LLTextureFetchWorker* getActiveWorker(const LLUUID& id);
+        friend class LLTextureFetch;
         
 private:
-        static void sendRequestListToSimulators();
+        class URLResponder : public LLHTTPClient::Responder
+        {
+        public:
+                URLResponder(LLTextureFetch* fetcher, const LLUUID& id)
+                        : mFetcher(fetcher), mID(id)
+                {
+                }
+                ~URLResponder()
+                {
+                }
+                virtual void error(U32 status, const std::string& reason)
+                {
+                        mFetcher->lockQueue();
+                        LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
+                        if (worker)
+                        {
+                                llinfos << "LLTextureFetchWorker::URLResponder::error " << status << ": " << reason << llendl;
+                                worker->callbackURLReceived(LLSD(), false);
+                        }
+                        mFetcher->unlockQueue();
+                }
+                virtual void result(const LLSD& content)
+                {
+                        mFetcher->lockQueue();
+                        LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
+                        if (worker)
+                        {
+                                worker->callbackURLReceived(content, true);
+                        }
+                        mFetcher->unlockQueue();
+                }
+        private:
+                LLTextureFetch* mFetcher;
+                LLUUID mID;
+        };
+
+        class HTTPGetResponder : public LLCurl::Responder
+        {
+        public:
+                HTTPGetResponder(LLTextureFetch* fetcher, const LLUUID& id)
+                        : mFetcher(fetcher), mID(id)
+                {
+                }
+                ~HTTPGetResponder()
+                {
+                }
+                virtual void completed(U32 status, const std::stringstream& content)
+                {
+                        mFetcher->lockQueue();
+                        LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
+                        if (worker)
+                        {
+                                const std::string& cstr = content.str();
+                                if (200 <= status &&  status < 300)
+                                {
+                                        if (203 == status) // partial information (i.e. last block)
+                                        {
+                                                worker->callbackHttpGet((U8*)cstr.c_str(), cstr.length(), true);
+                                        }
+                                        else
+                                        {
+                                                worker->callbackHttpGet((U8*)cstr.c_str(), cstr.length(), false);
+                                        }
+                                }
+                                else
+                                {
+                                        llinfos << "LLTextureFetchWorker::HTTPGetResponder::error " << status << ": " << cstr << llendl;
+                                        worker->callbackHttpGet(NULL, -1, true);
+                                }
+                        }
+                        mFetcher->unlockQueue();
+                }
+        private:
+                LLTextureFetch* mFetcher;
+                LLUUID mID;
+        };
+
+        class CacheReadResponder : public LLTextureCache::ReadResponder
+        {
+        public:
+                CacheReadResponder(LLTextureFetch* fetcher, const LLUUID& id, LLImageFormatted* image)
+                        : mFetcher(fetcher), mID(id)
+                {
+                        setImage(image);
+                }
+                virtual void completed(bool success)
+                {
+                        mFetcher->lockQueue();
+                        LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
+                        if (worker)
+                        {
+                                worker->callbackCacheRead(success, mFormattedImage, mImageSize, mImageLocal);
+                        }
+                        mFetcher->unlockQueue();
+                }
+        private:
+                LLTextureFetch* mFetcher;
+                LLUUID mID;
+        };
+
+        class CacheWriteResponder : public LLTextureCache::WriteResponder
+        {
+        public:
+                CacheWriteResponder(LLTextureFetch* fetcher, const LLUUID& id)
+                        : mFetcher(fetcher), mID(id)
+                {
+                }
+                virtual void completed(bool success)
+                {
+                        mFetcher->lockQueue();
+                        LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
+                        if (worker)
+                        {
+                                worker->callbackCacheWrite(success);
+                        }
+                        mFetcher->unlockQueue();
+                }
+        private:
+                LLTextureFetch* mFetcher;
+                LLUUID mID;
+        };
+        
+        class DecodeResponder : public LLResponder
+        {
+        public:
+                DecodeResponder(LLTextureFetch* fetcher, const LLUUID& id, LLTextureFetchWorker* worker)
+                        : mFetcher(fetcher), mID(id), mWorker(worker)
+                {
+                }
+                virtual void completed(bool success)
+                {
+                        mFetcher->lockQueue();
+                        LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
+                        if (worker)
+                        {
+                                worker->callbackDecoded(success);
+                        }
+                        mFetcher->unlockQueue();
+                }
+        private:
+                LLTextureFetch* mFetcher;
+                LLUUID mID;
+                LLTextureFetchWorker* mWorker; // debug only (may get deleted from under us, use mFetcher/mID)
+        };
+
+        struct Compare
+        {
+                // lhs < rhs
+                bool operator()(const LLTextureFetchWorker* lhs, const LLTextureFetchWorker* rhs) const
+                {
+                        // greater priority is "less"
+                        const F32 lpriority = lhs->mImagePriority;
+                        const F32 rpriority = rhs->mImagePriority;
+                        if (lpriority > rpriority) // higher priority
+                                return true;
+                        else if (lpriority < rpriority)
+                                return false;
+                        else
+                                return lhs < rhs;
+                }
+        };
         
 public:
-        virtual bool doWork(S32 param); // Called from LLWorkerThread::processRequest()
+        /*virtual*/ bool doWork(S32 param); // Called from LLWorkerThread::processRequest()
+        /*virtual*/ void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
+        /*virtual*/ bool deleteOK(); // called from update() (WORK THREAD)
 
         ~LLTextureFetchWorker();
         void relese() { --mActiveCount; }
 
-
 protected:
-        LLTextureFetchWorker(const LLUUID& id, const LLHost& host, F32 mPriority, S32 discard);
+        LLTextureFetchWorker(LLTextureFetch* fetcher, const LLUUID& id, const LLHost& host,
+                                                 F32 priority, S32 discard, S32 size);
 
 private:
-        virtual void startWork(S32 param); // called from addWork() (MAIN THREAD)
-        virtual void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
+        /*virtual*/ void startWork(S32 param); // called from addWork() (MAIN THREAD)
+        /*virtual*/ void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
 
+        void resetFormattedData();
+        
         void setImagePriority(F32 priority);
-        void setDesiredDiscard(S32 discard);
-        void insertPacket(S32 index, U8* data, S32 size);
+        void setDesiredDiscard(S32 discard, S32 size);
+        bool insertPacket(S32 index, U8* data, S32 size);
         void clearPackets();
         U32 calcWorkPriority();
-        bool startVFSLoad(LLVFS* vfs, LLAssetType::EType asset_type);
-        bool loadFromVFS();
+        void removeFromCache();
         bool processSimulatorPackets();
-        void startDecode();
         bool decodeImage();
-
+        bool writeToCacheComplete();
+        
         void lockWorkData() { mWorkMutex.lock(); }
         void unlockWorkData() { mWorkMutex.unlock(); }
-        
-        static void lockQueue() { sDataMutex->lock(); }
-        static void unlockQueue() { sDataMutex->unlock(); }
+
+        void callbackURLReceived(const LLSD& data, bool success);
+        void callbackHttpGet(U8* data, S32 data_size, bool last_block);
+        void callbackCacheRead(bool success, LLImageFormatted* image,
+                                                   S32 imagesize, BOOL islocal);
+        void callbackCacheWrite(bool success);
+        void callbackDecoded(bool success);
         
 private:
-        enum e_state
+        enum e_state // mState
         {
-                INIT = 1,
-                LOAD_FROM_CACHE,
+                // NOTE: Affects LLTextureBar::draw in lltextureview.cpp (debug hack)
+                INVALID = 0,
+                INIT,
+                LOAD_FROM_TEXTURE_CACHE,
+                CACHE_POST,
+                LOAD_FROM_NETWORK,
                 LOAD_FROM_SIMULATOR,
-                WRITE_TO_VFS,
+                LOAD_FROM_HTTP_GET_URL,
+                LOAD_FROM_HTTP_GET_DATA,
                 DECODE_IMAGE,
                 DECODE_IMAGE_UPDATE,
+                WRITE_TO_CACHE,
+                WAIT_ON_WRITE,
                 DONE
         };
+        enum e_request_state // mSentRequest
+        {
+                UNSENT = 0,
+                QUEUED = 1,
+                SENT_SIM = 2,
+                SENT_URL = 3,
+                SENT_HTTP = 4
+        };
+        static const char* sStateDescs[];
         e_state mState;
+        LLTextureFetch* mFetcher;
+        LLImageWorker* mImageWorker;
         LLPointer<LLImageFormatted> mFormattedImage;
         LLPointer<LLImageRaw> mRawImage;
         LLPointer<LLImageRaw> mAuxImage;
         LLUUID mID;
         LLHost mHost;
-        F32 mPriority;
+        U8 mType;
+        F32 mImagePriority;
+        U32 mWorkPriority;
+        F32 mRequestedPriority;
         S32 mDesiredDiscard;
+        S32 mSimRequestedDiscard;
         S32 mRequestedDiscard;
+        S32 mLoadedDiscard;
         S32 mDecodedDiscard;
         LLFrameTimer mRequestedTimer;
-        LLFrameTimer mIdleTimer;
-        LLVFSThread::handle_t mFileHandle;
+        LLFrameTimer mFetchTimer;
+        LLTextureCache::handle_t mCacheReadHandle;
+        LLTextureCache::handle_t mCacheWriteHandle;
         U8* mBuffer;
         S32 mBufferSize;
         S32 mRequestedSize;
+        S32 mDesiredSize;
+        S32 mFileSize;
+        S32 mCachedSize;
         BOOL mLoaded;
-        BOOL mRequested;
+        e_request_state mSentRequest;
         BOOL mDecoded;
+        BOOL mWritten;
         BOOL mNeedsAux;
+        BOOL mHaveAllData;
+        BOOL mInLocalCache;
+        S32 mRetryAttempt;
+        std::string mURL;
         S32 mActiveCount;
 
         // Work Data
@@ -129,635 +323,1532 @@ private:
         {
                 PacketData(U8* data, S32 size) { mData = data; mSize = size; }
                 ~PacketData() { clearData(); }
-                void clearData() { delete mData; mData = NULL; }
+                void clearData() { delete[] mData; mData = NULL; }
                 U8* mData;
                 U32 mSize;
         };
         std::vector<PacketData*> mPackets;
+        S32 mFirstPacket;
         S32 mLastPacket;
-        S32 mTotalPackets;
-        S32 mTotalBytes;
-        
-        // Class variables (statics)
-        
-        static LLWorkerThread* sWorkerThread;
-        static LLMutex* sDataMutex;
+        U16 mTotalPackets;
+        U8 mImageCodec;
+};
 
-        // Map of all requests by UUID
-        typedef std::map<LLUUID,LLTextureFetchWorker*> map_t;
-        static map_t sRequests;
+//static
+const char* LLTextureFetchWorker::sStateDescs[] = {
+        "INVALID",
+        "INIT",
+        "LOAD_FROM_TEXTURE_CACHE",
+        "CACHE_POST",
+        "LOAD_FROM_NETWORK",
+        "LOAD_FROM_SIMULATOR",
+        "LOAD_FROM_HTTP_URL",
+        "LOAD_FROM_HTTP_DATA",
+        "DECODE_IMAGE",
+        "DECODE_IMAGE_UPDATE",
+        "WRITE_TO_CACHE",
+        "WAIT_ON_WRITE",
+        "DONE",
+};
 
-        // Set of requests that require network data
-        typedef std::set<LLTextureFetchWorker*> queue_t ;
-        static queue_t sNetworkQueue;
+// called from MAIN THREAD
 
-        static LLFrameTimer sNetworkTimer;
-};
+LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
+                                                                                   const LLUUID& id,    // Image UUID
+                                                                                   const LLHost& host,  // Simulator host
+                                                                                   F32 priority,                // Priority
+                                                                                   S32 discard,                 // Desired discard
+                                                                                   S32 size)                    // Desired size
+        : LLWorkerClass(fetcher, "TextureFetch"),
+          mState(INIT),
+          mFetcher(fetcher),
+          mImageWorker(NULL),
+          mID(id),
+          mHost(host),
+          mImagePriority(priority),
+          mWorkPriority(0),
+          mRequestedPriority(0.f),
+          mDesiredDiscard(-1),
+          mSimRequestedDiscard(-1),
+          mRequestedDiscard(-1),
+          mLoadedDiscard(-1),
+          mDecodedDiscard(-1),
+          mCacheReadHandle(LLTextureCache::nullHandle()),
+          mCacheWriteHandle(LLTextureCache::nullHandle()),
+          mBuffer(NULL),
+          mBufferSize(0),
+          mRequestedSize(0),
+          mDesiredSize(FIRST_PACKET_SIZE),
+          mFileSize(0),
+          mCachedSize(0),
+          mLoaded(FALSE),
+          mSentRequest(UNSENT),
+          mDecoded(FALSE),
+          mWritten(FALSE),
+          mNeedsAux(FALSE),
+          mHaveAllData(FALSE),
+          mInLocalCache(FALSE),
+          mRetryAttempt(0),
+          mActiveCount(0),
+          mWorkMutex(fetcher->getWorkerAPRPool()),
+          mFirstPacket(0),
+          mLastPacket(-1),
+          mTotalPackets(0),
+          mImageCodec(IMG_CODEC_INVALID)
+{
+        calcWorkPriority();
+        mType = host.isOk() ? LLImageBase::TYPE_AVATAR_BAKE : LLImageBase::TYPE_NORMAL;
+//      llinfos << "Create: " << mID << " mHost:" << host << " Discard=" << discard << llendl;
+        if (!mFetcher->mDebugPause)
+        {
+                U32 work_priority = mWorkPriority | LLWorkerThread::PRIORITY_HIGH;
+                addWork(0, work_priority );
+        }
+        setDesiredDiscard(discard, size);
+}
 
-//statics
-LLTextureFetchWorker::map_t LLTextureFetchWorker::sRequests;
-LLTextureFetchWorker::queue_t LLTextureFetchWorker::sNetworkQueue;
-LLFrameTimer LLTextureFetchWorker::sNetworkTimer;
-LLWorkerThread* LLTextureFetchWorker::sWorkerThread = NULL;
-LLMutex* LLTextureFetchWorker::sDataMutex = NULL;
+LLTextureFetchWorker::~LLTextureFetchWorker()
+{
+//      llinfos << "Destroy: " << mID
+//                      << " Decoded=" << mDecodedDiscard
+//                      << " Requested=" << mRequestedDiscard
+//                      << " Desired=" << mDesiredDiscard << llendl;
+        llassert_always(!haveWork());
+        lockWorkData();
+        if (mCacheReadHandle != LLTextureCache::nullHandle())
+        {
+                mFetcher->mTextureCache->readComplete(mCacheReadHandle, true);
+        }
+        if (mCacheWriteHandle != LLTextureCache::nullHandle())
+        {
+                mFetcher->mTextureCache->writeComplete(mCacheWriteHandle, true);
+        }
+        if (mImageWorker)
+        {
+                mImageWorker->scheduleDelete();
+        }
+        mFormattedImage = NULL;
+        clearPackets();
+        unlockWorkData();
+}
 
-// called from MAIN THREAD
-//static
-void LLTextureFetchWorker::initClass(bool threaded, bool runalways)
+void LLTextureFetchWorker::clearPackets()
 {
-        sWorkerThread = new LLWorkerThread(threaded, runalways);
-        sDataMutex = new LLMutex(sWorkerThread->getAPRPool());
+        for_each(mPackets.begin(), mPackets.end(), DeletePointer());
+        mPackets.clear();
+        mTotalPackets = 0;
+        mLastPacket = -1;
+        mFirstPacket = 0;
 }
 
-// called from MAIN THREAD
-//static
-void LLTextureFetchWorker::updateClass()
+U32 LLTextureFetchWorker::calcWorkPriority()
 {
-        const F32 REQUEST_TIME = 1.f;
-        const F32 MIN_IDLE_TIME = 1.f * 60.f; // 1 minute
-        const F32 MAX_IDLE_TIME = 5.f * 60.f; // 5 minutes
-        const S32 MIN_IDLE_COUNT = 16; // always keep last 16 idle requests
-        const F32 MAX_IDLE_COUNT = 1024; // max number of idle requests
+//      llassert_always(mImagePriority >= 0 && mImagePriority <= LLViewerImage::maxDecodePriority());
+        F32 priority_scale = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerImage::maxDecodePriority();
+        mWorkPriority = (U32)(mImagePriority * priority_scale);
+        return mWorkPriority;
+}
 
-        // Periodically, gather the list of textures that need data from the network
-        // And send the requests out to the simulators
-        if (sNetworkTimer.getElapsedTimeF32() >= REQUEST_TIME)
+// mWorkMutex is locked
+void LLTextureFetchWorker::setDesiredDiscard(S32 discard, S32 size)
+{
+        bool prioritize = false;
+        if (mDesiredDiscard != discard)
         {
-                sNetworkTimer.reset();
-                sendRequestListToSimulators();
+                if (!haveWork())
+                {
+                        calcWorkPriority();
+                        if (!mFetcher->mDebugPause)
+                        {
+                                U32 work_priority = mWorkPriority | LLWorkerThread::PRIORITY_HIGH;
+                                addWork(0, work_priority);
+                        }
+                }
+                else if (mDesiredDiscard < discard)
+                {
+                        prioritize = true;
+                }
+                mDesiredDiscard = discard;
+                mDesiredSize = size;
         }
-        // Remove any old requests (releasing their raw data)
-        typedef std::pair<F32, LLTextureFetchWorker*> idle_pair;
-        typedef std::set<idle_pair, compare_pair_greater<F32,LLTextureFetchWorker*> > idle_set;
-        idle_set remove_set;
-        for (map_t::iterator iter = sRequests.begin(); iter != sRequests.end(); ++iter)
+        else if (size > mDesiredSize)
         {
-                LLTextureFetchWorker* worker = iter->second;
-                if (worker->mActiveCount > 0)
-                        continue;
-                if (worker->haveWork())
-                        continue;
-                F32 idletime = worker->mIdleTimer.getElapsedTimeF32();
-                if (idletime < MIN_IDLE_TIME)
-                        continue;
-                remove_set.insert(std::make_pair(idletime, worker));
+                mDesiredSize = size;
+                prioritize = true;
         }
-        S32 num_left = remove_set.size();
-        for (idle_set::iterator iter = remove_set.begin(); iter != remove_set.end(); ++iter)
+        if ((prioritize && mState == INIT) || mState == DONE)
         {
-                if (num_left <= MIN_IDLE_COUNT)
-                        break;
-                if (iter->first < MAX_IDLE_TIME &&
-                        num_left < MAX_IDLE_COUNT)
-                        break;
-                num_left--;
+                mState = INIT;
+                U32 work_priority = mWorkPriority | LLWorkerThread::PRIORITY_HIGH;
+                setPriority(work_priority);
         }
 }
 
-// called from MAIN THREAD
-//static
-void LLTextureFetchWorker::sendRequestListToSimulators()
+void LLTextureFetchWorker::setImagePriority(F32 priority)
 {
-        const F32 LAZY_FLUSH_TIMEOUT = 60.f;
-        const S32 IMAGES_PER_REQUEST = 50;
-        // Send requests
-        typedef std::map< LLHost, std::vector<LLTextureFetchWorker*> > work_request_map_t;
-        work_request_map_t requests;
-        for (queue_t::iterator iter = sNetworkQueue.begin(); iter != sNetworkQueue.end(); ++iter)
+//      llassert_always(priority >= 0 && priority <= LLViewerImage::maxDecodePriority());
+        F32 delta = fabs(priority - mImagePriority);
+        if (delta > (mImagePriority * .05f) || mState == DONE)
         {
-                LLTextureFetchWorker* req = *iter;
-                if (req->haveWork())
+                mImagePriority = priority;
+                calcWorkPriority();
+                U32 work_priority = mWorkPriority | (getPriority() & LLWorkerThread::PRIORITY_HIGHBITS);
+                setPriority(work_priority);
+        }
+}
+
+void LLTextureFetchWorker::resetFormattedData()
+{
+        delete[] mBuffer;
+        mBuffer = NULL;
+        mBufferSize = 0;
+        if (mFormattedImage.notNull())
+        {
+                mFormattedImage->deleteData();
+        }
+        mHaveAllData = FALSE;
+}
+
+// Called from MAIN thread
+void LLTextureFetchWorker::startWork(S32 param)
+{
+        llassert(mImageWorker == NULL);
+        llassert(mFormattedImage.isNull());
+}
+
+#include "llviewerimagelist.h" // debug
+
+// Called from LLWorkerThread::processRequest()
+bool LLTextureFetchWorker::doWork(S32 param)
+{
+        LLMutexLock lock(&mWorkMutex);
+
+        if (mFetcher->mDebugPause)
+        {
+                return false; // debug: don't do any work
+        }
+        if (mID == mFetcher->mDebugID)
+        {
+                mFetcher->mDebugCount++; // for setting breakpoints
+        }
+
+        if (mState != DONE)
+        {
+                mFetchTimer.reset();
+        }
+        
+        if (mState == INIT)
+        {
+                mRequestedDiscard = -1;
+                mLoadedDiscard = -1;
+                mDecodedDiscard = -1;
+                mRequestedSize = 0;
+                mFileSize = 0;
+                mCachedSize = 0;
+                mLoaded = FALSE;
+                mSentRequest = UNSENT;
+                mDecoded  = FALSE;
+                mWritten  = FALSE;
+                delete[] mBuffer;
+                mBuffer = NULL;
+                mBufferSize = 0;
+                mHaveAllData = FALSE;
+                clearPackets(); // TODO: Shouldn't be necessary
+                mCacheReadHandle = LLTextureCache::nullHandle();
+                mCacheWriteHandle = LLTextureCache::nullHandle();
+                mURL.clear();
+                mState = LOAD_FROM_TEXTURE_CACHE;
+                // fall through
+        }
+
+        if (mState == LOAD_FROM_TEXTURE_CACHE)
+        {
+                if (mCacheReadHandle == LLTextureCache::nullHandle())
                 {
-                        continue; // busy
+                        U32 cache_priority = mWorkPriority;
+                        S32 offset = mFormattedImage.notNull() ? mFormattedImage->getDataSize() : 0;
+                        S32 size = mDesiredSize - offset;
+                        if (size <= 0)
+                        {
+                                mState = CACHE_POST;
+                                return false;
+                        }
+                        mFileSize = 0;
+                        mLoaded = FALSE;
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
+                        CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
+                        mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority,
+                                                                                                                                          offset, size, responder);
                 }
-                if ((req->mRequestedDiscard == req->mDesiredDiscard) &&
-                        (req->mRequestedTimer.getElapsedTimeF32() < LAZY_FLUSH_TIMEOUT))
+
+                if (mLoaded)
                 {
-                        continue;
+                        // Make sure request is complete. *TODO: make this auto-complete
+                        if (mFetcher->mTextureCache->readComplete(mCacheReadHandle, false))
+                        {
+                                mCacheReadHandle = LLTextureCache::nullHandle();
+                                mState = CACHE_POST;
+                                // fall through
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+                else
+                {
+                        return false;
                 }
-                req->mRequestedDiscard = req->mDesiredDiscard;
-                req->mRequestedTimer.reset();
-                requests[req->mHost].push_back(req);
         }
-        for (work_request_map_t::iterator iter1 = requests.begin();
-                 iter1 != requests.end(); ++iter1)
+
+        if (mState == CACHE_POST)
         {
-                LLHost host = iter1->first;
-                // invalid host = load from static VFS
-                if (host != LLHost::invalid)
+                mCachedSize = mFormattedImage.notNull() ? mFormattedImage->getDataSize() : 0;
+                // Successfully loaded
+                if ((mCachedSize >= mDesiredSize) || mHaveAllData)
                 {
-                        S32 request_count = 0;
-                        for (std::vector<LLTextureFetchWorker*>::iterator iter2 = iter1->second.begin();
-                                 iter2 != iter1->second.end(); ++iter2)
+                        // we have enough data, decode it
+                        llassert_always(mFormattedImage->getDataSize() > 0);
+                        mState = DECODE_IMAGE;
+                        // fall through
+                }
+                else
+                {
+                        // need more data
+                        mState = LOAD_FROM_NETWORK;
+                        // fall through
+                }
+        }
+
+        if (mState == LOAD_FROM_NETWORK)
+        {
+                if (mSentRequest == UNSENT)
+                {
+                        if (mFormattedImage.isNull())
                         {
-                                LLTextureFetchWorker* req = *iter2;
-                                if (0 == request_count)
+                                mFormattedImage = new LLImageJ2C;
+                        }
+                        // Add this to the network queue and sit here.
+                        // LLTextureFetch::update() will send off a request which will change our state
+                        S32 data_size = mFormattedImage->getDataSize();
+                        if (data_size > 0)
+                        {
+                                // Only used for simulator requests
+                                mFirstPacket = (data_size - FIRST_PACKET_SIZE) / MAX_IMG_PACKET_SIZE + 1;
+                                if (FIRST_PACKET_SIZE + (mFirstPacket-1) * MAX_IMG_PACKET_SIZE != data_size)
                                 {
-                                        gMessageSystem->newMessageFast(_PREHASH_RequestImage);
+                                        llwarns << "Bad CACHED TEXTURE size: " << data_size << " removing." << llendl;
+                                        removeFromCache();
+                                        resetFormattedData();
+                                        clearPackets();
                                 }
-                                S32 packet = req->mLastPacket + 1;
-                                gMessageSystem->nextBlockFast(_PREHASH_RequestImage);
-                                gMessageSystem->addUUIDFast(_PREHASH_Image, req->mID);
-                                gMessageSystem->addS32Fast(_PREHASH_DiscardLevel, req->mDesiredDiscard);
-                                gMessageSystem->addF32Fast(_PREHASH_DownloadPriority, req->mPriority);
-                                gMessageSystem->addU32Fast(_PREHASH_Packet, packet);
+                                else
+                                {
+                                        mLastPacket = mFirstPacket-1;
+                                        mTotalPackets = (mFileSize - FIRST_PACKET_SIZE + MAX_IMG_PACKET_SIZE-1) / MAX_IMG_PACKET_SIZE + 1;
+                                }
+                        }
+                        mRequestedSize = mDesiredSize;
+                        mRequestedDiscard = mDesiredDiscard;
+                        mSentRequest = QUEUED;
+                        mFetcher->lockQueue();
+                        mFetcher->addToNetworkQueue(this);
+                        mFetcher->unlockQueue();
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                }
+                return false;
+        }
+        
+        if (mState == LOAD_FROM_SIMULATOR)
+        {
+                if (processSimulatorPackets())
+                {
+                        mFetcher->lockQueue();
+                        mFetcher->removeFromNetworkQueue(this);
+                        mFetcher->unlockQueue();
+                        if (!mFormattedImage->getDataSize())
+                        {
+                                // processSimulatorPackets() failed
+                                llwarns << "processSimulatorPackets() failed to load buffer" << llendl;
+                                return true; // failed
+                        }
+                        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                        mState = DECODE_IMAGE;
+                }
+                else
+                {
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                }
+                return false;
+        }
+        
+#if 0
+        if (mState == LOAD_FROM_HTTP_GET_URL)
+        {
+                if (!mSentRequest)
+                {
+                        mSentRequest = TRUE;
+                        mLoaded = FALSE;
+                        std::string url;
+                        LLViewerRegion* region = gAgent.getRegion();
+                        if (region)
+                        {
+                                url = region->getCapability("RequestTextureDownload");
+                        }
+                        if (!url.empty())
+                        {
+                                LLSD sd;
+                                sd = mID.asString();
+                                setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                                LLHTTPClient::post(url, sd, new URLResponder(mFetcher, mID));
+                                return false;
+                        }
+                        else
+                        {
+                                llwarns << mID << ": HTTP get url failed, requesting from simulator" << llendl;
+                                mSentRequest = FALSE;
+                                mState = LOAD_FROM_SIMULATOR;
+                                return false;
+                        }
+                }
+                else
+                {
+                        if (mLoaded)
+                        {
+                                if (!mURL.empty())
+                                {
+                                        mState = LOAD_FROM_HTTP_GET_DATA;
+                                        mSentRequest = FALSE; // reset
+                                        mLoaded = FALSE; // reset
+                                }
+                                else
+                                {
+                                        llwarns << mID << ": HTTP get url is empty, requesting from simulator" << llendl;
+                                        mSentRequest = FALSE;
+                                        mState = LOAD_FROM_SIMULATOR;
+                                        return false;
+                                }
+                        }
+                }
+                // fall through
+        }
+        
+        if (mState == LOAD_FROM_HTTP_GET_DATA)
+        {
+                if (!mSentRequest)
+                {
+                        mSentRequest = TRUE;
+                        S32 cur_size = mFormattedImage->getDataSize(); // amount of data we already have
+                        mRequestedSize = mDesiredSize;
+                        mRequestedDiscard = mDesiredDiscard;
+#if 1 // *TODO: LLCurl::getByteRange is broken (ignores range)
+                        cur_size = 0;
+                        mFormattedImage->deleteData();
+#endif
+                        mRequestedSize -= cur_size;
+                        //                        F32 priority = mImagePriority / (F32)LLViewerImage::maxDecodePriority(); // 0-1
+                        S32 offset = cur_size;
+                        mBufferSize = cur_size; // This will get modified by callbackHttpGet()
+                        std::string url;
+                        if (mURL.empty())
+                        {
+                                //url = "http://asset.agni/0000002f-38ae-0e17-8e72-712e58964e9c.texture";
+                                std::stringstream urlstr;
+                                urlstr << "http://asset.agni/" << mID.asString() << ".texture";
+                                url = urlstr.str();
+                        }
+                        else
+                        {
+                                url = mURL;
+                        }
+                        mLoaded = FALSE;
+//                      llinfos << "HTTP GET: " << mID << " Offset: " << offset << " Bytes: " << mRequestedSize << llendl;
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                        LLCurl::getByteRange(url, offset, mRequestedSize,
+                                                                 new HTTPGetResponder(mFetcher, mID)); // *TODO: use mWorkPriority
+                        return false; // not done
+                }
 
-                                request_count++;
-                                if (request_count >= IMAGES_PER_REQUEST)
+                if (mLoaded)
+                {
+                        S32 cur_size = mFormattedImage->getDataSize();
+                        if (mRequestedSize < 0)
+                        {
+                                llwarns << "http get failed for: " << mID << llendl;
+                                if (cur_size == 0)
                                 {
-                                        gMessageSystem->sendSemiReliable(host, NULL, NULL);
-                                        request_count = 0;
+                                        resetFormattedData();
+                                        return true; // failed
+                                }
+                                else
+                                {
+                                        mState = DECODE_IMAGE;
+                                        return false; // use what we have
                                 }
                         }
-                        if (request_count >= IMAGES_PER_REQUEST)
+                        llassert_always(mBufferSize == cur_size + mRequestedSize);
+                        if (mHaveAllData)
                         {
-                                gMessageSystem->sendSemiReliable(host, NULL, NULL);
+                                mFileSize = mBufferSize;
                         }
+                        U8* buffer = new U8[mBufferSize];
+                        if (cur_size > 0)
+                        {
+                                memcpy(buffer, mFormattedImage->getData(), cur_size);
+                        }
+                        memcpy(buffer + cur_size, mBuffer, mRequestedSize); // append
+                        // NOTE: setData releases current data and owns new data (buffer)
+                        mFormattedImage->setData(buffer, mBufferSize);
+                        // delete temp data
+                        delete[] mBuffer; // Note: not 'buffer' (assigned in setData())
+                        mBuffer = NULL;
+                        mBufferSize = 0;
+                        mLoadedDiscard = mRequestedDiscard;
+                        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                        mState = DECODE_IMAGE;
+                        return false;
+                }
+
+                // NOTE: Priority gets updated when the http get completes (in callbackHTTPGet())
+                setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                return false;
+        }
+#endif
+        
+        if (mState == DECODE_IMAGE)
+        {
+                llassert_always(mFormattedImage->getDataSize() > 0);
+                setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
+                mRawImage = NULL;
+                mAuxImage = NULL;
+                llassert_always(mImageWorker == NULL);
+                llassert_always(mFormattedImage.notNull());
+                S32 discard = mHaveAllData ? 0 : mLoadedDiscard;
+                U32 image_priority = LLWorkerThread::PRIORITY_NORMAL | mWorkPriority;
+                mDecoded  = FALSE;
+                mState = DECODE_IMAGE_UPDATE;
+                mImageWorker = new LLImageWorker(mFormattedImage, image_priority, discard, new DecodeResponder(mFetcher, mID, this));
+                // fall though (need to call requestDecodedData() to start work)
+        }
+        
+        if (mState == DECODE_IMAGE_UPDATE)
+        {
+                if (decodeImage())
+                {
+                        if (mDecodedDiscard < 0)
+                        {
+                                if (mCachedSize > 0 && !mInLocalCache && mRetryAttempt == 0)
+                                {
+                                        // Cache file should be deleted, try again
+                                        llwarns << mID << ": Decode of cached file failed (removed), retrying" << llendl;
+                                        mFormattedImage = NULL;
+                                        ++mRetryAttempt;
+                                        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                                        mState = INIT;
+                                        return false;
+                                }
+                                else
+                                {
+                                        llwarns << "UNABLE TO LOAD TEXTURE: " << mID << " RETRIES: " << mRetryAttempt << llendl;
+                                        mState = DONE; // failed
+                                }
+                        }
+                        else
+                        {
+                                setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                                mState = WRITE_TO_CACHE;
+                        }
+                        // fall through
+                }
+                else
+                {
+                        return false;
                 }
         }
-}
 
-//static
-LLTextureFetchWorker* LLTextureFetchWorker::getWorker(const LLUUID& id,
-                                                                                                          const LLHost& host,
-                                                                                                          F32 priority,
-                                                                                                          S32 discard,
-                                                                                                          BOOL needs_aux)
-{
-        LLTextureFetchWorker* res;
-        lockQueue();
-        map_t::iterator iter = sRequests.find(id);
-        if (iter != sRequests.end())
+        if (mState == WRITE_TO_CACHE)
         {
-                res = iter->second;
-                if (res->mHost != host)
+                if (mInLocalCache || !mFileSize || mSentRequest == UNSENT)
                 {
-                        llerrs << "LLTextureFetchWorker::getWorker called with multiple hosts" << llendl;
+                        // If we're in a local cache or we didn't actually receive any new data, skip
+                        mState = DONE;
+                        return false;
                 }
-                res->setImagePriority(priority);
-                res->setDesiredDiscard(discard);
-                
+                S32 datasize = mFormattedImage->getDataSize();
+                llassert_always(datasize);
+                setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
+                U32 cache_priority = mWorkPriority;
+                mWritten = FALSE;
+                mState = WAIT_ON_WRITE;
+                CacheWriteResponder* responder = new CacheWriteResponder(mFetcher, mID);
+                mCacheWriteHandle = mFetcher->mTextureCache->writeToCache(mID, cache_priority,
+                                                                                                                                  mFormattedImage->getData(), datasize,
+                                                                                                                                  mFileSize, responder);
+                // fall through
         }
-        else
+        
+        if (mState == WAIT_ON_WRITE)
         {
-                res = new LLTextureFetchWorker(id, host, priority, discard);
+                if (writeToCacheComplete())
+                {
+                        mState = DONE;
+                        // fall through
+                }
+                else
+                {
+                        if (mDesiredDiscard < mDecodedDiscard)
+                        {
+                                // We're waiting for this write to complete before we can receive more data
+                                // (we can't touch mFormattedImage until the write completes)
+                                // Prioritize the write
+                                mFetcher->mTextureCache->prioritizeWrite(mCacheWriteHandle);
+                        }
+                        return false;
+                }
         }
-        unlockQueue();
-        res->mActiveCount++;
-        res->mNeedsAux = needs_aux;
-        return res;
-}
 
-LLTextureFetchWorker* LLTextureFetchWorker::getActiveWorker(const LLUUID& id)
-{
-        LLTextureFetchWorker* res = NULL;
-        lockQueue();
-        map_t::iterator iter = sRequests.find(id);
-        if (iter != sRequests.end())
+        if (mState == DONE)
         {
-                res = iter->second;
+                if (mDecodedDiscard >= 0 && mDesiredDiscard < mDecodedDiscard)
+                {
+                        // More data was requested, return to INIT
+                        mState = INIT;
+                        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+                        return false;
+                }
+                else
+                {
+                        setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
+                        return true;
+                }
         }
-        unlockQueue();
-        return res;
+        
+        return false;
 }
 
-LLTextureFetchWorker::LLTextureFetchWorker(const LLUUID& id,    // Image UUID
-                                                                                   const LLHost& host,  // Simulator host
-                                                                                   F32 priority,                // Priority
-                                                                                   S32 discard)                 // Desired discard level
-        : LLWorkerClass(sWorkerThread, "TextureFetch"),
-          mState(INIT),
-          mID(id),
-          mHost(host),
-          mPriority(priority),
-          mDesiredDiscard(discard),
-          mRequestedDiscard(-1),
-          mDecodedDiscard(-1),
-          mFileHandle(LLVFSThread::nullHandle()),
-          mBuffer(NULL),
-          mBufferSize(0),
-          mRequestedSize(0),
-          mLoaded(FALSE),
-          mRequested(FALSE),
-          mDecoded(FALSE),
-          mActiveCount(0),
-          mWorkMutex(sWorkerThread->getAPRPool()),
-          mLastPacket(-1),
-          mTotalPackets(0),
-          mTotalBytes(0)
+// Called from MAIN thread
+void LLTextureFetchWorker::endWork(S32 param, bool aborted)
 {
-        lockQueue();
-        sRequests[mID] = this;
-        unlockQueue();  
-        addWork(0, calcWorkPriority());
+        if (mImageWorker)
+        {
+                mImageWorker->scheduleDelete();
+                mImageWorker = NULL;
+        }
+        mFormattedImage = NULL;
 }
 
-LLTextureFetchWorker::~LLTextureFetchWorker()
+//////////////////////////////////////////////////////////////////////////////
+
+// virtual
+void LLTextureFetchWorker::finishWork(S32 param, bool completed)
 {
-        lockQueue();
-        mFormattedImage = NULL;
-        map_t::iterator iter = sRequests.find(mID);
-        if (iter != sRequests.end() && iter->second == this)
+        // The following are required in case the work was aborted
+        if (mCacheReadHandle != LLTextureCache::nullHandle())
         {
-                sRequests.erase(iter);
+                mFetcher->mTextureCache->readComplete(mCacheReadHandle, true);
+                mCacheReadHandle = LLTextureCache::nullHandle();
+        }
+        if (mCacheWriteHandle != LLTextureCache::nullHandle())
+        {
+                mFetcher->mTextureCache->writeComplete(mCacheWriteHandle, true);
+                mCacheWriteHandle = LLTextureCache::nullHandle();
         }
-        sNetworkQueue.erase(this);
-        unlockQueue();
-        clearPackets();
 }
 
-void LLTextureFetchWorker::clearPackets()
+// virtual
+bool LLTextureFetchWorker::deleteOK()
 {
-        lockWorkData();
-        for_each(mPackets.begin(), mPackets.end(), DeletePointer());
-        mPackets.clear();
-        unlockWorkData();
+        bool delete_ok = true;
+        // Allow any pending reads or writes to complete
+        if (mCacheReadHandle != LLTextureCache::nullHandle())
+        {
+                if (mFetcher->mTextureCache->readComplete(mCacheReadHandle, true))
+                {
+                        mCacheReadHandle = LLTextureCache::nullHandle();
+                }
+                else
+                {
+                        delete_ok = false;
+                }
+        }
+        if (mCacheWriteHandle != LLTextureCache::nullHandle())
+        {
+                if (mFetcher->mTextureCache->writeComplete(mCacheWriteHandle))
+                {
+                        mCacheWriteHandle = LLTextureCache::nullHandle();
+                }
+                else
+                {
+                        delete_ok = false;
+                }
+        }
+
+        if ((haveWork() &&
+                 // not ok to delete from these states
+                 ((mState >= LOAD_FROM_HTTP_GET_URL && mState <= LOAD_FROM_HTTP_GET_DATA) ||
+                  (mState >= WRITE_TO_CACHE && mState <= WAIT_ON_WRITE))))
+        {
+                delete_ok = false;
+        }
+        
+        return delete_ok;
 }
 
-U32 LLTextureFetchWorker::calcWorkPriority()
+
+void LLTextureFetchWorker::removeFromCache()
 {
-        F32 priority_scale = (F32)LLWorkerThread::PRIORITY_LOWBITS / LLViewerImage::maxDecodePriority();
-        U32 priority = (U32)(mPriority * priority_scale);
-        return LLWorkerThread::PRIORITY_NORMAL | priority;
+        if (!mInLocalCache)
+        {
+                mFetcher->mTextureCache->removeFromCache(mID);
+        }
 }
 
-void LLTextureFetchWorker::setDesiredDiscard(S32 discard)
+
+//////////////////////////////////////////////////////////////////////////////
+
+bool LLTextureFetchWorker::processSimulatorPackets()
 {
-        if (mDesiredDiscard != discard)
+        if (mLastPacket >= mFirstPacket)
         {
-                mDesiredDiscard = discard;
-                if (!haveWork())
+                S32 buffer_size = mFormattedImage->getDataSize();
+                for (S32 i = mFirstPacket; i<=mLastPacket; i++)
+                {
+                        buffer_size += mPackets[i]->mSize;
+                }
+                bool have_all_data = mLastPacket >= mTotalPackets-1;
+                llassert_always(mRequestedSize > 0);
+                if (buffer_size >= mRequestedSize || have_all_data)
                 {
-                        addWork(0, calcWorkPriority());
+                        /// We have enough (or all) data
+                        if (have_all_data)
+                        {
+                                mHaveAllData = TRUE;
+                        }
+                        S32 cur_size = mFormattedImage->getDataSize();
+                        if (buffer_size > cur_size)
+                        {
+                                /// We have new data
+                                U8* buffer = new U8[buffer_size];
+                                S32 offset = 0;
+                                if (cur_size > 0 && mFirstPacket > 0)
+                                {
+                                        memcpy(buffer, mFormattedImage->getData(), cur_size);
+                                        offset = cur_size;
+                                }
+                                for (S32 i=mFirstPacket; i<=mLastPacket; i++)
+                                {
+                                        memcpy(buffer + offset, mPackets[i]->mData, mPackets[i]->mSize);
+                                        offset += mPackets[i]->mSize;
+                                }
+                                // NOTE: setData releases current data
+                                mFormattedImage->setData(buffer, buffer_size);
+                        }
+                        mLoadedDiscard = mRequestedDiscard;
+                        return true;
                 }
         }
+        return false;
 }
 
-void LLTextureFetchWorker::setImagePriority(F32 priority)
+//////////////////////////////////////////////////////////////////////////////
+
+void LLTextureFetchWorker::callbackURLReceived(const LLSD& data, bool success)
 {
-        if (priority != mPriority)
+#if 0
+        LLMutexLock lock(&mWorkMutex);
+        if (!mSentRequest || mState != LOAD_FROM_HTTP_GET_URL)
         {
-                mPriority = priority;
-                setPriority(calcWorkPriority());
+                llwarns << "callbackURLReceived for unrequested fetch worker, req="
+                                << mSentRequest << " state= " << mState << llendl;
+                return;
         }
+        if (success)
+        {
+                mURL = data.asString();
+        }
+        mLoaded = TRUE;
+        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+#endif
 }
 
-void LLTextureFetchWorker::insertPacket(S32 index, U8* data, S32 size)
+//////////////////////////////////////////////////////////////////////////////
+
+void LLTextureFetchWorker::callbackHttpGet(U8* data, S32 data_size, bool last_block)
 {
-        PacketData* packet = new PacketData(data, size);
-        
-        lockWorkData();
-        if (index >= (S32)mPackets.size())
+#if 0
+        LLMutexLock lock(&mWorkMutex);
+        if (!mSentRequest || mState != LOAD_FROM_HTTP_GET_DATA)
         {
-                mPackets.resize(index+1, (PacketData*)NULL); // initializes v to NULL pointers
+                llwarns << "callbackHttpGet for unrequested fetch worker, req="
+                                << mSentRequest << " state= " << mState << llendl;
+                return;
         }
-        if (mPackets[index] != NULL)
+//      llinfos << "HTTP RECEIVED: " << mID.asString() << " Bytes: " << data_size << llendl;
+        if (mLoaded)
         {
-                llwarns << "LLTextureFetchWorker::insertPacket called for duplicate packet: " << index << llendl;
+                llwarns << "Duplicate callback for " << mID.asString() << llendl;
+                return; // ignore duplicate callback
         }
-        mPackets[index] = packet;
-        while (mLastPacket+1 < (S32)mPackets.size() && mPackets[mLastPacket+1] != NULL)
+        if (data_size >= 0)
         {
-                ++mLastPacket;
+                if (data_size > 0)
+                {
+                        mBuffer = new U8[data_size];
+                        // *TODO: set the formatted image data here
+                        memcpy(mBuffer, data, data_size);
+                        mBufferSize += data_size;
+                        if (data_size < mRequestedSize || last_block == true)
+                        {
+                                mHaveAllData = TRUE;
+                        }
+                        else if (data_size > mRequestedSize)
+                        {
+                                // *TODO: This will happen until we fix LLCurl::getByteRange()
+                                llinfos << "HUH?" << llendl;
+                                mHaveAllData = TRUE;
+                                mFormattedImage->deleteData();
+                                mBufferSize = data_size;
+                        }
+                }
+                else
+                {
+                        // We requested data but received none (and no error),
+                        // so presumably we have all of it
+                        mHaveAllData = TRUE;
+                }
+                mRequestedSize = data_size;
         }
-        unlockWorkData();
+        else
+        {
+                mRequestedSize = -1; // error
+        }
+        mLoaded = TRUE;
+        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
+#endif
 }
 
-// Called from LLWorkerThread::processRequest()
-bool LLTextureFetchWorker::doWork(S32 param)
+//////////////////////////////////////////////////////////////////////////////
+
+void LLTextureFetchWorker::callbackCacheRead(bool success, LLImageFormatted* image,
+                                                                                         S32 imagesize, BOOL islocal)
 {
-        switch(mState)
-        {
-          case INIT:
-          {
-                  // fall through
-          }
-          case LOAD_FROM_CACHE:
-          {
-                  // Load any existing data from the cache
-                  if (mFileHandle == LLVFSThread::nullHandle())
-                  {
-                          bool res = startVFSLoad(gVFS, LLAssetType::AT_TEXTURE);
-                          if (!res) res = startVFSLoad(gStaticVFS, LLAssetType::AT_TEXTURE_TGA);
-                          if (!res) res = startVFSLoad(gStaticVFS, LLAssetType::AT_TEXTURE);
-                          if (!res)
-                          {
-                                  // Didn't load from VFS
-                                  mFormattedImage = new LLImageJ2C;
-                                  mState = LOAD_FROM_SIMULATOR;
-                          }
-                  }
-                  if (mFileHandle != LLVFSThread::nullHandle())
-                  {
-                          if (!loadFromVFS())
-                          {
-                                  return false; // not done
-                          }
-                          if (!mLoaded)
-                          {
-                                  llwarns << "Load from VFS failed on: " << mID << llendl;
-                                  return true;
-                          }
-                          bool res = mFormattedImage->setData(mBuffer, mBufferSize);
-                          if (!res)
-                          {
-                                  llwarns << "loadLocalImage() - setData() failed" << llendl;
-                                  mFormattedImage->deleteData();
-                                  return true;
-                          }
-                          // Successfully loaded
-                          if (mFormattedImage->getDiscardLevel() <= mRequestedDiscard)
-                          {
-                                  // we have enough data, decode it
-                                  mState = DECODE_IMAGE;
-                                  mRequestedSize = mBufferSize;
-                          }
-                          else
-                          {
-                                  // need more data
-                                  mState = LOAD_FROM_SIMULATOR;
-                                  mRequestedSize = mFormattedImage->calcDataSize(mRequestedDiscard);
-                          }
-                  }
-                  return false;
-          }
-          case LOAD_FROM_SIMULATOR:
-          {
-                  if (!mRequested)
-                  {
-                          lockQueue();
-                          sNetworkQueue.insert(this);
-                          unlockQueue();
-                          mRequested = TRUE;
-                  }
-                  if (processSimulatorPackets())
-                  {
-                          mState = WRITE_TO_VFS;
-                  }
-                  return false;
-          }
-          case WRITE_TO_VFS:
-          {
-                  mState = DECODE_IMAGE;
-                  // fall through
-          }
-          case DECODE_IMAGE:
-          {
-                  startDecode();
-                  mState = DECODE_IMAGE_UPDATE;
-                  // fall through
-          }
-          case DECODE_IMAGE_UPDATE:
-          {
-                  if (decodeImage())
-                  {
-                          mState = DONE;
-                  }
-                  return false;
-          }
-          case DONE:
-          {
-                  // Do any cleanup here
-                  // Destroy the formatted image, we don't need it any more (raw image is still valid)
-                  mFormattedImage = NULL;
-                  mIdleTimer.reset();
-                  return true;
-          }
-          default:
-          {
-                  llerrs << "LLTextureFetchWorker::doWork() has illegal state" << llendl;
-                  return true;
-          }
+        LLMutexLock lock(&mWorkMutex);
+        if (mState != LOAD_FROM_TEXTURE_CACHE)
+        {
+                llwarns << "Read callback for " << mID << " with state = " << mState << llendl;
+                return;
         }
+        if (success)
+        {
+                llassert_always(imagesize > 0);
+                mFileSize = imagesize;
+                mFormattedImage = image;
+                mImageCodec = image->getCodec();
+                mInLocalCache = islocal;
+                if (mFileSize != 0 && mFormattedImage->getDataSize() >= mFileSize)
+                {
+                        mHaveAllData = TRUE;
+                }
+        }
+        mLoaded = TRUE;
+        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 }
 
-// Called from MAIN thread
-void LLTextureFetchWorker::startWork(S32 param)
+void LLTextureFetchWorker::callbackCacheWrite(bool success)
 {
+        LLMutexLock lock(&mWorkMutex);
+        if (mState != WAIT_ON_WRITE)
+        {
+                llwarns << "Write callback for " << mID << " with state = " << mState << llendl;
+                return;
+        }
+        mWritten = TRUE;
+        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 }
 
-void LLTextureFetchWorker::endWork(S32 param, bool aborted)
+//////////////////////////////////////////////////////////////////////////////
+
+void LLTextureFetchWorker::callbackDecoded(bool success)
 {
+        if (mState != DECODE_IMAGE_UPDATE)
+        {
+                llwarns << "Decode callback for " << mID << " with state = " << mState << llendl;
+                return;
+        }
+//      llinfos << mID << " : DECODE COMPLETE " << llendl;
+        setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-bool LLTextureFetchWorker::startVFSLoad(LLVFS* vfs, LLAssetType::EType asset_type)
+bool LLTextureFetchWorker::decodeImage()
 {
-        // Start load from VFS if it's there
-        if (vfs->getExists(mID, asset_type))
+        llassert_always(mImageWorker);
+        bool res = true;
+        if (mRawImage.isNull())
         {
-                mBufferSize = vfs->getSize(mID, asset_type);
-                mBuffer = new U8[mBufferSize];
-                mFileHandle = LLVFSThread::sLocal->read(vfs, mID, asset_type, mBuffer, 0, mBufferSize);
-                if (mFileHandle == LLVFSThread::nullHandle())
+                res = false;
+                if (mImageWorker->requestDecodedData(mRawImage, -1))
                 {
-                        llwarns << "loadLocalImage() - vfs read failed in static VFS: " << mID << llendl;
-                        delete mBuffer;
-                        mBuffer = NULL;
-                        return false;
+                        res = true;
+//                      llinfos << mID << " : BASE DECODE FINISHED" << llendl;
                 }
-                if (asset_type == LLAssetType::AT_TEXTURE_TGA)
+        }
+        if (res &&
+                (mRawImage.notNull() && mRawImage->getDataSize() > 0) &&
+                (mNeedsAux && mAuxImage.isNull()))
+        {
+                res = false;
+                if (mImageWorker->requestDecodedAuxData(mAuxImage, 4, -1))
                 {
-                        mFormattedImage = new LLImageTGA;
+                        res = true;
+//                      llinfos << mID << " : AUX DECODE FINISHED" << llendl;
                 }
-                else if (asset_type == LLAssetType::AT_TEXTURE)
+        }
+        if (res)
+        {
+                if ((mRawImage.notNull() && mRawImage->getDataSize() > 0) &&
+                        (!mNeedsAux || (mAuxImage.notNull() && mAuxImage->getDataSize() > 0)))
                 {
-                        mFormattedImage = new LLImageJ2C;
+                        mDecodedDiscard = mFormattedImage->getDiscardLevel();
+//                      llinfos << mID << " : DECODE FINISHED. DISCARD: " << mDecodedDiscard << llendl;
                 }
                 else
                 {
-                        llerrs << "LLTextureFetchWorker::startVFSLoad called with bad asset type: " << asset_type << llendl;
+                        llwarns << "DECODE FAILED: " << mID << " Discard: " << (S32)mFormattedImage->getDiscardLevel() << llendl;
+                        removeFromCache();
                 }
-                return true;
+                mImageWorker->scheduleDelete();
+                mImageWorker = NULL;
         }
-        return false;
+        return res;
 }
 
-bool LLTextureFetchWorker::loadFromVFS()
+//////////////////////////////////////////////////////////////////////////////
+
+bool LLTextureFetchWorker::writeToCacheComplete()
 {
-        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
+        // Complete write to cache
+        if (mCacheWriteHandle != LLTextureCache::nullHandle())
+        {
+                if (!mWritten)
+                {
+                        return false;
+                }
+                if (mFetcher->mTextureCache->writeComplete(mCacheWriteHandle))
+                {
+                        mCacheWriteHandle = LLTextureCache::nullHandle();
+                }
+                else
+                {
+                        return false;
+                }
+        }
+        return true;
+}
 
-        llassert(mLoaded == FALSE);
-        
-        // Check loading status
-        LLVFSThread::status_t status = LLVFSThread::sLocal->getRequestStatus(mFileHandle);
-        if (status == LLVFSThread::STATUS_QUEUED || status == LLVFSThread::STATUS_INPROGRESS)
+
+//////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+// public
+
+LLTextureFetch::LLTextureFetch(LLTextureCache* cache, bool threaded)
+        : LLWorkerThread("TextureFetch", threaded),
+          mDebugCount(0),
+          mDebugPause(FALSE),
+          mQueueMutex(getAPRPool()),
+          mTextureCache(cache)
+{
+}
+
+LLTextureFetch::~LLTextureFetch()
+{
+        // ~LLQueuedThread() called here
+}
+
+bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 priority,
+                                                                   S32 w, S32 h, S32 c, S32 discard, bool needs_aux)
+{
+        if (mDebugPause)
         {
                 return false;
         }
-        else if (status == LLVFSThread::STATUS_COMPLETE)
+        
+        LLTextureFetchWorker* worker = NULL;
+        LLMutexLock lock(&mQueueMutex);
+        map_t::iterator iter = mRequestMap.find(id);
+        if (iter != mRequestMap.end())
         {
-                mLoaded = TRUE;
-                return true;
+                worker = iter->second;
+                if (worker->mHost != host)
+                {
+                        llwarns << "LLTextureFetch::createRequest " << id << " called with multiple hosts: "
+                                        << host << " != " << worker->mHost << llendl;
+                        removeRequest(worker, true);
+                        worker = NULL;
+                        return false;
+                }
+        }
+        // If the requester knows the dimentions of the image,
+        // this will calculate how much data we need without having to parse the header
+        S32 desired_size;
+        if (w*h*c > 0)
+        {
+                desired_size = LLImageJ2C::calcDataSizeJ2C(w, h, c, discard);
         }
         else
         {
-                llwarns << "loadLocalImage() - vfs read failed" << llendl;
-                LLVFSThread::Request* req = (LLVFSThread::Request*)LLVFSThread::sLocal->getRequest(mFileHandle);
-                if (req && mFormattedImage.notNull())
+                desired_size = FIRST_PACKET_SIZE;
+                discard = MAX_DISCARD_LEVEL;
+        }
+        if (worker)
+        {
+                if (worker->wasAborted())
                 {
-                        LLVFS* vfs = req->getVFS();
-                        LLAssetType::EType asset_type = mFormattedImage->getCodec() == IMG_CODEC_TGA ? LLAssetType::AT_TEXTURE_TGA : LLAssetType::AT_TEXTURE;
-                        vfs->removeFile(mID, asset_type);
+                        return false; // need to wait for previous aborted request to complete
+                }
+                worker->lockWorkData();
+                worker->setImagePriority(priority);
+                worker->setDesiredDiscard(discard, desired_size);
+                worker->unlockWorkData();
+                if (!worker->haveWork())
+                {
+                        worker->mState = LLTextureFetchWorker::INIT;
+                        worker->addWork(0, LLWorkerThread::PRIORITY_HIGH | worker->mWorkPriority);
                 }
-                return true;
         }
+        else
+        {
+                worker = new LLTextureFetchWorker(this, id, host, priority, discard, desired_size);
+                mRequestMap[id] = worker;
+        }
+        worker->mActiveCount++;
+        worker->mNeedsAux = needs_aux;
+//      llinfos << "REQUESTED: " << id << " Discard: " << discard << llendl;
+        return true;
 }
 
+void LLTextureFetch::deleteRequest(const LLUUID& id, bool cancel)
+{
+        LLMutexLock lock(&mQueueMutex);
+        LLTextureFetchWorker* worker = getWorker(id);
+        if (worker)
+        {               
+                removeRequest(worker, cancel);
+        }
+}
 
-//////////////////////////////////////////////////////////////////////////////
+// protected
 
-bool LLTextureFetchWorker::processSimulatorPackets()
+// call lockQueue() first!
+void LLTextureFetch::addToNetworkQueue(LLTextureFetchWorker* worker)
+{
+        if (mRequestMap.find(worker->mID) != mRequestMap.end())
+        {
+                // only add to the queue if in the request map
+                // i.e. a delete has not been requested
+                mNetworkQueue.insert(worker->mID);
+        }
+        for (cancel_queue_t::iterator iter1 = mCancelQueue.begin();
+                 iter1 != mCancelQueue.end(); ++iter1)
+        {
+                iter1->second.erase(worker->mID);
+        }
+}
+
+// call lockQueue() first!
+void LLTextureFetch::removeFromNetworkQueue(LLTextureFetchWorker* worker)
+{
+        mNetworkQueue.erase(worker->mID);
+}
+
+// call lockQueue() first!
+void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel)
+{
+        mRequestMap.erase(worker->mID);
+        size_t erased = mNetworkQueue.erase(worker->mID);
+        if (cancel && erased > 0)
+        {
+                mCancelQueue[worker->mHost].insert(worker->mID);
+        }
+        worker->scheduleDelete();
+}
+
+// call lockQueue() first!
+LLTextureFetchWorker* LLTextureFetch::getWorker(const LLUUID& id)
+{
+        LLTextureFetchWorker* res = NULL;
+        map_t::iterator iter = mRequestMap.find(id);
+        if (iter != mRequestMap.end())
+        {
+                res = iter->second;
+        }
+        return res;
+}
+
+
+bool LLTextureFetch::getRequestFinished(const LLUUID& id, S32& discard_level,
+                                                                                LLPointer<LLImageRaw>& raw, LLPointer<LLImageRaw>& aux)
 {
         bool res = false;
-        lockWorkData();
-        if (mLastPacket >= 0)
+        LLMutexLock lock(&mQueueMutex);
+        LLTextureFetchWorker* worker = getWorker(id);
+        if (worker)
         {
-                S32 data_size = 0;
-                for (S32 i = 0; i<=mLastPacket; i++)
+                if (worker->wasAborted())
                 {
-                        data_size += mPackets[i]->mSize;
+                        res = true;
                 }
-                if (data_size >= mRequestedSize || mLastPacket == mTotalPackets)
+                else if (!worker->haveWork())
                 {
-                        /// We have enough (or all) data, copy it into mBuffer
-                        if (mBufferSize < data_size)
+                        // Should only happen if we set mDebugPause...
+                        if (!mDebugPause)
                         {
-                                delete mBuffer;
-                                mBuffer = new U8[data_size];
-                                mBufferSize = data_size;
+//                              llwarns << "Adding work for inactive worker: " << id << llendl;
+                                worker->addWork(0, LLWorkerThread::PRIORITY_HIGH | worker->mWorkPriority);
                         }
-                        S32 offset = 0;
-                        for (S32 i = 0; i<=mLastPacket; i++)
+                }
+                else if (worker->checkWork())
+                {
+                        discard_level = worker->mDecodedDiscard;
+                        raw = worker->mRawImage; worker->mRawImage = NULL;
+                        aux = worker->mAuxImage; worker->mAuxImage = NULL;
+                        res = true;
+                }
+                else
+                {
+                        worker->lockWorkData();
+                        if ((worker->mDecodedDiscard >= 0) &&
+                                (worker->mDecodedDiscard < discard_level || discard_level < 0) &&
+                                (worker->mState >= LLTextureFetchWorker::WAIT_ON_WRITE))
                         {
-                                memcpy(mBuffer + offset, mPackets[i]->mData, mPackets[i]->mSize);
-                                offset += mPackets[i]->mSize;
+                                // Not finished, but data is ready
+                                discard_level = worker->mDecodedDiscard;
+                                if (worker->mRawImage) raw = worker->mRawImage;
+                                if (worker->mAuxImage) aux = worker->mAuxImage;
                         }
-                        res = true;
+                        worker->unlockWorkData();
                 }
         }
-        unlockWorkData();
+        else
+        {
+                res = true;
+        }
+        return res;
+}
+
+bool LLTextureFetch::updateRequestPriority(const LLUUID& id, F32 priority)
+{
+        bool res = false;
+        LLMutexLock lock(&mQueueMutex);
+        LLTextureFetchWorker* worker = getWorker(id);
+        if (worker)
+        {
+                worker->lockWorkData();
+                worker->setImagePriority(priority);
+                worker->unlockWorkData();
+                res = true;
+        }
         return res;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-void LLTextureFetchWorker::startDecode()
+//virtual
+S32 LLTextureFetch::update(U32 max_time_ms)
 {
-        mRawImage = NULL;
-        mAuxImage = NULL;
+        S32 res;
+        res = LLWorkerThread::update(max_time_ms);
+        
+        const F32 REQUEST_TIME = 1.f;
+
+        // Periodically, gather the list of textures that need data from the network
+        // And send the requests out to the simulators
+        if (mNetworkTimer.getElapsedTimeF32() >= REQUEST_TIME)
+        {
+                mNetworkTimer.reset();
+                sendRequestListToSimulators();
+        }
+        
+        return res;
 }
 
-bool LLTextureFetchWorker::decodeImage()
+//////////////////////////////////////////////////////////////////////////////
+
+void LLTextureFetch::sendRequestListToSimulators()
 {
-        const F32 MAX_DECODE_TIME = .001f; // 1 ms
-        if (mRawImage->getDataSize() == 0)
+        const S32 IMAGES_PER_REQUEST = 50;
+        const F32 LAZY_FLUSH_TIMEOUT = 15.f; // 10.0f // temp
+        const F32 MIN_REQUEST_TIME = 1.0f;
+        const F32 MIN_DELTA_PRIORITY = 1000.f;
+
+        LLMutexLock lock(&mQueueMutex);
+        
+        // Send requests
+        typedef std::set<LLTextureFetchWorker*,LLTextureFetchWorker::Compare> request_list_t;
+        typedef std::map< LLHost, request_list_t > work_request_map_t;
+        work_request_map_t requests;
+        for (queue_t::iterator iter = mNetworkQueue.begin(); iter != mNetworkQueue.end(); )
         {
-                if (!mFormattedImage->requestDecodedData(mRawImage, -1, MAX_DECODE_TIME))
+                queue_t::iterator curiter = iter++;
+                LLTextureFetchWorker* req = getWorker(*curiter);
+                if (!req)
                 {
-                        return false;
+                        mNetworkQueue.erase(curiter);
+                        continue; // paranoia
+                }
+                if (req->mID == mDebugID)
+                {
+                        mDebugCount++; // for setting breakpoints
+                }
+                if (req->mTotalPackets > 0 && req->mLastPacket >= req->mTotalPackets-1)
+                {
+                        // We have all the packets... make sure this is high priority
+//                      req->setPriority(LLWorkerThread::PRIORITY_HIGH | req->mWorkPriority);
+                        continue;
+                }
+                F32 elapsed = req->mRequestedTimer.getElapsedTimeF32();
+                F32 delta_priority = llabs(req->mRequestedPriority - req->mImagePriority);
+                if ((req->mSimRequestedDiscard != req->mDesiredDiscard) ||
+                        (delta_priority > MIN_DELTA_PRIORITY && elapsed >= MIN_REQUEST_TIME) ||
+                        (elapsed >= LAZY_FLUSH_TIMEOUT))
+                {
+                        requests[req->mHost].insert(req);
                 }
-                mFormattedImage->releaseDecodedData(); // so that we have the only ref to the raw image
         }
-        if (mNeedsAux && mAuxImage->getDataSize() == 0)
+
+        std::string http_url;
+#if 0
+        if (gSavedSettings.getBOOL("ImagePipelineUseHTTP"))
         {
-                if (!mFormattedImage->requestDecodedAuxData(mAuxImage, 4, -1, MAX_DECODE_TIME ))
+                LLViewerRegion* region = gAgent.getRegion();
+                if (region)
                 {
-                        return false;
+                        http_url = region->getCapability("RequestTextureDownload");
                 }
-                mFormattedImage->releaseDecodedData(); // so that we have the only ref to the raw image
         }
-        mDecodedDiscard = mFormattedImage->getDiscardLevel();
-        return true;
+#endif
+        
+        for (work_request_map_t::iterator iter1 = requests.begin();
+                 iter1 != requests.end(); ++iter1)
+        {
+                bool use_http = http_url.empty() ? false : true;
+                LLHost host = iter1->first;
+                // invalid host = use agent host
+                if (host == LLHost::invalid)
+                {
+                        host = gAgent.getRegionHost();
+                }
+                else
+                {
+                        use_http = false;
+                }
+
+                if (use_http)
+                {
+                }
+                else
+                {
+                        S32 request_count = 0;
+                        for (request_list_t::iterator iter2 = iter1->second.begin();
+                                 iter2 != iter1->second.end(); ++iter2)
+                        {
+                                LLTextureFetchWorker* req = *iter2;
+                                req->mSentRequest = LLTextureFetchWorker::SENT_SIM;
+                                if (0 == request_count)
+                                {
+                                        gMessageSystem->newMessageFast(_PREHASH_RequestImage);
+                                        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                                        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                }
+                                S32 packet = req->mLastPacket + 1;
+                                gMessageSystem->nextBlockFast(_PREHASH_RequestImage);
+                                gMessageSystem->addUUIDFast(_PREHASH_Image, req->mID);
+                                gMessageSystem->addS8Fast(_PREHASH_DiscardLevel, (S8)req->mSimRequestedDiscard);
+                                gMessageSystem->addF32Fast(_PREHASH_DownloadPriority, req->mImagePriority);
+                                gMessageSystem->addU32Fast(_PREHASH_Packet, packet);
+                                gMessageSystem->addU8Fast(_PREHASH_Type, req->mType);
+//                              llinfos << "IMAGE REQUEST: " << req->mID << " Discard: " << req->mDesiredDiscard
+//                                              << " Packet: " << packet << " Priority: " << req->mImagePriority << llendl;
+
+                                req->lockWorkData();
+                                req->mSimRequestedDiscard = req->mDesiredDiscard;
+                                req->mRequestedPriority = req->mImagePriority;
+                                req->mRequestedTimer.reset();
+                                req->unlockWorkData();
+                                request_count++;
+                                if (request_count >= IMAGES_PER_REQUEST)
+                                {
+//                                      llinfos << "REQUESTING " << request_count << " IMAGES FROM HOST: " << host.getIPString() << llendl;
+                                        gMessageSystem->sendSemiReliable(host, NULL, NULL);
+                                        request_count = 0;
+                                }
+                        }
+                        if (request_count > 0 && request_count < IMAGES_PER_REQUEST)
+                        {
+//                              llinfos << "REQUESTING " << request_count << " IMAGES FROM HOST: " << host.getIPString() << llendl;
+                                gMessageSystem->sendSemiReliable(host, NULL, NULL);
+                                request_count = 0;
+                        }
+                }
+        }
+        
+        // Send cancelations
+        if (!mCancelQueue.empty())
+        {
+                for (cancel_queue_t::iterator iter1 = mCancelQueue.begin();
+                         iter1 != mCancelQueue.end(); ++iter1)
+                {
+                        LLHost host = iter1->first;
+                        if (host == LLHost::invalid)
+                        {
+                                host = gAgent.getRegionHost();
+                        }
+                        S32 request_count = 0;
+                        for (queue_t::iterator iter2 = iter1->second.begin();
+                                 iter2 != iter1->second.end(); ++iter2)
+                        {
+                                if (0 == request_count)
+                                {
+                                        gMessageSystem->newMessageFast(_PREHASH_RequestImage);
+                                        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                                        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                }
+                                gMessageSystem->nextBlockFast(_PREHASH_RequestImage);
+                                gMessageSystem->addUUIDFast(_PREHASH_Image, *iter2);
+                                gMessageSystem->addS8Fast(_PREHASH_DiscardLevel, -1);
+                                gMessageSystem->addF32Fast(_PREHASH_DownloadPriority, 0);
+                                gMessageSystem->addU32Fast(_PREHASH_Packet, 0);
+                                gMessageSystem->addU8Fast(_PREHASH_Type, 0);
+//                              llinfos << "CANCELING IMAGE REQUEST: " << (*iter2) << llendl;
+
+                                request_count++;
+                                if (request_count >= IMAGES_PER_REQUEST)
+                                {
+                                        gMessageSystem->sendSemiReliable(host, NULL, NULL);
+                                        request_count = 0;
+                                }
+                        }
+                        if (request_count > 0 && request_count < IMAGES_PER_REQUEST)
+                        {
+                                gMessageSystem->sendSemiReliable(host, NULL, NULL);
+                        }
+                }
+                mCancelQueue.clear();
+        }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-#if 0
-// static
-void LLTextureFetchWorker::receiveImageHeader(LLMessageSystem *msg, void **user_data)
+bool LLTextureFetchWorker::insertPacket(S32 index, U8* data, S32 size)
 {
-        LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+        mRequestedTimer.reset();
+        if (index >= mTotalPackets)
+        {
+//              llwarns << "Received Image Packet " << index << " > max: " << mTotalPackets << " for image: " << mID << llendl;
+                return false;
+        }
+        if (index > 0 && index < mTotalPackets-1 && size != MAX_IMG_PACKET_SIZE)
+        {
+//              llwarns << "Received bad sized packet: " << index << ", " << size << " != " << MAX_IMG_PACKET_SIZE << " for image: " << mID << llendl;
+                return false;
+        }
         
-        // Receive image header, copy into image object and decompresses 
-        // if this is a one-packet image. 
+        if (index >= (S32)mPackets.size())
+        {
+                mPackets.resize(index+1, (PacketData*)NULL); // initializes v to NULL pointers
+        }
+        else if (mPackets[index] != NULL)
+        {
+//              llwarns << "Received duplicate packet: " << index << " for image: " << mID << llendl;
+                return false;
+        }
+
+        mPackets[index] = new PacketData(data, size);
+        while (mLastPacket+1 < (S32)mPackets.size() && mPackets[mLastPacket+1] != NULL)
+        {
+                ++mLastPacket;
+        }
+        return true;
+}
 
-        gImageList.sTextureBits += msg->getReceiveBytes();
-        gImageList.sTexturePackets++;
+bool LLTextureFetch::receiveImageHeader(const LLHost& host, const LLUUID& id, U8 codec, U16 packets, U32 totalbytes,
+                                                                                U16 data_size, U8* data)
+{
+        LLMutexLock lock(&mQueueMutex);
+        LLTextureFetchWorker* worker = getWorker(id);
+        bool res = true;
 
-        LLUUID id;
-        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
-//      LLString ip_string(u32_to_ip_string(msg->getSenderIP()));
+        ++mPacketCount;
         
-        LLTextureFetchWorker* worker = getActiveWorker(id);
         if (!worker)
         {
-                llwarns << "receiveImageHeader for non active worker: " << id << llendl;
-                return;
+//              llwarns << "Received header for non active worker: " << id << llendl;
+                res = false;
         }
-        worker->mRequestedTimer.reset();
-                
-        // check to see if we've gotten this packet before
-        if (worker->mLastPacket != -1)
+        else if (worker->mState != LLTextureFetchWorker::LOAD_FROM_NETWORK ||
+                         worker->mSentRequest != LLTextureFetchWorker::SENT_SIM)
         {
-                llwarns << "Img: " << id << ":" << " Duplicate Image Header" << llendl;
-                return;
+//              llwarns << "receiveImageHeader for worker: " << id
+//                              << " in state: " << LLTextureFetchWorker::sStateDescs[worker->mState]
+//                              << " sent: " << worker->mSentRequest << llendl;
+                res = false;
         }
-
-        //      Copy header data into image object
-        worker->lockWorkData();
-        msg->getU8Fast(_PREHASH_ImageID, _PREHASH_Codec, image->mDataCodec);
-        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packets, image->mTotalPackets);
-        msg->getU32Fast(_PREHASH_ImageID, _PREHASH_Size, image->mTotalBytes);
-        if (0 == image->mTotalPackets)
+        else if (worker->mLastPacket != -1)
         {
-                llwarns << "Img: " << id << ":" << " Number of packets is 0" << llendl;
+                // check to see if we've gotten this packet before
+//              llwarns << "Received duplicate header for: " << id << llendl;
+                res = false;
         }
-        worker->unlockWorkData();
-
-        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
-        if (data_size)
+        else if (!data_size)
+        {
+                llwarns << "Img: " << id << ":" << " Empty Image Header" << llendl;
+                res = false;
+        }
+        if (!res)
         {
-                U8 *data = new U8[data_size];
-                msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
-                worker->insertPacket(0, data, data_size)
+                ++mBadPacketCount;
+                mCancelQueue[host].insert(id);
+                return false;
         }
+
+        worker->lockWorkData();
+
+        //      Copy header data into image object
+        worker->mImageCodec = codec;
+        worker->mTotalPackets = packets;
+        worker->mFileSize = (S32)totalbytes;    
+        llassert_always(totalbytes > 0);
+        llassert_always(data_size == FIRST_PACKET_SIZE || data_size == worker->mFileSize);
+        res = worker->insertPacket(0, data, data_size);
+        worker->setPriority(LLWorkerThread::PRIORITY_HIGH | worker->mWorkPriority);
+        worker->mState = LLTextureFetchWorker::LOAD_FROM_SIMULATOR;
+        worker->unlockWorkData();
+        return res;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// static
-void LLTextureFetchWorker::receiveImagePacket(LLMessageSystem *msg, void **user_data)
+bool LLTextureFetch::receiveImagePacket(const LLHost& host, const LLUUID& id, U16 packet_num, U16 data_size, U8* data)
 {
-        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
-        LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+        LLMutexLock lock(&mQueueMutex);
+        LLTextureFetchWorker* worker = getWorker(id);
+        bool res = true;
+
+        ++mPacketCount;
         
-        gImageList.sTextureBits += msg->getReceiveBytes();
-        gImageList.sTexturePackets++;
+        if (!worker)
+        {
+//              llwarns << "Received packet " << packet_num << " for non active worker: " << id << llendl;
+                res = false;
+        }
+        else if (worker->mLastPacket == -1)
+        {
+//              llwarns << "Received packet " << packet_num << " before header for: " << id << llendl;
+                res = false;
+        }
+        else if (!data_size)
+        {
+                llwarns << "Img: " << id << ":" << " Empty Image Header" << llendl;
+                res = false;
+        }
+        if (!res)
+        {
+                ++mBadPacketCount;
+                mCancelQueue[host].insert(id);
+                return false;
+        }
 
-        LLUUID id;
-        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
-//      LLString ip_string(u32_to_ip_string(msg->getSenderIP()));
+        worker->lockWorkData();
+        
+        res = worker->insertPacket(packet_num, data, data_size);
+        
+        if ((worker->mState == LLTextureFetchWorker::LOAD_FROM_SIMULATOR) ||
+                (worker->mState == LLTextureFetchWorker::LOAD_FROM_NETWORK))
+        {
+                worker->setPriority(LLWorkerThread::PRIORITY_HIGH | worker->mWorkPriority);
+                worker->mState = LLTextureFetchWorker::LOAD_FROM_SIMULATOR;
+        }
+        else
+        {
+//              llwarns << "receiveImagePacket " << packet_num << "/" << worker->mLastPacket << " for worker: " << id
+//                      << " in state: " << LLTextureFetchWorker::sStateDescs[worker->mState] << llendl;
+                removeFromNetworkQueue(worker); // failsafe
+                mCancelQueue[host].insert(id);
+        }
+        
+        worker->unlockWorkData();
 
-        U16 packet_num;
-        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packet, packet_num);
+        return res;
+}
 
-        LLTextureFetchWorker* worker = getActiveWorker(id);
-        if (!worker)
+//////////////////////////////////////////////////////////////////////////////
+
+S32 LLTextureFetch::getFetchState(const LLUUID& id, F32& data_progress_p, F32& requested_priority_p,
+                                                                  U32& fetch_priority_p, F32& fetch_dtime_p, F32& request_dtime_p)
+{
+        S32 state = LLTextureFetchWorker::INVALID;
+        F32 data_progress = 0.0f;
+        F32 requested_priority = 0.0f;
+        F32 fetch_dtime = 999999.f;
+        F32 request_dtime = 999999.f;
+        U32 fetch_priority = 0;
+        
+        LLMutexLock lock(&mQueueMutex);
+        LLTextureFetchWorker* worker = getWorker(id);
+        if (worker && worker->haveWork())
         {
-                llwarns << "receiveImageHeader for non active worker: " << id << llendl;
-                return;
+                worker->lockWorkData();
+                state = worker->mState;
+                fetch_dtime = worker->mFetchTimer.getElapsedTimeF32();
+                request_dtime = worker->mRequestedTimer.getElapsedTimeF32();
+                if (worker->mFileSize > 0)
+                {
+                        if (state == LLTextureFetchWorker::LOAD_FROM_SIMULATOR)
+                        {
+                                S32 data_size = FIRST_PACKET_SIZE + (worker->mLastPacket-1) * MAX_IMG_PACKET_SIZE;
+                                data_size = llmax(data_size, 0);
+                                data_progress = (F32)data_size / (F32)worker->mFileSize;
+                        }
+                        else if (worker->mFormattedImage.notNull())
+                        {
+                                data_progress = (F32)worker->mFormattedImage->getDataSize() / (F32)worker->mFileSize;
+                        }
+                }
+                if (state >= LLTextureFetchWorker::LOAD_FROM_NETWORK && state <= LLTextureFetchWorker::LOAD_FROM_HTTP_GET_DATA)
+                {
+                        requested_priority = worker->mRequestedPriority;
+                }
+                else
+                {
+                        requested_priority = worker->mImagePriority;
+                }
+                fetch_priority = worker->getPriority();
+                worker->unlockWorkData();
         }
-        worker->mRequestedTimer.reset();
+        data_progress_p = data_progress;
+        requested_priority_p = requested_priority;
+        fetch_priority_p = fetch_priority;
+        fetch_dtime_p = fetch_dtime;
+        request_dtime_p = request_dtime;
+        return state;
+}
 
-        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
-        if (data_size)
+void LLTextureFetch::dump()
+{
+        llinfos << "LLTextureFetch REQUESTS:" << llendl;
+        for (request_queue_t::iterator iter = mRequestQueue.begin();
+                 iter != mRequestQueue.end(); ++iter)
         {
-                U8 *data = new U8[data_size];
-                msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
-                worker->insertPacket(0, data, data_size)
+                LLQueuedThread::QueuedRequest* qreq = *iter;
+                LLWorkerThread::WorkRequest* wreq = (LLWorkerThread::WorkRequest*)qreq;
+                LLTextureFetchWorker* worker = (LLTextureFetchWorker*)wreq->getWorkerClass();
+                llinfos << " ID: " << worker->mID
+                                << " PRI: " << llformat("0x%08x",wreq->getPriority())
+                                << " STATE: " << worker->sStateDescs[worker->mState]
+                                << llendl;
         }
 }
-#endif
 
- //////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 29cac99..a53deae 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -28,20 +28,79 @@
 #ifndef LL_LLTEXTUREFETCH_H
 #define LL_LLTEXTUREFETCH_H
 
+#include "lldir.h"
+#include "llimage.h"
+#include "lluuid.h"
 #include "llworkerthread.h"
 
 class LLViewerImage;
+class LLTextureFetchWorker;
+class LLTextureCache;
+class LLHost;
 
 // Interface class
-class LLTextureFetch
+class LLTextureFetch : public LLWorkerThread
 {
+        friend class LLTextureFetchWorker;
+        
 public:
-        static void initClass();
-        static void updateClass();
-        static void cleanupClass();
+        LLTextureFetch(LLTextureCache* cache, bool threaded);
+        ~LLTextureFetch();
 
-        static LLWorkerClass::handle_t addRequest(LLImageFormatted* image, S32 discard);
-        static bool getRequestFinished(LLWorkerClass::handle_t handle);
+        /*virtual*/ S32 update(U32 max_time_ms);        
+
+        bool createRequest(const LLUUID& id, const LLHost& host, F32 priority,
+                                           S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
+        void deleteRequest(const LLUUID& id, bool cancel);
+        bool getRequestFinished(const LLUUID& id, S32& discard_level,
+                                                        LLPointer<LLImageRaw>& raw, LLPointer<LLImageRaw>& aux);
+        bool updateRequestPriority(const LLUUID& id, F32 priority);
+
+        bool receiveImageHeader(const LLHost& host, const LLUUID& id, U8 codec, U16 packets, U32 totalbytes, U16 data_size, U8* data);
+        bool receiveImagePacket(const LLHost& host, const LLUUID& id, U16 packet_num, U16 data_size, U8* data);
+
+        // Debug
+        S32 getFetchState(const LLUUID& id, F32& decode_progress_p, F32& requested_priority_p,
+                                          U32& fetch_priority_p, F32& fetch_dtime_p, F32& request_dtime_p);
+        void dump();
+        S32 getNumRequests() { return mRequestMap.size(); }
+        
+        // Public for access by callbacks
+        void lockQueue() { mQueueMutex.lock(); }
+        void unlockQueue() { mQueueMutex.unlock(); }
+        LLTextureFetchWorker* getWorker(const LLUUID& id);
+        
+protected:
+        void addToNetworkQueue(LLTextureFetchWorker* worker);
+        void removeFromNetworkQueue(LLTextureFetchWorker* worker);
+        void removeRequest(LLTextureFetchWorker* worker, bool cancel);
+
+private:
+        void sendRequestListToSimulators();
+
+public:
+        LLUUID mDebugID;
+        S32 mDebugCount;
+        BOOL mDebugPause;
+        S32 mPacketCount;
+        S32 mBadPacketCount;
+        
+private:
+        LLMutex mQueueMutex;
+
+        LLTextureCache* mTextureCache;
+        
+        // Map of all requests by UUID
+        typedef std::map<LLUUID,LLTextureFetchWorker*> map_t;
+        map_t mRequestMap;
+
+        // Set of requests that require network data
+        typedef std::set<LLUUID> queue_t;
+        queue_t mNetworkQueue;
+        typedef std::map<LLHost,std::set<LLUUID> > cancel_queue_t;
+        cancel_queue_t mCancelQueue;
+
+        LLFrameTimer mNetworkTimer;
 };
 
-#endif LL_LLTEXTUREFETCH_H
+#endif // LL_LLTEXTUREFETCH_H
diff --git a/linden/indra/newview/lltextureview.cpp b/linden/indra/newview/lltextureview.cpp
index 75abb39..d28ee74 100644
--- a/linden/indra/newview/lltextureview.cpp
+++ b/linden/indra/newview/lltextureview.cpp
@@ -33,48 +33,509 @@
 
 #include "llrect.h"
 #include "llerror.h"
-
-#include "viewer.h"
+#include "lllfsthread.h"
 #include "llui.h"
+#include "llimageworker.h"
 
-#include "llviewerimagelist.h"
+#include "llhoverview.h"
 #include "llselectmgr.h"
+#include "lltexlayer.h"
+#include "lltexturecache.h"
+#include "lltexturefetch.h"
+#include "lltexturetable.h"
 #include "llviewerobject.h"
 #include "llviewerimage.h"
-#include "llhoverview.h"
+#include "llviewerimagelist.h"
+#include "viewer.h"
+
+extern F32 texmem_lower_bound_scale;
 
 LLTextureView *gTextureView = NULL;
 
 //static
 std::set<LLViewerImage*> LLTextureView::sDebugImages;
 
+////////////////////////////////////////////////////////////////////////////
+
+static LLString title_string1a("Tex UUID Area  DDis(Req)  DecodePri(Fetch)     [download]        pk/max");
+static LLString title_string1b("Tex UUID Area  DDis(Req)  Fetch(DecodePri)     [download]        pk/max");
+static LLString title_string2("State");
+static LLString title_string3("Pkt Bnd");
+static LLString title_string4("  W x H (Dis) Mem");
+
+static S32 title_x1 = 0;
+static S32 title_x2 = 440;
+static S32 title_x3 = title_x2 + 40;
+static S32 title_x4 = title_x3 + 50;
+static S32 texture_bar_height = 8;
+
+////////////////////////////////////////////////////////////////////////////
+
+class LLTextureBar : public LLView
+{
+public:
+        LLPointer<LLViewerImage> mImagep;
+        S32 mHilite;
+
+public:
+        LLTextureBar(const std::string& name, const LLRect& r, LLTextureView* texview)
+                : LLView(name, r, FALSE),
+                  mHilite(0),
+                  mTextureView(texview)
+        {
+        }
+
+        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_TEXTURE_BAR; }
+        virtual LLString getWidgetTag() const { return LL_TEXTURE_BAR_TAG; }
+
+        virtual void draw();
+        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual LLRect getRequiredRect();       // Return the height of this object, given the set options.
+
 // Used for sorting
-struct SortTextureBars
+        struct sort
+        {
+                bool operator()(const LLView* i1, const LLView* i2)
+                {
+                        LLTextureBar* bar1p = (LLTextureBar*)i1;
+                        LLTextureBar* bar2p = (LLTextureBar*)i2;
+                        LLViewerImage *i1p = bar1p->mImagep;
+                        LLViewerImage *i2p = bar2p->mImagep;
+                        F32 pri1 = i1p->getDecodePriority(); // i1p->mRequestedDownloadPriority
+                        F32 pri2 = i2p->getDecodePriority(); // i2p->mRequestedDownloadPriority
+                        if (pri1 > pri2)
+                                return true;
+                        else if (pri2 > pri1)
+                                return false;
+                        else
+                                return i1p->getID() < i2p->getID();
+                }
+        };
+
+        struct sort_fetch
+        {
+                bool operator()(const LLView* i1, const LLView* i2)
+                {
+                        LLTextureBar* bar1p = (LLTextureBar*)i1;
+                        LLTextureBar* bar2p = (LLTextureBar*)i2;
+                        LLViewerImage *i1p = bar1p->mImagep;
+                        LLViewerImage *i2p = bar2p->mImagep;
+                        U32 pri1 = i1p->mFetchPriority;
+                        U32 pri2 = i2p->mFetchPriority;
+                        if (pri1 > pri2)
+                                return true;
+                        else if (pri2 > pri1)
+                                return false;
+                        else
+                                return i1p->getID() < i2p->getID();
+                }
+        };      
+private:
+        LLTextureView* mTextureView;
+};
+
+void LLTextureBar::draw()
 {
-        bool operator()(const LLView* i1, const LLView* i2)
-        {
-                LLTextureBar* bar1p = (LLTextureBar*)i1;
-                LLTextureBar* bar2p = (LLTextureBar*)i2;
-                LLViewerImage *i1p = bar1p->mImagep;
-                LLViewerImage *i2p = bar2p->mImagep;
-                F32 pri1 = i1p->getDecodePriority(); // i1p->mRequestedDownloadPriority
-                F32 pri2 = i2p->getDecodePriority(); // i2p->mRequestedDownloadPriority
-                if (pri1 > pri2)
-                        return true;
-                else if (pri2 > pri1)
-                        return false;
+        if (!mImagep)
+        {
+                return;
+        }
+
+        LLColor4 color;
+        if (mImagep->getID() == gTextureFetch->mDebugID)
+        {
+                color = LLColor4::cyan2;
+        }
+        else if (mHilite)
+        {
+                S32 idx = llclamp(mHilite,1,3);
+                if (idx==1) color = LLColor4::orange;
+                else if (idx==2) color = LLColor4::yellow;
+                else color = LLColor4::pink2;
+        }
+        else if (mImagep->mDontDiscard)
+        {
+                color = LLColor4::green4;
+        }
+        else if (mImagep->getBoostLevel())
+        {
+                color = LLColor4::magenta;
+        }
+        else if (mImagep->getDecodePriority() == 0.0f)
+        {
+                color = LLColor4::grey; color[VALPHA] = .7f;
+        }
+        else
+        {
+                color = LLColor4::white; color[VALPHA] = .7f;
+        }
+
+        // We need to draw:
+        // The texture UUID or name
+        // The progress bar for the texture, highlighted if it's being download
+        // Various numerical stats.
+        char tex_str[256];
+        S32 left, right;
+        S32 top = 0;
+        S32 bottom = top + 6;
+        LLColor4 clr;
+
+        LLGLSUIDefault gls_ui;
+        
+        // Get the name or UUID of the image.
+        gTextureTable.getName(mImagep->mID);
+        
+        // Name, pixel_area, requested pixel area, decode priority
+        char uuid_str[255];
+        mImagep->mID.toString(uuid_str);
+        uuid_str[8] = 0;
+        if (mTextureView->mOrderFetch)
+        {
+                sprintf(tex_str, "%s %7.0f %d(%d) 0x%08x(%8.0f)",
+                                uuid_str,
+                                mImagep->mMaxVirtualSize,
+                                mImagep->mDesiredDiscardLevel,
+                                mImagep->mRequestedDiscardLevel,
+                                mImagep->mFetchPriority,
+                                mImagep->getDecodePriority());
+        }
+        else
+        {
+                sprintf(tex_str, "%s %7.0f %d(%d) %8.0f(0x%08x)",
+                                uuid_str,
+                                mImagep->mMaxVirtualSize,
+                                mImagep->mDesiredDiscardLevel,
+                                mImagep->mRequestedDiscardLevel,
+                                mImagep->getDecodePriority(),
+                                mImagep->mFetchPriority);
+        }
+
+        LLFontGL::sMonospace->renderUTF8(tex_str, 0, title_x1, mRect.getHeight(),
+                                                                         color, LLFontGL::LEFT, LLFontGL::TOP);
+
+        // State
+        // Hack: mirrored from lltexturefetch.cpp
+        struct { const char* desc; LLColor4 color; } fetch_state_desc[] = {
+                { "---", LLColor4::red },       // INVALID
+                { "INI", LLColor4::white },     // INIT
+                { "DSK", LLColor4::cyan },      // LOAD_FROM_TEXTURE_CACHE
+                { "DSK", LLColor4::blue },      // CACHE_POST
+                { "NET", LLColor4::green },     // LOAD_FROM_NETWORK
+                { "SIM", LLColor4::green },     // LOAD_FROM_SIMULATOR
+                { "URL", LLColor4::green2 },// LOAD_FROM_HTTP_GET_URL
+                { "HTP", LLColor4::green },     // LOAD_FROM_HTTP_GET_DATA
+                { "DEC", LLColor4::yellow },// DECODE_IMAGE
+                { "DEC", LLColor4::yellow },// DECODE_IMAGE_UPDATE
+                { "WRT", LLColor4::purple },// WRITE_TO_CACHE
+                { "WRT", LLColor4::orange },// WAIT_ON_WRITE
+                { "END", LLColor4::red },   // DONE
+#define LAST_STATE 12
+                { "CRE", LLColor4::magenta }, // LAST_STATE+1
+                { "FUL", LLColor4::green }, // LAST_STATE+2
+                { "BAD", LLColor4::red }, // LAST_STATE+3
+                { "MIS", LLColor4::red }, // LAST_STATE+4
+                { "---", LLColor4::white }, // LAST_STATE+5
+        };
+        const S32 fetch_state_desc_size = (S32)(sizeof(fetch_state_desc)/sizeof(fetch_state_desc[0]));
+        S32 state =
+                mImagep->mNeedsCreateTexture ? LAST_STATE+1 :
+                mImagep->mFullyLoaded ? LAST_STATE+2 :
+                mImagep->mMinDiscardLevel > 0 ? LAST_STATE+3 :
+                mImagep->mIsMissingAsset ? LAST_STATE+4 :
+                !mImagep->mIsFetching ? LAST_STATE+5 :
+                mImagep->mFetchState;
+        state = llclamp(state,0,fetch_state_desc_size-1);
+
+        LLFontGL::sMonospace->renderUTF8(fetch_state_desc[state].desc, 0, title_x2, mRect.getHeight(),
+                                                                         fetch_state_desc[state].color,
+                                                                         LLFontGL::LEFT, LLFontGL::TOP);
+        LLGLSNoTexture gls_no_texture;
+
+        // Draw the progress bar.
+        S32 bar_width = 100;
+        S32 bar_left = 280;
+        left = bar_left;
+        right = left + bar_width;
+
+        glColor4f(0.f, 0.f, 0.f, 0.75f);
+        gl_rect_2d(left, top, right, bottom);
+
+        F32 data_progress = mImagep->mDownloadProgress;
+        
+        if (data_progress > 0.0f)
+        {
+                // Downloaded bytes
+                right = left + llfloor(data_progress * (F32)bar_width);
+                if (right > left)
+                {
+                        glColor4f(0.f, 0.f, 1.f, 0.75f);
+                        gl_rect_2d(left, top, right, bottom);
+                }
+        }
+
+        S32 pip_width = 6;
+        S32 pip_space = 14;
+        S32 pip_x = title_x3 + pip_space/2;
+        
+        // Draw the packet pip
+        F32 last_event = mImagep->mLastPacketTimer.getElapsedTimeF32();
+        if (last_event < 1.f)
+        {
+                clr = LLColor4::white; 
+        }
+        else
+        {
+                last_event = mImagep->mRequestDeltaTime;
+                if (last_event < 1.f)
+                {
+                        clr = LLColor4::green;
+                }
                 else
-                        return i1p->getID() < i2p->getID();
+                {
+                        last_event = mImagep->mFetchDeltaTime;
+                        if (last_event < 1.f)
+                        {
+                                clr = LLColor4::yellow;
+                        }
+                }
+        }
+        if (last_event < 1.f)
+        {
+                clr.setAlpha(1.f - last_event);
+                glColor4fv(clr.mV);
+                gl_rect_2d(pip_x, top, pip_x + pip_width, bottom);
         }
+        pip_x += pip_width + pip_space;
+
+        // we don't want to show bind/resident pips for textures using the default texture
+        if (mImagep->getHasGLTexture())
+        {
+                // Draw the bound pip
+                last_event = mImagep->sLastFrameTime - mImagep->mLastBindTime;
+                if (last_event < 1.f)
+                {
+                        clr = mImagep->getMissed() ? LLColor4::red : LLColor4::magenta1;
+                        clr.setAlpha(1.f - last_event);
+                        glColor4fv(clr.mV);
+                        gl_rect_2d(pip_x, top, pip_x + pip_width, bottom);
+                }
+        }
+        pip_x += pip_width + pip_space;
+
+        
+        {
+                LLGLSUIDefault gls_ui;
+                // draw the packet data
+//              {
+//                      LLString num_str = llformat("%3d/%3d", mImagep->mLastPacket+1, mImagep->mPackets);
+//                      LLFontGL::sMonospace->renderUTF8(num_str, 0, bar_left + 100, mRect.getHeight(), color,
+//                                                                                       LLFontGL::LEFT, LLFontGL::TOP);
+//              }
+                
+                // draw the image size at the end
+                {
+                        LLString num_str = llformat("%3dx%3d (%d) %7d", mImagep->getWidth(), mImagep->getHeight(),
+                                                                                mImagep->getDiscardLevel(), mImagep->mTextureMemory);
+                        LLFontGL::sMonospace->renderUTF8(num_str, 0, title_x4, mRect.getHeight(), color,
+                                                                                        LLFontGL::LEFT, LLFontGL::TOP);
+                }
+        }
+
+}
+
+BOOL LLTextureBar::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+        if ((mask & (MASK_CONTROL|MASK_SHIFT|MASK_ALT)) == MASK_ALT)
+        {
+                gTextureFetch->mDebugID = mImagep->getID();
+                return TRUE;
+        }
+        return LLView::handleMouseDown(x,y,mask);
+}
+
+LLRect LLTextureBar::getRequiredRect()
+{
+        LLRect rect;
+
+        rect.mTop = texture_bar_height;
+
+        return rect;
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+class LLGLTexMemBar : public LLView
+{
+public:
+        LLGLTexMemBar(const std::string& name, LLTextureView* texview)
+                : LLView(name, FALSE),
+                  mTextureView(texview)
+        {
+                S32 line_height = (S32)(LLFontGL::sMonospace->getLineHeight() + .5f);
+                setRect(LLRect(0,0,100,line_height * 4));
+                updateRect();
+        }
+
+        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_TEX_MEM_BAR; };
+        virtual LLString getWidgetTag() const { return LL_GL_TEX_MEM_BAR_TAG; };
+
+        virtual void draw();    
+        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual LLRect getRequiredRect();       // Return the height of this object, given the set options.
+
+private:
+        LLTextureView* mTextureView;
 };
 
+void LLGLTexMemBar::draw()
+{
+        S32 bound_mem = LLViewerImage::sBoundTextureMemory;
+        S32 max_bound_mem = LLViewerImage::sMaxBoundTextureMem;
+        S32 total_mem = LLViewerImage::sTotalTextureMemory;
+        S32 max_total_mem = LLViewerImage::sMaxTotalTextureMem;
+        F32 discard_bias = LLViewerImage::sDesiredDiscardBias;
+        S32 line_height = (S32)(LLFontGL::sMonospace->getLineHeight() + .5f);
+        
+        //----------------------------------------------------------------------------
+        LLGLSUIDefault gls_ui;
+        F32 text_color[] = {1.f, 1.f, 1.f, 0.75f};
+        
+        std::string text;
+        text = llformat("GL Tot: %d/%d MB Bound: %d/%d MB Discard Bias: %.2f",
+                                        total_mem/(1024*1024),
+                                        max_total_mem/(1024*1024),
+                                        bound_mem/(1024*1024),
+                                        max_bound_mem/(1024*1024),
+                                        discard_bias);
+
+        LLFontGL::sMonospace->renderUTF8(text, 0, 0, line_height*3,
+                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
+
+        //----------------------------------------------------------------------------
+        S32 bar_left = 380;
+        S32 bar_width = 200;
+        S32 top = line_height*3 - 2;
+        S32 bottom = top - 6;
+        S32 left = bar_left;
+        S32 right = left + bar_width;
+
+        F32 bar_scale = (F32)bar_width / (max_bound_mem * 1.5f);
+        
+        LLGLSNoTexture gls_no_texture;
+        
+        glColor4f(0.5f, 0.5f, 0.5f, 0.75f);
+        gl_rect_2d(left, top, right, bottom);
+
+        
+        left = bar_left;
+        right = left + llfloor(bound_mem * bar_scale);
+        if (bound_mem < llfloor(max_bound_mem * texmem_lower_bound_scale))
+        {
+                glColor4f(0.f, 1.f, 0.f, 0.75f);
+        }
+        else if (bound_mem < max_bound_mem)
+        {
+                glColor4f(1.f, 1.f, 0.f, 0.75f);
+        }
+        else
+        {
+                glColor4f(1.f, 0.f, 0.f, 0.75f);
+        }
+        gl_rect_2d(left, top, right, bottom);
+
+        bar_scale = (F32)bar_width / (max_total_mem * 1.5f);
+        
+        top = bottom - 2;
+        bottom = top - 6;
+        left = bar_left;
+        right = left + llfloor(total_mem * bar_scale);
+        if (total_mem < llfloor(max_total_mem * texmem_lower_bound_scale))
+        {
+                glColor4f(0.f, 1.f, 0.f, 0.75f);
+        }
+        else if (total_mem < max_total_mem)
+        {
+                glColor4f(1.f, 1.f, 0.f, 0.75f);
+        }
+        else
+        {
+                glColor4f(1.f, 0.f, 0.f, 0.75f);
+        }
+        gl_rect_2d(left, top, right, bottom);
+
+        //----------------------------------------------------------------------------
+
+        LLGLEnable tex(GL_TEXTURE_2D);
+        
+        text = llformat("Textures: Count: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d IW:%d(%d) RAW:%d",
+                                        gImageList.getNumImages(),
+                                        gTextureFetch->getNumRequests(), gTextureFetch->getNumDeletes(),
+                                        gTextureFetch->mPacketCount, gTextureFetch->mBadPacketCount, 
+                                        gTextureCache->getNumReads(), gTextureCache->getNumWrites(),
+                                        LLLFSThread::sLocal->getPending(),
+                                        LLImageWorker::sCount, LLImageWorker::getWorkerThread()->getNumDeletes(),
+                                        LLImageRaw::sRawImageCount);
+
+        LLFontGL::sMonospace->renderUTF8(text, 0, 0, line_height*2,
+                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
+        
+        S32 dx1 = 0;
+        if (gTextureFetch->mDebugPause)
+        {
+                LLFontGL::sMonospace->renderUTF8("!", 0, title_x1, line_height,
+                                                                                 text_color, LLFontGL::LEFT, LLFontGL::TOP);
+                dx1 += 8;
+        }
+        if (mTextureView->mFreezeView)
+        {
+                LLFontGL::sMonospace->renderUTF8("*", 0, title_x1, line_height,
+                                                                                 text_color, LLFontGL::LEFT, LLFontGL::TOP);
+                dx1 += 8;
+        }
+        if (mTextureView->mOrderFetch)
+        {
+                LLFontGL::sMonospace->renderUTF8(title_string1b, 0, title_x1+dx1, line_height,
+                                                                                 text_color, LLFontGL::LEFT, LLFontGL::TOP);
+        }
+        else
+        {       
+                LLFontGL::sMonospace->renderUTF8(title_string1a, 0, title_x1+dx1, line_height,
+                                                                                 text_color, LLFontGL::LEFT, LLFontGL::TOP);
+        }
+        
+        LLFontGL::sMonospace->renderUTF8(title_string2, 0, title_x2, line_height,
+                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
+
+        LLFontGL::sMonospace->renderUTF8(title_string3, 0, title_x3, line_height,
+                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
+
+        LLFontGL::sMonospace->renderUTF8(title_string4, 0, title_x4, line_height,
+                                                                         text_color, LLFontGL::LEFT, LLFontGL::TOP);
+}
+
+BOOL LLGLTexMemBar::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+        return FALSE;
+}
+
+LLRect LLGLTexMemBar::getRequiredRect()
+{
+        LLRect rect;
+        rect.mTop = 8;
+        return rect;
+}
+
+////////////////////////////////////////////////////////////////////////////
+
 LLTextureView::LLTextureView(const std::string& name, const LLRect& rect)
-:       LLContainerView(name, rect)
+        :       LLContainerView(name, rect),
+                mFreezeView(FALSE),
+                mOrderFetch(FALSE),
+                mPrintList(FALSE),
+                mNumTextureBars(0)
 {
         setVisible(FALSE);
-        mFreezeView = FALSE;
         
-        mNumTextureBars = 0;
         setDisplayChildren(TRUE);
         mGLTexMemBar = 0;
 }
@@ -122,46 +583,79 @@ void LLTextureView::draw()
                 typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t;
                 display_list_t display_image_list;
         
-                for (LLViewerImageList::image_list_t::iterator iter = gImageList.mImageList.begin();
+                if (mPrintList)
+                {
+                        llinfos << "ID\tMEM\tBOOST\tPRI\tWIDTH\tHEIGHT\tDISCARD" << llendl;
+                }
+        
+                for (LLViewerImageList::image_priority_list_t::iterator iter = gImageList.mImageList.begin();
                          iter != gImageList.mImageList.end(); )
                 {
                         LLPointer<LLViewerImage> imagep = *iter++;
-#if 1
+
+                        S32 cur_discard = imagep->getDiscardLevel();
+                        S32 desired_discard = imagep->mDesiredDiscardLevel;
+                        
+                        if (mPrintList)
+                        {
+                                llinfos << imagep->getID()
+                                                << "\t" <<  imagep->mTextureMemory
+                                                << "\t" << imagep->getBoostLevel()
+                                                << "\t" << imagep->getDecodePriority()
+                                                << "\t" << imagep->getWidth()
+                                                << "\t" << imagep->getHeight()
+                                                << "\t" << cur_discard
+                                                << llendl;
+                        }
+                
+#if 0
                         if (imagep->getDontDiscard())
                         {
                                 continue;
                         }
-#endif
+
                         if (imagep->isMissingAsset())
                         {
                                 continue;
                         }
-                        
-#define HIGH_PRIORITY 100000000.f
-                        F32 pri = imagep->getDecodePriority();
+#endif
 
-                        if (sDebugImages.find(imagep) != sDebugImages.end())
+#define HIGH_PRIORITY 100000000.f
+                        F32 pri;
+                        if (mOrderFetch)
+                        {
+                                pri = ((F32)imagep->mFetchPriority)/256.f;
+                        }
+                        else
                         {
-                                pri += 3*HIGH_PRIORITY;
+                                pri = imagep->getDecodePriority();
                         }
                         
+                        if (sDebugImages.find(imagep) != sDebugImages.end())
+                        {
+                                pri += 4*HIGH_PRIORITY;
+                        }
+
+                        if (!mOrderFetch)
+                        {
 #if 1
                         if (pri < HIGH_PRIORITY && gSelectMgr)
                         {
                                 S32 te;
                                 LLViewerObject *objectp;
-                                for (gSelectMgr->getFirstTE(&objectp, &te); objectp; gSelectMgr->getNextTE(&objectp, &te))
+                                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                                for (selection->getFirstTE(&objectp, &te); objectp; selection->getNextTE(&objectp, &te))
                                 {
                                         if (imagep == objectp->getTEImage(te))
                                         {
-                                                pri += 2*HIGH_PRIORITY;
+                                                pri += 3*HIGH_PRIORITY;
                                                 break;
                                         }
                                 }
                         }
 #endif
 #if 1
-                        if (pri < HIGH_PRIORITY)
+                        if (pri < HIGH_PRIORITY && (cur_discard< 0 || desired_discard < cur_discard))
                         {
                                 LLViewerObject *objectp = gHoverView->getLastHoverObject();
                                 if (objectp)
@@ -178,31 +672,29 @@ void LLTextureView::draw()
                                 }
                         }
 #endif
-#if 0
-                        if (pri < HIGH_PRIORITY)
-                        {
-                                if (imagep->mBoostPriority)
-                                {
-                                        pri += 4*HIGH_PRIORITY;
-                                }
-                        }
-#endif
 #if 1
                         if (pri > 0.f && pri < HIGH_PRIORITY)
                         {
                                 if (imagep->mLastPacketTimer.getElapsedTimeF32() < 1.f ||
-                                        imagep->mLastDecodeTime.getElapsedTimeF32() < 1.f)
+                                        imagep->mFetchDeltaTime < 0.25f)
                                 {
                                         pri += 1*HIGH_PRIORITY;
                                 }
                         }
 #endif
-//                      if (pri > 0.0f)
+                        }
+                        
+                        if (pri > 0.0f)
                         {
                                 display_image_list.insert(std::make_pair(pri, imagep));
                         }
                 }
-
+                
+                if (mPrintList)
+                {
+                        mPrintList = FALSE;
+                }
+                
                 static S32 max_count = 50;
                 S32 count = 0;
                 for (display_list_t::iterator iter = display_image_list.begin();
@@ -224,9 +716,12 @@ void LLTextureView::draw()
                         }
                 }
 
-                sortChildren(SortTextureBars());
-        
-                mGLTexMemBar = new LLGLTexMemBar("gl texmem bar");
+                if (mOrderFetch)
+                        sortChildren(LLTextureBar::sort_fetch());
+                else
+                        sortChildren(LLTextureBar::sort());
+
+                mGLTexMemBar = new LLGLTexMemBar("gl texmem bar", this);
                 addChild(mGLTexMemBar);
         
                 reshape(mRect.getWidth(), mRect.getHeight(), TRUE);
@@ -256,54 +751,46 @@ void LLTextureView::draw()
 
 BOOL LLTextureView::addBar(LLViewerImage *imagep, S32 hilite)
 {
-        if (!imagep)
-        {
-                return FALSE;
-        }
-
+        llassert(imagep);
+        
         LLTextureBar *barp;
         LLRect r;
 
         mNumTextureBars++;
 
-        for (std::vector<LLTextureBar*>::iterator iter = mTextureBars.begin();
-                 iter != mTextureBars.end(); iter++)
-        {
-                LLTextureBar* barp = *iter;
-                if (barp->mImagep == imagep)
-                {
-                        barp->mHilite = hilite;
-                        return FALSE;
-                }
-        }
-
-        barp = new LLTextureBar("texture bar", r);
+        barp = new LLTextureBar("texture bar", r, this);
         barp->mImagep = imagep; 
         barp->mHilite = hilite;
 
         addChild(barp);
         mTextureBars.push_back(barp);
 
-        // Rearrange all child bars.
-        reshape(mRect.getWidth(), mRect.getHeight());
         return TRUE;
 }
 
 BOOL LLTextureView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        if (mask & MASK_SHIFT)
+        if ((mask & (MASK_CONTROL|MASK_SHIFT|MASK_ALT)) == (MASK_ALT|MASK_SHIFT))
         {
-                mFreezeView = !mFreezeView;
+                mPrintList = TRUE;
                 return TRUE;
         }
-        else if (mask & MASK_CONTROL)
+        if ((mask & (MASK_CONTROL|MASK_SHIFT|MASK_ALT)) == (MASK_CONTROL|MASK_SHIFT))
         {
-                return FALSE;
+                gTextureFetch->mDebugPause = !gTextureFetch->mDebugPause;
+                return TRUE;
         }
-        else
+        if (mask & MASK_SHIFT)
         {
-                return FALSE;
+                mFreezeView = !mFreezeView;
+                return TRUE;
         }
+        if (mask & MASK_CONTROL)
+        {
+                mOrderFetch = !mOrderFetch;
+                return TRUE;
+        }
+        return LLView::handleMouseDown(x,y,mask);
 }
 
 BOOL LLTextureView::handleMouseUp(S32 x, S32 y, MASK mask)
@@ -313,11 +800,6 @@ BOOL LLTextureView::handleMouseUp(S32 x, S32 y, MASK mask)
 
 BOOL LLTextureView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
-        if (key == ' ')
-        {
-                mFreezeView = !mFreezeView;
-                return TRUE;
-        }
         return FALSE;
 }
 
diff --git a/linden/indra/newview/lltextureview.h b/linden/indra/newview/lltextureview.h
index bfeb8f9..70ca39a 100644
--- a/linden/indra/newview/lltextureview.h
+++ b/linden/indra/newview/lltextureview.h
@@ -28,14 +28,17 @@
 #ifndef LL_LLTEXTUREVIEW_H
 #define LL_LLTEXTUREVIEW_H
 
-#include "lltexturebar.h"
 #include "llcontainerview.h"
 #include "linked_lists.h"
 
 class LLViewerImage;
+class LLTextureBar;
+class LLGLTexMemBar;
 
 class LLTextureView : public LLContainerView
 {
+        friend class LLTextureBar;
+        friend class LLGLTexMemBar;
 public:
         LLTextureView(const std::string& name, const LLRect& rect);
         ~LLTextureView();
@@ -55,16 +58,18 @@ public:
 private:
         BOOL addBar(LLViewerImage *image, BOOL hilight = FALSE);
         void removeAllBars();
-        
+
 private:
+        BOOL mFreezeView;
+        BOOL mOrderFetch;
+        BOOL mPrintList;
+        
         LLTextBox *mInfoTextp;
 
         std::vector<LLTextureBar*> mTextureBars;
         U32 mNumTextureBars;
 
         LLGLTexMemBar* mGLTexMemBar;
-
-        BOOL mFreezeView;
         
 public:
         static std::set<LLViewerImage*> sDebugImages;
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index d004a2d..9489a2b 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -35,6 +35,7 @@
 
 #include "llviewerwindow.h"
 #include "lltoolcomp.h"
+#include "lltoolfocus.h"
 #include "llfocusmgr.h"
 #include "llagent.h"
 #include "llviewborder.h"
@@ -154,6 +155,14 @@ BOOL LLTool::handleKey(KEY key, MASK mask)
         return FALSE;
 }
 
+LLTool* LLTool::getOverrideTool(MASK mask)
+{
+        if (mask & MASK_ALT)
+        {
+                return gToolCamera;
+        }
+        return NULL;
+}
 
 // static
 void    LLTool::onMouseCaptureLost( LLMouseHandler* old_captor )
diff --git a/linden/indra/newview/lltool.h b/linden/indra/newview/lltool.h
index 3116c72..866755a 100644
--- a/linden/indra/newview/lltool.h
+++ b/linden/indra/newview/lltool.h
@@ -77,6 +77,8 @@ public:
         virtual void                    handleSelect()                  { }     // do stuff when your tool is selected
         virtual void                    handleDeselect()                { }     // clean up when your tool is deselected
 
+        virtual LLTool*                 getOverrideTool(MASK mask);
+
         // isAlwaysRendered() - return true if this is a tool that should
         // always be rendered regardless of selection.
         virtual BOOL isAlwaysRendered() { return FALSE; }
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 1822c63..210a1e7 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -182,7 +182,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                 return;
         }
 
-        if (gToolMgr->getCurrentTool(gKeyboard->currentMask(TRUE)) == gToolParcel)
+        if (gToolMgr->getCurrentTool() == gToolParcel)
         {
                 // selecting land, don't do anything
                 return;
@@ -301,8 +301,8 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                 msg->addF32Fast(_PREHASH_Seconds, seconds);
                 msg->addF32Fast(_PREHASH_Height, mStartingZ);
 
-                BOOL parcel_selected = gParcelMgr->getWholeParcelSelected();
-                LLParcel* selected_parcel = gParcelMgr->getSelectedParcel();
+                BOOL parcel_selected = gParcelMgr->getParcelSelection()->getWholeParcelSelected();
+                LLParcel* selected_parcel = gParcelMgr->getParcelSelection()->getParcel();
 
                 if (parcel_selected && selected_parcel)
                 {
@@ -535,7 +535,7 @@ void LLToolBrushLand::onIdle( void* brush_tool )
 {
         LLToolBrushLand* self = reinterpret_cast<LLToolBrushLand*>(brush_tool);
 
-        if( gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) ) == self )
+        if( gToolMgr->getCurrentTool() == self )
         {
                 self->brush();
         }
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 0ef710d..8898dcb 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -167,7 +167,7 @@ void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
 
         if( hit_obj )
         {
-                if (gSelectMgr->getObjectCount())
+                if (gSelectMgr->getSelection()->getObjectCount())
                 {
                         gEditMenuHandler = gSelectMgr;
                 }
@@ -223,7 +223,7 @@ BOOL LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         mMouseDown = TRUE;
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback, TRUE);
         return TRUE;
 }
 
@@ -241,7 +241,7 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
 
         if( hit_obj || gToolTranslate->mManip->getHighlightedPart() != LLManip::LL_NO_PART )
         {
-                if (gSelectMgr->getObjectCount())
+                if (gToolTranslate->mManip->getSelection()->getObjectCount())
                 {
                         gEditMenuHandler = gSelectMgr;
                 }
@@ -272,9 +272,22 @@ BOOL LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
         return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
+LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)
+{
+        if (mask == MASK_CONTROL)
+        {
+                return gToolRotate;
+        }
+        else if (mask == (MASK_CONTROL | MASK_SHIFT))
+        {
+                return gToolStretch;
+        }
+        return LLToolComposite::getOverrideTool(mask);
+}
+
 BOOL LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if (!gSelectMgr->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
+        if (mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
         {
                 // You should already have an object selected from the mousedown.
                 // If so, show its properties
@@ -350,7 +363,7 @@ void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
 
         if( hit_obj || gToolStretch->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
         {
-                if (gSelectMgr->getObjectCount())
+                if (gToolStretch->mManip->getSelection()->getObjectCount())
                 {
                         gEditMenuHandler = gSelectMgr;
                 }
@@ -378,9 +391,20 @@ BOOL LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)
         return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
+LLTool* LLToolCompScale::getOverrideTool(MASK mask)
+{
+        if (mask == MASK_CONTROL)
+        {
+                return gToolRotate;
+        }
+
+        return LLToolComposite::getOverrideTool(mask);
+}
+
+
 BOOL LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if (!gSelectMgr->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
+        if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
         {
                 // You should already have an object selected from the mousedown.
                 // If so, show its properties
@@ -480,6 +504,11 @@ BOOL LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)
         mObjectPlacedOnMouseDown = FALSE;
         mMouseDown = FALSE;
 
+        if (!handled)
+        {
+                handled = LLToolComposite::handleMouseUp(x, y, mask);
+        }
+
         return handled;
 }
 
@@ -534,7 +563,7 @@ void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
         
         if( hit_obj || gToolRotate->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
         {
-                if (gSelectMgr->getObjectCount())
+                if (gToolRotate->mManip->getSelection()->getObjectCount())
                 {
                         gEditMenuHandler = gSelectMgr;
                 }
@@ -562,10 +591,18 @@ BOOL LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)
         return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
+LLTool* LLToolCompRotate::getOverrideTool(MASK mask)
+{
+        if (mask == (MASK_CONTROL | MASK_SHIFT))
+        {
+                return gToolStretch;
+        }
+        return LLToolComposite::getOverrideTool(mask);
+}
 
 BOOL LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if (!gSelectMgr->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
+        if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
         {
                 // You should already have an object selected from the mousedown.
                 // If so, show its properties
@@ -668,7 +705,7 @@ BOOL LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask)
 
         // On mousedown, start grabbing
         gGrabTransientTool = this;
-        gCurrentToolset->selectTool( (LLTool*) mGrab );
+        gToolMgr->getCurrentToolset()->selectTool( (LLTool*) mGrab );
 
         return gToolGrab->handleMouseDown(x, y, mask);
 }
@@ -685,7 +722,7 @@ BOOL LLToolCompGun::handleDoubleClick(S32 x, S32 y, MASK mask)
 
         // On mousedown, start grabbing
         gGrabTransientTool = this;
-        gCurrentToolset->selectTool( (LLTool*) mGrab );
+        gToolMgr->getCurrentToolset()->selectTool( (LLTool*) mGrab );
 
         return gToolGrab->handleDoubleClick(x, y, mask);
 }
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 143b5b1..d75cd11 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -129,6 +129,8 @@ 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(S32 x, S32 y, MASK mask);
 };
 
@@ -148,8 +150,9 @@ 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(S32 x, S32 y, MASK mask);
-
 };
 
 
@@ -169,6 +172,8 @@ public:
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);
         virtual void            render();
 
+        virtual LLTool*         getOverrideTool(MASK mask);
+
         static void pickCallback(S32 x, S32 y, MASK mask);
 
 protected:
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 398263f..ffa124f 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -601,6 +601,7 @@ LLToolDragAndDrop::LLToolDragAndDrop()
          LLTool("draganddrop", NULL),
          mDragStartX(0),
          mDragStartY(0),
+         mSource(SOURCE_AGENT),
          mCursor(UI_CURSOR_NO),
          mLastAccept(ACCEPT_NO),
          mDrop(FALSE),
@@ -1203,6 +1204,8 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
                 return TRUE;
         }
 
+        if (!item) return FALSE;
+        
         LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
         if(!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID()))
         {
@@ -1258,6 +1261,11 @@ void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj,
                                                                                         LLToolDragAndDrop::ESource source,
                                                                                         const LLUUID& src_id)
 {
+        if (!item)
+        {
+                llwarns << "LLToolDragAndDrop::dropTextureAllFaces no texture item." << llendl;
+                return;
+        }
         LLUUID asset_id = item->getAssetUUID();
         BOOL success = handleDropTextureProtections(hit_obj, item, source, src_id);
         if(!success)
@@ -1273,11 +1281,9 @@ void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj,
                 // update viewer side image in anticipation of update from simulator
                 hit_obj->setTEImage(face, image);
                 dialog_refresh_all();
-                
-                // send the update to the simulator
-                hit_obj->sendTEUpdate();
         }
-
+        // send the update to the simulator
+        hit_obj->sendTEUpdate();
 }
 
 /*
@@ -1480,6 +1486,9 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
                 // since it's coming from the library or trash, we want to not
                 // 'take' it back to the same place.
                 item->setParent(LLUUID::null);
+                // *TODO this code isn't working - the parent (FolderID) is still
+                // set when the object is "taken".  so code on the "take" side is
+                // checking for trash and library as well (llviewermenu.cpp)
         }
         if (mSource == SOURCE_NOTECARD)
         {
@@ -1662,7 +1671,7 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
         const S32 BUCKET_SIZE = sizeof(U8) + UUID_BYTES;
         U8 bucket[BUCKET_SIZE];
         bucket[0] = (U8)item->getType();
-        memcpy(&bucket[1], &(item->getUUID().mData), UUID_BYTES);
+        memcpy(&bucket[1], &(item->getUUID().mData), UUID_BYTES);               /* Flawfinder: ignore */
         pack_instant_message(
                 gMessageSystem,
                 gAgent.getID(),
@@ -1842,26 +1851,26 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
                 U8* bucket = new U8[bucket_size];
                 U8* pos = bucket;
                 U8 type = (U8)cat->getType();
-                memcpy(pos, &type, sizeof(U8));
+                memcpy(pos, &type, sizeof(U8));         /* Flawfinder: ignore */
                 pos += sizeof(U8);
-                memcpy(pos, &(cat->getUUID()), UUID_BYTES);
+                memcpy(pos, &(cat->getUUID()), UUID_BYTES);             /* Flawfinder: ignore */
                 pos += UUID_BYTES;
                 S32 i;
                 count = cats.count();
                 for(i = 0; i < count; ++i)
                 {
-                        memcpy(pos, &type, sizeof(U8));
+                        memcpy(pos, &type, sizeof(U8));         /* Flawfinder: ignore */
                         pos += sizeof(U8);
-                        memcpy(pos, &(cats.get(i)->getUUID()), UUID_BYTES);
+                        memcpy(pos, &(cats.get(i)->getUUID()), UUID_BYTES);             /* Flawfinder: ignore */
                         pos += UUID_BYTES;
                 }
                 count = items.count();
                 for(i = 0; i < count; ++i)
                 {
                         type = (U8)items.get(i)->getType();
-                        memcpy(pos, &type, sizeof(U8));
+                        memcpy(pos, &type, sizeof(U8));         /* Flawfinder: ignore */
                         pos += sizeof(U8);
-                        memcpy(pos, &(items.get(i)->getUUID()), UUID_BYTES);
+                        memcpy(pos, &(items.get(i)->getUUID()), UUID_BYTES);            /* Flawfinder: ignore */
                         pos += UUID_BYTES;
                 }
                 pack_instant_message(
@@ -2320,6 +2329,12 @@ EAcceptance LLToolDragAndDrop::dad3dTextureObject(
         {
                 return  ACCEPT_NO_LOCKED;
         }
+        //If texture !copyable don't texture or you'll never get it back.
+        if(!item->getPermissions().allowCopyBy(gAgent.getID()))
+        {
+                return ACCEPT_NO;
+        }
+
         if(drop && (ACCEPT_YES_SINGLE <= rv))
         {
                 if((mask & MASK_SHIFT))
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 504a787..b855e0f 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -61,7 +61,7 @@ LLToolFace::~LLToolFace()
 
 BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if (!gSelectMgr->isEmpty())
+        if (!gSelectMgr->getSelection()->isEmpty())
         {
                 // You should already have an object selected from the mousedown.
                 // If so, show its properties
@@ -109,7 +109,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
                                 // object wasn't selected so add the object and face
                                 gSelectMgr->selectObjectOnly(hit_obj, hit_face);
                         }
-                        else if (!gSelectMgr->contains(hit_obj, hit_face) )
+                        else if (!gSelectMgr->getSelection()->contains(hit_obj, hit_face) )
                         {
                                 // object is selected, but not this face, so add it.
                                 gSelectMgr->addAsIndividual(hit_obj, hit_face);
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index e57f5fb..479d55c 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -62,9 +62,6 @@ BOOL gCameraBtnPan = FALSE;
 const S32 SLOP_RANGE = 4;
 const F32 FOCUS_OFFSET_FACTOR = 1.f;
 
-extern void handle_first_tool(void*);
-
-
 //
 // Camera - shared functionality
 //
@@ -91,13 +88,19 @@ LLToolCamera::~LLToolCamera()
 // virtual
 void LLToolCamera::handleSelect()
 {
-        gFloaterTools->setStatusText("Click and drag to change view");
+        if (gFloaterTools)
+        {
+                gFloaterTools->setStatusText("Click and drag to change view");
+        }
 }
 
 // virtual
 void LLToolCamera::handleDeselect()
 {
-        gFloaterTools->setStatusText("");
+        if (gFloaterTools)
+        {
+                gFloaterTools->setStatusText("");
+        }
 //      gAgent.setLookingAtAvatar(FALSE);
 }
 
@@ -155,7 +158,8 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
         // check for hud attachments
         if (hit_obj && hit_obj->isHUDAttachment())
         {
-                if (!gSelectMgr->getObjectCount() || gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                if (!selection->getObjectCount() || selection->getSelectType() != SELECT_TYPE_HUD)
                 {
                         gToolCamera->mValidClickPoint = FALSE;
                         return;
@@ -194,7 +198,7 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
         }
         //RN: check to see if this is mouse-driving as opposed to ALT-zoom or Focus tool
         else if (mask & MASK_ALT || 
-                        (gToolMgr->getCurrentTool(mask)->getName() == "Camera")) 
+                        (gToolMgr->getCurrentTool()->getName() == "Camera")) 
         {
                 LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
                 if (hit_obj)
diff --git a/linden/indra/newview/lltoolfocus.h b/linden/indra/newview/lltoolfocus.h
index 9b15463..26a7085 100644
--- a/linden/indra/newview/lltoolfocus.h
+++ b/linden/indra/newview/lltoolfocus.h
@@ -46,6 +46,8 @@ public:
         virtual void    handleSelect();
         virtual void    handleDeselect();
 
+        virtual LLTool* getOverrideTool(MASK mask) { return NULL; }
+
         static void pickCallback(S32 x, S32 y, MASK mask);
         BOOL mouseSteerMode() { return mMouseSteering; }
 
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index 90dbd48..e186e4a 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -145,7 +145,7 @@ void LLToolGrab::pickCallback(S32 x, S32 y, MASK mask)
 
         BOOL extend_select = (mask & MASK_SHIFT);
 
-        if (!extend_select && !gSelectMgr->isEmpty())
+        if (!extend_select && !gSelectMgr->getSelection()->isEmpty())
         {
                 gSelectMgr->deselectAll();
                 gToolGrab->mDeselectedThisClick = TRUE;
diff --git a/linden/indra/newview/lltoolgrab.h b/linden/indra/newview/lltoolgrab.h
index db8242c..ad05295 100644
--- a/linden/indra/newview/lltoolgrab.h
+++ b/linden/indra/newview/lltoolgrab.h
@@ -53,7 +53,7 @@ public:
 
         virtual void            handleSelect();
         virtual void            handleDeselect();
-
+        
         virtual LLViewerObject* getEditingObject();
         virtual LLVector3d              getEditingPointGlobal();
         virtual BOOL                    isEditing();
diff --git a/linden/indra/newview/lltoolgun.cpp b/linden/indra/newview/lltoolgun.cpp
index e4ec56a..dfe97ae 100644
--- a/linden/indra/newview/lltoolgun.cpp
+++ b/linden/indra/newview/lltoolgun.cpp
@@ -67,7 +67,7 @@ void LLToolGun::handleDeselect()
 BOOL LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         gGrabTransientTool = this;
-        gCurrentToolset->selectTool( gToolGrab );
+        gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
 
         return gToolGrab->handleMouseDown(x, y, mask);
 }
diff --git a/linden/indra/newview/lltoolgun.h b/linden/indra/newview/lltoolgun.h
index 38854a3..6884cb6 100644
--- a/linden/indra/newview/lltoolgun.h
+++ b/linden/indra/newview/lltoolgun.h
@@ -45,6 +45,7 @@ public:
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
 
+        virtual LLTool* getOverrideTool(MASK mask) { return NULL; }
         virtual BOOL    clipMouseWhenDown()             { return FALSE; }
 
 private:
diff --git a/linden/indra/newview/lltoolindividual.cpp b/linden/indra/newview/lltoolindividual.cpp
index e17a2a1..96bd89e 100644
--- a/linden/indra/newview/lltoolindividual.cpp
+++ b/linden/indra/newview/lltoolindividual.cpp
@@ -85,7 +85,7 @@ void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask)
 
 BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if(!gSelectMgr->isEmpty())
+        if(!gSelectMgr->getSelection()->isEmpty())
         {
                 // You should already have an object selected from the mousedown.
                 // If so, show its inventory. 
@@ -104,10 +104,10 @@ BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 void LLToolIndividual::handleSelect()
 {
-        LLViewerObject* obj = gSelectMgr->getFirstRootObject();
+        LLViewerObject* obj = gSelectMgr->getSelection()->getFirstRootObject();
         if(!obj)
         {
-                obj = gSelectMgr->getFirstObject();
+                obj = gSelectMgr->getSelection()->getFirstObject();
         }
         gSelectMgr->deselectAll();
         if(obj)
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 68a3e77..b6e14a2 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -53,7 +53,6 @@ LLToolMgr*		gToolMgr	= NULL;
 // Used when app not active to avoid processing hover.
 LLTool*                 gToolNull       = NULL;
 
-LLToolset*              gCurrentToolset         = NULL;
 LLToolset*              gBasicToolset           = NULL;
 LLToolset*              gCameraToolset          = NULL;
 //LLToolset*            gLandToolset            = NULL;
@@ -65,10 +64,12 @@ LLToolset*		gFaceEditToolset	= NULL;
 
 LLToolMgr::LLToolMgr()
         :
-        mCurrentTool(NULL), 
+        mBaseTool(NULL), 
         mSavedTool(NULL),
         mTransientTool( NULL ),
-        mOverrideTool( NULL )
+        mOverrideTool( NULL ),
+        mSelectedTool( NULL ),
+        mCurrentToolset( NULL )
 {
         gToolNull = new LLTool(NULL);  // Does nothing
         setCurrentTool(gToolNull);
@@ -78,8 +79,6 @@ LLToolMgr::LLToolMgr()
 //      gLandToolset            = new LLToolset();
         gMouselookToolset       = new LLToolset();
         gFaceEditToolset        = new LLToolset();
-
-        gCurrentToolset = gBasicToolset;
 }
 
 void LLToolMgr::initTools()
@@ -197,8 +196,8 @@ void LLToolMgr::initTools()
         gToolObjPicker = new LLToolObjPicker();
 
         // On startup, use "select" tool
+        setCurrentToolset(gBasicToolset);
         gBasicToolset->selectTool( gToolPie );
-        useSelectedTool( gBasicToolset );
 }
 
 LLToolMgr::~LLToolMgr()
@@ -267,138 +266,103 @@ LLToolMgr::~LLToolMgr()
         gToolNull = NULL;
 }
 
-
-void LLToolMgr::useSelectedTool( LLToolset* vp )
-{
-        setCurrentTool( vp->getSelectedTool() ); 
-}
-
 BOOL LLToolMgr::usingTransientTool()
 {
         return mTransientTool ? TRUE : FALSE;
 }
 
-void LLToolMgr::setCurrentTool( LLTool* tool )
+void LLToolMgr::setCurrentToolset(LLToolset* current)
 {
-        if (tool == mCurrentTool)
+        if (!current) return;
+
+        // switching toolsets?
+        if (current != mCurrentToolset)
         {
-                // didn't change tool, so don't mess with
-                // handleSelect or handleDeselect
-                return;
+                // deselect current tool
+                if (mSelectedTool)
+                {
+                        mSelectedTool->handleDeselect();
+                }
+                mCurrentToolset = current;
+                // select first tool of new toolset only if toolset changed
+                mCurrentToolset->selectFirstTool();
         }
+        // update current tool based on new toolset
+        setCurrentTool( mCurrentToolset->getSelectedTool() );
+}
+
+LLToolset* LLToolMgr::getCurrentToolset()
+{
+        return mCurrentToolset;
+}
 
+void LLToolMgr::setCurrentTool( LLTool* tool )
+{
         if (mTransientTool)
         {
-                mTransientTool->handleDeselect();
                 mTransientTool = NULL;
         }
-        else if( mCurrentTool )
-        {
-                mCurrentTool->handleDeselect();
-        }
 
-        mCurrentTool = tool;
-        if (mCurrentTool)
-        {
-                mCurrentTool->handleSelect();
-        }
+        mBaseTool = tool;
+        updateToolStatus();
 }
 
-LLTool* LLToolMgr::getCurrentTool(MASK override_mask)
+LLTool* LLToolMgr::getCurrentTool()
 {
-        // In mid-drag, always keep the current tool
-        if (gToolTranslate->hasMouseCapture()
-                || gToolRotate->hasMouseCapture()
-                || gToolStretch->hasMouseCapture())
-        {
-                // might have gotten here by overriding another tool
-                if (mOverrideTool)
-                {
-                        return mOverrideTool;
-                }
-                else
-                {
-                        return mCurrentTool;
-                }
-        }
+        MASK override_mask = gKeyboard->currentMask(TRUE);
 
+        LLTool* cur_tool = NULL;
+        // always use transient tools if available
         if (mTransientTool)
         {
                 mOverrideTool = NULL;
-                return mTransientTool;
+                cur_tool = mTransientTool;
         }
-
-        if (mCurrentTool == gToolGun)
+        // tools currently grabbing mouse input will stay active
+        else if (mSelectedTool && mSelectedTool->hasMouseCapture())
         {
-                mOverrideTool = NULL;
-                return mCurrentTool;
+                cur_tool = mSelectedTool;
         }
-
-        // ALT always gets you the camera tool
-        if (override_mask & MASK_ALT)
+        else
         {
-                mOverrideTool = gToolCamera;
-                return mOverrideTool;
-        }
+                mOverrideTool = mBaseTool ? mBaseTool->getOverrideTool(override_mask) : NULL;
 
-        if (mCurrentTool == gToolCamera)
-        {
-                // ...can't switch out of camera
-                mOverrideTool = NULL;
-                return mCurrentTool;
-        }
-        else if (mCurrentTool == gToolGrab)
-        {
-                // ...can't switch out of grab
-                mOverrideTool = NULL;
-                return mCurrentTool;
+                // use override tool if available otherwise drop back to base tool
+                cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
         }
-        else if (mCurrentTool == gToolInspect)
-        {
-                // ...can't switch out of grab
-                mOverrideTool = NULL;
-                return mCurrentTool;
-        }
-        else
+
+        //update tool selection status
+        if (mSelectedTool != cur_tool)
         {
-                // ...can switch between editing tools
-                if (override_mask == MASK_CONTROL)
-                {
-                        // Control lifts when in the pie tool, otherwise switches to rotate
-                        if (mCurrentTool == gToolPie)
-                        {
-                                mOverrideTool = gToolGrab;
-                        }
-                        else
-                        {
-                                mOverrideTool = gToolRotate;
-                        }
-                        return mOverrideTool;
-                }
-                else if (override_mask == (MASK_CONTROL | MASK_SHIFT))
+                if (mSelectedTool)
                 {
-                        // Shift-Control spins when in the pie tool, otherwise switches to scale
-                        if (mCurrentTool == gToolPie)
-                        {
-                                mOverrideTool = gToolGrab;
-                        }
-                        else
-                        {
-                                mOverrideTool = gToolStretch;
-                        }
-                        return mOverrideTool;
+                        mSelectedTool->handleDeselect();
                 }
-                else
+                if (cur_tool)
                 {
-                        mOverrideTool = NULL;
-                        return mCurrentTool;
+                        cur_tool->handleSelect();
                 }
+                mSelectedTool = cur_tool;
         }
+
+        return mSelectedTool;
+}
+
+LLTool* LLToolMgr::getBaseTool()
+{
+        return mBaseTool;
+}
+
+void LLToolMgr::updateToolStatus()
+{
+        // call getcurrenttool() to calculate active tool and call handleSelect() and handleDeselect() immediately
+        // when active tool changes
+        getCurrentTool();
 }
 
 BOOL LLToolMgr::inEdit()
 {
-        return mCurrentTool != gToolPie && mCurrentTool != gToolNull;
+        return mBaseTool != gToolPie && mBaseTool != gToolNull;
 }
 
 void LLToolMgr::setTransientTool(LLTool* tool)
@@ -411,34 +375,26 @@ void LLToolMgr::setTransientTool(LLTool* tool)
         {
                 if (mTransientTool)
                 {
-                        mTransientTool->handleDeselect();
                         mTransientTool = NULL;
                 }
-                else if (mCurrentTool)
-                {
-                        mCurrentTool->handleDeselect();
-                }
 
                 mTransientTool = tool;
-                mTransientTool->handleSelect();
         }
+
+        updateToolStatus();
 }
 
 void LLToolMgr::clearTransientTool()
 {
         if (mTransientTool)
         {
-                mTransientTool->handleDeselect();
                 mTransientTool = NULL;
-                if (mCurrentTool)
-                {
-                        mCurrentTool->handleSelect();
-                }
-                else
+                if (!mBaseTool)
                 {
-                        llwarns << "mCurrentTool is NULL" << llendl;
+                        llwarns << "mBaseTool is NULL" << llendl;
                 }
         }
+        updateToolStatus();
 }
 
 
@@ -447,26 +403,19 @@ void LLToolMgr::clearTransientTool()
 // release this locking.
 void LLToolMgr::onAppFocusLost()
 {
-        if (mCurrentTool 
-                && mCurrentTool == gToolGun)
-        {
-                mCurrentTool->handleDeselect();
-        }
-        mSavedTool = mCurrentTool;
-        mCurrentTool = gToolNull;
+        mSavedTool = mBaseTool;
+        mBaseTool = gToolNull;
+        updateToolStatus();
 }
 
 void LLToolMgr::onAppFocusGained()
 {
         if (mSavedTool)
         {
-                if (mSavedTool == gToolGun)
-                {
-                        mCurrentTool->handleSelect();
-                }
-                mCurrentTool = mSavedTool;
+                mBaseTool = mSavedTool;
                 mSavedTool = NULL;
         }
+        updateToolStatus();
 }
 
 /////////////////////////////////////////////////////
@@ -510,7 +459,10 @@ BOOL LLToolset::isToolSelected( S32 index )
 void LLToolset::selectFirstTool()
 {
         mSelectedTool = mToolList.getFirstData();
-        gToolMgr->setCurrentTool( mSelectedTool );
+        if (gToolMgr) 
+        {
+                gToolMgr->setCurrentTool( mSelectedTool );
+        }
 }
 
 
@@ -559,5 +511,5 @@ void LLToolset::selectPrevTool()
 void select_tool( void *tool_pointer )
 {
         LLTool *tool = (LLTool *)tool_pointer;
-        gCurrentToolset->selectTool( tool );
+        gToolMgr->getCurrentToolset()->selectTool( tool );
 }
diff --git a/linden/indra/newview/lltoolmgr.h b/linden/indra/newview/lltoolmgr.h
index 6f0f50b..5cf005a 100644
--- a/linden/indra/newview/lltoolmgr.h
+++ b/linden/indra/newview/lltoolmgr.h
@@ -51,27 +51,33 @@ public:
         // Must be called after gSavedSettings set up.
         void                    initTools();
 
-        LLTool*                 getCurrentTool(MASK override_mask);
+        LLTool*                 getCurrentTool(); // returns active tool, taking into account keyboard state
+        LLTool*                 getBaseTool(); // returns active tool when overrides are deactivated
 
         BOOL                    inEdit();
-        void                    useSelectedTool( LLToolset* vp );
 
         void                    setTransientTool(LLTool* tool);
         void                    clearTransientTool();
         BOOL                    usingTransientTool();
 
+        void                    setCurrentToolset(LLToolset* current);
+        LLToolset*              getCurrentToolset();
+
         void                    onAppFocusGained();
         void                    onAppFocusLost();
 
 protected:
         friend class LLToolset;  // to allow access to setCurrentTool();
         void                    setCurrentTool(LLTool* tool);
+        void                    updateToolStatus();
 
 protected:
-        LLTool*                 mCurrentTool;
+        LLTool*                 mBaseTool;
         LLTool*                 mSavedTool;             // The current tool at the time application focus was lost.
         LLTool*                 mTransientTool;
         LLTool*                 mOverrideTool; // Tool triggered by keyboard override
+        LLTool*                 mSelectedTool; // last known active tool
+        LLToolset*              mCurrentToolset;
 };
 
 // Sets of tools for various modes
@@ -106,7 +112,6 @@ void select_tool(void *tool);
 // Globals (created and destroyed by LLViewerWindow)
 extern LLToolMgr*   gToolMgr;
 
-extern LLToolset* gCurrentToolset;
 extern LLToolset* gBasicToolset;
 extern LLToolset *gCameraToolset;
 //extern LLToolset *gLandToolset;
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index ca3d0e7..a779554 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -234,10 +234,7 @@ BOOL LLVisualParamHint::render()
         {
                 LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool();
                 LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);
-                gPipeline.unbindAGP();
-                avatarPoolp->syncAGP();
-                gPipeline.bindAGP();
-                avatarPoolp->renderAvatars(avatarp, TRUE);  // renders only one avatar (no shaders)
+                avatarPoolp->renderAvatars(avatarp);  // renders only one avatar
         }
         avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
         
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index e4be8ce..3eaa275 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -62,6 +62,7 @@
 LLToolPie *gToolPie = NULL;
 
 LLViewerObject* LLToolPie::sClickActionObject = NULL;
+LLHandle<LLObjectSelection> LLToolPie::sLeftClickSelection = NULL;
 
 extern void handle_buy(void*);
 
@@ -79,8 +80,7 @@ LLToolPie::LLToolPie()
 
 BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        // if buttons swapped, don't pick transparent so users can't "pay" 
-        // transparent objects
+        //left mouse down always picks transparent
         gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, leftMouseCallback, 
                                                                                           TRUE, TRUE);
         mGrabMouseButtonDown = TRUE;
@@ -188,19 +188,19 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                                 || parent && parent->flagTakesMoney())
                         {
                                 sClickActionObject = parent;
-                                LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                                sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
                                 return TRUE;
                         }
                         break;
                 case CLICK_ACTION_BUY:
                         sClickActionObject = parent;
-                        LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                        sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
                         return TRUE;
                 case CLICK_ACTION_OPEN:
                         if (parent && parent->allowOpen())
                         {
                                 sClickActionObject = parent;
-                                LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                                sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
                         }
                         return TRUE;
                 }
@@ -213,7 +213,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                 !always_show)
         {
                 gGrabTransientTool = this;
-                gCurrentToolset->selectTool( gToolGrab );
+                gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
                 return gToolGrab->handleObjectHit( object, x, y, mask);
         }
         
@@ -272,8 +272,8 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         // Spawn pie menu
         if (mHitLand)
         {
-                gParcelMgr->selectParcelAt( gLastHitPosGlobal );
-
+                LLParcelSelectionHandle selection = gParcelMgr->selectParcelAt( gLastHitPosGlobal );
+                gMenuHolder->setParcelSelection(selection);
                 gPieLand->show(x, y, mPieMouseButtonDown);
 
                 // VEFFECT: ShowPie
@@ -288,6 +288,8 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         }
         else if (object)
         {
+                gMenuHolder->setObjectSelection(gSelectMgr->getSelection());
+
                 if (object->isAvatar() 
                         || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
                 {
@@ -321,7 +323,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                 {
                         // BUG: What about chatting child objects?
                         LLString name;
-                        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                         if (node)
                         {
                                 name = node->mName;
@@ -413,10 +415,11 @@ void LLToolPie::selectionPropertiesReceived()
                 return;
         }
 
-        if (sClickActionObject
-                && !sClickActionObject->isDead())
+        if (!sLeftClickSelection->isEmpty())
         {
-                LLViewerObject* root = gSelectMgr->getFirstRootObject();
+                LLViewerObject* root = sLeftClickSelection->getFirstRootObject();
+                // since we don't currently have a way to lock a selection, it could have changed
+                // after we initially clicked on the object
                 if (root == sClickActionObject)
                 {
                         U8 action = root->getClickAction();
@@ -436,6 +439,7 @@ void LLToolPie::selectionPropertiesReceived()
                         }
                 }
         }
+        sLeftClickSelection = NULL;
         sClickActionObject = NULL;
 }
 
@@ -622,6 +626,19 @@ void LLToolPie::handleDeselect()
         gSelectMgr->validateSelection();
 }
 
+LLTool* LLToolPie::getOverrideTool(MASK mask)
+{
+        if (mask == MASK_CONTROL)
+        {
+                return gToolGrab;
+        }
+        else if (mask == (MASK_CONTROL | MASK_SHIFT))
+        {
+                return gToolGrab;
+        }
+
+        return LLTool::getOverrideTool(mask);
+}
 
 void LLToolPie::stopEditing()
 {
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index 3a8f85b..dd54b5c 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -32,6 +32,7 @@
 #include "lluuid.h"
 
 class LLViewerObject;
+class LLObjectSelection;
 
 class LLToolPie 
 :       public LLTool
@@ -52,6 +53,7 @@ public:
 
         virtual void            onMouseCaptureLost();
         virtual void            handleDeselect();
+        virtual LLTool*         getOverrideTool(MASK mask);
 
         static void                     leftMouseCallback(S32 x, S32 y, MASK mask);
         static void                     rightMouseCallback(S32 x, S32 y, MASK mask);
@@ -71,6 +73,7 @@ protected:
         LLUUID                          mHitObjectID;
         BOOL                            mMouseOutsideSlop;                              // for this drag, has mouse moved outside slop region
         static LLViewerObject* sClickActionObject;
+        static LLHandle<LLObjectSelection> sLeftClickSelection;
 };
 
 extern LLToolPie *gToolPie;
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 594be6c..e246546 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -129,7 +129,7 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
         // ...and go back to the default tool
         if (added && !gSavedSettings.getBOOL("CreateToolKeepSelected"))
         {
-                gCurrentToolset->selectTool( gToolTranslate );
+                gToolMgr->getCurrentToolset()->selectTool( gToolTranslate );
         }
 
         return added;
@@ -171,7 +171,6 @@ LLPCode LLToolPlacerPanel::sSphere		= LL_PCODE_SPHERE;
 LLPCode LLToolPlacerPanel::sSphereHemi  = LL_PCODE_SPHERE_HEMI;
 LLPCode LLToolPlacerPanel::sTree                = LL_PCODE_LEGACY_TREE;
 LLPCode LLToolPlacerPanel::sGrass               = LL_PCODE_LEGACY_GRASS;
-LLPCode LLToolPlacerPanel::sTreeNew             = LL_PCODE_TREE_NEW;
 
 S32                     LLToolPlacerPanel::sButtonsAdded = 0;
 LLButton*       LLToolPlacerPanel::sButtons[ TOOL_PLACER_NUM_BUTTONS ];
diff --git a/linden/indra/newview/lltoolplacer.h b/linden/indra/newview/lltoolplacer.h
index e4f9c7a..ab90ca1 100644
--- a/linden/indra/newview/lltoolplacer.h
+++ b/linden/indra/newview/lltoolplacer.h
@@ -85,7 +85,6 @@ public:
         static LLPCode sSphereHemi;
         static LLPCode sTree;
         static LLPCode sGrass;
-        static LLPCode sTreeNew;
 
 private:
         void            addButton( const LLString& up_state, const LLString& down_state, LLPCode* pcode );
diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index a557136..924916c 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -93,7 +93,7 @@ BOOL LLToolSelect::handleDoubleClick(S32 x, S32 y, MASK mask)
 }
 
 // static
-void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select)
+LLHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select)
 {
         BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly");
         BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");
@@ -193,9 +193,10 @@ void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL
                         if (!already_selected)
                         {
                                 LLViewerObject* root_object = (LLViewerObject*)object->getRootEdit();
+                                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
 
                                 // this is just a temporary selection
-                                LLSelectNode* select_node = gSelectMgr->findSelectNode(root_object);
+                                LLSelectNode* select_node = selection->findNode(root_object);
                                 if (select_node)
                                 {
                                         select_node->setTransient(TRUE);
@@ -203,7 +204,7 @@ void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL
 
                                 for (S32 i = 0; i < (S32)root_object->mChildList.size(); i++)
                                 {
-                                        select_node = gSelectMgr->findSelectNode(root_object->mChildList[i]);
+                                        select_node = selection->findNode(root_object->mChildList[i]);
                                         if (select_node)
                                         {
                                                 select_node->setTransient(TRUE);
@@ -221,6 +222,8 @@ void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL
                 gSavedSettings.setBOOL("SelectMovableOnly", select_movable);
                 gSelectMgr->setForceSelection(FALSE);
         }
+
+        return gSelectMgr->getSelection();
 }
 
 BOOL LLToolSelect::handleMouseUp(S32 x, S32 y, MASK mask)
diff --git a/linden/indra/newview/lltoolselect.h b/linden/indra/newview/lltoolselect.h
index 5d2cc9d..065e08f 100644
--- a/linden/indra/newview/lltoolselect.h
+++ b/linden/indra/newview/lltoolselect.h
@@ -32,6 +32,8 @@
 #include "v3math.h"
 #include "lluuid.h"
 
+class LLObjectSelection;
+
 class LLToolSelect : public LLTool
 {
 public:
@@ -43,7 +45,7 @@ public:
 
         virtual void            stopEditing();
 
-        static void                     handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select);
+        static LLHandle<LLObjectSelection>      handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select);
 
         virtual void            onMouseCaptureLost();
         virtual void            handleDeselect();
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index c0c0818..eaad28c 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -65,6 +65,10 @@ LLToolSelectLand::LLToolSelectLand( )
         mLastShowParcelOwners(FALSE)
 { }
 
+LLToolSelectLand::~LLToolSelectLand()
+{
+}
+
 
 BOOL LLToolSelectLand::handleMouseDown(S32 x, S32 y, MASK mask)
 {
@@ -133,7 +137,7 @@ BOOL LLToolSelectLand::handleMouseUp(S32 x, S32 y, MASK mask)
                         roundXY(mEastNorthTop);
 
                         // Don't auto-select entire parcel.
-                        gParcelMgr->selectLand( mWestSouthBottom, mEastNorthTop, FALSE );
+                        mSelection = gParcelMgr->selectLand( mWestSouthBottom, mEastNorthTop, FALSE );
                 }
 
                 mMouseOutsideSlop = FALSE;
@@ -220,6 +224,7 @@ void LLToolSelectLand::handleSelect()
 void LLToolSelectLand::handleDeselect()
 {
         gFloaterTools->setStatusText("");
+        mSelection = NULL;
         //gParcelMgr->deselectLand();
         gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
diff --git a/linden/indra/newview/lltoolselectland.h b/linden/indra/newview/lltoolselectland.h
index 9bc1880..06ce1ee 100644
--- a/linden/indra/newview/lltoolselectland.h
+++ b/linden/indra/newview/lltoolselectland.h
@@ -31,11 +31,14 @@
 #include "lltool.h"
 #include "v3dmath.h"
 
+class LLParcelSelection;
+
 class LLToolSelectLand
 :       public LLTool
 {
 public:
         LLToolSelectLand( );
+        virtual ~LLToolSelectLand();
 
         /*virtual*/ BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
@@ -68,6 +71,7 @@ protected:
         LLVector3d              mEastNorthTop;                  // global coords, from drag
 
         BOOL                    mLastShowParcelOwners;  // store last Show Parcel Owners setting
+        LLHandle<LLParcelSelection> mSelection;         // hold on to a parcel selection
 };
 
 extern LLToolSelectLand *gToolParcel;
diff --git a/linden/indra/newview/lltoolview.cpp b/linden/indra/newview/lltoolview.cpp
index 5b80339..fa8d65b 100644
--- a/linden/indra/newview/lltoolview.cpp
+++ b/linden/indra/newview/lltoolview.cpp
@@ -148,7 +148,7 @@ void LLToolView::draw()
 {
         // turn off highlighting for all containers 
         // and hide all option panels except for the selected one.
-        LLTool* selected = gCurrentToolset->getSelectedTool();
+        LLTool* selected = gToolMgr->getCurrentToolset()->getSelectedTool();
         for( LLToolContainer* contain = mContainList.getFirstData();
                  contain != NULL;
                  contain = mContainList.getNextData()
@@ -188,7 +188,6 @@ void LLToolView::onClickToolButton(void* userdata)
         LLToolContainer* clicked = (LLToolContainer*) userdata;
 
         // Switch to this one
-        gCurrentToolset->selectTool( clicked->mTool );
-        gToolMgr->useSelectedTool( gCurrentToolset );
+        gToolMgr->getCurrentToolset()->selectTool( clicked->mTool );
 }
 
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index 58ba9b8..80d35dd 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -264,7 +264,7 @@ void LLTracker::render3D()
                         else 
                         {
                                 const LLRelationship* buddy = av_tracker.getBuddyInfo(avatar_id);
-                                if(buddy && !buddy->isOnline())
+                                if(buddy && !buddy->isOnline() && !gAgent.isGodlike())
                                 {
                                         stop_tracking = TRUE;
                                 }
@@ -556,8 +556,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                 //gCylinder.render(1000);
         glPopMatrix();
 
-        char text[1024];
-        sprintf(text, "%.0f m", to_vec.magVec());
+        char text[1024];                /* Flawfinder: ignore */
+        snprintf(text, sizeof(text), "%.0f m", to_vec.magVec());                /* Flawfinder: ignore */
 
         LLWString wstr;
         wstr += utf8str_to_wstring(label);
diff --git a/linden/indra/newview/lluploaddialog.cpp b/linden/indra/newview/lluploaddialog.cpp
index a67aa7d..620133e 100644
--- a/linden/indra/newview/lluploaddialog.cpp
+++ b/linden/indra/newview/lluploaddialog.cpp
@@ -102,8 +102,13 @@ void LLUploadDialog::setMessage( const std::string& msg)
         char* temp_msg = new char[size];
         
         //strcpy(temp_msg,"Uploading...\n\n");
-        strcpy( temp_msg, msg.c_str());
+        if (temp_msg == NULL)
+        {
+                llerrs << "Memory Allocation Failed" << llendl;
+                return;
+        }
         
+        strcpy( temp_msg, msg.c_str());         /* Flawfinder: ignore */
         char* token = strtok( temp_msg, "\n" );
         while( token )
         {
diff --git a/linden/indra/newview/llurl.cpp b/linden/indra/newview/llurl.cpp
index d3ad8e2..0374ec9 100644
--- a/linden/indra/newview/llurl.cpp
+++ b/linden/indra/newview/llurl.cpp
@@ -66,9 +66,10 @@ void LLURL::init(const char * url)
         mExtension[0] = '\0';
         mTag[0] = '\0';
         
-        char url_copy[MAX_STRING];
+        char url_copy[MAX_STRING];              /* Flawfinder: ignore */
 
-        strcpy (url_copy,url);
+        strncpy (url_copy,url, MAX_STRING -1);          /* Flawfinder: ignore */
+        url_copy[MAX_STRING -1] = '\0';
 
         char *parse;
         char *leftover_url = url_copy;
@@ -77,7 +78,8 @@ void LLURL::init(const char * url)
         // copy and lop off tag
         if ((parse = strchr(url_copy,'#')))
         {
-                strcpy(mTag,parse+1);
+                strncpy(mTag,parse+1, LL_MAX_PATH -1);          /* Flawfinder: ignore */
+                mTag[LL_MAX_PATH -1] = '\0';
                 *parse = '\0';
         }
 
@@ -85,7 +87,8 @@ void LLURL::init(const char * url)
         if ((parse = strchr(url_copy,':')))
         {
                 *parse = '\0';
-                strcpy(mURI,leftover_url);
+                strncpy(mURI,leftover_url, LL_MAX_PATH -1);             /* Flawfinder: ignore */
+                mURI[LL_MAX_PATH -1] = '\0';
                 leftover_url = parse + 1;
         }
 
@@ -95,14 +98,15 @@ void LLURL::init(const char * url)
                 leftover_url += 2; // skip the "//"
 
                 span = strcspn(leftover_url, "/"); 
-                strncat(mAuthority,leftover_url,span);
+                strncat(mAuthority,leftover_url,span);          /* Flawfinder: ignore */
                 leftover_url += span;
         }
         
         if ((parse = strrchr(leftover_url,'.')))
         {
                 // copy and lop off extension
-                strcpy(mExtension,parse+1);
+                strncpy(mExtension,parse+1, LL_MAX_PATH -1);            /* Flawfinder: ignore */
+                mExtension[LL_MAX_PATH -1] = '\0';
                 *parse = '\0';
         }
 
@@ -116,11 +120,13 @@ void LLURL::init(const char * url)
         }
 
         // copy and lop off filename
-        strcpy(mFilename,parse);
+        strncpy(mFilename,parse, LL_MAX_PATH -1);/* Flawfinder: ignore */
+        mFilename[LL_MAX_PATH -1] = '\0';
         *parse = '\0';
 
         // what's left should be the path
-        strcpy(mPath,leftover_url);
+        strncpy(mPath,leftover_url, LL_MAX_PATH -1);            /* Flawfinder: ignore */
+        mPath[LL_MAX_PATH -1] = '\0';
 
 //      llinfos << url << "  decomposed into: " << llendl;
 //      llinfos << "  URI : <" << mURI << ">" << llendl;
@@ -169,42 +175,43 @@ bool LLURL::operator!=(const LLURL& rhs) const
 
 const char * LLURL::getFQURL() const
 {
-        char        fqurl[LL_MAX_PATH];
+        char        fqurl[LL_MAX_PATH];         /* Flawfinder: ignore */
 
         fqurl[0] = '\0';
 
         if (mURI[0])
         {
-                strcat(fqurl,mURI);
-                strcat(fqurl,":");
+                strncat(fqurl,mURI, LL_MAX_PATH - strlen(fqurl) -1);            /* Flawfinder: ignore */
+                strcat(fqurl,":");              /* Flawfinder: ignore */
                 if (mAuthority[0])
                 {
-                        strcat(fqurl,"//");
+                        strcat(fqurl,"//");             /* Flawfinder: ignore */
                 }
         }
 
         if (mAuthority[0])
         {
-                strcat(fqurl,mAuthority);
+                strncat(fqurl,mAuthority, LL_MAX_PATH - strlen(fqurl) -1);              /* Flawfinder: ignore */
         }
 
-        strcat(fqurl,mPath);
+        strncat(fqurl,mPath, LL_MAX_PATH - strlen(fqurl) -1);           /* Flawfinder: ignore */
 
-        strcat(fqurl,mFilename);
+        strncat(fqurl,mFilename, LL_MAX_PATH - strlen(fqurl) -1);               /* Flawfinder: ignore */
         
         if (mExtension[0])
         {
-                strcat(fqurl,".");
-                strcat(fqurl,mExtension);
+                strcat(fqurl,".");              /* Flawfinder: ignore */
+                strncat(fqurl,mExtension, LL_MAX_PATH - strlen(fqurl) -1);              /* Flawfinder: ignore */
         }
 
         if (mTag[0])
         {
-                strcat(fqurl,"#");
-                strcat(fqurl,mTag);
+                strcat(fqurl,"#");              /* Flawfinder: ignore */
+                strncat(fqurl,mTag, LL_MAX_PATH - strlen(fqurl) -1);            /* Flawfinder: ignore */
         }
 
-        strcpy(LLURL::sReturnString,fqurl);
+        strncpy(LLURL::sReturnString,fqurl, LL_MAX_PATH -1);            /* Flawfinder: ignore */
+        LLURL::sReturnString[LL_MAX_PATH -1] = '\0';
 
         return(LLURL::sReturnString);
 }
@@ -212,16 +219,18 @@ const char * LLURL::getFQURL() const
 
 const char* LLURL::updateRelativePath(const LLURL &url)
 {
-        char new_path[LL_MAX_PATH];
-        char tmp_path[LL_MAX_PATH];
+        char new_path[LL_MAX_PATH];             /* Flawfinder: ignore */
+        char tmp_path[LL_MAX_PATH];             /* Flawfinder: ignore */
 
         char *parse;
 
         if (mPath[0] != '/')
         {
                 //start with existing path
-                strcpy (new_path,url.mPath);
-                strcpy (tmp_path,mPath);
+                strncpy (new_path,url.mPath, LL_MAX_PATH -1);           /* Flawfinder: ignore */
+                new_path[LL_MAX_PATH -1] = '\0';
+                strncpy (tmp_path,mPath, LL_MAX_PATH -1);               /* Flawfinder: ignore */
+                tmp_path[LL_MAX_PATH -1] = '\0';
 
                 parse = strtok(tmp_path,"/");
                 while (parse)
@@ -246,28 +255,30 @@ const char* LLURL::updateRelativePath(const LLURL &url)
                                 }
                                 else
                                 {
-                                        strcat(new_path,"../");
+                                        strcat(new_path,"../");         /* Flawfinder: ignore */
                                 }
 
                         }
                         else 
                         {
-                                strcat(new_path,parse);
-                                strcat(new_path,"/");
+                                strncat(new_path,parse, LL_MAX_PATH - strlen(new_path) -1 );            /* Flawfinder: ignore */
+                                strcat(new_path,"/");           /* Flawfinder: ignore */
                         }
                         parse = strtok(NULL,"/");
                 }
-                strcpy(mPath,new_path);
+                strncpy(mPath,new_path, LL_MAX_PATH -1);                /* Flawfinder: ignore */
+                mPath[LL_MAX_PATH -1] = '\0';
         }
         return mPath;
 }
 
 const char * LLURL::getFullPath()
 {
-        strcpy(LLURL::sReturnString,mPath);
-        strcat(LLURL::sReturnString,mFilename);
-        strcat(LLURL::sReturnString,".");
-        strcat(LLURL::sReturnString,mExtension);
+        strncpy(LLURL::sReturnString,mPath, LL_MAX_PATH -1);            /* Flawfinder: ignore */
+        LLURL::sReturnString[LL_MAX_PATH -1] = '\0';
+        strncat(LLURL::sReturnString,mFilename, LL_MAX_PATH - strlen(LLURL::sReturnString) -1);         /* Flawfinder: ignore */
+        strcat(LLURL::sReturnString,".");               /* Flawfinder: ignore */
+        strncat(LLURL::sReturnString,mExtension, LL_MAX_PATH - strlen(LLURL::sReturnString) -1);                /* Flawfinder: ignore */
         return(sReturnString);
 }
 
diff --git a/linden/indra/newview/llurl.h b/linden/indra/newview/llurl.h
index 58e8cf0..f60f06b 100644
--- a/linden/indra/newview/llurl.h
+++ b/linden/indra/newview/llurl.h
@@ -81,14 +81,14 @@ public:
 
 public: 
         
-        char        mURI[LL_MAX_PATH];
-        char        mAuthority[LL_MAX_PATH];
-        char        mPath[LL_MAX_PATH];
-        char        mFilename[LL_MAX_PATH];
-        char        mExtension[LL_MAX_PATH];
-        char        mTag[LL_MAX_PATH];
+        char        mURI[LL_MAX_PATH];          /* Flawfinder: ignore */
+        char        mAuthority[LL_MAX_PATH];            /* Flawfinder: ignore */
+        char        mPath[LL_MAX_PATH];         /* Flawfinder: ignore */
+        char        mFilename[LL_MAX_PATH];             /* Flawfinder: ignore */
+        char        mExtension[LL_MAX_PATH];            /* Flawfinder: ignore */
+        char        mTag[LL_MAX_PATH];          /* Flawfinder: ignore */
 
-        static char sReturnString[LL_MAX_PATH];
+        static char sReturnString[LL_MAX_PATH];         /* Flawfinder: ignore */
 };
 
 #endif  // LL_LLURL_H
diff --git a/linden/indra/newview/llurlwhitelist.cpp b/linden/indra/newview/llurlwhitelist.cpp
index 8992146..3a8c952 100644
--- a/linden/indra/newview/llurlwhitelist.cpp
+++ b/linden/indra/newview/llurlwhitelist.cpp
@@ -40,7 +40,7 @@ LLUrlWhiteList::LLUrlWhiteList () :
         mLoaded ( false ),
         mFilename ( "url_whitelist.ini" ),
         mUrlList ( 0 ),
-        mUrlListIter ( 0 )
+        mCurIndex ( 0 )
 {
 }
 
@@ -121,10 +121,10 @@ bool LLUrlWhiteList::save ()
         if ( file.is_open () )
         {
                 // for each entry we have
-                for ( LLStringListIter iter = mUrlList.begin (); iter != mUrlList.end (); ++iter )
+                for ( string_list_t::iterator iter = mUrlList.begin (); iter != mUrlList.end (); ++iter )
                 {
                         file << ( *iter ) << std::endl;
-                };
+                }
 
                 file.close ();
 
@@ -140,8 +140,7 @@ bool LLUrlWhiteList::clear ()
 {
         mUrlList.clear ();
 
-        // invalidate iterator since we changed the contents 
-        mUrlListIter = mUrlList.end ();
+        mCurIndex = 0;
 
         return true;
 }
@@ -175,7 +174,7 @@ bool LLUrlWhiteList::addItem ( const LLString& itemIn, bool saveAfterAdd )
 {
         LLString item = url_cleanup(itemIn);
         
-        mUrlList.insert ( mUrlList.end (), item );
+        mUrlList.push_back ( item );
 
         // use this when all you want to do is call addItem ( ... ) where necessary
         if ( saveAfterAdd )
@@ -191,11 +190,8 @@ bool LLUrlWhiteList::getFirst ( LLString& valueOut )
         if ( mUrlList.size () == 0 )
                 return false;
 
-        mUrlListIter = mUrlList.begin ();
-
-        valueOut = * ( mUrlListIter );
-
-        ++mUrlListIter;
+        mCurIndex = 0;
+        valueOut = mUrlList[mCurIndex++];
 
         return true;    
 }
@@ -204,12 +200,10 @@ bool LLUrlWhiteList::getFirst ( LLString& valueOut )
 //
 bool LLUrlWhiteList::getNext ( LLString& valueOut )
 {
-        if ( mUrlListIter == mUrlList.end () )
+        if ( mCurIndex >= mUrlList.size () )
                 return false;
 
-        valueOut = * ( mUrlListIter );
-
-        ++mUrlListIter;
+        valueOut = mUrlList[mCurIndex++];
 
         return true;
 }
diff --git a/linden/indra/newview/llurlwhitelist.h b/linden/indra/newview/llurlwhitelist.h
index 18ccf71..6f4289b 100644
--- a/linden/indra/newview/llurlwhitelist.h
+++ b/linden/indra/newview/llurlwhitelist.h
@@ -55,13 +55,12 @@ class LLUrlWhiteList
                 LLUrlWhiteList ();
                 static LLUrlWhiteList* sInstance;
 
-                typedef std::list < LLString > LLStringList;
-                typedef std::list < LLString >::iterator LLStringListIter;
+                typedef std::vector < LLString > string_list_t ;
 
                 bool mLoaded;
                 const LLString mFilename;
-                LLStringList mUrlList;
-                LLStringListIter mUrlListIter;
+                string_list_t mUrlList;
+                U32 mCurIndex;
 };
 
 #endif  // LL_LLURLWHITELIST_H
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index f980aa0..4b554a9 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -117,14 +117,14 @@ void LLUserAuth::authenticate(
         XMLRPC_VectorAppendString(params, "last", lastname, 0);
         XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0);
         XMLRPC_VectorAppendString(params, "start", start, 0);
-        char buffer[MAX_STRING];
-        sprintf(buffer, "%d", LL_VERSION_MAJOR);
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
+        snprintf(buffer, MAX_STRING, "%d", LL_VERSION_MAJOR);           /* Flawfinder: ignore */
         XMLRPC_VectorAppendString(params, "major", buffer, 0);
-        sprintf(buffer, "%d", LL_VERSION_MINOR);
+        snprintf(buffer, MAX_STRING, "%d", LL_VERSION_MINOR);           /* Flawfinder: ignore */
         XMLRPC_VectorAppendString(params, "minor", buffer, 0);
-        sprintf(buffer, "%d", LL_VERSION_PATCH);
+        snprintf(buffer, MAX_STRING, "%d", LL_VERSION_PATCH);           /* Flawfinder: ignore */
         XMLRPC_VectorAppendString(params, "patch", buffer, 0);
-        sprintf(buffer, "%d", LL_VIEWER_BUILD);
+        snprintf(buffer, MAX_STRING, "%d", LL_VIEWER_BUILD);            /* Flawfinder: ignore */
         XMLRPC_VectorAppendString(params, "build", buffer, 0);
         XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
         XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
@@ -230,7 +230,7 @@ static void parseOptionInto(
 {
         std::string key;
         std::string val;
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         XMLRPC_VALUE_TYPE_EASY type;
         XMLRPC_VALUE row = XMLRPC_VectorRewind(option);
         while(row)
@@ -248,7 +248,7 @@ static void parseOptionInto(
                         }
                         else if(xmlrpc_type_int == type)
                         {
-                                sprintf(buffer, "%d", XMLRPC_GetValueInt(opt));
+                                snprintf(buffer, MAX_STRING, "%d", XMLRPC_GetValueInt(opt));            /* Flawfinder: ignore */
                                 val.assign(buffer);
                         }
                         //llinfos "option val: " << val << llendl;
@@ -296,8 +296,8 @@ LLUserAuth::UserAuthcode LLUserAuth::parseResponse()
                 }
                 else if(xmlrpc_type_int == type)
                 {
-                        char buf[MAX_STRING];
-                        snprintf(buf, MAX_STRING, "%d", XMLRPC_GetValueInt(current));
+                        char buf[MAX_STRING];           /* Flawfinder: ignore */
+                        snprintf(buf, MAX_STRING, "%d", XMLRPC_GetValueInt(current));           /* Flawfinder: ignore */
                         val.assign(buf);
                         lldebugs << "val: " << val << llendl;
                         mResponses.insert(response_t::value_type(key, val));
diff --git a/linden/indra/newview/llvelocitybar.cpp b/linden/indra/newview/llvelocitybar.cpp
index d285733..403ff4f 100644
--- a/linden/indra/newview/llvelocitybar.cpp
+++ b/linden/indra/newview/llvelocitybar.cpp
@@ -121,8 +121,8 @@ void LLVelocityBar::draw()
 
         top = BAR_TOP + 15;
         left = 0;
-        char str[80];
-        sprintf(str, "Velocity %.3fm/s", velocity);
+        char str[80];           /* Flawfinder: ignore */
+        snprintf(str, sizeof(str), "Velocity %.3fm/s", velocity);               /* Flawfinder: ignore */
         LLFontGL::sMonospace->renderUTF8(str, 0, left, top, color, LLFontGL::LEFT, LLFontGL::TOP);
 
         top = TICK_BOTTOM;
diff --git a/linden/indra/newview/llviewerassetstorage.cpp b/linden/indra/newview/llviewerassetstorage.cpp
index 72af419..fd92d75 100644
--- a/linden/indra/newview/llviewerassetstorage.cpp
+++ b/linden/indra/newview/llviewerassetstorage.cpp
@@ -101,7 +101,7 @@ void LLViewerAssetStorage::storeAssetData(
                         // Read the data from the VFS if it'll fit in this packet.
                         if (asset_size + 100 < MTUBYTES)
                         {
-                                BOOL res = vfile.read(buffer, asset_size);
+                                BOOL res = vfile.read(buffer, asset_size);              /* Flawfinder: ignore */
                                 S32 bytes_read = res ? vfile.getLastBytesRead() : 0;
                                 
                                 if( bytes_read == asset_size )
@@ -162,6 +162,11 @@ void LLViewerAssetStorage::storeAssetData(
         bool temp_file,
         bool is_priority)
 {
+        if(!filename)
+        {
+                llerrs << "No filename specified" << llendl;
+        }
+        
         LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
         llinfos << "LLViewerAssetStorage::storeAssetData (legacy)" << asset_id << ":" << LLAssetType::lookup(asset_type) << llendl;
 
@@ -172,7 +177,7 @@ void LLViewerAssetStorage::storeAssetData(
         legacy->mUpCallback = callback;
         legacy->mUserData = user_data;
 
-        FILE *fp = LLFile::fopen(filename, "rb");
+        FILE* fp = LLFile::fopen(filename, "rb");               /* Flawfinder: ignore */
         if (fp)
         {
                 LLVFile file(mVFS, asset_id, asset_type, LLVFile::WRITE);
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 62fa0ef..598046a 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -138,7 +138,8 @@ void LLViewerCamera::calcProjection(const F32 far_distance) const
 
 LLMatrix4 gProjectionMat;
 
-void LLViewerCamera::updateFrustumPlanes()
+//static
+void LLViewerCamera::updateFrustumPlanes(LLCamera& camera, BOOL ortho)
 {
         GLint viewport[4];
         GLdouble model[16];
@@ -159,23 +160,26 @@ void LLViewerCamera::updateFrustumPlanes()
         frust[2].setVec((F32)objX,(F32)objY,(F32)objZ);
         gluUnProject(viewport[0],viewport[1]+viewport[3],0,model,proj,viewport,&objX,&objY,&objZ);
         frust[3].setVec((F32)objX,(F32)objY,(F32)objZ);
-        /*gluUnProject(viewport[0],viewport[1],1,model,proj,viewport,&objX,&objY,&objZ);
-        frust[4].setVec((F32)objX,(F32)objY,(F32)objZ);
-        gluUnProject(viewport[0]+viewport[2],viewport[1],1,model,proj,viewport,&objX,&objY,&objZ);
-        frust[5].setVec((F32)objX,(F32)objY,(F32)objZ);
-        gluUnProject(viewport[0]+viewport[2],viewport[1]+viewport[3],1,model,proj,viewport,&objX,&objY,&objZ);
-        frust[6].setVec((F32)objX,(F32)objY,(F32)objZ);
-        gluUnProject(viewport[0],viewport[1]+viewport[3],1,model,proj,viewport,&objX,&objY,&objZ);
-        frust[7].setVec((F32)objX,(F32)objY,(F32)objZ);*/
         
-        for (U32 i = 0; i < 4; i++)
+        if (ortho)
         {
-                LLVector3 vec = frust[i] - getOrigin();
-                vec.normVec();
-                frust[i+4] = getOrigin() + vec*getFar()*2.0;
+                LLVector3 far_shift = LLVector3(camera.getFar()*2.0f,0,0);
+                for (U32 i = 0; i < 4; i++)
+                {
+                        frust[i+4] = frust[i] + far_shift;
+                }
+        }
+        else
+        {
+                for (U32 i = 0; i < 4; i++)
+                {
+                        LLVector3 vec = frust[i] - camera.getOrigin();
+                        vec.normVec();
+                        frust[i+4] = camera.getOrigin() + vec*camera.getFar()*2.0f;
+                }
         }
 
-        calcAgentFrustumPlanes(frust);
+        camera.calcAgentFrustumPlanes(frust);
 }
 
 void LLViewerCamera::setPerspective(BOOL for_selection,
@@ -274,7 +278,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
                 glGetIntegerv(GL_VIEWPORT, (GLint*)gGLViewport);
         }
 
-        updateFrustumPlanes();
+        updateFrustumPlanes(*this);
 
         if (gSavedSettings.getBOOL("CameraOffset"))
         {
@@ -602,22 +606,34 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
                 return FALSE;
         }
 
-        num_faces = drawablep->getNumFaces();
+        LLVolume* volume = volumep->getVolume();
+        if (!volume)
+        {
+                return FALSE;
+        }
+
+        LLVOVolume* vo_volume = (LLVOVolume*) volumep;
+
+        vo_volume->updateRelativeXform();
+        LLMatrix4 mat = vo_volume->getRelativeXform();
+        
+        LLMatrix4 render_mat(vo_volume->getRenderRotation(), LLVector4(vo_volume->getRenderPosition()));
+
+        num_faces = volume->getNumFaces();
         for (i = 0; i < num_faces; i++)
         {
-                LLStrider<LLVector3> vertices;
-                LLFace* face = drawablep->getFace(i);
-                face->getVertices(vertices);
-                
-                for (S32 v = 0; v < (S32)drawablep->getFace(i)->getGeomCount(); v++)
+                const LLVolumeFace& face = volume->getVolumeFace(i);
+                                
+                for (U32 v = 0; v < face.mVertices.size(); v++)
                 {
-                        LLVector3 vec = vertices[v];
-                        if (!face->isState(LLFace::GLOBAL))
+                        LLVector4 vec = LLVector4(face.mVertices[v].mPosition) * mat;
+
+                        if (drawablep->isActive())
                         {
-                                vec = vec*face->getRenderMatrix();
+                                vec = vec * render_mat; 
                         }
-                        
-                        BOOL in_frustum = pointInFrustum(vec) > 0;
+
+                        BOOL in_frustum = pointInFrustum(LLVector3(vec)) > 0;
 
                         if ( !in_frustum && all_verts ||
                                  in_frustum && !all_verts)
diff --git a/linden/indra/newview/llviewercamera.h b/linden/indra/newview/llviewercamera.h
index 8ea2738..a7e600b 100644
--- a/linden/indra/newview/llviewercamera.h
+++ b/linden/indra/newview/llviewercamera.h
@@ -55,7 +55,7 @@ public:
                                                                 const LLVector3 &up_direction,
                                                                 const LLVector3 &point_of_interest);
 
-        void updateFrustumPlanes();
+        static void updateFrustumPlanes(LLCamera& camera, BOOL ortho = FALSE);
         void setPerspective(BOOL for_selection, S32 x, S32 y_from_bot, S32 width, S32 height, BOOL limit_select_distance, F32 z_near = 0, F32 z_far = 0);
 
         const LLMatrix4 &getProjection() const;
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 86e58d1..e1aa3ae 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -105,7 +105,7 @@ BOOL LLFloaterSettingsDebug::postBuild()
         childSetUserData("boolean_combo", this);
         childSetCommitCallback("color_swatch", onCommitSettings);
         childSetUserData("color_swatch", this);
-
+        childSetAction("default_btn", onClickDefault, this);
         mComment = (LLTextEditor*)getChildByName("comment_text");
         return TRUE;
 }
@@ -129,7 +129,7 @@ void LLFloaterSettingsDebug::show(void*)
                 gUICtrlFactory->buildFloater(sInstance, "floater_settings_debug.xml");
         }
 
-        sInstance->open();
+        sInstance->open();              /* Flawfinder: ignore */
 }
 
 //static 
@@ -217,6 +217,20 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
         }
 }
 
+// static
+void LLFloaterSettingsDebug::onClickDefault(void* user_data)
+{
+        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+        LLComboBox* settings_combo = (LLComboBox*)floaterp->getChildByName("settings_combo");
+        LLControlBase* controlp = (LLControlBase*)settings_combo->getCurrentUserdata();
+
+        if (controlp)
+        {
+                controlp->resetToDefault();
+                floaterp->updateControl(controlp);
+        }
+}
+
 // we've switched controls, or doing per-frame update, so update spinners, etc.
 void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 {
@@ -440,6 +454,8 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
                         if (!spinner4->hasFocus())
                         {
                                 spinner4->setPrecision(3);
+                                spinner4->setMinValue(0.0);
+                                spinner4->setMaxValue(1.f);
                                 spinner4->setValue(clr.mV[VALPHA]);
                         }
                         break;
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 4be4313..d9a2682 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -46,6 +46,7 @@ public:
         static void show(void*);
         static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
         static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
+        static void onClickDefault(void* user_data);
 
 protected:
         static LLFloaterSettingsDebug* sInstance;
@@ -54,6 +55,7 @@ protected:
 
 //setting variables are declared in this function
 void declare_settings();
+void settings_version_fixup();
 
 // saved at end of session
 extern LLControlGroup gSavedSettings;
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index f09e34c..071b699 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -63,6 +63,9 @@
 #include "llfloatertools.h"
 #include "llviewerimagelist.h"
 #include "llfocusmgr.h"
+#include "llcubemap.h"
+#include "llviewerregion.h"
+#include "lldrawpoolwater.h"
 
 extern U32 gFrameCount;
 extern LLPointer<LLImageGL> gStartImageGL;
@@ -103,8 +106,12 @@ void display_startup()
                 return; 
         }
 
-        LLDynamicTexture::updateAllInstances();
-
+        // Required for HTML update in login screen
+        static S32 frame_count = 0;
+        if (frame_count++ > 1) // make sure we have rendered a frame first
+        {
+                LLDynamicTexture::updateAllInstances();
+        }
         glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
         LLGLSDefault gls_default;
         LLGLSUIDefault gls_ui;
@@ -174,11 +181,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
                 // Clean up memory the pools may have allocated
                 if (rebuild)
                 {
-                        if (!gViewerWindow->renderingFastFrame())
-                        {
-                                gFrameStats.start(LLFrameStats::REBUILD);
-                                gPipeline.rebuildPools();
-                        }
+                        gFrameStats.start(LLFrameStats::REBUILD);
+                        gPipeline.rebuildPools();
                 }
                 return; 
         }
@@ -378,14 +382,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
                 }
         }
 
-        if (rebuild)
-        {
-                if (gViewerWindow->renderingFastFrame())
-                {
-                        gFrameStats.start(LLFrameStats::STATE_SORT);
-                        gFrameStats.start(LLFrameStats::REBUILD);
-                }
-        }
 
         /////////////////////////////
         //
@@ -394,6 +390,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
         //
 
         gCamera->setZoomParameters(zoom_factor, subfield);
+        gCamera->setNear(MIN_NEAR_PLANE);
 
         //////////////////////////
         //
@@ -409,6 +406,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
         else if (!gViewerWindow->isPickPending())
         {
                 glClear( GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
+                //DEBUG TEMPORARY
+                glClear(GL_COLOR_BUFFER_BIT);
         }
         gViewerWindow->setupViewport();
 
@@ -429,7 +428,13 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
                 glClearColor(0.5f, 0.5f, 0.5f, 0.f);
                 glClear(GL_COLOR_BUFFER_BIT);
                 glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+                LLPipeline::sUseOcclusion = FALSE;
         }
+        else
+        {
+                LLPipeline::sUseOcclusion = gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery;
+        }
+
         stop_glerror();
 
         ///////////////////////////////////////
@@ -442,7 +447,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
         glLightModelfv (GL_LIGHT_MODEL_AMBIENT,one);
         stop_glerror();
         
-        //LLGLState::verify();
+        //Increment drawable frame counter
+        LLDrawable::incrementVisible();
 
         /////////////////////////////////////
         //
@@ -452,6 +458,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
         //
         if (!gDisconnected)
         {
+                if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
+                { //don't draw hud objects in this frame
+                        gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
+                }
+                
                 LLFastTimer t(LLFastTimer::FTM_WORLD_UPDATE);
                 stop_glerror();
                 display_update_camera();
@@ -467,34 +478,41 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
                 gPipeline.updateGeom(max_geom_update_time);
                 stop_glerror();
                 
+                LLSpatialPartition* part = gPipeline.getSpatialPartition(LLPipeline::PARTITION_VOLUME);
+                part->processImagery(gCamera);
+
+                display_update_camera();
+
                 gFrameStats.start(LLFrameStats::UPDATE_CULL);
-                gPipeline.updateCull();
+                gPipeline.updateCull(*gCamera);
                 stop_glerror();
                 
-                if (rebuild && !gViewerWindow->renderingFastFrame())
+                ///////////////////////////////////
+                //
+                // StateSort
+                //
+                // Responsible for taking visible objects, and adding them to the appropriate draw orders.
+                // In the case of alpha objects, z-sorts them first.
+                // Also creates special lists for outlines and selected face rendering.
+                //
                 {
                         LLFastTimer t(LLFastTimer::FTM_REBUILD);
-
-                        ///////////////////////////////////
-                        //
-                        // StateSort
-                        //
-                        // Responsible for taking visible objects, and adding them to the appropriate draw orders.
-                        // In the case of alpha objects, z-sorts them first.
-                        // Also creates special lists for outlines and selected face rendering.
-                        //
-                        gFrameStats.start(LLFrameStats::STATE_SORT);
-                        gPipeline.stateSort();
-                        stop_glerror();
                         
-                        //////////////////////////////////////
-                        //
-                        // rebuildPools
-                        //
-                        //
-                        gFrameStats.start(LLFrameStats::REBUILD);
-                        gPipeline.rebuildPools();
+                        gFrameStats.start(LLFrameStats::STATE_SORT);
+                        gPipeline.stateSort(*gCamera);
                         stop_glerror();
+                                
+                        if (rebuild)
+                        {
+                                //////////////////////////////////////
+                                //
+                                // rebuildPools
+                                //
+                                //
+                                gFrameStats.start(LLFrameStats::REBUILD);
+                                gPipeline.rebuildPools();
+                                stop_glerror();
+                        }
                 }
         }
 
@@ -535,19 +553,74 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
         //      glPopMatrix();
         //}
 
-        if (gViewerWindow->renderingFastFrame())
-        {
-                gFrameStats.start(LLFrameStats::RENDER_SYNC);
-                gFrameStats.start(LLFrameStats::RENDER_GEOM);
-        }
-        else if (!(gLogoutRequestSent && gHaveSavedSnapshot) 
+        if (!(gLogoutRequestSent && gHaveSavedSnapshot) 
                         && !gRestoreGL
                         && !gDisconnected)
         {
-                gPipeline.renderGeom();
+                gPipeline.renderGeom(*gCamera);
                 stop_glerror();
         }
 
+        //render hud attachments
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+        if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE))
+        {
+                LLCamera hud_cam = *gCamera;
+                glClear(GL_DEPTH_BUFFER_BIT);
+                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);
+                //only render hud objects
+                U32 mask = gPipeline.getRenderTypeMask();
+                gPipeline.setRenderTypeMask(0);
+                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
+
+                BOOL has_ui = gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI);
+                if (has_ui)
+                {
+                        gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI);
+                }
+
+                BOOL use_occlusion = gSavedSettings.getBOOL("UseOcclusion");
+                gSavedSettings.setBOOL("UseOcclusion", FALSE);
+
+                //cull, sort, and render hud objects
+                gPipeline.updateCull(hud_cam);
+
+                gPipeline.toggleRenderType(LLDrawPool::POOL_ALPHA_POST_WATER);
+                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_BUMP);
+                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_SIMPLE);
+                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_VOLUME);
+                
+                {
+                        LLFastTimer ftm(LLFastTimer::FTM_REBUILD);
+                        gPipeline.stateSort(hud_cam);
+                }
+                
+                if (LLVertexBuffer::sEnableVBOs)
+                {
+                        LLImageGL::sBoundTextureMemory += LLVertexBuffer::sAllocatedBytes;
+                }
+                
+                gPipeline.renderGeom(hud_cam);
+
+                //restore type mask
+                gPipeline.setRenderTypeMask(mask);
+                if (has_ui)
+                {
+                        gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI);
+                }
+                gSavedSettings.setBOOL("UseOcclusion", use_occlusion);
+        }
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+
         gFrameStats.start(LLFrameStats::RENDER_UI);
 
         if (gHandleKeysAsync)
@@ -570,6 +643,64 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
 
 }
 
+BOOL setup_hud_matrices(BOOL for_select)
+{
+        LLVOAvatar* my_avatarp = gAgent.getAvatarObject();
+        if (my_avatarp && my_avatarp->hasHUDAttachment())
+        {
+                if (!for_select)
+                {
+                        // clamp target zoom level to reasonable values
+                        my_avatarp->mHUDTargetZoom = llclamp(my_avatarp->mHUDTargetZoom, 0.1f, 1.f);
+                        // smoothly interpolate current zoom level
+                        my_avatarp->mHUDCurZoom = lerp(my_avatarp->mHUDCurZoom, my_avatarp->mHUDTargetZoom, LLCriticalDamp::getInterpolant(0.03f));
+                }
+
+                F32 zoom_level = my_avatarp->mHUDCurZoom;
+                // clear z buffer and set up transform for hud
+                if (!for_select)
+                {
+                        glClear(GL_DEPTH_BUFFER_BIT);
+                }
+                LLBBox hud_bbox = my_avatarp->getHUDBBox();
+
+                // set up transform to encompass bounding box of HUD
+                glMatrixMode(GL_PROJECTION);
+                glLoadIdentity();
+                F32 hud_depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
+                if (for_select)
+                {
+                        //RN: reset viewport to window extents so ortho screen is calculated with proper reference frame
+                        gViewerWindow->setupViewport();
+                }
+                glOrtho(-0.5f * gCamera->getAspect(), 0.5f * gCamera->getAspect(), -0.5f, 0.5f, 0.f, hud_depth);
+
+                // apply camera zoom transform (for high res screenshots)
+                F32 zoom_factor = gCamera->getZoomFactor();
+                S16 sub_region = gCamera->getZoomSubRegion();
+                if (zoom_factor > 1.f)
+                {
+                        float offset = zoom_factor - 1.f;
+                        int pos_y = sub_region / llceil(zoom_factor);
+                        int pos_x = sub_region - (pos_y*llceil(zoom_factor));
+                        glTranslatef(gCamera->getAspect() * 0.5f * (offset - (F32)pos_x * 2.f), 0.5f * (offset - (F32)pos_y * 2.f), 0.f);
+                        glScalef(zoom_factor, zoom_factor, 1.f);
+                }
+
+                glMatrixMode(GL_MODELVIEW);
+                glLoadIdentity();
+                glLoadMatrixf(OGL_TO_CFR_ROTATION);             // Load Cory's favorite reference frame
+                glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f);
+                glScalef(zoom_level, zoom_level, zoom_level);
+
+                return TRUE;
+        }
+        else
+        {
+                return FALSE;
+        }
+}
+
 
 void render_ui_and_swap()
 {
@@ -581,11 +712,11 @@ void render_ui_and_swap()
         {
                 LLGLSUIDefault gls_ui;
                 gPipeline.disableLights();
-                
+                LLVertexBuffer::startRender();
                 if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
                 {
                         LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
-                        if (!gViewerWindow->renderingFastFrame() && !gDisconnected)
+                        if (!gDisconnected)
                         {
                                 render_ui_3d();
 #ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -598,6 +729,8 @@ void render_ui_and_swap()
                         LLGLState::checkStates();
 #endif
                 }
+                LLVertexBuffer::stopRender();
+                glFlush();
 
                 // now do the swap buffer
                 if (gDisplaySwapBuffers)
@@ -605,9 +738,13 @@ void render_ui_and_swap()
                         LLFastTimer t(LLFastTimer::FTM_SWAP);
                         gViewerWindow->mWindow->swapBuffers();
                 }
-        }
 
-        gViewerWindow->finishFirstFastFrame();
+                {
+                        LLFastTimer ftm(LLFastTimer::FTM_CLIENT_COPY);
+                        LLVertexBuffer::clientCopy(0.016);
+                }
+
+        }
 }
 
 void render_ui_3d()
@@ -622,8 +759,6 @@ void render_ui_3d()
         //
 
         // Render selections
-
-        glDisableClientState(GL_VERTEX_ARRAY);
         glDisableClientState(GL_COLOR_ARRAY);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -680,7 +815,6 @@ void render_ui_2d()
                 LLFontGL::sCurOrigin.mY -= llround((F32)gViewerWindow->getWindowHeight() * (F32)pos_y / zoom_factor);
         }
 
-
         stop_glerror();
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
@@ -781,11 +915,12 @@ void render_disconnected_background()
         {
                 llinfos << "Loading last bitmap..." << llendl;
 
-                char temp_str[MAX_PATH];
-                strcpy(temp_str, gDirUtilp->getLindenUserDir().c_str());
-                strcat(temp_str, gDirUtilp->getDirDelimiter().c_str());
+                char temp_str[MAX_PATH];                /* Flawfinder: ignore */
+                strncpy(temp_str, gDirUtilp->getLindenUserDir().c_str(), MAX_PATH -1);          /* Flawfinder: ignore */
+                temp_str[MAX_PATH -1] = '\0';
+                strncat(temp_str, gDirUtilp->getDirDelimiter().c_str(), MAX_PATH - strlen(temp_str) -1);                /* Flawfinder: ignore */
 
-                strcat(temp_str, SCREEN_LAST_FILENAME);
+                strcat(temp_str, SCREEN_LAST_FILENAME);         /* Flawfinder: ignore */
 
                 LLPointer<LLImageBMP> image_bmp = new LLImageBMP;
                 if( !image_bmp->load(temp_str) )
diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp
index d4201c0..fd98070 100644
--- a/linden/indra/newview/llviewergesture.cpp
+++ b/linden/indra/newview/llviewergesture.cpp
@@ -156,18 +156,18 @@ void LLViewerGestureList::saveToServer()
         //U64 xfer_id = gXferManager->registerXfer(buffer, end - buffer);
         // write to a file because mem<->mem xfer isn't implemented
         LLUUID random_uuid;
-        char filename[LL_MAX_PATH];
+        char filename[LL_MAX_PATH];             /* Flawfinder: ignore */
         random_uuid.generate();
         random_uuid.toString(filename);
-        strcat(filename,".tmp");
+        strcat(filename,".tmp");                /* Flawfinder: ignore */
 
-        char filename_and_path[LL_MAX_PATH];
-        sprintf(filename_and_path, "%s%s%s", 
+        char filename_and_path[LL_MAX_PATH];            /* Flawfinder: ignore */
+        snprintf(filename_and_path, LL_MAX_PATH, "%s%s%s",              /* Flawfinder: ignore */
                 gDirUtilp->getTempDir().c_str(), 
                 gDirUtilp->getDirDelimiter().c_str(),
                 filename);
 
-        FILE *fp = LLFile::fopen(filename_and_path, "wb");
+        FILE* fp = LLFile::fopen(filename_and_path, "wb");              /* Flawfinder: ignore */
 
         if (fp)
         {
@@ -270,7 +270,7 @@ void LLViewerGestureList::xferCallback(void *data, S32 size, void** /*user_data*
 // static
 void LLViewerGestureList::processGestureUpdate(LLMessageSystem *msg, void** /*user_data*/)
 {
-        char remote_filename[MAX_STRING];
+        char remote_filename[MAX_STRING];               /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_AgentBlock, _PREHASH_Filename, MAX_STRING, remote_filename);
 
 
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 7500ada..5a745ae 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -34,11 +34,13 @@
 #include "llmath.h"
 #include "llerror.h"
 #include "llgl.h"
+#include "llglheaders.h"
 #include "llhost.h"
 #include "llimage.h"
 #include "llimagebmp.h"
 #include "llimagej2c.h"
 #include "llimagetga.h"
+#include "llmemtype.h"
 #include "llstl.h"
 #include "lltexturetable.h"
 #include "llvfile.h"
@@ -47,41 +49,12 @@
 #include "lltimer.h"
 
 // viewer includes
+#include "lldrawpool.h"
+#include "lltexturefetch.h"
 #include "llviewerimagelist.h"
 #include "llviewercontrol.h"
-#include "viewer.h"
-#include "llglheaders.h"
 #include "pipeline.h"
-#include "lldrawpool.h"
-
-const S32 IMAGE_HEADER_SIZE = 27;
-const S32 PACKET_HEADER_SIZE = 4;
-
-///////////////////////////////////////////////////////////////////////////////
-
-class LLViewerImagePacket
-{
-public:
-        LLViewerImagePacket(U8 *data, U16 data_size, U16 packet_num, BOOL wrote_to_disk)
-        {
-                mData = data;
-                mDataSize = data_size;
-                mPacketNum = packet_num;
-                mWroteToDisk = wrote_to_disk;
-        }
-
-        ~LLViewerImagePacket()
-        {
-                delete[] mData;
-        }
-
-public:
-        U8      *mData;
-        U16     mDataSize;
-        U16     mPacketNum;
-        BOOL mWroteToDisk;
-};
-
+#include "viewer.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -95,6 +68,8 @@ LLPointer<LLImageGL> LLViewerImage::sNullImagep = NULL;
 S32 LLViewerImage::sImageCount = 0;
 LLTimer LLViewerImage::sEvaluationTimer;
 F32 LLViewerImage::sDesiredDiscardBias = 0.f;
+static F32 sDesiredDiscardBiasMin = -2.0f; // -max number of levels to improve image quality by
+static F32 sDesiredDiscardBiasMax = 1.5f; // max number of levels to reduce image quality by
 F32 LLViewerImage::sDesiredDiscardScale = 1.1f;
 S32 LLViewerImage::sBoundTextureMemory = 0;
 S32 LLViewerImage::sTotalTextureMemory = 0;
@@ -109,6 +84,43 @@ void LLViewerImage::initClass()
         LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,3);
         raw->clear(0x77, 0x77, 0x77, 0xFF);
         sNullImagep->createGLTexture(0, raw);
+
+#if 1
+        LLViewerImage* imagep = new LLViewerImage(IMG_DEFAULT, TRUE);
+        sDefaultImagep = imagep;
+        const S32 dim = 128;
+        LLPointer<LLImageRaw> image_raw = new LLImageRaw(dim,dim,3);
+        U8* data = image_raw->getData();
+        for (S32 i = 0; i<dim; i++)
+        {
+                for (S32 j = 0; j<dim; j++)
+                {
+#if 0
+                        const S32 border = 2;
+                        if (i<border || j<border || i>=(dim-border) || j>=(dim-border))
+                        {
+                                *data++ = 0xff;
+                                *data++ = 0xff;
+                                *data++ = 0xff;
+                        }
+                        else
+#endif
+                        {
+                                *data++ = 0x7f;
+                                *data++ = 0x7f;
+                                *data++ = 0x7f;
+                        }
+                }
+        }
+        imagep->createGLTexture(0, image_raw);
+        image_raw = NULL;
+        gImageList.addImage(imagep);
+        imagep->dontDiscard();
+#else
+        sDefaultImagep = gImageList.getImage(IMG_DEFAULT, TRUE, TRUE);
+#endif
+        sSmokeImagep = gImageList.getImage(IMG_SMOKE, TRUE, TRUE);
+
 }
 
 // static
@@ -171,6 +183,7 @@ void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity)
                         sEvaluationTimer.reset();
                 }
         }
+        sDesiredDiscardBias = llclamp(sDesiredDiscardBias, sDesiredDiscardBiasMin, sDesiredDiscardBiasMax);
 }
 
 //----------------------------------------------------------------------------
@@ -209,35 +222,20 @@ LLViewerImage::LLViewerImage(const LLImageRaw* raw, BOOL usemipmaps)
 
 void LLViewerImage::init(bool firstinit)
 {
-        mDataCodec = 0;
         mFullWidth = 0;
         mFullHeight = 0;
-        mFormattedImagep = NULL;
         mNeedsAux = FALSE;
-        mRequested = FALSE;
-        mNeedsDecode = FALSE;
         mTexelsPerImage = 64.f*64.f;
         mMaxVirtualSize = 0.f;
+        mDiscardVirtualSize = 0.f;
         mMaxCosAngle = -1.f;
         mRequestedDiscardLevel = -1;
         mRequestedDownloadPriority = 0.f;
-        mPackets = 0;
-        mGotFirstPacket = FALSE;
-        mPacketsReceived = 0;
         mFullyLoaded = FALSE;
         mDesiredDiscardLevel = MAX_DISCARD_LEVEL + 1;
         mMinDesiredDiscardLevel = MAX_DISCARD_LEVEL + 1;
-        mStreamFile = NULL;
-        mCachedData = NULL;
-        mCachedSize = 0;
-        mFormattedFlushed = FALSE;
-        mTotalBytes = 0;
+        mCalculatedDiscardLevel = -1.f;
 
-        resetPacketData();
-
-        mLastPacketProcessed = -1;
-        mLastBytesProcessed = 0;
-        mLastPacket = -1;
         mDecodingAux = FALSE;
 
         mKnownDrawWidth = 0;
@@ -247,7 +245,6 @@ void LLViewerImage::init(bool firstinit)
         {
                 mDecodePriority = 0.f;
                 mInImageList = 0;
-                mInStaticVFS = FALSE;
         }
         mIsMediaTexture = FALSE;
 
@@ -261,9 +258,18 @@ void LLViewerImage::init(bool firstinit)
         
         mIsRawImageValid = FALSE;
         mRawDiscardLevel = INVALID_DISCARD_LEVEL;
-        mRawImage = NULL;
+        mMinDiscardLevel = 0;
 
         mTargetHost = LLHost::invalid;
+
+        mHasFetcher = FALSE;
+        mIsFetching = FALSE;
+        mFetchState = 0;
+        mFetchPriority = 0;
+        mDownloadProgress = 0.f;
+        mFetchDeltaTime = 999999.f;
+        mDecodeFrame = 0;
+        mVisibleFrame = 0;
 }
 
 // virtual
@@ -283,6 +289,10 @@ void LLViewerImage::dump()
 
 LLViewerImage::~LLViewerImage()
 {
+        if (mHasFetcher)
+        {
+                gTextureFetch->deleteRequest(getID(), true);
+        }
         // Explicitly call LLViewerImage::cleanup since we're in a destructor and cleanup is virtual
         LLViewerImage::cleanup();
         sImageCount--;
@@ -304,27 +314,9 @@ void LLViewerImage::cleanup()
         }
         mLoadedCallbackList.clear();
 
-        // Clean up any remaining packet data.
-        std::for_each(mReceivedPacketMap.begin(), mReceivedPacketMap.end(), DeletePairedPointer());
-        mReceivedPacketMap.clear();
-
-        // Clean up the streaming file
-        if (mStreamFile && !mStreamFile->isReadComplete())
-        {
-//              llwarns << "Destroying LLViewerImage stream file while still reading data!" << llendl;
-        }
-        delete mStreamFile;
-        mStreamFile = NULL;
-
         // Clean up image data
-        setFormattedImage(NULL);
-        mRawImage = NULL;
-        mIsRawImageValid = FALSE;
-        mAuxRawImage = NULL;
+        destroyRawImage();
         
-        delete[] mCachedData;
-        mCachedData = NULL;
-
         // LLImageGL::cleanup will get called more than once when this is used in the destructor.
         LLImageGL::cleanup();
 }
@@ -335,128 +327,25 @@ void LLViewerImage::reinit(BOOL usemipmaps /* = TRUE */)
         LLImageGL::init(usemipmaps);
         init(false);
         setSize(0,0,0);
-        if (mInStaticVFS)
-        {
-                mFormattedFlushed = TRUE;
-        }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void LLViewerImage::setFormattedImage(LLImageFormatted* imagep)
-{
-        mFormattedImagep = NULL; // deletes image
-        mFormattedImagep = imagep;
-        if (mFormattedImagep.notNull())
-        {
-                mFormattedImagep->mMemType = LLMemType::MTYPE_APPFMTIMAGE;
-                mFormattedFlushed = FALSE;
-        }
-        else
-        {
-                setNeedsDecode(FALSE);
-        }
-}
-
-BOOL LLViewerImage::loadLocalImage(const LLUUID &image_id)
-{
-        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
-        
-        // first look for this image in the static VFS
-        LLAssetType::EType asset_type = LLAssetType::AT_NONE;
-        // Try TGA first
-        if (gStaticVFS->getExists(image_id, LLAssetType::AT_TEXTURE_TGA))
-        {
-                asset_type = LLAssetType::AT_TEXTURE_TGA;
-                //RN: force disable discards for TGA files because they can't decode at different quality levels
-                dontDiscard();
-                mDataCodec = IMG_CODEC_TGA;
-        }
-        else if (gStaticVFS->getExists(image_id, LLAssetType::AT_TEXTURE))
-        {
-                // then try for a J2C version
-                asset_type = LLAssetType::AT_TEXTURE;
-                mDataCodec = IMG_CODEC_J2C;
-                LLImageJ2C* imagej2c = new LLImageJ2C();
-                setFormattedImage(imagej2c);
-        }
-
-        if (asset_type != LLAssetType::AT_NONE)
-        {
-                S32 size = gStaticVFS->getSize(image_id, asset_type);
-                U8* buffer = new U8[size];
-                BOOL success = LLVFSThread::sLocal->readImmediate(gStaticVFS, image_id, asset_type, buffer, 0, size);
-
-                if (!success)
-                {
-                        llwarns << "loadLocalImage() - vfs read failed" << llendl;
-                        return FALSE;
-                }
-
-                mInStaticVFS = TRUE;
-                mFullyLoaded = TRUE;
-                setNeedsDecode(TRUE); // Loading a local image
-                mID = image_id;
-                setDecodeData(buffer, size);
-                mTotalBytes = size;
-                mLastBytesProcessed = size;
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
-BOOL LLViewerImage::startVFSLoad()
-{
-        // We're no longer considered "flushed" no matter what happens after here.
-        mFormattedFlushed = FALSE;
-        if (!mStreamFile && mFormattedImagep.isNull())
-        {
-                // Start load from VFS if it's there
-                if (gVFS->getExists(mID, LLAssetType::AT_TEXTURE))
-                {
-//                      llinfos << "Reading image from disk " << getID() << llendl;
-                        
-                        //llinfos << mID << ": starting VFS load" << llendl;
-                        mStreamFile = new LLVFile(gVFS, mID, LLAssetType::AT_TEXTURE, LLVFile::READ_WRITE);
-                        mCachedSize = 0;
-                        gImageList.mLoadingStreamList.push_back(this);
-                }
-                else
-                {
-                        return loadLocalImage(mID);
-                }
-        }
-        return TRUE;
-}
-
-void LLViewerImage::startImageDecode()
-{
-        // We need to load and/or decode the image
-        if (mFormattedImagep.isNull())
-        {
-                startVFSLoad(); // Start the VFS loading
-        }
-        else
-        {
-                setNeedsDecode(TRUE); // Force a new decode of this texture
-        }
-}
-
-
+// ONLY called from LLViewerImageList
 BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
 {
-        if (mFormattedImagep.notNull() && mFormattedImagep->isDecoding())
+        if (!mNeedsCreateTexture)
         {
-                llerrs << "Trying to create texture on an image that is currently being decoded: " << mID << llendl;
+                destroyRawImage();
+                return FALSE;
         }
         mNeedsCreateTexture     = FALSE;
         if (mRawImage.isNull())
         {
                 llerrs << "LLViewerImage trying to create texture with no Raw Image" << llendl;
         }
-//      llinfos << llformat("IMAGE Creating (%d,%d) [%d x %d] Bytes: %d ",
-//                                              mRawDiscardLevel, mFormattedImagep ? mFormattedImagep->getDiscardLevel() : -1,
+//      llinfos << llformat("IMAGE Creating (%d) [%d x %d] Bytes: %d ",
+//                                              mRawDiscardLevel, 
 //                                              mRawImage->getWidth(), mRawImage->getHeight(),mRawImage->getDataSize())
 //                      << mID.getString() << llendl;
         BOOL res = TRUE;
@@ -471,7 +360,7 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
                         // A non power-of-two image was uploaded (through a non standard client)
                         // We treat these images as missing assets which causes them to
                         // be renderd as 'missing image' and to stop requesting data
-                        setIsMissingAsset(TRUE);
+                        setIsMissingAsset();
                         destroyRawImage();
                         return FALSE;
                 }
@@ -481,6 +370,7 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
         // Iterate through the list of image loading callbacks to see
         // what sort of data they need.
         //
+        // *TODO: Fix image callback code
         BOOL imageraw_callbacks = FALSE;
         for(callback_list_t::iterator iter = mLoadedCallbackList.begin();
                 iter != mLoadedCallbackList.end(); )
@@ -500,292 +390,6 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
         return res;
 }
 
-BOOL LLViewerImage::destroyTexture()
-{
-        LLImageGL::destroyGLTexture();
-        return TRUE;
-}
-
-void LLViewerImage::resetPacketData()
-{
-        //llinfos << "resetting packet data for " << getID() << llendl;
-        mPackets = 0;
-        mLastPacket = -1;
-        mPacketsReceived = 0;
-        mGotFirstPacket = FALSE;
-        mRequested = FALSE;
-
-        std::for_each(mReceivedPacketMap.begin(), mReceivedPacketMap.end(), DeletePairedPointer());
-        mReceivedPacketMap.clear();
-        mLastPacketProcessed = -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// This sets up a new formatted image at the requested size, and sets the decode flag
-void LLViewerImage::setDecodeData(U8 * data, U32 size)
-{
-        if (size == mTotalBytes)
-        {
-                mFullyLoaded = TRUE;
-        }
-        if (mDataCodec == IMG_CODEC_J2C) 
-        {
-                //Codec 2 = compressed with JPEG2000 (Wavelet)
-                // Create formatted image first, then use it to generate the
-                // raw image.
-                if (mFormattedImagep.isNull())
-                {
-                        LLPointer<LLImageJ2C> j2cp = new LLImageJ2C();
-                        setFormattedImage(j2cp);
-                }
-                BOOL res = mFormattedImagep->setData(data, size);
-                if (mFullyLoaded)
-                {
-                        mFormattedImagep->setDiscardLevel(0); // Force full res if all data is loaded
-                }
-                if ((mFormattedImagep->getWidth() > MAX_IMAGE_SIZE_DEFAULT ||
-                         mFormattedImagep->getHeight() > MAX_IMAGE_SIZE_DEFAULT) &&
-                        (mFormattedImagep->getDiscardLevel() == 0))
-                {
-                        mFormattedImagep->setDiscardLevel(1); // Force x2048 images to x1024
-                }
-                
-                if( res )
-                {
-                        if (mFormattedImagep->getComponents() > 4)
-                        {
-                                mNeedsAux = TRUE;
-                        }
-                        else
-                        {
-                                mNeedsAux = FALSE;
-                        }
-                        mFullWidth = mFormattedImagep->getWidth();
-                        mFullHeight = mFormattedImagep->getHeight();
-                        if ((mFullWidth == 0) || (mFullHeight == 0))
-                        {
-                                llwarns << "Zero size width/height!" << llendl;
-                        }
-                        setNeedsDecode(TRUE); // Setting new formatted data
-                }
-                else
-                {
-                        llwarns << "Unable to setData() for image " << mID << " Aborting." << llendl;
-                        abortDecode();
-                }
-        }
-        else if (mDataCodec == IMG_CODEC_TGA)
-        {
-                //Codec 4 = compressed with TGA
-                // Create formatted image first, then use it to generate the
-                // raw image.
-                if (mFormattedImagep.isNull())
-                {
-                        LLPointer<LLImageTGA> tgap = new LLImageTGA();
-                        setFormattedImage(tgap);
-                }
-                BOOL res = mFormattedImagep->setData(data, size);
-                
-                if( res )
-                {
-                        mFullWidth = mFormattedImagep->getWidth();
-                        mFullHeight = mFormattedImagep->getHeight();
-                        if ((mFullWidth == 0) || (mFullHeight == 0))
-                        {
-                                llwarns << "Zero size width/height!" << llendl;
-                        }
-                        setNeedsDecode(TRUE); // Setting new formatted data
-                }
-                else
-                {
-                        llwarns << "Unable to setData() for image " << mID << " Aborting." << llendl;
-                        abortDecode();
-                }
-        }
-        else 
-        {
-                llerrs << "Image " << mID << ": Unknown codec " << (int)mDataCodec << llendl;
-                setNeedsDecode(FALSE); // Unknown codec
-        }
-}
-
-void LLViewerImage::decodeImage(const F32 decode_time)
-{
-        if (!needsDecode())
-        {
-                return;
-        }
-
-        if (mFormattedImagep.isNull())
-        {
-                llerrs << "Decoding image without formatted data!" << llendl;
-                return;
-        }
-
-        //
-        // Only do a decode if we don't already have an image for this resolution. 
-        //
-        if (getTexName() != 0 && getDiscardLevel() <= mFormattedImagep->getDiscardLevel()
-                && !mNeedsAux)
-        {
-                // We already have an image this size or larger
-                setNeedsDecode(FALSE);
-                return;
-        }
-
-        // Partial Decode of J2C images:
-        //  If this is the first time we are decoding an image,
-        //  make sure we limit the amount of data we decode in order not to stall other decodes
-        if (!mFormattedImagep->isDecoding() && mFormattedImagep->getCodec() == IMG_CODEC_J2C)
-        {
-                LLImageJ2C* j2cp = (LLImageJ2C*)((LLImageFormatted*)mFormattedImagep);
-                const S32 INITIAL_DECODE_SIZE = 2048;
-                if (!mDontDiscard &&
-                        getUseMipMaps() &&
-                        !mNeedsAux &&
-                        getDiscardLevel() < 0 &&
-                        mFormattedImagep->getDataSize() > INITIAL_DECODE_SIZE * 2)
-                {
-                        j2cp->setMaxBytes(INITIAL_DECODE_SIZE);
-                }
-                else
-                {
-                        j2cp->setMaxBytes(0); // In case we set it on a previous decode
-                }
-        }
-        
-        //
-        // Decode Image
-        //
-        mLastDecodeTime.reset();
-                
-        if (mFormattedImagep->getCodec() == 0)
-        {
-                llerrs << "LLViewerImage::decodeImage: mFormattedImagep->getCodec() == 0" << llendl;
-        }
-
-        //
-        // Decode first 4 channels
-        //
-        // Skip over this if we're already in the process of decoding the aux channel,
-        // that means that we've alredy decoded the base channels of this texture.
-        if (!mDecodingAux)
-        {
-                if (!mFormattedImagep->isDecoding())
-                {
-                        mNeedsCreateTexture     = FALSE; // Raw is no longer valid
-                        destroyRawImage();
-                        createRawImage(mFormattedImagep->getDiscardLevel());
-                        //llinfos << "starting decode at " << (S32)mFormattedImagep->getDiscardLevel() << " for " << getID() << llendl;
-                }
-                else
-                {
-                        llassert(mRawImage.notNull());
-                }
-                if (!mFormattedImagep->decode(mRawImage, decode_time, 0, 4))
-                {
-                        if (!mFormattedImagep->isDecoding())
-                        {
-                                // bogus data, delete and try again
-                                llwarns << "Failed to decode " << mID << ":" << gTextureTable.getName(mID) << llendl;
-                                abortDecode();
-                                destroyRawImage();
-                                return;
-                        }
-                }
-//              llinfos << llformat("IMAGE Decode (%d) ", mFormattedImagep->getDiscardLevel()) << mID << llendl;
-
-                // Get the discard level of the decoded raw image,
-                // which may not match the formatted image discard level if a partial decode was done
-                mRawDiscardLevel = mFormattedImagep->getRawDiscardLevel();
-                
-                if (mFormattedImagep->isDecoding())
-                {
-                        return; // Not done decoding.
-                }
-        }
-                                
-        //
-        // If we've finished with the main channels and need to decode the aux, do it now.
-        // Aux buffers contain extra data (e.g. cloth maps)
-        //
-        if (mNeedsAux)
-        {
-                mDecodingAux = TRUE;
-
-                // Create the target raw image for the aux channels
-                if (mAuxRawImage.isNull())
-                {
-                        S32 discard = mFormattedImagep->getDiscardLevel();
-                        mAuxRawImage = new LLImageRaw(getWidth(discard), getHeight(discard), 1);
-                        mAuxRawImage->mMemType = LLMemType::MTYPE_APPAUXRAWIMAGE;
-                }
-
-                if (!mFormattedImagep->decode(mAuxRawImage, decode_time, 4, 4))
-                {
-                        if (!mFormattedImagep->isDecoding())
-                        {
-                                llwarns << "Failed to decode high components " << mID << ":" << gTextureTable.getName(mID) << llendl;
-                                abortDecode();
-                                destroyRawImage();
-                                return; // decode failed; re-request
-                        }
-                }
-                
-                if (mFormattedImagep->isDecoding())
-                {
-                        return; // Not done decoding.
-                }
-                
-                mDecodingAux = FALSE;
-        }
-
-        if (mRawImage.notNull() && getComponents() != mRawImage->getComponents())
-        {
-                //
-                // We've changed the number of components (presumably this is after
-                // decoding the first packet of an image), so we need to move any
-                // objects using this pool to a different pool.
-                //
-                mComponents = mRawImage->getComponents();
-                gPipeline.dirtyPoolObjectTextures(this);
-        }                       
-
-        //
-        // We've decoded this image, and no longer need to.
-        //
-        setNeedsDecode(FALSE); // Done decoding image
-        mIsRawImageValid = TRUE;
-        
-        //
-        // We have a raw image, and now we need to push the data
-        // from the raw image into the GL image
-        //
-        llassert(mRawImage.notNull());
-        mNeedsCreateTexture = TRUE;
-
-        // Everything's OK...
-#if LL_DEBUG
-        lldebugst(LLERR_IMAGE) << "Img: ";
-        std::string tex_name = gTextureTable.getName(mID);
-        if (!tex_name.empty())
-        {
-                llcont << tex_name;
-        }
-        else
-        {
-                llcont << mID;
-        }
-        llcont << " Discard level " << (S32)getDiscardLevel();
-        llcont << llendl;
-#endif
-}
-
-bool LLViewerImage::isDecoding()
-{
-        return (mFormattedImagep.notNull() && mFormattedImagep->isDecoding());
-}
-
 //============================================================================
 
 void LLViewerImage::addTextureStats(F32 pixel_area,
@@ -868,15 +472,23 @@ void LLViewerImage::processTextureStats()
                 }
                 else
                 {
-                        // Guess the required scale factor of the image using pixels per texel..
-                        // Right now, use a safe 1:1 for the tradeoff - we can adjust this later.
-                        // Actually, it might be nice to generate a float, so we can prioritize which
-                        // ones we can discard quality levels from.
-                        discard_level = (F32)(log(mTexelsPerImage/mMaxVirtualSize) / log_4);
+                        if ((mCalculatedDiscardLevel >= 0.f) &&
+                                (llabs(mMaxVirtualSize - mDiscardVirtualSize) < mMaxVirtualSize*.20f))
+                        {
+                                // < 20% change in virtual size = no change in desired discard
+                                discard_level = mCalculatedDiscardLevel; 
+                        }
+                        else
+                        {
+                                // Calculate the required scale factor of the image using pixels per texel
+                                discard_level = (F32)(log(mTexelsPerImage/mMaxVirtualSize) / log_4);
+                                mDiscardVirtualSize = mMaxVirtualSize;
+                                mCalculatedDiscardLevel = discard_level;
+                        }
                 }
                 if (mBoostLevel < LLViewerImage::BOOST_HIGH)
                 {
-                        static const F32 discard_bias = 0.5f; // Must be < 1 or highest discard will never load!
+                        static const F32 discard_bias = -.5f; // Must be < 1 or highest discard will never load!
                         discard_level += discard_bias;
                         discard_level += sDesiredDiscardBias;
                         discard_level *= sDesiredDiscardScale; // scale
@@ -901,94 +513,68 @@ void LLViewerImage::processTextureStats()
                 // proper action if we don't.
                 //
 
-                //
-                // Only need to do an actual decode if we don't have the right GL level,
-                // or we don't have raw data and need raw data.
-                //
                 BOOL increase_discard = FALSE;
-                if (getDiscardLevel() < 0 || mDesiredDiscardLevel < getDiscardLevel())
+                S32 current_discard = getDiscardLevel();
+                if ((sDesiredDiscardBias > 0.0f) &&
+                        (current_discard >= 0 && mDesiredDiscardLevel >= current_discard))
                 {
-                        // We need to do a decode of that discard level to get more data.
-                        if (mFormattedImagep.notNull() && !needsDecode())
+                        if ( sBoundTextureMemory > sMaxBoundTextureMem*texmem_middle_bound_scale)
                         {
-                                if (mFormattedImagep->getDiscardLevel() <= mDesiredDiscardLevel)
+                                // Limit the amount of GL memory bound each frame
+                                if (mDesiredDiscardLevel > current_discard)
                                 {
-                                        setNeedsDecode(TRUE); // processTextureStats - Changing discard level of texture
+                                        increase_discard = TRUE;
                                 }
-                                // else let the llviewerimagelist logic do its thing
                         }
-                        else if (mFormattedFlushed)
+                        if ( sTotalTextureMemory > sMaxTotalTextureMem*texmem_middle_bound_scale)
                         {
-                                //llinfos << "Attempting vfs reload (a) of " << mID << llendl;
-                                startVFSLoad();
-                        }
-                }
-                else if (sDesiredDiscardBias > 0.0f && sBoundTextureMemory > sMaxBoundTextureMem*texmem_middle_bound_scale)
-                {
-                        // Limit the amount of GL memory bound each frame
-                        if (mDesiredDiscardLevel > getDiscardLevel())
-                        {
-                                increase_discard = TRUE;
+                                // Only allow GL to have 2x the video card memory
+                                if (!getBoundRecently())
+                                {
+                                        increase_discard = TRUE;
+                                }
                         }
-                }
-                else if (sDesiredDiscardBias > 0.0f && sTotalTextureMemory > sTotalTextureMemory*texmem_middle_bound_scale)
-                {
-                        // Only allow GL to have 2x the video card memory
-                        if (!getBoundRecently())
+                        if (increase_discard)
                         {
-                                increase_discard = TRUE;
+                                //                      llinfos << "DISCARDED: " << mID << " Discard: " << current_discard << llendl;
+                                sBoundTextureMemory -= mTextureMemory;
+                                sTotalTextureMemory -= mTextureMemory;
+                                // Increase the discard level (reduce the texture res)
+                                S32 new_discard = current_discard+1;
+                                setDiscardLevel(new_discard);
+                                sBoundTextureMemory += mTextureMemory;
+                                sTotalTextureMemory += mTextureMemory;
                         }
                 }
-                if (increase_discard)
-                {
-                        sBoundTextureMemory -= mTextureMemory;
-                        sTotalTextureMemory -= mTextureMemory;
-                        // Increase the discard level (reduce the texture res)
-                        S32 new_discard = getDiscardLevel()+1;
-                        setDiscardLevel(new_discard);
-                        sBoundTextureMemory += mTextureMemory;
-                        sTotalTextureMemory += mTextureMemory;
-                }
         }
-        
-        //
-        // Flush the formatted data for this image if it hasn't been used in a while.
-        //
-#if 1
-        const F32 FLUSH_TIME = 30.f;
-        if (mFormattedImagep.notNull())
-        {
-                if ((mLastDecodeTime.getElapsedTimeF32() > FLUSH_TIME)
-                        && !mStreamFile
-                        && (this->mLastPacketTimer.getElapsedTimeF32() > FLUSH_TIME)
-                        && !mNeedsDecode
-                        && !mFormattedImagep->isDecoding()
-                        && (mDesiredDiscardLevel == getDiscardLevel()))
-                {
-                        //llinfos << mID << ": flushing formatted image, last processed packet " << mLastPacketProcessed << llendl;
-                        // Treat this very similarly to like we haven't gotten any data
-                        // Flush all received packets that haven't been processed, they will be readded on reload.
-                        resetPacketData();
-
-                        setFormattedImage(NULL);
-                        mFullyLoaded = FALSE;
-
-                        // This flag says that we may have VFS data if we want to reload this texture
-                        // (or get network traffic for this texture)
-                        mFormattedFlushed = TRUE;
-                }
-        }
-#endif
 }
 
 //============================================================================
 
 F32 LLViewerImage::calcDecodePriority()
 {
-        F32 priority;
-        S32 gldiscard = getDiscardLevel();
-        S32 ddiscard = gldiscard - mDesiredDiscardLevel;
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+        if (mID == gTextureFetch->mDebugID)
+        {
+                gTextureFetch->mDebugCount++; // for setting breakpoints
+        }
+#endif
+        
+        if (mNeedsCreateTexture)
+        {
+                return mDecodePriority; // no change while waiting to create
+        }
 
+        F32 priority;
+        S32 cur_discard = getDiscardLevel();
+        F32 pixel_priority = fsqrtf(mMaxVirtualSize) * (1.f + mMaxCosAngle);
+        const S32 MIN_NOT_VISIBLE_FRAMES = 30; // NOTE: this function is not called every frame
+        mDecodeFrame++;
+        if (pixel_priority > 0.f)
+        {
+                mVisibleFrame = mDecodeFrame;
+        }
+        
         if (mIsMissingAsset)
         {
                 priority = 0.0f;
@@ -996,50 +582,73 @@ F32 LLViewerImage::calcDecodePriority()
         else if (mDesiredDiscardLevel > mMaxDiscardLevel)
         {
                 // Don't decode anything we don't need
-                priority = 0.0f;
+                priority = -1.0f;
+        }
+        else if (pixel_priority <= 0.f && (cur_discard < 0 || mDesiredDiscardLevel < cur_discard))
+        {
+                // Not on screen but we might want some data
+                if (mBoostLevel > BOOST_HIGH)
+                {
+                        // Always want high boosted images
+                        priority = 1.f;
+                }
+                else if (mVisibleFrame == 0 || (mDecodeFrame - mVisibleFrame > MIN_NOT_VISIBLE_FRAMES))
+                {
+                        // Don't decode anything that isn't visible unless it's important
+                        priority = -2.0f;
+                }
+                else
+                {
+                        // Leave the priority as-is
+                        return mDecodePriority;
+                }
         }
-        else if (gldiscard < 0 && mDesiredDiscardLevel >= 0)
+        else if (cur_discard < 0)
         {
-                // We don't have any data yet, we need something immideately
-                priority = 200000.f;
+                // We don't have any data yet, so we don't know the size of the image, treat as 1024x1024
+//              priority = 900000.f;
+                static const F64 log_2 = log(2.0);
+                F32 desired = (F32)(log(1024.0/pixel_priority) / log_2);
+                S32 ddiscard = MAX_DISCARD_LEVEL - (S32)desired + 1;
+                ddiscard = llclamp(ddiscard, 1, 9);
+                priority = ddiscard*100000.f;
         }
-        else if (getDiscardLevel() < 0 && mDesiredDiscardLevel < MAX_DISCARD_LEVEL+1)
+        else if (cur_discard <= mMinDiscardLevel)
         {
-                // We have data, but haven't decoded any of it yet, but it on top
-                priority = 300000.f;
+                // larger mips are corrupted
+                priority = -3.0f;
         }
-        else if (gldiscard <= mDesiredDiscardLevel)
+        else if (cur_discard <= mDesiredDiscardLevel)
         {
-                priority = 0.0f;
+                priority = -4.0f;
         }
         else
         {
-                // priority range = 0 - 10000 (10 ^ 4)
+                // priority range = 100000-400000
+                S32 ddiscard = cur_discard - mDesiredDiscardLevel;
                 if (getDontDiscard())
                 {
                         ddiscard+=2;
                 }
-                else if (!getBoundRecently())
+                else if (!getBoundRecently() && mBoostLevel == 0)
                 {
                         ddiscard-=2;
                 }
-                else
-                {
-                        ddiscard-=1;
-                }
                 ddiscard = llclamp(ddiscard, 0, 4);
-                
-                priority = powf(10.f,(F32)ddiscard);
+                priority = ddiscard*100000.f;
         }
         if (priority > 0.0f)
         {
-                F32 pixel_priority = llmin(mMaxVirtualSize * (1.5f + mMaxCosAngle) * (100.f / (1024.f*1024.f)), 100.f);
                 pixel_priority = llclamp(pixel_priority, 0.0f, priority-1.f);
                 priority += pixel_priority;
-                if ( mBoostLevel > 0)
+                if ( mBoostLevel > BOOST_HIGH)
                 {
                         priority += 1000000.f + 1000.f * mBoostLevel;
                 }
+                else if ( mBoostLevel > 0)
+                {
+                        priority +=       0.f + 1000.f * mBoostLevel;
+                }
         }
         return priority;
 }
@@ -1048,7 +657,7 @@ F32 LLViewerImage::calcDecodePriority()
 //static
 F32 LLViewerImage::maxDecodePriority()
 {
-        return 1400000.f;
+        return 2000000.f;
 }
 
 void LLViewerImage::setDecodePriority(F32 priority)
@@ -1062,10 +671,6 @@ void LLViewerImage::setDecodePriority(F32 priority)
         {
                 mDecodePriority = priority;
         }
-        if (mStreamFile)
-        {
-                mStreamFile->setReadPriority(priority);
-        }
 }
 
 void LLViewerImage::setBoostLevel(S32 level)
@@ -1079,187 +684,219 @@ void LLViewerImage::setBoostLevel(S32 level)
 
 //============================================================================
 
-void LLViewerImage::abortDecode()
+bool LLViewerImage::updateFetch()
 {
-        // Don't try to recover, just don't set a formatted image.
-        // Recovery makes the code MUCH more complex
-        //llinfos << "Reset on abort decode" << llendl;
-        resetPacketData();
+        mFetchState = 0;
+        mFetchPriority = 0;
+        mFetchDeltaTime = 999999.f;
+        mRequestDeltaTime = 999999.f;
 
-        setFormattedImage(NULL);
-        mFullyLoaded = FALSE;
-        // Make sure mNeedsAux is false, otherwise it'll try to decode the 5th channel
-        mNeedsAux = FALSE;
-        mFullWidth = 0;
-        mFullHeight = 0;
-        setNeedsDecode(FALSE); // Aborting setDecodeData
-        mDecodingAux = FALSE;
-        if (mStreamFile)
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+        if (mID == gTextureFetch->mDebugID)
         {
-                llwarns << "Removing bad texture: " << mID << llendl;
-                hoseStreamFile();
+                gTextureFetch->mDebugCount++; // for setting breakpoints
         }
-        else
+#endif
+        
+        if (mIsMediaTexture)
         {
-                llwarns << "Removing bad texture: " << mID << llendl;
-                LLVFile vf(gVFS, mID, LLAssetType::AT_TEXTURE, LLVFile::READ_WRITE);
-                vf.remove();
+                llassert_always(!mHasFetcher);
+                return false; // skip
         }
-        mRequestedDiscardLevel = -1; // make sure we re-request the data
-}
-
-void LLViewerImage::hoseStreamFile()
-{
-        mStreamFile->remove();
-
-        delete mStreamFile;
-        mStreamFile = NULL;
-                        
-        delete[] mCachedData;
-        mCachedData = NULL;
-        mCachedSize = 0;
-}
-
-
-// Sets mStreamFile to NULL when finishes loading.
-BOOL LLViewerImage::loadStreamFile()
-{
-        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
-        // load as much data as possible from the stream cache file
-        // TODO: unify stream cache with load local
-
-        // are we waiting on a file read?
-        if (mStreamFile)
+        if (mNeedsCreateTexture)
         {
-                if (mCachedSize == 0)
+                // We may be fetching still (e.g. waiting on write)
+                // but don't check until we've processed the raw data we have
+                return false;
+        }
+        if (mFullyLoaded)
+        {
+                llassert_always(!mHasFetcher);
+                return false;
+        }
+        if (mIsMissingAsset)
+        {
+                llassert_always(!mHasFetcher);
+                return false; // skip
+        }
+        if (!mLoadedCallbackList.empty() && mRawImage.notNull())
+        {
+                return false; // process any raw image data in callbacks before replacing
+        }
+        
+        S32 current_discard = getDiscardLevel();
+        S32 desired_discard = getDesiredDiscardLevel();
+        F32 decode_priority = getDecodePriority();
+        
+        if (mIsFetching)
+        {
+                // Sets mRawDiscardLevel, mRawImage, mAuxRawImage
+                S32 fetch_discard = current_discard;
+                bool finished = gTextureFetch->getRequestFinished(getID(), fetch_discard, mRawImage, mAuxRawImage);
+                if (finished)
                 {
-                        if (mStreamFile->isLocked(VFSLOCK_APPEND))
-                        {
-                                // avoid stalling if we are still writing to the file
-                                return FALSE;
-                        }
-                        mCachedSize = mStreamFile->getSize();
-                        if (mCachedSize >= 27)
+                        mIsFetching = FALSE;
+                }
+                else
+                {
+                        mFetchState = gTextureFetch->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
+                                                                                                           mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
+                }
+                
+                // We may have data ready regardless of whether or not we are finished (e.g. waiting on write)
+                if (mRawImage.notNull())
+                {
+                        mRawDiscardLevel = fetch_discard;
+                        if ((mRawImage->getDataSize() > 0 && mRawDiscardLevel >= 0) &&
+                                (current_discard < 0 || mRawDiscardLevel < current_discard))
                         {
-                                mCachedData = new U8[mCachedSize];
-                                mStreamFile->read(mCachedData, mCachedSize, TRUE, 100 + mDecodePriority);
+                                if (getComponents() != mRawImage->getComponents())
+                                {
+                                        // We've changed the number of components, so we need to move any
+                                        // objects using this pool to a different pool.
+                                        mComponents = mRawImage->getComponents();
+                                        gImageList.dirtyImage(this);
+                                }                       
+                                mIsRawImageValid = TRUE;
+                                gImageList.mCreateTextureList.insert(this);
+                                mNeedsCreateTexture = TRUE;
+                                mFullWidth = mRawImage->getWidth() << mRawDiscardLevel;
+                                mFullHeight = mRawImage->getHeight() << mRawDiscardLevel;
                         }
                         else
                         {
-                                llwarns << "Cached image " << mID << " has length " << mCachedSize << " not loading" << llendl;
-
-                                mStreamFile->remove();
-
-                                delete mStreamFile;
-                                mStreamFile = NULL;
-                                mCachedSize = 0;
-                                return FALSE;
+                                // Data is ready but we don't need it
+                                // (received it already while fetcher was writing to disk)
+                                destroyRawImage();
+                                return false; // done
                         }
                 }
                 
-                // is it finished?
-                if (mStreamFile->isReadComplete())
+                if (!mIsFetching)
                 {
-                        //llinfos << mID << ": loading from stream file " << llendl;
-                        U16 packet;
-                        U32 file_version;
-                        LLUUID file_id;
-
-                        U8 *tmp = mCachedData;
-                        memcpy(&file_version, tmp, 4);
-                        tmp += 4;
-                        memcpy(file_id.mData, tmp, 16);
-                        tmp += 16;
-
-                        if (file_version != sCurrentFileVersion ||
-                                file_id != mID)
-                        {
-                                // this file is from an old version, failed to open, or is invalid
-                                hoseStreamFile();
-
-                                return TRUE; // done
-                        }
-
-                        mGotFirstPacket = TRUE;
-
-                        memcpy(&mDataCodec, tmp, 1);
-                        tmp += 1;
-                        memcpy(&mPackets, tmp, 2);
-                        tmp += 2;
-
-                        memcpy(&mTotalBytes, tmp, 4);
-                        tmp += 4;
-
-                        while (tmp - mCachedData < mCachedSize)
+                        if (mRawDiscardLevel < 0)
                         {
-                                memcpy(&packet, tmp, 2);
-                                tmp += 2;
-
-                                if (packet >= mPackets)
+                                // We finished but received no data
+                                if (current_discard < 0)
                                 {
-                                        llwarns << "Cached image " << mID << " has bogus packet " << packet << " of " << mPackets << llendl;
-
-                                        hoseStreamFile();
-                                        return TRUE; // done
-                                }
-
-                                U16 data_size;
-                                memcpy((U8*)&(data_size), tmp, 2);
-                                tmp += 2;
-
-                                if (tmp + data_size > mCachedData + mCachedSize)
-                                {
-                                        llwarns << "Cached image " << mID << " has bad length " << mCachedSize << ", should be " << (S32)(tmp + data_size - mCachedData) << llendl;
-
-                                        hoseStreamFile();
-                                        return TRUE; // done
-                                }
-
-                                if (mReceivedPacketMap.find(packet) == mReceivedPacketMap.end())
-                                {
-                                        U8 *buf = new U8[data_size];
-                                        memcpy(buf, tmp, data_size);
-                                        mReceivedPacketMap[packet] = new LLViewerImagePacket(buf, data_size, packet, TRUE);
+                                        llwarns << mID << ": Marking image as missing" << llendl;
+                                        setIsMissingAsset();
+                                        desired_discard = -1;
                                 }
                                 else
                                 {
-                                        // Technically this assertion is correct, but there may be bogus VFS files out there which invalidate this
-                                        // condition.
-                                        //llassert(!mReceivedPacketMap[packet]->mWroteToDisk);
-                                        mReceivedPacketMap[packet]->mWroteToDisk = TRUE;
+                                        llwarns << mID << ": Setting min discard to " << current_discard << llendl;
+                                        mMinDiscardLevel = current_discard;
+                                        desired_discard = current_discard;
                                 }
-
-                                tmp += data_size;
-
-                                mPacketsReceived++;
+                                destroyRawImage();
                         }
+                        else if (mRawImage.isNull())
+                        {
+                                // We have data, but our fetch failed to return raw data
+                                // *TODO: FIgure out why this is happening and fix it
+                                destroyRawImage();
+                        }
+                }
+                else if (mDecodePriority >= 0.f)
+                {
+                        gTextureFetch->updateRequestPriority(mID, mDecodePriority);
+                }
+        }
 
-                        delete mStreamFile;
-                        mStreamFile = NULL;
-                        
-                        delete[] mCachedData;
-                        mCachedData = NULL;
-                        mCachedSize = 0;
-
-                        // Make sure we process all of the packet data associated with this texture.
-                        mLastPacketProcessed = -1;
-                        mLastPacket = -1;
-                        mLastPacketTimer.reset();
-
-                        // Process the packets and write to disk any that have not been written
-                        checkPacketData();
-
-                        return TRUE; // done
+        bool make_request = true;
+        
+        if (decode_priority <= 0)
+        {
+                make_request = false;
+        }
+        else if (mNeedsCreateTexture || mIsMissingAsset)
+        {
+                make_request = false;
+        }
+        else if (current_discard >= 0 && current_discard <= mMinDiscardLevel)
+        {
+                make_request = false;
+        }
+        else
+        {
+                if (mIsFetching)
+                {
+                        if (mRequestedDiscardLevel <= desired_discard)
+                        {
+                                make_request = false;
+                        }
                 }
                 else
                 {
-                        return FALSE; // still loading
+                        if (current_discard >= 0 && current_discard <= desired_discard)
+                        {
+                                make_request = false;
+                        }
                 }
         }
-        else
+        
+        if (make_request)
+        {
+                S32 w=0, h=0, c=0;
+                if (current_discard >= 0)
+                {
+                        w = getWidth(0);
+                        h = getHeight(0);
+                        c = getComponents();
+                }
+                if (!mDontDiscard)
+                {
+                        if (mBoostLevel == 0)
+                        {
+                                desired_discard = llmax(desired_discard, current_discard-1);
+                        }
+                        else
+                        {
+                                desired_discard = llmax(desired_discard, current_discard-2);
+                        }
+                }
+                if (gTextureFetch->createRequest(getID(),getTargetHost(), decode_priority,
+                                                                                 w, h, c, desired_discard,
+                                                                                 needsAux()))
+                {
+                        mHasFetcher = TRUE;
+                        mIsFetching = TRUE;
+                        mRequestedDiscardLevel = desired_discard;
+                        mFetchState = gTextureFetch->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
+                                                                                                           mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
+                }
+                // if createRequest() failed, we're finishing up a request for this UUID,
+                // wait for it to complete
+        }
+        else if (mHasFetcher && !mIsFetching)
+        {
+                // Only delete requests that haven't receeived any network data for a while
+                const F32 FETCH_IDLE_TIME = 5.f;
+                if (mLastPacketTimer.getElapsedTimeF32() > FETCH_IDLE_TIME)
+                {
+//                      llinfos << "Deleting request: " << getID() << " Discard: " << current_discard << " <= min:" << mMinDiscardLevel << " or priority == 0: " << decode_priority << llendl;
+                        gTextureFetch->deleteRequest(getID(), true);
+                        mHasFetcher = FALSE;
+                }
+        }
+        
+        llassert_always(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
+        
+        return mIsFetching ? true : false;
+}
+
+void LLViewerImage::setIsMissingAsset()
+{
+        if (mHasFetcher)
         {
-                return TRUE; // not loading
+                gTextureFetch->deleteRequest(getID(), true);
+                mHasFetcher = FALSE;
+                mIsFetching = FALSE;
+                mFetchState = 0;
+                mFetchPriority = 0;
         }
+        mIsMissingAsset = TRUE;
 }
 
 //============================================================================
@@ -1278,13 +915,14 @@ void LLViewerImage::setLoadedCallback( loaded_callback_func loaded_callback, S32
         mLoadedCallbackList.push_back(entryp);
 }
 
-void LLViewerImage::doLoadedCallbacks()
+bool LLViewerImage::doLoadedCallbacks()
 {
-        // Need to make sure we don't do these during the process of a decode or something?
-        if ((mFormattedImagep.notNull() && mFormattedImagep->isDecoding()) || mNeedsCreateTexture)
+        if (mNeedsCreateTexture)
         {
-                return;
+                return false;
         }
+
+        bool res = false;
         
         if (isMissingAsset())
         {
@@ -1311,12 +949,6 @@ void LLViewerImage::doLoadedCallbacks()
                 gl_discard = MAX_DISCARD_LEVEL + 1;
         }
 
-        // assert: We should either have a valid raw image, be decoding one, or not have one at all
-        llassert(mIsRawImageValid || needsDecode() || mRawImage.isNull());
-        // assert: We should either not have a raw image, or it's discard level should be <= gl_discard
-        llassert(!mIsRawImageValid || mRawDiscardLevel <= gl_discard);
-
-
         //
         // Determine the quality levels of textures that we can provide to callbacks
         // and whether we need to do decompression/readback to get it
@@ -1335,18 +967,9 @@ void LLViewerImage::doLoadedCallbacks()
         }
         else
         {
-                if (mFormattedImagep.notNull())
-                {
-                        // If we don't have a raw image or a GL image, we need to decode from a formatted image
-                        best_aux_discard = llmin(best_aux_discard,
-                                mFormattedImagep->calcDiscardLevelBytes(mFormattedImagep->getDataSize()));
-                }
-                else
-                {
-                        // We have no data at all, we need to get the formatted image.
-                        // Do this by forcing the best aux discard to be 0.
-                        best_aux_discard = 0;
-                }
+                // We have no data at all, we need to get it
+                // Do this by forcing the best aux discard to be 0.
+                best_aux_discard = 0;
         }
 
 
@@ -1357,7 +980,6 @@ void LLViewerImage::doLoadedCallbacks()
         bool run_gl_callbacks = false;
         bool run_raw_callbacks = false;
         bool need_readback = false;
-        bool need_decompress = false;
 
         for(callback_list_t::iterator iter = mLoadedCallbackList.begin();
                 iter != mLoadedCallbackList.end(); )
@@ -1375,12 +997,6 @@ void LLViewerImage::doLoadedCallbacks()
                                         // We have useful data, run the callbacks
                                         run_raw_callbacks = true;
                                 }
-                                else if (entryp->mLastUsedDiscard > best_aux_discard)
-                                {
-                                        // We need to decompress data, but don't need
-                                        // to run the callbacks
-                                        need_decompress = true;
-                                }
                         }
                         else
                         {
@@ -1420,10 +1036,8 @@ void LLViewerImage::doLoadedCallbacks()
                 createRawImage(gl_discard, TRUE);
                 readBackRaw(gl_discard, mRawImage);
                 mIsRawImageValid = TRUE;
-        }
-        if (need_decompress)
-        {
-                startImageDecode();
+                llassert_always(mRawImage.notNull());
+                llassert_always(!mNeedsAux || mAuxRawImage.notNull());
         }
 
         //
@@ -1434,10 +1048,6 @@ void LLViewerImage::doLoadedCallbacks()
                 // Do callbacks which require raw image data.
                 //llinfos << "doLoadedCallbacks raw for " << getID() << llendl;
 
-                LLImageRaw* raw_image = mRawImage;
-                LLImageRaw* raw_image_aux = mAuxRawImage;
-                llassert(!mNeedsAux || mAuxRawImage.notNull());
-                
                 // Call each party interested in the raw data.
                 for(callback_list_t::iterator iter = mLoadedCallbackList.begin();
                         iter != mLoadedCallbackList.end(); )
@@ -1450,28 +1060,26 @@ void LLViewerImage::doLoadedCallbacks()
                                 // to satisfy the interested party, then this is the last time that
                                 // we're going to call them.
 
+                                llassert_always(mRawImage.notNull());
+                                llassert_always(!mNeedsAux || mAuxRawImage.notNull());
 
                                 BOOL final = mRawDiscardLevel <= entryp->mDesiredDiscard ? TRUE : FALSE;
                                 //llinfos << "Running callback for " << getID() << llendl;
-                                //llinfos << raw_image->getWidth() << "x" << raw_image->getHeight() << llendl;
+                                //llinfos << mRawImage->getWidth() << "x" << mRawImage->getHeight() << llendl;
                                 if (final)
                                 {
                                         //llinfos << "Final!" << llendl;
                                 }
                                 entryp->mLastUsedDiscard = mRawDiscardLevel;
-                                entryp->mCallback(TRUE, this, raw_image, raw_image_aux, mRawDiscardLevel, final, entryp->mUserData);
+                                entryp->mCallback(TRUE, this, mRawImage, mAuxRawImage, mRawDiscardLevel, final, entryp->mUserData);
                                 if (final)
                                 {
                                         iter = mLoadedCallbackList.erase(curiter);
                                         delete entryp;
                                 }
+                                res = true;
                         }
                 }
-
-                //
-                // If you want to keep a copy of the raw image, you better copy it off yourself
-                //
-                destroyRawImage();
         }
 
         //
@@ -1497,6 +1105,7 @@ void LLViewerImage::doLoadedCallbacks()
                                         iter = mLoadedCallbackList.erase(curiter);
                                         delete entryp;
                                 }
+                                res = true;
                         }
                 }
         }
@@ -1508,450 +1117,14 @@ void LLViewerImage::doLoadedCallbacks()
         {
                 gImageList.mCallbackList.erase(this);
         }
-}
 
-//============================================================================
-
-// static
-void LLViewerImage::receiveImage(LLMessageSystem *msg, void **user_data)
-{
-        LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
-        
-        // Receive image header, copy into image object and decompresses 
-        // if this is a one-packet image. 
-
-        LLUUID id;
-
-        char ip_string[256];
-        u32_to_ip_string(msg->getSenderIP(),ip_string);
-
-        if (msg->getReceiveCompressedSize())
-        {
-                gImageList.sTextureBits += msg->getReceiveCompressedSize() * 8;
-        }
-        else
-        {
-                gImageList.sTextureBits += msg->getReceiveSize() * 8;
-        }
-        gImageList.sTexturePackets++;
-
-        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
-
-        char id_string[UUID_STR_LENGTH];
-        id.toString(id_string);
-
-        LLViewerImage *image = gImageList.getImage(id);                                 //  Look up the correct image 
-
-        image->mLastPacketTimer.reset();
+        // Done with any raw image data at this point (will be re-created if we still have callbacks)
+        destroyRawImage();
         
-        if (image->mFullyLoaded)
-        {
-//              llinfos << id << ":" << " Packet 0 for already loaded image!" << llendl;
-                return;
-        }
-                
-        // check to see if we've gotten this packet before
-        if (image->mGotFirstPacket)
-        {
-                //llinfos << id << ":" << " Duplicate Packet 0" << llendl;
-                return;
-        }
-        if (!image->mRequested)
-        {
-//              llinfos << id << ":" << " Packet 0 for unrequested image!" << llendl;
-                return;
-        }
-
-        image->mGotFirstPacket = TRUE;
-
-        //      Copy header data into image object
-        msg->getU8Fast(_PREHASH_ImageID, _PREHASH_Codec, image->mDataCodec);
-        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packets, image->mPackets);
-        msg->getU32Fast(_PREHASH_ImageID, _PREHASH_Size, image->mTotalBytes);
-
-        if (0 == image->mPackets)
-        {
-                llwarns << "Img: " << (gTextureTable.getName(id).empty() ? id_string : gTextureTable.getName(id)) << ":" << " Number of packets is 0" << llendl;
-                return;
-        }
-
-        lldebugst(LLERR_IMAGE) << "Img: " << (gTextureTable.getName(id).empty() ? id_string : gTextureTable.getName(id)) << ":" << " Packet 0:" << image->mPackets - 1 << llendl;
-
-        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
-
-        // Got a packet, reset the counter.
-        image->mRequestTime.reset();
-        image->mPacketsReceived++;
-
-        if (data_size)
-        {
-                if (gVFS->getExists(image->mID, LLAssetType::AT_TEXTURE))
-                {
-                        // We have data in the VFS, but it's not loaded.
-                        // We should start the VFS load on the assumption that we're going to use this data shortly.
-                        image->startVFSLoad();
-                        // We can throw out this data, because we have at least ONE packet on the disk
-                        //llinfos << "Throwing out first packet for " << image->mID << " which we already have a VFS file for!" << llendl;
-                        return;
-                }
-
-                // this buffer gets saved off in the packet list
-                U8 *data = new U8[data_size];
-                msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
-
-                // output this image data to cache file
-                // only do this if we don't have old data
-                LLVFile file(gVFS, image->mID, LLAssetType::AT_TEXTURE, LLVFile::APPEND);
-                if (! file.getSize())
-                {
-                        BOOL write_to_vfs = FALSE;
-                        if (image->mPackets == 0)
-                        {
-                                // Uh oh, we don't have packet data size
-                                // This must be something from a local cache
-                                llwarns << "Creating VFS file even though we don't know the number of packets!" << llendl;
-                        }
-                        else
-                        {
-                                write_to_vfs = file.setMaxSize(image->mTotalBytes + IMAGE_HEADER_SIZE + image->mPackets * PACKET_HEADER_SIZE);
-                        }
-
-                        // to avoid another dynamic allocation, just assume we won't be gettimg image packets > 1 MTU
-                        if (data_size > MTUBYTES)
-                        {
-                                llerrs << "image data chunk too large: " << data_size << " bytes" << llendl;
-                        }
-
-                        if (write_to_vfs)
-                        {
-                                const S32 WRITE_BUF_SIZE = IMAGE_HEADER_SIZE + PACKET_HEADER_SIZE + MTUBYTES;
-                                U8 buffer[WRITE_BUF_SIZE];
-                                U8 *tmp = buffer;
-
-                                // write current version byte to file, so we can change the format and detect old files later
-                                memcpy(tmp, &LLViewerImage::sCurrentFileVersion, 4);
-                                tmp += 4;
-                                memcpy(tmp, id.mData, 16);
-                                tmp += 16;
-                                memcpy(tmp, (U8*)&(image->mDataCodec), 1);
-                                tmp += 1;
-                                memcpy(tmp, (U8*)&(image->mPackets), 2);
-                                tmp += 2;
-                                memcpy(tmp, (U8*)&(image->mTotalBytes), 4);
-                                tmp += 4;
-                                U16 zero = 0;
-                                memcpy(tmp, (U8*)&zero, 2);
-                                tmp += 2;
-                                memcpy(tmp, (U8*)&(data_size), 2);
-                                tmp += 2;
-
-                                // now copy in the image data
-                                // it's a shame we can't use the original data buffer
-                                // but this needs to be a single, atomic write
-                                memcpy(tmp, data, data_size);
-
-//                              llinfos << "Writing packet 0 to disk for " << image->getID() << llendl;
-                                file.write(buffer, IMAGE_HEADER_SIZE + PACKET_HEADER_SIZE + data_size);
-                        }
-                        // do this AFTER writing to the VFS since LLViewerImagePacket may delete 'data'
-                        llassert( image->mReceivedPacketMap.find(0) == image->mReceivedPacketMap.end() );
-                        image->mReceivedPacketMap[0] = new LLViewerImagePacket(data, data_size, 0, TRUE);
-                }
-
-                image->checkPacketData();
-        }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// TODO: lastbytes vs. texturebits?
-// TODO: is mRequested already used?
-
-// static
-void LLViewerImage::receiveImagePacket(LLMessageSystem *msg, void **user_data)
-{
-        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
-        LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
-        
-        // Receives image packet, copy into image object,
-        // checks if all packets received, decompresses if so. 
-
-        LLUUID id;
-        U16 packet_num;
-        char id_string[UUID_STR_LENGTH];
-
-        char ip_string[256];
-        u32_to_ip_string(msg->getSenderIP(),ip_string);
-
-        if (msg->getReceiveCompressedSize())
-        {
-                gImageList.sTextureBits += msg->getReceiveCompressedSize() * 8;
-        }
-        else
-        {
-                gImageList.sTextureBits += msg->getReceiveSize() * 8;
-        }
-        gImageList.sTexturePackets++;
-
-        //llprintline("Start decode, image header...");
-        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
-        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packet, packet_num);
-
-        id.toString(id_string);
-        
-        LLViewerImage *image = gImageList.hasImage(id);                 //  Look up the correct image 
-        if (!image ||!(image->mRequested))
-        {
-                // Getting a packet for an unrequested image.
-                lldebugst(LLERR_IMAGE) << "Img: " << (gTextureTable.getName(id).empty() ? id_string : gTextureTable.getName(id)) << " Packet ";
-                llcont << packet_num << " for unrequested from " << ip_string << llendl;
-
-                // don't cancel the request - this might just be an out of order packet
-                return;
-        }
-
-        image->mLastPacketTimer.reset();
-        
-        if (image->mReceivedPacketMap.find(packet_num) != image->mReceivedPacketMap.end())
-        {
-                return;
-        }
-
-        // check to see if we already got this packet
-        BOOL duplicate = FALSE;
-        if (packet_num <= image->mLastPacketProcessed)
-        {
-                duplicate = TRUE;
-        }
-        else if (image->mReceivedPacketMap.find(packet_num) != image->mReceivedPacketMap.end())
-        {
-                duplicate = TRUE;
-        }
-
-        if (duplicate)
-        {
-                //llinfos << image->mID << ": duplicate packet " << packet_num << " last " << image->mLastPacketProcessed << llendl;
-                return;
-        }
-
-        // Got a packet, reset the counter.
-        image->mRequestTime.reset();
-        image->mPacketsReceived++;
-
-        std::string tex_name = gTextureTable.getName(id);
-        if (image->mPackets == 0)
-        {
-                lldebugst(LLERR_IMAGE) << "Img: " << (tex_name.empty() ? id_string : tex_name) << " Packet " << packet_num << " out of order " << llendl;
-        }
-        else
-        {
-                lldebugst(LLERR_IMAGE) << "Img: " << (tex_name.empty() ? id_string : tex_name) << " Packet " << packet_num << ":" << image->mPackets - 1 << llendl;
-        }
-
-
-        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
-        if (data_size)
-        {
-
-                U8 *data = new U8[data_size];
-                msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
-
-                // as above assume we won't be gettimg image packets > 1 MTU
-                if (data_size > MTUBYTES)
-                {
-                        llerrs << "image data chunk too large: " << data_size << " bytes" << llendl;
-                }
-
-                // We don't want to write it to disk yet, just put it on the queue.
-                image->mReceivedPacketMap[packet_num] = new LLViewerImagePacket(data, data_size, packet_num, FALSE);
-                // Process this packet.
-                image->checkPacketData();
-        }
-}
-
-
-BOOL LLViewerImage::checkPacketData()
-{
-        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
-
-        S32 cur_size = 0;
-        S32 next_size = 0;
-        S32 next_discard = llmax(getDiscardLevel()-1,0);
-
-        // 1. Check if we already have formatted data to decode
-        if (mFormattedImagep.notNull())
-        {
-                if ((mFormattedImagep->isDecoding()) || mStreamFile)
-                {
-                        return TRUE; // we're busy decoding, don't request more data yet
-                }
-                
-                cur_size = mFormattedImagep->getDataSize();
-                next_size = mFormattedImagep->calcDataSize(next_discard);
-                next_size = llmin(next_size, (S32)mTotalBytes);
-                
-                if (cur_size >= next_size)
-                {
-                        setDecodeData(mFormattedImagep->getData(), cur_size);
-                        return TRUE;
-                }
-        }
-
-        if (mFullyLoaded)
-        {
-                // Somehow we think we have new packet data but are flagged as fully loaded
-                resetPacketData();
-                return TRUE;
-        }
-
-        // 2. Check if we already have new packets
-        if (!mPackets || !mGotFirstPacket)
-        {
-                return FALSE;
-        }
-        if (mReceivedPacketMap.empty() || mReceivedPacketMap.find(mLastPacketProcessed + 1) == mReceivedPacketMap.end())
-        {
-                return FALSE;
-        }
-        
-        // 3. Decide if we have enough new data to decode
-        S32 new_size = cur_size;
-        U16 next_packet_num = mLastPacketProcessed;
-        for (vip_map_t::iterator iter = mReceivedPacketMap.begin();
-                 iter != mReceivedPacketMap.end() && iter->second->mPacketNum == ++next_packet_num;
-                 iter++)
-        {
-                new_size += iter->second->mDataSize;
-                mLastPacket = iter->second->mPacketNum;
-        }
-        mLastBytesProcessed = new_size;
-
-        if (new_size < next_size)
-        {
-                return FALSE;
-        }
- 
-        if (!gVFS->getExists(mID, LLAssetType::AT_TEXTURE))
-        {
-                // We must have removed the file, probably because it was corrupted. Abort!
-                //llinfos << "Reset on no VFS file!" << llendl;
-                abortDecode();
-                return FALSE;
-        }
-
-        if (mLastPacketProcessed == -1 && cur_size != 0)
-        {
-                llerrs << "LLViewerImage: duplicate first packet!" << llendl;
-        }
-
-        // 4. Append new data to existing data and decode
-
-        // 4a. Write the packets to disk
-        LLVFile file(gVFS, mID, LLAssetType::AT_TEXTURE, LLVFile::APPEND);
-        vip_map_t::iterator first_iter = mReceivedPacketMap.begin();
-        S32 first_idx = 0;
-        while (first_iter != mReceivedPacketMap.end())
-        {
-                S32 packet_data_size = 0;
-                vip_map_t::iterator end_iter = first_iter;
-                S32 end_idx = first_idx;
-                while(end_iter != mReceivedPacketMap.end())
-                {
-                        LLViewerImagePacket *vip = end_iter->second;
-                        if (!vip->mWroteToDisk)
-                        {
-                                packet_data_size += (PACKET_HEADER_SIZE + vip->mDataSize);
-                        }
-                        else
-                        {
-                                break;
-                        }
-                        ++end_iter;
-                        ++end_idx;
-                }
-                if (packet_data_size > 0)
-                {
-                        U8* packet_data_buffer = new U8[packet_data_size];
-                        U8* packet_data = packet_data_buffer;
-                        for (vip_map_t::iterator iter = first_iter; iter != end_iter; ++iter)
-                        {
-                                LLViewerImagePacket *vip = iter->second;
-                                                
-                                memcpy(packet_data, &vip->mPacketNum, 2);
-                                memcpy(packet_data + 2, &(vip->mDataSize), 2);
-                                memcpy(packet_data + PACKET_HEADER_SIZE, vip->mData, vip->mDataSize);
-                                packet_data += (PACKET_HEADER_SIZE + vip->mDataSize);
-                        
-                                vip->mWroteToDisk = TRUE;
-                        }
-                        if (packet_data - packet_data_buffer != packet_data_size) llerrs << "wtf?" << llendl;
-
-                        //                      llinfos << mID << " Writing packets " << first_idx << "-" << end_idx << " to file." << llendl;
-                        file.write(packet_data_buffer, packet_data_size);
-                
-                        delete[] packet_data_buffer;
-                }
-                if (end_iter == first_iter)
-                {
-                        ++end_iter;
-                        ++end_idx;
-                }
-                first_iter = end_iter;
-                first_idx = end_idx;
-        }
-
-        // 4b. Append the data
-        U8* data = new U8[new_size];
-        if (cur_size > 0)
-        {
-                memcpy(data, mFormattedImagep->getData(), cur_size);
-        }
-        LLViewerImagePacket *pkt = mReceivedPacketMap.begin()->second;
-        while (pkt && pkt->mPacketNum == mLastPacketProcessed + 1)
-        {
-                memcpy((U8*)(data + cur_size), pkt->mData, pkt->mDataSize);
-                cur_size += pkt->mDataSize;
-                mLastPacketProcessed = pkt->mPacketNum;
-                delete mReceivedPacketMap.begin()->second;
-                mReceivedPacketMap.erase(mReceivedPacketMap.begin());
-                pkt = NULL;
-                if (!mReceivedPacketMap.empty())
-                {
-                        pkt = mReceivedPacketMap.begin()->second;
-                }
-        }
-
-        llassert(cur_size == new_size);
-        lldebugst(LLERR_IMAGE) << "IMAGE RECEIVED: " << mID.getString() << " Bytes: " << cur_size << "/" << mTotalBytes << llendl;
-        
-        // 4c. Set the data to be decoded, and the number of bytes to use.
-        setDecodeData(data, new_size);
-
-        // 5. Recalculate the image priority
-        gImageList.removeImageFromList(this);
-        F32 decode_priority = calcDecodePriority();
-        setDecodePriority(decode_priority);
-        gImageList.addImageToList(this);
-        
-        return TRUE;
+        return res;
 }
 
-F32 LLViewerImage::getDecodeProgress(F32 *data_progress_p)
-{
-        F32 decode_progress = 0.0f;
-        F32 data_progress = 0.0f;
-        
-        if (mLastPacket >= 0)
-        {
-                S32 max_bytes = mTotalBytes;
-                S32 data_bytes = mLastBytesProcessed;
-                S32 decode_bytes = mFormattedImagep.notNull() ? mFormattedImagep->getDataSize() : data_bytes;
-                data_progress = (F32)data_bytes / (F32)max_bytes;
-                decode_progress = (F32)decode_bytes / (F32)max_bytes;
-        }
-        if (data_progress_p) *data_progress_p = data_progress;
-        return decode_progress;
-}
+//============================================================================
 
 // Call with 0,0 to turn this feature off.
 void LLViewerImage::setKnownDrawSize(S32 width, S32 height)
@@ -1976,13 +1149,8 @@ BOOL LLViewerImage::bind(S32 stage) const
         BOOL res = bindTextureInternal(stage);
         if (res)
         {
-                if (mIsMissingAsset)
-                {
-                        // If we can bind, clearly we have an asset.
-                        // If mIsMissingAsset was true and we get here, it's likely
-                        // that the asset server was messed up and then it recovered.
-                        mIsMissingAsset = FALSE;
-                }
+                //llassert_always(mIsMissingAsset == FALSE);
+                
         }
         else
         {
@@ -2013,7 +1181,6 @@ BOOL LLViewerImage::bind(S32 stage) const
 LLImageRaw* LLViewerImage::createRawImage(S8 discard_level, BOOL allocate)
 {
         llassert(discard_level >= 0);
-        llassert(mFormattedImagep.isNull() || !mFormattedImagep->isDecoding());
         if (mRawImage.notNull())
         {
                 llerrs << "createRawImage() called with existing mRawImage" << llendl;
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index e2f44e5..54865ff 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -41,7 +41,6 @@ class LLViewerImage;
 typedef void    (*loaded_callback_func)( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
 
 class LLVFile;
-class LLViewerImagePacket;
 class LLMessageSystem;
  
 class LLLoadedCallbackEntry
@@ -70,7 +69,8 @@ class LLTextureBar;
 
 class LLViewerImage : public LLImageGL
 {
-//      friend class LLViewerImageList;
+        LOG_CLASS(LLViewerImage);
+
         friend class LLTextureBar; // debug info only
         friend class LLTextureView; // debug info only
         
@@ -78,8 +78,6 @@ public:
         static void initClass();
         static void cleanupClass();
         static void updateClass(const F32 velocity, const F32 angular_velocity);
-        static void receiveImage(LLMessageSystem *msg, void **user_data);
-        static void receiveImagePacket(LLMessageSystem *msg, void **user_data);
         static BOOL bindTexture(LLImageGL* image, const U32 stage = 0)
         {
                 if (image)
@@ -188,24 +186,6 @@ public:
 
         const LLUUID& getID() { return mID; }
 
-        void setFormattedImage(LLImageFormatted* imagep);
-        
-        // Load an image from the static VFS
-        BOOL loadLocalImage(const LLUUID& uuid);
-
-        // Start loading of data from VFS, if any
-        BOOL startVFSLoad();
-        void startImageDecode();
-
-        // Methods for loading and decoding data
-        void setDecodeData(U8 *data, U32 size);
-        void decodeImage(const F32 decode_time = 0.0);
-        bool isDecoding();
-
-        // Poll the VFS to see if the read is complete.  Returns TRUE if
-        // the read is complete (and sets mStreamFile to NULL).
-        BOOL loadStreamFile();
-
         // New methods for determining image quality/priority
         // texel_area_ratio is ("scaled" texel area)/(original texel area), approximately.
         void addTextureStats(F32 pixel_area,
@@ -216,9 +196,6 @@ public:
         // Process image stats to determine priority/quality requirements.
         void processTextureStats();
 
-        // Checks image data and decodes if ready. Returns true if packets were decoded or are pending
-        BOOL checkPacketData();
-
         // Set callbacks to get called when the image gets updated with higher 
         // resolution versions.
         void setLoadedCallback(loaded_callback_func cb,
@@ -226,13 +203,11 @@ public:
                                                    BOOL keep_imageraw,
                                                    void* userdata);
 
+         // ONLY call from LLViewerImageList
         BOOL createTexture(S32 usename = 0);
-        BOOL destroyTexture();
 
         BOOL needsAux() const                                                   { return mNeedsAux; }
         void setNeedsAux(const BOOL needs_aux)                  { mNeedsAux = needs_aux; }
-        BOOL needsDecode() const                                                { return mNeedsDecode; }
-        void setNeedsDecode(const BOOL needs_decode)    { mNeedsDecode = needs_decode; }
 
         // setDesiredDiscardLevel is only used by LLViewerImageList
         void setDesiredDiscardLevel(S32 discard) { mDesiredDiscardLevel = discard; }
@@ -247,20 +222,20 @@ public:
         enum
         {
                 BOOST_NONE                      = 0,
-                BOOST_TERRAIN           = 1,    
-                BOOST_AVATAR_BAKED      = 2,
-                BOOST_AVATAR            = 3,
-                BOOST_CLOUDS            = 4,
+                BOOST_AVATAR_BAKED      = 1,
+                BOOST_AVATAR            = 2,
+                BOOST_CLOUDS            = 3,
                 
                 BOOST_HIGH                      = 10,
-                BOOST_SELECTED          = 11,
-                BOOST_HUD                       = 12,
-                BOOST_AVATAR_BAKED_SELF = 13,
-                BOOST_UI                        = 14,
-                BOOST_PREVIEW           = 15,
-                BOOST_MAP                       = 16,
-                BOOST_MAP_LAYER         = 17,
-                BOOST_AVATAR_SELF       = 18, // needed for baking avatar
+                BOOST_TERRAIN           = 11, // has to be high priority for minimap / low detail
+                BOOST_SELECTED          = 12,
+                BOOST_HUD                       = 13,
+                BOOST_AVATAR_BAKED_SELF = 14,
+                BOOST_UI                        = 15,
+                BOOST_PREVIEW           = 16,
+                BOOST_MAP                       = 17,
+                BOOST_MAP_LAYER         = 18,
+                BOOST_AVATAR_SELF       = 19, // needed for baking avatar
                 BOOST_MAX_LEVEL
         };
         void setBoostLevel(S32 level);
@@ -275,111 +250,88 @@ public:
         // the priority list, and cause horrible things to happen.
         void setDecodePriority(F32 priority = -1.0f);
 
+        bool updateFetch();
+        
         // Override the computation of discard levels if we know the exact output
         // size of the image.  Used for UI textures to not decode, even if we have
         // more data.
         void setKnownDrawSize(S32 width, S32 height);
 
-        void setIsMissingAsset(BOOL b)          { mIsMissingAsset = b; }
+        void setIsMissingAsset();
         BOOL isMissingAsset()                           { return mIsMissingAsset; }
 
-        BOOL getNeedsCreateTexture() const      { return mNeedsCreateTexture; }
-        
         bool hasCallbacks() { return mLoadedCallbackList.empty() ? false : true; }
         
-        void doLoadedCallbacks();
-        S32 getLastPacket() { return mLastPacket; }
-        F32 getDecodeProgress(F32 *data_progress_p = 0);
+        bool doLoadedCallbacks();
 
-        void abortDecode();
-        void destroyRawImage(); // Delete the raw image for this discard level
-        
 private:
         /*virtual*/ void cleanup(); // Cleanup the LLViewerImage (so we can reinitialize it)
 
         void init(bool firstinit);
-        void hoseStreamFile();
-        void resetPacketData();
 
         // Used to be in LLImageGL
         LLImageRaw* createRawImage(S8 discard_level = 0, BOOL allocate = FALSE);
+        void destroyRawImage();
         
 public:
         S32 mFullWidth;
         S32 mFullHeight;
-        LLVFile *mStreamFile;
 
         // Data used for calculating required image priority/quality level/decimation
         mutable F32 mMaxVirtualSize;    // The largest virtual size of the image, in pixels - how much data to we need?
         mutable F32 mMaxCosAngle;               // The largest cos of the angle between camera X vector and the object
 
         F32 mTexelsPerImage;                    // Texels per image.
+        F32 mDiscardVirtualSize;                // Virtual size used to calculate desired discard
         
         S8  mInImageList;                               // TRUE if image is in list (in which case don't reset priority!)
         S8  mIsMediaTexture;                    // TRUE if image is being replaced by media (in which case don't update)
-        S8  mInStaticVFS;                               // Source data in local VFS
-        S8  mFormattedFlushed;
 
-        S8  mRequested;                                 // An image request is currently in process.
-        S8  mFullyLoaded;
-        
         // Various info regarding image requests
-        LLFrameTimer mRequestTime;
         S32 mRequestedDiscardLevel;
         F32 mRequestedDownloadPriority;
+        S32 mFetchState;
+        U32 mFetchPriority;
+        F32 mDownloadProgress;
+        F32 mFetchDeltaTime;
+        F32 mRequestDeltaTime;
+        S32 mDecodeFrame;
+        S32 mVisibleFrame; // decode frame where image was last visible
         
         // Timers
-        LLFrameTimer mLastDecodeTime;           // Time since last decode.
         LLFrameTimer mLastPacketTimer;          // Time since last packet.
         LLFrameTimer mLastReferencedTimer;
-        
+
 private:
         LLUUID mID;
-        LLPointer<LLImageFormatted> mFormattedImagep;
 
         S8  mDesiredDiscardLevel;                       // The discard level we'd LIKE to have - if we have it and there's space
         S8  mMinDesiredDiscardLevel;            // The minimum discard level we'd like to have
-        S8  mGotFirstPacket;
-        S8  mNeedsCreateTexture;
-        
-        S8  mNeedsDecode;                               // We have a compressed image that we want to decode, now.
+        S8  mNeedsCreateTexture;        
         S8  mNeedsAux;                                  // We need to decode the auxiliary channels
-
         S8  mDecodingAux;                               // Are we decoding high components
-        mutable S8 mIsMissingAsset;             // True if we know that there is no image asset with this image id in the database.
-        
-        // Codec of incoming packet data
-        U8  mDataCodec;
         S8  mIsRawImageValid;
+        S8  mHasFetcher;                                // We've made a fecth request
+        S8  mIsFetching;                                // Fetch request is active
+        S8  mFullyLoaded;
+        mutable S8 mIsMissingAsset;             // True if we know that there is no image asset with this image id in the database.     
 
-        typedef std::map<U16, LLViewerImagePacket *> vip_map_t;
-        vip_map_t mReceivedPacketMap;
-        S32 mLastPacketProcessed;
-        U32 mLastBytesProcessed;                // Total bytes including the last packet rec'd
-
-        // Data download/decode info
-        U32 mPacketsReceived;
-        U32 mTotalBytes;
-        S32 mLastPacket;                                // Last packet received without a gap.
-        U16 mPackets;
-
-        // VFS info
-        U8 *mCachedData;
-        S32 mCachedSize;
-        
         // Override the computation of discard levels if we know the exact output size of the image.
         // Used for UI textures to not decode, even if we have more data.
-        S32  mKnownDrawWidth;
-        S32      mKnownDrawHeight;
+        S32 mKnownDrawWidth;
+        S32     mKnownDrawHeight;
 
-        F32  mDecodePriority;                   // The priority for decoding this image.
-        S32  mBoostLevel;                               // enum describing priority level
+        F32 mDecodePriority;                    // The priority for decoding this image.
+        S32 mBoostLevel;                                // enum describing priority level
         
         typedef std::list<LLLoadedCallbackEntry*> callback_list_t;
         callback_list_t mLoadedCallbackList;
 
         LLPointer<LLImageRaw> mRawImage;
-        S32                                     mRawDiscardLevel;
+        S32 mRawDiscardLevel;
+        S32     mMinDiscardLevel;
+        F32 mCalculatedDiscardLevel; // Last calculated discard level
+        
         // Used ONLY for cloth meshes right now.  Make SURE you know what you're 
         // doing if you use it for anything else! - djs
         LLPointer<LLImageRaw> mAuxRawImage;
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 20ca3bf..456afdb 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -39,57 +39,30 @@
 #include "llimagejpeg.h"
 #include "llmediaengine.h"
 
+#include "llsdserialize.h"
+#include "llsys.h"
 #include "llvfs.h"
 #include "llvfile.h"
 #include "llvfsthread.h"
 #include "message.h"
 
 #include "llagent.h"
-#include "llviewercontrol.h"
+#include "lltexturecache.h"
+#include "lltexturefetch.h"
 #include "lltexturetable.h" // For looking up names from uuid's.
+#include "llviewercontrol.h"
 #include "llviewerimage.h"
 #include "llviewerregion.h"
+#include "pipeline.h"
 #include "viewer.h"
-#include "llsys.h"
-#include "llpaneldisplay.h" // for LL_MAX_VRAM_INDEX
 
-void (*LLViewerImageList::sUUIDCallback)(void **, const LLUUID&) = NULL;
+////////////////////////////////////////////////////////////////////////////
 
-const U32 SIXTEEN_MEG = 0x1000000;
-const F32 MAX_IMAGE_PRIORITY = 100000000.f;
+void (*LLViewerImageList::sUUIDCallback)(void **, const LLUUID&) = NULL;
 
 U32 LLViewerImageList::sTextureBits = 0;
 U32 LLViewerImageList::sTexturePackets = 0;
 
-struct CodecExtMap
-{
-        CodecExtMap( const char* ext, U8 codec ) : mExt( ext ), mCodec( codec ) {}
-        const char* mExt;
-        U8 mCodec;
-};
-
-// Note: Keep codec extensions in order of likelihood the image
-// will be found.
-const S32 CODEC_EXT_MAP_COUNT = 2;
-const CodecExtMap CODEC_EXT_MAP[CODEC_EXT_MAP_COUNT] =
-{
-        CodecExtMap( "_07", IMG_CODEC_J2C ),
-        CodecExtMap( ".tga", IMG_CODEC_TGA )
-};
-
-const U32 MIN_AVAIL_MEM_FOR_DECODE = 1048576;
-
-// HACK: We have to try to allocate a constant fraction of this
-// memory for AGP.  This isn't worthwhile on 128 meg cards.
-// So for 128 meg cards, only alloc 64 megs.
-const S32 VIDEO_CARD_MEM_SIZES[6] = { 0x1000000, // 16MB
-                                                                          0x2000000, // 32MB
-                                                                          0x4000000,  // 64MB+
-                                                                          0x8000000, // 128MB
-                                                                          0x10000000, // 256MB
-                                                                          0x20000000, // 512MB
-                                                                        };
-
 const S32 IMAGES_PER_REQUEST = 42;
 const S32 IMAGES_MIN_UPDATES = 4;  // Always update the highest N images each frame
 const S32 IMAGES_MAX_PACKET_UPDATES = 1; // Only send N packets of IMAGES_PER_REQUEST in a frame
@@ -105,22 +78,6 @@ LLStat LLViewerImageList::sGLBoundMemStat(32, TRUE);
 LLStat LLViewerImageList::sRawMemStat(32, TRUE);
 LLStat LLViewerImageList::sFormattedMemStat(32, TRUE);
 
-//static
-S32 LLViewerImageList::calcMaxTextureRAM()
-{
-        // Decide the maximum amount of RAM we should allow the user to allocate to texture cache
-        LLMemoryInfo memory_info;
-        U32 available_memory = memory_info.getPhysicalMemory();
-        
-        clamp_rescale((F32)available_memory,
-                                 (F32)(SIXTEEN_MEG * 16),
-                                 (F32)U32_MAX,
-                                 (F32)(SIXTEEN_MEG * 4),
-                                 (F32)(U32_MAX >> 1));
-        return available_memory;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 
 LLViewerImageList::LLViewerImageList() 
@@ -145,57 +102,22 @@ void LLViewerImageList::init()
                 return;
         }
 
-        // This stuff is global! Bad behavior if more than one image list.
-
-        // Set the fallback GL texture to smoke...
-        LLViewerImage::sSmokeImagep = getImage(IMG_SMOKE, TRUE, TRUE);
-        // Set the fallback GL texture to gray with a white border...
-#if 0
-        LLViewerImage* imagep = new LLViewerImage(IMG_DEFAULT, TRUE);
-        LLViewerImage::sDefaultImagep = imagep;
-        const S32 dim = 128;
-        const S32 border = 2;
-        LLPointer<LLImageRaw> image_raw = new LLImageRaw(dim,dim,3);
-        U8* data = image_raw->getData();
-        for (S32 i = 0; i<dim; i++)
-        {
-                for (S32 j = 0; j<dim; j++)
-                {
-                        if (i<border || j<border || i>=(dim-border) || j>=(dim-border))
-                        {
-                                *data++ = 0xff;
-                                *data++ = 0xff;
-                                *data++ = 0xff;
-                        }
-                        else
-                        {
-                                *data++ = 0x7f;
-                                *data++ = 0x7f;
-                                *data++ = 0x7f;
-                        }
-                }
-        }
-        imagep->createGLTexture(0, image_raw);
-        image_raw = NULL;
-        addImage(imagep);
-        imagep->dontDiscard();
-#else
-        LLViewerImage::sDefaultImagep = getImage(IMG_DEFAULT, TRUE, TRUE);
-#endif
-
-
         mUpdateStats = TRUE;
 
         // Update how much texture RAM we're allowed to use.
         updateMaxResidentTexMem();
 
         mMovieImageHasMips = FALSE;
+
+        doPreloadImages();
+
+        decodeAllImages(5.f); // decode preloaded images
 }
 
 void LLViewerImageList::doPreloadImages()
 {
         llinfos << "Preloading images..." << llendl;
-        
+
         // Set the "missing asset" image
         LLViewerImage::sMissingAssetImagep = preloadImage("missing_asset.tga" , LLUUID::null, TRUE);
 
@@ -335,6 +257,7 @@ void LLViewerImageList::doPreloadImages()
         preloadImage("spin_up_in_blue.tga", LLUUID::null, FALSE);
         preloadImage("spin_up_out_blue.tga", LLUUID::null, FALSE);
         preloadImage("square_btn_32x128.tga", LLUUID::null, FALSE);
+        preloadImage("square_btn_selected_32x128.tga", LLUUID::null, FALSE);
         preloadImage("startup_logo.tga", LLUUID::null, FALSE);
         preloadImage("status_build.tga", LLUUID::null, FALSE);
         preloadImage("status_buy_currency.tga", LLUUID::null, FALSE);
@@ -346,6 +269,8 @@ void LLViewerImageList::doPreloadImages()
         preloadImage("status_scripts.tga", LLUUID::null, FALSE);
         preloadImage("tab_bottom_blue.tga", LLUUID::null, FALSE);
         preloadImage("tab_bottom_selected_blue.tga", LLUUID::null, FALSE);
+        preloadImage("tab_left.tga", LLUUID::null, FALSE);
+        preloadImage("tab_left_selected.tga", LLUUID::null, FALSE);
         preloadImage("tab_top_blue.tga", LLUUID::null, FALSE);
         preloadImage("tab_top_selected_blue.tga", LLUUID::null, FALSE);
         preloadImage("tool_dozer.tga", LLUUID::null, FALSE);
@@ -355,6 +280,45 @@ void LLViewerImageList::doPreloadImages()
         preloadImage("white.tga", LLUUID::null, TRUE);
 }
 
+static std::string get_texture_list_name()
+{
+        BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
+        return std::string("texture_list_") + (login_last?"last":"home") + ".xml";
+}
+
+void LLViewerImageList::doPrefetchImages()
+{
+        if (gPurgeCache)
+        {
+                // cache was purged, no point
+                return;
+        }
+        
+        // Pre-fetch textures from last logout
+        LLSD imagelist;
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, get_texture_list_name());
+        llifstream file;
+        file.open(filename.c_str());
+        if (file.is_open())
+        {
+                LLSDSerialize::fromXML(imagelist, file);
+        }
+        for (LLSD::array_iterator iter = imagelist.beginArray();
+                 iter != imagelist.endArray(); ++iter)
+        {
+                LLSD imagesd = *iter;
+                LLUUID uuid = imagesd["uuid"];
+                S32 pixel_area = imagesd["area"];
+                LLViewerImage* image = getImage(uuid, MIPMAP_TRUE, FALSE);
+                if (image)
+                {
+                        image->addTextureStats((F32)pixel_area);
+                }
+        }
+
+        
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 LLViewerImageList::~LLViewerImageList()
@@ -364,43 +328,70 @@ LLViewerImageList::~LLViewerImageList()
 
 void LLViewerImageList::shutdown()
 {
-        // Clean up potential callback data
-        // mIRCallbackData is now stl and will clean itself up
+        // Write out list of currently loaded textures for precaching on startup
+        typedef std::set<std::pair<S32,LLViewerImage*> > image_area_list_t;
+        image_area_list_t image_area_list;
+        for (image_priority_list_t::iterator iter = mImageList.begin();
+                 iter != mImageList.end(); ++iter)
+        {
+                LLViewerImage* image = *iter;
+                if (!image->getUseDiscard() ||
+                        image->needsAux() ||
+                        image->getTargetHost() != LLHost::invalid)
+                {
+                        continue; // avoid UI, baked, and other special images
+                }
+                S32 desired = image->getDesiredDiscardLevel();
+                if (desired >= 0 && desired < MAX_DISCARD_LEVEL)
+                {
+                        S32 pixel_area = image->getWidth(desired) * image->getHeight(desired);
+                        image_area_list.insert(std::make_pair(pixel_area, image));
+                }
+        }
+        
+        LLSD imagelist;
+        const S32 max_count = 1000;
+        S32 count = 0;
+        for (image_area_list_t::reverse_iterator riter = image_area_list.rbegin();
+                 riter != image_area_list.rend(); ++riter)
+        {
+                LLViewerImage* image = riter->second;
+                imagelist[count]["area"] = riter->first;
+                imagelist[count]["uuid"] = image->getID();
+                if (++count >= max_count)
+                        break;
+        }
 
+        if (count > 0 && !gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "").empty())
+        {
+                std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, get_texture_list_name());
+                llofstream file;
+                file.open(filename.c_str());
+                LLSDSerialize::toPrettyXML(imagelist, file);
+        }
+        
         //
         // Clean up "loaded" callbacks.
         //
         mCallbackList.clear();
-
+        mIRCallbackData.clear();
+        
         // Clean up preloaded images
         mPreloadedImages.clear();
         
-        //
-        // If we're working on decoding an image, finish it off so we can clean it up.
-        //
-        LLViewerImage *imagep = mCurrentDecodeImagep;
-        if (imagep)
-        {
-                imagep->abortDecode();
-                imagep->destroyRawImage();
-                mCurrentDecodeImagep = NULL;
-        }
-
         // Flush all of the references
         mLoadingStreamList.clear();
+        mCreateTextureList.clear();
 
         mUUIDMap.clear();
 
-        // This stuff is global!
-        LLViewerImage::sDefaultImagep = NULL;
-
         mImageList.clear();
 }
 
 void LLViewerImageList::dump()
 {
         llinfos << "LLViewerImageList::dump()" << llendl;
-        for (image_list_t::iterator it = mImageList.begin(); it != mImageList.end(); ++it)
+        for (image_priority_list_t::iterator it = mImageList.begin(); it != mImageList.end(); ++it)
         {
                 LLViewerImage* image = *it;
 
@@ -456,20 +447,20 @@ LLViewerImage* LLViewerImageList::preloadImage(const LLString& filename, const L
 
 ///////////////////////////////////////////////////////////////////////////////
 
-LLViewerImage * LLViewerImageList::getImage(const LLString& filename,
-                                                                                        const LLUUID &image_set_id,
-                                                                                        BOOL usemipmaps,
-                                                                                        BOOL level_immediate)
+LLViewerImage* LLViewerImageList::getImage(const LLString& filename,
+                                                                                   const LLUUID &image_set_id,
+                                                                                   BOOL usemipmaps,
+                                                                                   BOOL level_immediate)
 {
         return getImageFromFile(filename, image_set_id, usemipmaps, level_immediate, 0, 0);
 }
 
-LLViewerImage * LLViewerImageList::getImageFromFile(const LLString& filename,
-                                                                                                        const LLUUID &image_set_id,
-                                                                                                        BOOL usemipmaps,
-                                                                                                        BOOL level_immediate,
-                                                                                                        LLGLint internal_format,
-                                                                                                        LLGLenum primary_format)
+LLViewerImage* LLViewerImageList::getImageFromFile(const LLString& filename,
+                                                                                                   const LLUUID &image_set_id,
+                                                                                                   BOOL usemipmaps,
+                                                                                                   BOOL level_immediate,
+                                                                                                   LLGLint internal_format,
+                                                                                                   LLGLenum primary_format)
 {
         if (gNoRender)
         {
@@ -485,7 +476,7 @@ LLViewerImage * LLViewerImageList::getImageFromFile(const LLString& filename,
         LLUUID image_id = LLUUID( gViewerArt.getString(filename.c_str()) );
         if (image_id.isNull())
         {
-                llwarns << "Unable to find inage " << filename << " in gViewerArt" << llendl;
+                llwarns << "Unable to find image " << filename << " in gViewerArt" << llendl;
                 if (image_set_id.notNull())
                 {
                         // We *know* that missing_asset.tga exists,
@@ -512,58 +503,9 @@ LLViewerImage * LLViewerImageList::getImageFromFile(const LLString& filename,
                 image_id = image_set_id;
         }
         
-        // First see if we already have this image loaded.
-        LLPointer<LLViewerImage> imagep = hasImage(image_id);
-
-        if (imagep.isNull())
-        {
-                // No image loaded.  Try to read the filename given.
-                bool success = false;
-                if (!filename.empty())
-                {
-                        // This is strictly for local .tga files not in the static VFS
-                        LLString image_file = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, filename);
-                        imagep = new LLViewerImage(image_id, usemipmaps);
-                        LLPointer<LLImageRaw> image_raw = new LLImageRaw(image_file);
-                        if ( image_raw->getDataSize() > 0 )
-                        {
-                                imagep->createGLTexture(0, image_raw);
-                                image_raw = NULL;
-
-                                if (usemipmaps == FALSE)
-                                {
-                                        // num mipmaped textures are almost always clamped, so clamp by default
-                                        imagep->bind();
-                                        imagep->setClamp(TRUE, TRUE);
-                                }
-                                
-                                if (internal_format && primary_format)
-                                {
-                                        imagep->setExplicitFormat(internal_format, primary_format);
-                                }
-
-                                addImage(imagep);
-
-                                if (level_immediate)
-                                {
-                                        imagep->dontDiscard();
-                                }
-
-                                success = true;
-                        }
-                        else
-                        {
-                                imagep = NULL;
-                        }
-                }
-
-                if (!success)
-                {
-                        // We couldn't load from a file.  Try the VFS.
-                        imagep = getImageFromUUID(image_id, usemipmaps, level_immediate, 
-                                                                          internal_format, primary_format, LLHost());
-                }
-        }
+        // Load the image
+        LLViewerImage* imagep = getImageFromUUID(image_id, usemipmaps, level_immediate, 
+                                                                                         internal_format, primary_format, LLHost());
 
         return imagep;
 }
@@ -609,40 +551,7 @@ LLViewerImage* LLViewerImageList::getImageFromUUID(const LLUUID &image_id,
                 if (level_immediate)
                 {
                         imagep->dontDiscard();
-                }
-
-                // if rendering enabled, actually try to load this image
-                if (!gNoRender)
-                {
-                        // First check the local image cache to see if it's there.
-                        if (imagep->loadLocalImage(image_id))
-                        {
-//                              llinfos << "Loading Local Image: " << image_id
-//                                              << llformat(" MIP:%d IMM:%d",usemipmaps,level_immediate)
-//                                              << llendl;
-                                if( level_immediate )
-                                {
-                                        if (imagep->needsDecode())
-                                        {
-                                                imagep->decodeImage(0.f); // getImage (local image)
-                                        }
-
-                                        if (imagep->getNeedsCreateTexture())
-                                        {
-                                                imagep->createTexture();
-                                        }
-                                }
-                        }
-                        else
-                        {
-                                // if we don't have this locally, we'll want to start on the highest discard
-                                if (!imagep->getDontDiscard())
-                                {
-                                        imagep->setDesiredDiscardLevel(imagep->getMaxDiscardLevel());
-                                }
-
-                                imagep->startVFSLoad();
-                        }
+                        imagep->setBoostLevel(LLViewerImage::BOOST_UI);
                 }
         }
         
@@ -695,13 +604,6 @@ void LLViewerImageList::addImage(LLViewerImage *new_image)
         }
         sNumImages++;
         
-#if 0
-        // Add this image to the viewer image list.
-        if (new_image->getDecodePriority() == 0.0f)
-        {
-                new_image->setDecodePriority(MAX_IMAGE_PRIORITY); // Initially put in front of list
-        }
-#endif
         addImageToList(new_image);
         mUUIDMap[image_id] = new_image;
 }
@@ -721,35 +623,6 @@ void LLViewerImageList::deleteImage(LLViewerImage *image)
         }
 }
 
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-void image_request_callback(void **data, S32 number)
-{
-        gImageList.handleIRCallback(data, number);
-}
-
-void LLViewerImageList::handleIRCallback(void **data, const S32 number)
-{
-        callback_data_t* requested_images = (callback_data_t*)data;
-        if (number == LL_ERR_TCP_TIMEOUT)
-        {
-                for (callback_data_t::iterator iter = requested_images->begin();
-                         iter != requested_images->end();)
-                {
-                        LLViewerImage* image = *iter++;
-                        image->mRequested = FALSE;
-                        image->mRequestedDiscardLevel = -1; // Indicates we need to re-request this
-                }
-        }
-
-        // Delete and remove from our list of callback data
-        delete requested_images;
-        llverify(mIRCallbackData.erase(requested_images) == 1);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void LLViewerImageList::updateMovieImage(const LLUUID& uuid, BOOL active)
@@ -785,7 +658,16 @@ void LLViewerImageList::updateMovieImage(const LLUUID& uuid, BOOL active)
         }
 }
 
-void LLViewerImageList::updateImages(const F32 decode_time_max)
+////////////////////////////////////////////////////////////////////////////
+
+void LLViewerImageList::dirtyImage(LLViewerImage *image)
+{
+        mDirtyTextureList.insert(image);
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+void LLViewerImageList::updateImages(F32 max_time)
 {
         sNumImagesStat.addValue(sNumImages);
         sNumRawImagesStat.addValue(LLImageRaw::sRawImageCount);
@@ -795,28 +677,40 @@ void LLViewerImageList::updateImages(const F32 decode_time_max)
         sFormattedMemStat.addValue(LLImageFormatted::sGlobalFormattedMemory/(1024.f*1024.f));
 
         updateImagesDecodePriorities();
-        updateImagesSendRequests();
-        
-        if (gGLManager.mIsDisabled)
+        max_time -= updateImagesFetchTextures(max_time);
+        max_time = llmax(max_time, 0.001f);
+        max_time -= updateImagesCreateTextures(max_time);
+        max_time = llmax(max_time, 0.001f);
+
+        if (!mDirtyTextureList.empty())
         {
-                // We don't want to run this part of the texture system while we don't have
-                // a GL context - we COULD probably do some of it, but that's tricky - djs 10/29/03
-                return;
+                LLFastTimer t(LLFastTimer::FTM_IMAGE_MARK_DIRTY);
+                gPipeline.dirtyPoolObjectTextures(mDirtyTextureList);
+                mDirtyTextureList.clear();
         }
 
-        updateImagesDecodeTextures(decode_time_max);
+        for (image_list_t::iterator iter = mCallbackList.begin();
+                 iter != mCallbackList.end(); )
+        {
+                LLViewerImage* image = *iter++;
+                // Do stuff to handle callbacks, update priorities, etc.
+                bool res = image->doLoadedCallbacks();
+                if (res)
+                {
+                        break; // only actually do one callback per frame
+                }
+        }
+        
         updateImagesMediaStreams();
-        updateImagesPollVFS();
         updateImagesUpdateStats();
 }
 
-
 void LLViewerImageList::updateImagesDecodePriorities()
 {
         // Update the decode priority for N images each frame
         {
                 const size_t max_update_count = 256;
-                S32 update_counter = llmin(max_update_count, mUUIDMap.size());
+                S32 update_counter = llmin(max_update_count, mUUIDMap.size()/10);
                 uuid_map_t::iterator iter = mUUIDMap.upper_bound(mLastUpdateUUID);
                 while(update_counter > 0)
                 {
@@ -826,6 +720,33 @@ void LLViewerImageList::updateImagesDecodePriorities()
                         }
                         mLastUpdateUUID = iter->first;
                         LLPointer<LLViewerImage> imagep = iter->second;
+                        ++iter; // safe to incrament now
+
+                        //
+                        // Flush formatted images using a lazy flush
+                        //
+                        const F32 LAZY_FLUSH_TIMEOUT = 30.f;
+                        S32 min_refs = 3; // 1 for mImageList, 1 for mUUIDMap, 1 for local reference
+                        if (imagep->hasCallbacks())
+                        {
+                                min_refs++; // Add an extra reference if we're on the loaded callback list
+                        }
+                        S32 num_refs = imagep->getNumRefs();
+                        if (num_refs == min_refs)
+                        {
+                                if (imagep->mLastReferencedTimer.getElapsedTimeF32() > LAZY_FLUSH_TIMEOUT)
+                                {
+                                        // Remove the unused image from the image list
+                                        deleteImage(imagep);
+                                        imagep = NULL; // should destroy the image
+                                        continue;
+                                }
+                        }
+                        else
+                        {
+                                imagep->mLastReferencedTimer.reset();
+                        }
+                        
                         imagep->processTextureStats();
                         F32 old_priority = imagep->getDecodePriority();
                         F32 decode_priority = imagep->calcDecodePriority();
@@ -836,12 +757,12 @@ void LLViewerImageList::updateImagesDecodePriorities()
                                 imagep->setDecodePriority(decode_priority);
                                 addImageToList(imagep);
                         }
-                        iter++;
                         update_counter--;
                 }
         }
 }
 
+/*
 static U8 get_image_type(LLViewerImage* imagep, LLHost target_host)
 {
         // Having a target host implies this is a baked image.  I don't
@@ -866,478 +787,90 @@ static U8 get_image_type(LLViewerImage* imagep, LLHost target_host)
         }
         return type_from_host;
 }
+*/
 
-void LLViewerImageList::updateImagesSendRequests()
+F32 LLViewerImageList::updateImagesCreateTextures(F32 max_time)
 {
-        // Send requests for images based on priority.
-        {
-                S32 request_count = 0;
-                S32 request_packets_sent = 0;
-                S32 update_count = 0;
+        if (gNoRender || gGLManager.mIsDisabled) return 0.0f;
         
-                callback_data_t *requested_images = NULL;
-
-                // Baked texture images may live on a separate host. JC
-                std::vector< LLPointer<LLViewerImage> > images_on_other_hosts;
-                LLHost agent_host = gAgent.getRegionHost();
-
-                for (image_list_t::iterator iter = mImageList.begin();
-                         iter != mImageList.end(); )
-                {
-                        image_list_t::iterator curiter = iter++;
-                        LLPointer<LLViewerImage> imagep = *curiter;
-
-                        if (imagep->mIsMediaTexture)
-                        {
-                                continue; // skip
-                        }
-
-                        F32 decode_priority = imagep->getDecodePriority();
-                        
-                        update_count++;
-                        if (mUpdateStats == FALSE &&
-                                update_count >= IMAGES_MIN_UPDATES &&
-                                decode_priority < MAX_IMAGE_PRIORITY)
-                        {
-                                break;
-                        }
-                        
-                        //
-                        // Flush formatted images using a lazy flush
-                        //
-                        const F32 LAZY_FLUSH_TIMEOUT = 30.f;
-                        S32 min_refs = 3; // 1 for mImageList, 1 for mUUIDMap, 1 for local reference
-                        if (imagep->hasCallbacks())
-                        {
-                                min_refs++; // Add an extra reference if we're on the loaded callback list
-                        }
-                        S32 num_refs = imagep->getNumRefs();
-                        if (num_refs == min_refs)
-                        {
-                                if (!(imagep->isDecoding()))
-                                {
-                                        if (imagep->mLastReferencedTimer.getElapsedTimeF32() > LAZY_FLUSH_TIMEOUT)
-                                        {
-                                                if (imagep->mStreamFile && !imagep->mStreamFile->isReadComplete())
-                                                {
-                                                        llwarns << "Stream file is still reading data, delaying flush!" << llendl;
-                                                }
-                                                else
-                                                {
-                                                        // Remove the unused image from the image list
-                                                        deleteImage(imagep);
-                                                        imagep = NULL; // should destroy the image
-                                                        continue;
-                                                }
-                                        }
-                                }
-                        }
-                        else
-                        {
-                                imagep->mLastReferencedTimer.reset();
-                        }
-
-                        if (decode_priority <= 0)
-                        {
-                                continue;
-                        }
-                        if (imagep->isMissingAsset())
-                        {
-                                continue;
-                        }       
-                        if (imagep->checkPacketData())
-                        {
-                                // New packets have been processed, re-evaluate next time
-                                continue;
-                        }
-                        if (request_packets_sent >= IMAGES_MAX_PACKET_UPDATES)
-                        {
-                                continue;
-                        }
-                        if (!gAgent.getRegion())
-                        {
-                                //llinfos << "Skipping request for " << imagep->getID() << " while waiting for a region" << llendl;
-                                continue;
-                        }
-
-                        F32 old_priority = imagep->mRequestedDownloadPriority;
-                        S32 current_discard = imagep->getDiscardLevel();
-                        S32 desired_discard = imagep->getDesiredDiscardLevel();
-
-                        if (current_discard >= 0 && current_discard <= desired_discard)
-                        {
-                                continue;
-                        }
-                        
-                        if (imagep->mRequestTime.getElapsedTimeF32() <= RESEND_IMAGE_REQUEST_TIME)
-                        {
-                                // Ignore < 20% difference, or no change in requested discard level
-                                if ((decode_priority > old_priority * .8f && decode_priority < old_priority * 1.25f) &&
-                                        (desired_discard == imagep->mRequestedDiscardLevel))
-                                {
-                                        continue;
-                                }                       
-                        }
-                        
-                        // Send the request
-                        {                       
-                                // Baked avatar textures may live on other hosts. JC
-                                LLHost target_host = imagep->getTargetHost();
-
-                                // This file is in the static VFS, we don't ever need to request it from the network.
-                                if (imagep->mInStaticVFS && imagep->mFormattedFlushed)
-                                {
-                                        // Unneeded? JC 8/2006
-                                        imagep->mRequestedDiscardLevel = desired_discard;
-                                        imagep->mRequestedDownloadPriority = decode_priority;
-                                        
-                                        // It's in the static VFS but not loaded, just load it from disk instead of sending a request.
-                                        imagep->startVFSLoad();
-                                }
-                                else if (target_host.isOk() && target_host != agent_host)
-                                {
-                                        // This is a special texture to request off a sim other than
-                                        // the one the agent is on.  We'll deal with it later.
-                                        images_on_other_hosts.push_back(imagep);
-                                }
-                                else
-                                {
-                                        imagep->mRequestedDiscardLevel = desired_discard;
-                                        imagep->mRequestedDownloadPriority = decode_priority;
-                                        
-                                        if (0 == request_count)
-                                        {
-                                                // Create a message if this is the first image request.
-                                                gMessageSystem->newMessageFast(_PREHASH_RequestImage);
-                                                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-                                                gMessageSystem->addUUIDFast(
-                                                        _PREHASH_AgentID, gAgent.getID());
-                                                gMessageSystem->addUUIDFast(
-                                                        _PREHASH_SessionID, gAgent.getSessionID());
-                                                requested_images = new callback_data_t;
-                                                // verify that requested_images is placed uniquely in the list
-                                                llverify((mIRCallbackData.insert(requested_images)).second);
-                                        }
-
-                                        requested_images->push_back(imagep);
-                                        request_count++;
-
-                                        gMessageSystem->nextBlockFast(_PREHASH_RequestImage);
-                                        S32 packet = imagep->getLastPacket() + 1;
-                                        gMessageSystem->addUUIDFast(_PREHASH_Image, imagep->getID());
-                                        gMessageSystem->addS8Fast(_PREHASH_DiscardLevel, (S8)desired_discard);
-                                        gMessageSystem->addF32Fast(_PREHASH_DownloadPriority, decode_priority);
-                                        gMessageSystem->addU32Fast(_PREHASH_Packet, packet);
-                                        U8 type = get_image_type(imagep, target_host);
-                                        gMessageSystem->addU8Fast(_PREHASH_Type, type);
-
-                                        lldebugst(LLERR_IMAGE)
-                                                << "IMAGE REQUEST: " << imagep->getID().getString()
-                                                << " discard: " << desired_discard
-                                                << " old_pri: " << old_priority
-                                                << " dld_pri: " << decode_priority
-                                                << " dec_pri: " << imagep->getDecodePriority()
-                                                << llendl;
-                                                
-                                }
-
-                                imagep->mRequested = TRUE;
-                                imagep->mRequestTime.reset();
-
-                                if (request_count >= IMAGES_PER_REQUEST)
-                                {
-                                        // IMAGES_PER_REQUEST packets combined, send packet.
-                                        gMessageSystem->sendSemiReliable(gAgent.getRegion()->getHost(), image_request_callback, (void **)requested_images);
+        //
+        // Create GL textures for all textures that need them (images which have been
+        // decoded, but haven't been pushed into GL).
+        //
+        LLFastTimer t(LLFastTimer::FTM_IMAGE_CREATE);
 
-                                        requested_images = NULL;
-                                        request_count = 0;
-                                        ++request_packets_sent;
-                                }
-                        }
-                }
-                
-                if (request_count != 0)
-                {
-                        // fill in the unused requested_images w/ NULL
-                        gMessageSystem->sendSemiReliable(gAgent.getRegion()->getHost(), image_request_callback, (void **)requested_images);
-                        requested_images = NULL;
-                        ++request_packets_sent;
-                }
-                
-                // We might have picked up some images on other hosts.
-                if (!images_on_other_hosts.empty())
+        LLTimer create_timer;
+        image_list_t::iterator enditer = mCreateTextureList.begin();
+        for (image_list_t::iterator iter = mCreateTextureList.begin();
+                 iter != mCreateTextureList.end();)
+        {
+                image_list_t::iterator curiter = iter++;
+                enditer = iter;
+                LLViewerImage *imagep = *curiter;
+                imagep->createTexture();
+                if (create_timer.getElapsedTimeF32() > max_time)
                 {
-                        // llinfos << "TAT: images_on_other_hosts " << images_on_other_hosts.size() << llendl;
-
-                        std::sort(images_on_other_hosts.begin(), images_on_other_hosts.end(), LLViewerImage::CompareByHostAndPriority());
-
-                        LLMessageSystem* msg = gMessageSystem;
-                        LLHost current_host = images_on_other_hosts[0]->getTargetHost();
-                        request_count = 0;
-
-                        for (std::vector<LLPointer<LLViewerImage> >::iterator it = images_on_other_hosts.begin();
-                                it != images_on_other_hosts.end();
-                                ++it)
-                        {
-                                LLPointer<LLViewerImage> imagep = *it;
-                                
-                                F32 decode_priority = imagep->getDecodePriority();
-                                S32 desired_discard = imagep->getDesiredDiscardLevel();
-                                
-                                imagep->mRequestedDiscardLevel = desired_discard;
-                                imagep->mRequestedDownloadPriority = decode_priority;
-                                
-                                if ((current_host != imagep->getTargetHost() || request_count >= IMAGES_PER_REQUEST) && request_count)
-                                {
-                                        // llinfos << "TAT: Sending " << request_count << " image requests for host: " << current_host << llendl;
-
-                                        // Need to flush to current host.
-                                        gMessageSystem->sendSemiReliable(current_host, image_request_callback, (void **)requested_images);
-                                        
-                                        requested_images = NULL;
-                                        current_host = imagep->getTargetHost();
-                                        request_count = 0;
-                                }
-
-                                if (request_count == 0)
-                                {
-                                        // Start a packet and build a new callback list for dropped
-                                        // packet handler.
-                                        msg->newMessageFast(_PREHASH_RequestImage);
-                                        msg->nextBlockFast(_PREHASH_AgentData);
-                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                                        requested_images = new callback_data_t;
-                                        mIRCallbackData.insert(requested_images);
-                                        current_host = imagep->getTargetHost();
-                                }
-                                                        
-                                requested_images->push_back(imagep);
-                                request_count++;
-                                        
-                                msg->nextBlockFast(_PREHASH_RequestImage);
-                                S32 packet = imagep->getLastPacket() + 1;
-                                msg->addUUIDFast(_PREHASH_Image, imagep->getID());
-                                msg->addS8Fast(_PREHASH_DiscardLevel, (S8)desired_discard);
-                                msg->addF32Fast(_PREHASH_DownloadPriority, decode_priority);
-                                msg->addU32Fast(_PREHASH_Packet, packet);
-                                U8 type = get_image_type(imagep, current_host);
-                                gMessageSystem->addU8Fast(_PREHASH_Type, type);
-                                
-                                if (!gMessageSystem->checkCircuitAlive(current_host))
-                                {
-                                        llinfos << "TAT: Image request for dead circuit " << current_host << ", " << imagep->getID() << llendl;
-                                        imagep->setTargetHost(agent_host);
-                                }
-
-                                if (!gMessageSystem->checkCircuitAlive(current_host))
-                                {
-                                        llinfos << "TAT: Image request for dead circuit " << current_host << ", " << imagep->getID() << llendl;
-                                        imagep->setTargetHost(agent_host);
-                                }
-
-                                imagep->mRequested = TRUE;
-                                imagep->mRequestTime.reset();                           
-                        }
-
-                        if (request_count != 0)
-                        {
-                                // fill in the unused requested_images w/ NULL
-                                msg->sendSemiReliable(current_host, image_request_callback, (void **)requested_images);
-                                requested_images = NULL;
-                        }
+                        break;
                 }
         }
+        mCreateTextureList.erase(mCreateTextureList.begin(), enditer);
+        return create_timer.getElapsedTimeF32();
 }
 
-
-
-void LLViewerImageList::updateImagesDecodeTextures(F32 decode_time_max)
+F32 LLViewerImageList::updateImagesFetchTextures(F32 max_time)
 {
-        if (gNoRender) return;
-
-                LLTimer image_op_timer;
-
-                BOOL done_one = FALSE;
-                image_op_timer.reset();
-
-                S32 create_count = 0;
-
-                // added by IW to help track down a bug
-                stop_glerror();
-
-                //
-                // Create GL textures for all textures that need them (images which have been
-                // decoded, but haven't been pushed into GL).
-                //
-                {
-                LLFastTimer t(LLFastTimer::FTM_IMAGE_CREATE);
-
-                for (image_list_t::iterator iter = mImageList.begin();
-                         iter != mImageList.end(); )
-                {
-                        LLPointer<LLViewerImage> imagep = *iter++;
-                        if (imagep->getNeedsCreateTexture())
-                        {
-                                create_count++;
-                                imagep->createTexture();
-                                if (decode_time_max != 0.f)
-                                {
-                                        if (image_op_timer.getElapsedTimeF32() > decode_time_max)
-                                        {
-                                                lldebugst(LLERR_IMAGE) << "Broke out of create texture!" << llendl;
-                                                break;
-                                        }
-                                }
-                        }
-                }
-                }
-                
-                //
-                // Work on decoding any image that's partially decoded, first
-                //
-                // Everything after here is time-sliced
-                //
-
-                if (mCurrentDecodeImagep.notNull()
-                        && mCurrentDecodeImagep->needsDecode()
-                        && mCurrentDecodeImagep->isDecoding())
-                {
-                        //llinfos << "Continue decoding " << mCurrentDecodeImagep->getID() << llendl;
-                        LLFastTimer t(LLFastTimer::FTM_IMAGE_DECODE);
-                        if (decode_time_max != 0.f)
-                        {
-                                if (done_one && image_op_timer.getElapsedTimeF32() >= decode_time_max)
-                                {
-                                        lldebugst(LLERR_IMAGE) << "Broke out of partial decode!" << llendl;
-                                }
-                                else
-                                {
-                                        F32 decode_time = decode_time_max - image_op_timer.getElapsedTimeF32();
-                                        decode_time = llmax(decode_time, .0001f); // min .1 ms
-                                        mCurrentDecodeImagep->decodeImage(decode_time); // Partial decode
-                                        done_one = TRUE;
-                                }
-                        }
-                        else
-                        {
-                                mCurrentDecodeImagep->decodeImage(0.0f); // Partial decode
-                                done_one = TRUE;
-                        }
-                }
-                
-                //
-                // Reprioritize any image that we just finished decoding
-                //
-                if (mCurrentDecodeImagep.notNull()
-                        && (!mCurrentDecodeImagep->needsDecode()
-                                || !mCurrentDecodeImagep->isDecoding()))
+        LLTimer image_op_timer;
+        
+        // Update the decode priority for N images each frame
+        // Make a list with 32 high priority entries + 256 cycled entries
+        const size_t max_priority_count = 32;
+        const size_t max_update_count = 256;
+
+        // 32 high priority entries
+        std::set<LLViewerImage*> entries;
+        size_t update_counter = llmin(max_priority_count, mImageList.size());
+        image_priority_list_t::iterator iter1 = mImageList.begin();
+        while(update_counter > 0)
+        {
+                entries.insert(*iter1);
+                ++iter1;
+                update_counter--;
+        }
+        
+        // 256 cycled entries
+        update_counter = llmin(max_update_count, mUUIDMap.size());
+        uuid_map_t::iterator iter2 = mUUIDMap.upper_bound(mLastFetchUUID);
+        while(update_counter > 0)
+        {
+                if (iter2 == mUUIDMap.end())
                 {
-                        // Reprioritize this image
-                        if (mCurrentDecodeImagep->mInImageList)
-                        {
-                                removeImageFromList(mCurrentDecodeImagep);
-                                mCurrentDecodeImagep->setDecodePriority();
-                                addImageToList(mCurrentDecodeImagep);
-                        }
-                        mCurrentDecodeImagep = NULL;
+                        iter2 = mUUIDMap.begin();
                 }
+                mLastFetchUUID = iter2->first;
+                entries.insert(iter2->second);
+                ++iter2;
+                update_counter--;
+        }
 
-                //
-                // At this point, we're going to check out the status of anything that's
-                // on our callback list.  Instead of calling the callback lists from a
-                // billion different places, we're ONLY going to handle them here.
-                //
-                // Do this here so if the callbacks take a lot of time, it counts
-                // against our decode timer totals
-
-                // For right now, just be really lame and just iterate through all images.
-                // This WILL be optimized soon.
-
-                if (mUpdateStats)
-                {
-                        // This is somewhat intensive, and it doesn't need to happen
-                        // immediately, so only do it when we update stats.
-                        for (image_callback_list_t::iterator iter = mCallbackList.begin();
-                                 iter != mCallbackList.end(); )
-                        {
-                                LLViewerImage* image = *iter++;
-                                // Do stuff to handle callbacks, update priorities, etc.
-                                image->doLoadedCallbacks();
-                        }
-                }
+        S32 min_count = max_priority_count + max_update_count/4;
+        for (std::set<LLViewerImage*>::iterator iter3 = entries.begin();
+                 iter3 != entries.end(); )
+        {
+                LLPointer<LLViewerImage> imagep = *iter3++;
 
-                //
-                // Decode as many images as we can at this point.
-                // If we're in the middle of finishing up one still,
-                // don't decode any more textures
-                //
-                if (mCurrentDecodeImagep.isNull() || mCurrentDecodeImagep->getBoostLevel())
+                imagep->updateFetch();
+                if (min_count <= 0 && image_op_timer.getElapsedTimeF32() > max_time)
                 {
-                        LLFastTimer t(LLFastTimer::FTM_IMAGE_DECODE);
-                        do
-                        {
-                                BOOL did_decode = FALSE;
-                                BOOL have_map_image = FALSE;
-                                for (image_list_t::iterator iter = mImageList.begin();
-                                         iter != mImageList.end(); )
-                                {
-                                        image_list_t::iterator curiter = iter++;
-                                        LLPointer<LLViewerImage> imagep = *curiter;
-                                        if (imagep->needsDecode())
-                                        {
-                                                if (decode_time_max != 0.f)
-                                                {
-                                                        if (!imagep->getBoostLevel() && done_one &&
-                                                                image_op_timer.getElapsedTimeF32() >= decode_time_max)
-                                                        {
-                                                                break;
-                                                        }
-                                                        F32 decode_time = decode_time_max - image_op_timer.getElapsedTimeF32();
-                                                        decode_time = llmax(decode_time, .0001f); // min .1 ms
-                                                        imagep->decodeImage(decode_time);
-                                                }
-                                                else
-                                                {
-                                                        imagep->decodeImage(0.0f);
-                                                }
-                                        
-                                                if (imagep->needsDecode())
-                                                {
-                                                        mCurrentDecodeImagep = imagep;
-                                                }
-                                                else
-                                                {
-                                                        // Reprioritize this image
-                                                        removeImageFromList(imagep);
-                                                        imagep->setDecodePriority();
-                                                        addImageToList(imagep);
-                                                
-                                                        mCurrentDecodeImagep = NULL;
-                                                }
-                                                done_one = TRUE;
-                                                did_decode = TRUE;
-                                        }
-                                        if (imagep->getBoostLevel() >= LLViewerImage::BOOST_MAP)
-                                        {
-                                                have_map_image = TRUE;
-                                        }
-                                        else if (have_map_image)
-                                        {
-                                                break; // skip other images if we are decoding map images
-                                        }
-                                }
-                                if (!did_decode)
-                                {
-                                        break;
-                                }
-                        } while (image_op_timer.getElapsedTimeF32() < decode_time_max);
+                        break;
                 }
+                min_count--;
+        }
+        return image_op_timer.getElapsedTimeF32();
 }
 
 void LLViewerImageList::updateImagesMediaStreams()
 {
-        if (gNoRender) return;
+        if (gNoRender || gGLManager.mIsDisabled) return;
         
                 // update media stream if required
                 LLMediaEngine* media_engine = LLMediaEngine::getInstance();
@@ -1358,8 +891,6 @@ void LLViewerImageList::updateImagesMediaStreams()
                                                         (renderer->getTextureDepth() != viewerImage->getComponents()) ||
                                                         (viewerImage->getHasGLTexture() == FALSE))
                                                 {
-                                                        llassert(!viewerImage->getUseMipMaps());
-                                                
                                                         // destroy existing GL image
                                                         viewerImage->destroyGLTexture();
                                         
@@ -1380,14 +911,15 @@ void LLViewerImageList::updateImagesMediaStreams()
                                                                                                            renderer->getTextureFormatPrimary(), 
                                                                                                            renderer->getTextureFormatType(),
                                                                                                            renderer->getTextureFormatSwapBytes());
+                                                // This should be redundant, but just in case:
+                                                viewerImage->setUseMipMaps(FALSE);
 
                                                 LLImageRaw* rawImage = media_engine->getImageRaw();
-
                                                 if ( rawImage )
                                                 {
-                                                        ((LLImageGL*)viewerImage)->setSubImage(rawImage, 0, 0,
-                                                                                                                                   renderer->getMediaWidth(),
-                                                                                                                                   renderer->getMediaHeight());
+                                                        viewerImage->setSubImage(rawImage, 0, 0,
+                                                                                                         renderer->getMediaWidth(),
+                                                                                                         renderer->getMediaHeight());
                                                 }
                                         }
                                         else
@@ -1404,89 +936,76 @@ void LLViewerImageList::updateImagesMediaStreams()
                 }
 }
 
-void LLViewerImageList::updateImagesPollVFS()
-{
-                // Sigh, VFS stuff has to be polled.  The VFS really needs some sort
-                // of mechanism to avoid this issue.
-                for (image_loading_list_t::iterator iter = mLoadingStreamList.begin();
-                         iter != mLoadingStreamList.end();)
-                {
-                        image_loading_list_t::iterator curiter = iter++;
-                        LLViewerImage *imagep = *curiter;
-                        imagep->loadStreamFile();
-                        if (!imagep->mStreamFile)
-                        {
-                                iter = mLoadingStreamList.erase(curiter);
-                        }
-                }
-}
-
 void LLViewerImageList::updateImagesUpdateStats()
 {
         if (mUpdateStats)
         {
-                for (image_list_t::iterator iter = mImageList.begin();
+                for (image_priority_list_t::iterator iter = mImageList.begin();
                          iter != mImageList.end(); )
                 {
                         LLViewerImage* imagep = *iter++;
                         imagep->resetTextureStats(mForceResetTextureStats);
                 }
-#if 0
-                S32 needs_decode_count = 0;
-                for (image_list_t::iterator iter = mImageList.begin();
-                         iter != mImageList.end(); )
-                {
-                        LLViewerImage* imagep = *iter++;
-                        // count priority images in need of decode (10000 ~= 100x100 pixels)
-                        if (imagep->getDecodePriority() > 10000.f && (imagep->needsDecode() || imagep->getNeedsCreateTexture()))
-                        {
-                                needs_decode_count++;
-                        }
-                }
-
-                // If we have a lot of priority decodes pending, take some time to decode them
-                const S32 force_decode_count = 20;
-                const F32 force_decode_time = 2.f; // seconds
-                const F32 force_decode_delay = 30.f; // seconds
-                if (needs_decode_count > force_decode_count && mForceDecodeTimer.hasExpired())
-                {
-                        decodeAllImages(force_decode_time); // spend some time decoding images
-                        mForceDecodeTimer.setTimerExpirySec(force_decode_delay); // wait 10 seconds
-                }
-#endif
                 mUpdateStats = FALSE;
                 mForceResetTextureStats = FALSE;
         }
 }
 
-void LLViewerImageList::decodeAllImages(F32 max_decode_time)
+void LLViewerImageList::decodeAllImages(F32 max_time)
 {
         LLTimer timer;
         if(!gNoRender)
         {
-                for (image_list_t::iterator iter = mImageList.begin();
+                // Update texture stats and priorities
+                std::vector<LLPointer<LLViewerImage> > image_list;
+                for (image_priority_list_t::iterator iter = mImageList.begin();
                          iter != mImageList.end(); )
                 {
                         LLViewerImage* imagep = *iter++;
-                        if (imagep->needsDecode())
-                        {
-                                imagep->decodeImage(0.f); // LLViewerImageList::decodeAllImages
-                        }
-                        if (max_decode_time > 0.0f && timer.getElapsedTimeF32() > max_decode_time)
+                        image_list.push_back(imagep);
+                        imagep->mInImageList = FALSE;
+                }
+                mImageList.clear();
+                for (std::vector<LLPointer<LLViewerImage> >::iterator iter = image_list.begin();
+                         iter != image_list.end(); ++iter)
+                {
+                        LLViewerImage* imagep = *iter;
+                        imagep->processTextureStats();
+                        F32 decode_priority = imagep->calcDecodePriority();
+                        imagep->setDecodePriority(decode_priority);
+                        mImageList.insert(imagep);
+                        imagep->mInImageList = TRUE;
+                }
+                image_list.clear();
+                
+                // Update fetch (decode)
+                for (image_priority_list_t::iterator iter = mImageList.begin();
+                         iter != mImageList.end(); )
+                {
+                        LLViewerImage* imagep = *iter++;
+                        imagep->updateFetch();
+                }
+                // Run threads
+                while (1)
+                {
+                        gTextureCache->update(1); // unpauses the texture cache thread
+                        gImageDecodeThread->update(1); // unpauses the image thread
+                        S32 fetch_pending = gTextureFetch->update(1); // unpauses the texture fetch thread
+                        if (fetch_pending == 0 || timer.getElapsedTimeF32() > max_time)
                         {
                                 break;
                         }
                 }
-
-                for (image_list_t::iterator iter = mImageList.begin();
+                // Update fetch again
+                for (image_priority_list_t::iterator iter = mImageList.begin();
                          iter != mImageList.end(); )
                 {
                         LLViewerImage* imagep = *iter++;
-                        if (imagep->getNeedsCreateTexture())
-                        {
-                                imagep->createTexture();
-                        }
+                        imagep->updateFetch();
                 }
+                max_time -= timer.getElapsedTimeF32();
+                max_time = llmax(max_time, .01f);
+                updateImagesCreateTextures(max_time);
         }
         if (timer.getElapsedTimeF32() > .5f) // seconds
         {
@@ -1560,12 +1079,8 @@ BOOL LLViewerImageList::createUploadFile(const LLString& filename,
                 return FALSE;
         }
 
-        raw_image->biasedScaleToPowerOfTwo(LLViewerImage::MAX_IMAGE_SIZE_DEFAULT);
-
-        LLPointer<LLImageJ2C> compressedImage = new LLImageJ2C;
+        LLPointer<LLImageJ2C> compressedImage = convertToUploadFile(raw_image);
 
-        compressedImage->setRate(0.f);
-        compressedImage->encode(raw_image);
         if( !compressedImage->save(out_filename) )
         {
                 llinfos << "Couldn't create output file " << out_filename << llendl;
@@ -1583,6 +1098,17 @@ BOOL LLViewerImageList::createUploadFile(const LLString& filename,
         return TRUE;
 }
 
+// note: modifies the argument raw_image!!!!
+LLPointer<LLImageJ2C> LLViewerImageList::convertToUploadFile(LLPointer<LLImageRaw> raw_image)
+{
+        raw_image->biasedScaleToPowerOfTwo(LLViewerImage::MAX_IMAGE_SIZE_DEFAULT);
+        LLPointer<LLImageJ2C> compressedImage = new LLImageJ2C();
+        compressedImage->setRate(0.f);
+        compressedImage->encode(raw_image);
+
+        return compressedImage;
+}
+
 //static
 S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
 {
@@ -1606,7 +1132,7 @@ S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
                 llwarns << "VRAM amount not detected, defaulting to " << max_vram/(double)(1<<20) << " MB" << llendl;
         }
         U32 system_ram = gSysMemory.getPhysicalMemory();
-        llinfos << "*** DETECTED " << system_ram/(double)(1<<20) << " MB of system memory." << llendl; // TomY TESTING DNCI
+        //llinfos << "*** DETECTED " << system_ram/(double)(1<<20) << " MB of system memory." << llendl; // TomY TESTING DNCI
         if (max == -2)
         {
                 max_vram = llmin(max_vram, (U32)(system_ram/2)); // max recommended setting
@@ -1629,6 +1155,16 @@ S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
         return idx;
 }
 
+const S32 VIDEO_CARD_MEM_SIZES[6] = { 0x1000000, // 16MB
+                                                                          0x2000000, // 32MB
+                                                                          0x4000000, // 64MB
+                                                                          0x8000000, // 128MB
+                                                                          0x10000000, // 256MB
+                                                                          0x20000000, // 512MB
+                                                                        };
+
+const S32 VIDEO_CARD_FRAMEBUFFER_MEM = 0xC00000; // 12MB
+
 void LLViewerImageList::updateMaxResidentTexMem(S32 max, U32 fudge)
 {
         // Initialize the image pipeline VRAM settings
@@ -1651,15 +1187,127 @@ void LLViewerImageList::updateMaxResidentTexMem(S32 max, U32 fudge)
         }
         mVideoMemorySetting = cur_setting;
         // TODO: set available resident texture mem based on use by other subsystems
-        // currently 12MB assumed...
+        // currently max(12MB, VRAM/4) assumed...
+
+        S32 vram_amt = VIDEO_CARD_MEM_SIZES[cur_setting];
+        S32 fb_mem = llmax(VIDEO_CARD_FRAMEBUFFER_MEM, vram_amt/4);
+        mMaxResidentTexMem = vram_amt - fb_mem - fudge;
         
-        mMaxResidentTexMem = VIDEO_CARD_MEM_SIZES[cur_setting] - 0xC00000 - fudge;  // - 12MB
-        mMaxResidentTexMem -= mMaxResidentTexMem/8;
+//      llinfos << "Graphics Card memory set to " << (VIDEO_CARD_MEM_SIZES[cur_setting]>>20)
+//                      << " MB" << llendl;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+// static
+void LLViewerImageList::receiveImageHeader(LLMessageSystem *msg, void **user_data)
+{
+        LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+
+        // Receive image header, copy into image object and decompresses 
+        // if this is a one-packet image. 
+
+        LLUUID id;
+
+        char ip_string[256];
+        u32_to_ip_string(msg->getSenderIP(),ip_string);
+
+        if (msg->getReceiveCompressedSize())
+        {
+                gImageList.sTextureBits += msg->getReceiveCompressedSize() * 8;
+        }
+        else
+        {
+                gImageList.sTextureBits += msg->getReceiveSize() * 8;
+        }
+        gImageList.sTexturePackets++;
+
+        U8 codec;
+        U16 packets;
+        U32 totalbytes;
+        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
+        msg->getU8Fast(_PREHASH_ImageID, _PREHASH_Codec, codec);
+        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packets, packets);
+        msg->getU32Fast(_PREHASH_ImageID, _PREHASH_Size, totalbytes);
+
+        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
+        if (!data_size)
+        {
+                return;
+        }
         
-        llinfos << "Graphics Card memory set to " << (VIDEO_CARD_MEM_SIZES[cur_setting]>>20)
-                        << " MB" << llendl;
+        // this buffer gets saved off in the packet list
+        U8 *data = new U8[data_size];
+        msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
+
+        LLViewerImage *image = gImageList.getImage(id);
+        if (!image)
+        {
+                return;
+        }
+        image->mLastPacketTimer.reset();
+        bool res = gTextureFetch->receiveImageHeader(msg->getSender(), id, codec, packets, totalbytes, data_size, data);
+        if (!res)
+        {
+                delete[] data;
+        }
 }
 
+// static
+void LLViewerImageList::receiveImagePacket(LLMessageSystem *msg, void **user_data)
+{
+        LLMemType mt1(LLMemType::MTYPE_APPFMTIMAGE);
+        LLFastTimer t(LLFastTimer::FTM_PROCESS_IMAGES);
+        
+        // Receives image packet, copy into image object,
+        // checks if all packets received, decompresses if so. 
+
+        LLUUID id;
+        U16 packet_num;
+
+        char ip_string[256];
+        u32_to_ip_string(msg->getSenderIP(),ip_string);
+
+        if (msg->getReceiveCompressedSize())
+        {
+                gImageList.sTextureBits += msg->getReceiveCompressedSize() * 8;
+        }
+        else
+        {
+                gImageList.sTextureBits += msg->getReceiveSize() * 8;
+        }
+        gImageList.sTexturePackets++;
+
+        //llprintline("Start decode, image header...");
+        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
+        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packet, packet_num);
+        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
+
+        if (!data_size)
+        {
+                return;
+        }
+        if (data_size > MTUBYTES)
+        {
+                llerrs << "image data chunk too large: " << data_size << " bytes" << llendl;
+        }
+        U8 *data = new U8[data_size];
+        msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
+
+        LLViewerImage *image = gImageList.getImage(id);
+        if (!image)
+        {
+                return;
+        }
+        image->mLastPacketTimer.reset();
+        bool res = gTextureFetch->receiveImagePacket(msg->getSender(), id, packet_num, data_size, data);
+        if (!res)
+        {
+                delete[] data;
+        }
+}
+
+
 // We've been that the asset server does not contain the requested image id.
 // static
 void LLViewerImageList::processImageNotInDatabase(LLMessageSystem *msg,void **user_data)
@@ -1671,6 +1319,26 @@ void LLViewerImageList::processImageNotInDatabase(LLMessageSystem *msg,void **us
         LLViewerImage* image = gImageList.hasImage( image_id );
         if( image )
         {
-                image->setIsMissingAsset( TRUE );
+                image->setIsMissingAsset();
         }
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+//static
+const U32 SIXTEEN_MEG = 0x1000000;
+S32 LLViewerImageList::calcMaxTextureRAM()
+{
+        // Decide the maximum amount of RAM we should allow the user to allocate to texture cache
+        LLMemoryInfo memory_info;
+        U32 available_memory = memory_info.getPhysicalMemory();
+        
+        clamp_rescale((F32)available_memory,
+                                 (F32)(SIXTEEN_MEG * 16),
+                                 (F32)U32_MAX,
+                                 (F32)(SIXTEEN_MEG * 4),
+                                 (F32)(U32_MAX >> 1));
+        return available_memory;
+}
+
+///////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 68cfcaf..3f3e521 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -58,12 +58,17 @@ typedef	void (*LLImageCallback)(BOOL success,
 
 class LLViewerImageList : public LLImageProviderInterface
 {
+        LOG_CLASS(LLViewerImageList);
+
         friend class LLTextureView;
         
 public:
         static BOOL createUploadFile(const LLString& filename, const LLString& out_filename, const U8 codec);
+        static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image);
         static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
         static S32 calcMaxTextureRAM();
+        static void receiveImageHeader(LLMessageSystem *msg, void **user_data);
+        static void receiveImagePacket(LLMessageSystem *msg, void **user_data);
 
 public:
         LLViewerImageList();
@@ -117,12 +122,13 @@ public:
         void removeImageFromList(LLViewerImage *image);
 
         void updateMovieImage(const LLUUID& image_id, BOOL active);
+        void dirtyImage(LLViewerImage *image);
         
         // Using image stats, determine what images are necessary, and perform image updates.
-        void updateImages(F32 decode_time);
+        void updateImages(F32 max_time);
 
         // Decode and create textures for all images currently in list.
-        void decodeAllImages(F32 max_decode_time = 0.f); 
+        void decodeAllImages(F32 max_decode_time); 
 
         void handleIRCallback(void **data, const S32 number);
 
@@ -136,40 +142,35 @@ public:
         void updateMaxResidentTexMem(S32 max = -1, U32 fudge = 0);
         
         void doPreloadImages();
+        void doPrefetchImages();
 
 private:
         LLViewerImage* preloadImage(const LLString& filename, const LLUUID &image_set_id, BOOL use_mips);
         void updateImagesDecodePriorities();
-        void updateImagesSendRequests();
-        void updateImagesDecodeTextures(F32 decode_max_time);
+        F32  updateImagesCreateTextures(F32 max_time);
+        F32  updateImagesFetchTextures(F32 max_time);
         void updateImagesMediaStreams();
-        void updateImagesPollVFS();
         void updateImagesUpdateStats();
         
 public:
-        typedef std::set<LLPointer<LLViewerImage>, LLViewerImage::Compare> image_list_t;
-        typedef std::set<LLPointer<LLViewerImage>, LLViewerImage::CompareForRemoval> image_removal_list_t;
-        typedef std::set<LLPointer<LLViewerImage>, LLViewerImage::CompareForWorstVisibility> image_visibility_list_t;
-        
-        // List of pending texture loads, waiting for the VFS.
-        // The asynchronous read has been initiated for all images in the list.
-        typedef std::list<LLPointer<LLViewerImage> > image_loading_list_t;
-        image_loading_list_t mLoadingStreamList;
-
-        // Images with "loaded" callbacks
-        typedef std::set<LLPointer<LLViewerImage> > image_callback_list_t;
-        image_callback_list_t mCallbackList;
+        typedef std::set<LLPointer<LLViewerImage> > image_list_t;       
+        image_list_t mLoadingStreamList;
+        image_list_t mCreateTextureList;
+        image_list_t mCallbackList;
 
+        // Note: just raw pointers because they are never referenced, just compared against
+        std::set<LLViewerImage*> mDirtyTextureList;
+        
         BOOL mForceResetTextureStats;
     
 private:
         typedef std::map< LLUUID, LLPointer<LLViewerImage> > uuid_map_t;
         uuid_map_t mUUIDMap;
         LLUUID mLastUpdateUUID;
+        LLUUID mLastFetchUUID;
         
-        image_list_t mImageList;
-
-        LLPointer<LLViewerImage> mCurrentDecodeImagep;
+        typedef std::set<LLPointer<LLViewerImage>, LLViewerImage::Compare> image_priority_list_t;       
+        image_priority_list_t mImageList;
 
         typedef std::vector<LLPointer<LLViewerImage> > callback_data_t;
         typedef std::set< callback_data_t* > callback_data_list_t;
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 487a9f8..7c12f56 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -268,7 +268,7 @@ bool LLViewerInventoryItem::importFileLocal(FILE* fp)
 
 bool LLViewerInventoryItem::exportFileLocal(FILE* fp) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH];         /* Flawfinder: ignore */
         fprintf(fp, "\tinv_item\t0\n\t{\n");
         mUUID.toString(uuid_str);
         fprintf(fp, "\t\titem_id\t%s\n", uuid_str);
@@ -450,16 +450,17 @@ bool LLViewerInventoryCategory::fetchDescendents()
 bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
 {
         // *NOTE: This buffer size is hard coded into scanf() below.
-        char buffer[MAX_STRING];
-        char keyword[MAX_STRING];
-        char valuestr[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
+        char keyword[MAX_STRING];               /* Flawfinder: ignore */
+        char valuestr[MAX_STRING];              /* Flawfinder: ignore */
 
         keyword[0] = '\0';
         valuestr[0] = '\0';
         while(!feof(fp))
         {
                 fgets(buffer, MAX_STRING, fp);
-                sscanf(buffer, " %254s %254s", keyword, valuestr);
+                sscanf( /* Flawfinder: ignore */
+                        buffer, " %254s %254s", keyword, valuestr); 
                 if(!keyword)
                 {
                         continue;
@@ -492,7 +493,8 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
+                        sscanf( /* Flawfinder: ignore */
+                                buffer, " %254s %254[^|]", keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
@@ -516,7 +518,7 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
 
 bool LLViewerInventoryCategory::exportFileLocal(FILE* fp) const
 {
-        char uuid_str[UUID_STR_LENGTH];
+        char uuid_str[UUID_STR_LENGTH];         /* Flawfinder: ignore */
         fprintf(fp, "\tinv_category\t0\n\t{\n");
         mUUID.toString(uuid_str);
         fprintf(fp, "\t\tcat_id\t%s\n", uuid_str);
@@ -672,7 +674,7 @@ void copy_inventory_item(
         msg->addUUIDFast(_PREHASH_OldAgentID, current_owner);
         msg->addUUIDFast(_PREHASH_OldItemID, item_id);
         msg->addUUIDFast(_PREHASH_NewFolderID, parent_id);
-        msg->addString("NewName", new_name);
+        msg->addStringFast(_PREHASH_NewName, new_name);
         gAgent.sendReliableMessage();
 }
 
@@ -689,11 +691,11 @@ void move_inventory_item(
         msg->nextBlockFast(_PREHASH_AgentData);
         msg->addUUIDFast(_PREHASH_AgentID, agent_id);
         msg->addUUIDFast(_PREHASH_SessionID, session_id);
-        msg->addBOOLFast(_PREHASH_Stamp, false);
+        msg->addBOOLFast(_PREHASH_Stamp, FALSE);
         msg->nextBlockFast(_PREHASH_InventoryData);
         msg->addUUIDFast(_PREHASH_ItemID, item_id);
         msg->addUUIDFast(_PREHASH_FolderID, parent_id);
-        msg->addString("NewName", new_name);
+        msg->addStringFast(_PREHASH_NewName, new_name);
         gAgent.sendReliableMessage();
 }
 
diff --git a/linden/indra/newview/llviewerjoint.cpp b/linden/indra/newview/llviewerjoint.cpp
index f8fed01..a1294be 100644
--- a/linden/indra/newview/llviewerjoint.cpp
+++ b/linden/indra/newview/llviewerjoint.cpp
@@ -101,10 +101,10 @@ void LLViewerJoint::setValid( BOOL valid, BOOL recursive )
         //----------------------------------------------------------------
         if (recursive)
         {
-                for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                                joint != NULL;
-                                joint = (LLViewerJoint*)mChildren.getNextData() )
+                for (child_list_t::iterator iter = mChildren.begin();
+                         iter != mChildren.end(); ++iter)
                 {
+                        LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                         joint->setValid(valid, TRUE);
                 }
         }
@@ -217,10 +217,10 @@ void LLViewerJoint::renderSkeleton(BOOL recursive)
         //----------------------------------------------------------------
         if (recursive)
         {
-                for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                                joint != NULL;
-                                joint = (LLViewerJoint*)mChildren.getNextData() )
+                for (child_list_t::iterator iter = mChildren.begin();
+                         iter != mChildren.end(); ++iter)
                 {
+                        LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                         joint->renderSkeleton();
                 }
         }
@@ -235,7 +235,7 @@ void LLViewerJoint::renderSkeleton(BOOL recursive)
 //--------------------------------------------------------------------
 // render()
 //--------------------------------------------------------------------
-U32 LLViewerJoint::render( F32 pixelArea )
+U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass )
 {
         U32 triangle_count = 0;
 
@@ -245,73 +245,68 @@ U32 LLViewerJoint::render( F32 pixelArea )
         if ( mValid )
         {
 
+
                 //----------------------------------------------------------------
                 // if object is transparent, defer it, otherwise
                 // give the joint subclass a chance to draw itself
                 //----------------------------------------------------------------
                 if ( gRenderForSelect )
                 {
-                        triangle_count += drawShape( pixelArea );
+                        triangle_count += drawShape( pixelArea, first_pass );
                 }
                 else if ( isTransparent() )
                 {
-                        LLGLEnable blend(GL_BLEND);
                         // Hair and Skirt
                         if ((pixelArea > MIN_PIXEL_AREA_3PASS_HAIR))
                         {
                                 // render all three passes
-                                LLGLEnable alpha_test(GL_ALPHA_TEST);
                                 LLGLDisable cull(GL_CULL_FACE);
                                 // first pass renders without writing to the z buffer
                                 {
                                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-                                        triangle_count += drawShape( pixelArea );
+                                        triangle_count += drawShape( pixelArea, first_pass);
                                 }
                                 // second pass writes to z buffer only
                                 glColorMask(FALSE, FALSE, FALSE, FALSE);
                                 {
-                                        triangle_count += drawShape( pixelArea );
+                                        triangle_count += drawShape( pixelArea, FALSE );
                                 }
                                 // third past respects z buffer and writes color
                                 glColorMask(TRUE, TRUE, TRUE, TRUE);
                                 {
                                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-                                        triangle_count += drawShape( pixelArea );
+                                        triangle_count += drawShape( pixelArea, FALSE );
                                 }
                         }
                         else
                         {
-                                LLGLEnable alpha_test(GL_ALPHA_TEST);
                                 // Render Inside (no Z buffer write)
                                 glCullFace(GL_FRONT);
                                 {
                                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-                                        triangle_count += drawShape( pixelArea );
+                                        triangle_count += drawShape( pixelArea, first_pass );
                                 }
                                 // Render Outside (write to the Z buffer)
                                 glCullFace(GL_BACK);
                                 {
-                                        triangle_count += drawShape( pixelArea );
+                                        triangle_count += drawShape( pixelArea, FALSE );
                                 }
                         }
                 }
                 else
                 {
                         // set up render state
-                        LLGLDisable blend(GL_BLEND);
-                        LLGLSPipelineAvatar gls_pipeline_avatar;
-                        triangle_count += drawShape( pixelArea );
+                        triangle_count += drawShape( pixelArea, first_pass );
                 }
         }
 
         //----------------------------------------------------------------
         // render children
         //----------------------------------------------------------------
-        LLViewerJoint *joint;
-        for (   joint = (LLViewerJoint *)mChildren.getFirstData();
-                        joint != NULL;
-                        joint = (LLViewerJoint *)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                 F32 jointLOD = joint->getLOD();
                 if (pixelArea >= jointLOD || sDisableLOD)
                 {
@@ -324,7 +319,6 @@ U32 LLViewerJoint::render( F32 pixelArea )
                 }
         }
 
-        glColorMask(TRUE, TRUE, TRUE, TRUE);
         return triangle_count;
 }
 
@@ -396,7 +390,7 @@ BOOL LLViewerJoint::isTransparent()
 //--------------------------------------------------------------------
 // drawShape()
 //--------------------------------------------------------------------
-U32 LLViewerJoint::drawShape( F32 pixelArea )
+U32 LLViewerJoint::drawShape( F32 pixelArea, BOOL first_pass )
 {
         return 0;
 }
@@ -409,65 +403,75 @@ void LLViewerJoint::setSkeletonComponents( U32 comp, BOOL recursive )
         mComponents = comp;
         if (recursive)
         {
-                for (   LLViewerJoint *joint = (LLViewerJoint *)mChildren.getFirstData();
-                                joint != NULL;
-                                joint = (LLViewerJoint *)mChildren.getNextData() )
+                for (child_list_t::iterator iter = mChildren.begin();
+                         iter != mChildren.end(); ++iter)
                 {
+                        LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                         joint->setSkeletonComponents(comp, recursive);
                 }
         }
 }
 
-void LLViewerJoint::updateFaceSizes(U32 &num_vertices, F32 pixel_area)
+void LLViewerJoint::updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area)
 {
-        for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                        joint != NULL;
-                        joint = (LLViewerJoint*)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
-                F32 jointLOD = joint->getLOD();
-                if (pixel_area >= jointLOD || sDisableLOD)
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
+                //F32 jointLOD = joint->getLOD();
+                //if (pixel_area >= jointLOD || sDisableLOD)
                 {
-                        joint->updateFaceSizes(num_vertices, pixel_area);
+                        joint->updateFaceSizes(num_vertices, num_indices, pixel_area);
 
-                        if (jointLOD != DEFAULT_LOD)
-                        {
-                                break;
-                        }
+                //      if (jointLOD != DEFAULT_LOD)
+                //      {
+                //              break;
+                //      }
                 }
         }
 }
 
 void LLViewerJoint::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind)
 {
-        for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                        joint != NULL;
-                        joint = (LLViewerJoint*)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
-                F32 jointLOD = joint->getLOD();
-                if (pixel_area >= jointLOD || sDisableLOD)
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
+                //F32 jointLOD = joint->getLOD();
+                //if (pixel_area >= jointLOD || sDisableLOD)
                 {
                         joint->updateFaceData(face, pixel_area, damp_wind);
 
-                        if (jointLOD != DEFAULT_LOD)
-                        {
-                                break;
-                        }
+                //      if (jointLOD != DEFAULT_LOD)
+                //      {
+                //              break;
+                //      }
                 }
         }
 }
 
+void LLViewerJoint::updateGeometry()
+{
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
+        {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
+                joint->updateGeometry();
+        }
+}
+
 
 BOOL LLViewerJoint::updateLOD(F32 pixel_area, BOOL activate)
 {
         BOOL lod_changed = FALSE;
         BOOL found_lod = FALSE;
 
-        for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                        joint != NULL;
-                        joint = (LLViewerJoint*)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                 F32 jointLOD = joint->getLOD();
-
+                
                 if (found_lod || jointLOD == DEFAULT_LOD)
                 {
                         // we've already found a joint to enable, so enable the rest as alternatives
@@ -491,12 +495,12 @@ BOOL LLViewerJoint::updateLOD(F32 pixel_area, BOOL activate)
 
 void LLViewerJoint::dump()
 {
-        for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                        joint != NULL;
-                        joint = (LLViewerJoint*)mChildren.getNextData() )
-                {
-                        joint->dump();
-                }
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
+        {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
+                joint->dump();
+        }
 }
 
 void LLViewerJoint::setVisible(BOOL visible, BOOL recursive)
@@ -505,12 +509,12 @@ void LLViewerJoint::setVisible(BOOL visible, BOOL recursive)
 
         if (recursive)
         {
-                for (   LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                                joint != NULL;
-                                joint = (LLViewerJoint*)mChildren.getNextData() )
-                        {
-                                joint->setVisible(visible, recursive);
-                        }
+                for (child_list_t::iterator iter = mChildren.begin();
+                         iter != mChildren.end(); ++iter)
+                {
+                        LLViewerJoint* joint = (LLViewerJoint*)(*iter);
+                        joint->setVisible(visible, recursive);
+                }
         }
 }
 
@@ -530,10 +534,10 @@ void LLViewerJoint::writeCAL3D(apr_file_t* fp)
         LLQuaternion bone_rot;
 
         S32 num_children = 0;
-        for (LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                joint != NULL;
-                joint = (LLViewerJoint*)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                 if (joint->mJointNum != -1)
                 {
                         num_children++;
@@ -560,10 +564,10 @@ void LLViewerJoint::writeCAL3D(apr_file_t* fp)
         apr_file_printf(fp, "           <LOCALROTATION>0 0 0 1</LOCALROTATION>\n");
         apr_file_printf(fp, "           <PARENTID>%d</PARENTID>\n", mParent ? mParent->mJointNum + 1 : -1);
         
-        for (LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                joint != NULL;
-                joint = (LLViewerJoint*)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                 if (joint->mJointNum != -1)
                 {
                         apr_file_printf(fp, "           <CHILDID>%d</CHILDID>\n", joint->mJointNum + 1);
@@ -572,10 +576,10 @@ void LLViewerJoint::writeCAL3D(apr_file_t* fp)
         apr_file_printf(fp, "   </BONE>\n");
 
         // recurse
-        for (LLViewerJoint *joint = (LLViewerJoint*)mChildren.getFirstData();
-                joint != NULL;
-                joint = (LLViewerJoint*)mChildren.getNextData() )
+        for (child_list_t::iterator iter = mChildren.begin();
+                 iter != mChildren.end(); ++iter)
         {
+                LLViewerJoint* joint = (LLViewerJoint*)(*iter);
                 if (joint->mJointNum != -1)
                 {
                         joint->writeCAL3D(fp);
diff --git a/linden/indra/newview/llviewerjoint.h b/linden/indra/newview/llviewerjoint.h
index 44ad8e7..148f3a6 100644
--- a/linden/indra/newview/llviewerjoint.h
+++ b/linden/indra/newview/llviewerjoint.h
@@ -62,7 +62,7 @@ public:
         // Traverses the entire joint hierarchy, setting up
         // transforms and calling the drawShape().
         // Derived classes may add text/graphic output.
-        virtual U32 render( F32 pixelArea );    // Returns triangle count
+        virtual U32 render( F32 pixelArea, BOOL first_pass = TRUE );    // Returns triangle count
 
         // Draws a bone graphic to the parent joint.
         // Derived classes may add text/graphic output.
@@ -78,7 +78,7 @@ public:
 
         // Draws the shape attached to a joint.
         // Called by render().
-        virtual U32 drawShape( F32 pixelArea );
+        virtual U32 drawShape( F32 pixelArea, BOOL first_pass = TRUE );
         virtual void drawNormals() {}
 
         enum Components
@@ -97,9 +97,9 @@ public:
         // Sets the level of detail for this node as a minimum
         // pixel area threshold.  If the current pixel area for this
         // object is less than the specified threshold, the node is
-        // not traversed.  In additin, if a value is specified (not
+        // not traversed.  In addition, if a value is specified (not
         // default of 0.0), and the pixel area is larger than the
-        // specified miniumn, the node is rendered, but no other siblings
+        // specified minimum, the node is rendered, but no other siblings
         // of this node under the same parent will be.
         F32 getLOD() { return mMinPixelArea; }
         void setLOD( F32 pixelArea ) { mMinPixelArea = pixelArea; }
@@ -120,9 +120,10 @@ public:
         void setPickName(PickName name) { mPickName = name; }
         PickName getPickName() { return mPickName; }
 
-        virtual void updateFaceSizes(U32 &num_vertices, F32 pixel_area);
+        virtual void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
         virtual void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE);
         virtual BOOL updateLOD(F32 pixel_area, BOOL activate);
+        virtual void updateGeometry();
         virtual void dump();
 
         void setVisible( BOOL visible, BOOL recursive );
@@ -154,3 +155,4 @@ public:
 
 #endif // LL_LLVIEWERJOINT_H
 
+
diff --git a/linden/indra/newview/llviewerjointattachment.cpp b/linden/indra/newview/llviewerjointattachment.cpp
index 89db44d..2a54a47 100644
--- a/linden/indra/newview/llviewerjointattachment.cpp
+++ b/linden/indra/newview/llviewerjointattachment.cpp
@@ -79,7 +79,7 @@ BOOL LLViewerJointAttachment::isTransparent()
 //-----------------------------------------------------------------------------
 // drawShape()
 //-----------------------------------------------------------------------------
-U32 LLViewerJointAttachment::drawShape( F32 pixelArea )
+U32 LLViewerJointAttachment::drawShape( F32 pixelArea, BOOL first_pass )
 {
         if (LLVOAvatar::sShowAttachmentPoints)
         {
@@ -296,47 +296,20 @@ void LLViewerJointAttachment::removeObject(LLViewerObject *object)
 //-----------------------------------------------------------------------------
 void LLViewerJointAttachment::setAttachmentVisibility(BOOL visible)
 {
-        if (!mAttachedObject || mAttachedObject->mDrawable.isNull())
+        if (!mAttachedObject || mAttachedObject->mDrawable.isNull() || 
+                !(mAttachedObject->mDrawable->getSpatialBridge()))
                 return;
 
         if (visible)
         {
                 // Hack to make attachments not visible by disabling their type mask!
                 // This will break if you can ever attach non-volumes! - djs 02/14/03
-                mAttachedObject->mDrawable->setRenderType(LLPipeline::RENDER_TYPE_VOLUME);
-                for (LLViewerObject::child_list_t::iterator iter = mAttachedObject->mChildList.begin();
-                         iter != mAttachedObject->mChildList.end(); ++iter)
-                {
-                        LLViewerObject* childp = *iter;
-                        if (childp && childp->mDrawable.notNull())
-                        {
-                                childp->mDrawable->setRenderType(LLPipeline::RENDER_TYPE_VOLUME);
-                        }
-                }
+                mAttachedObject->mDrawable->getSpatialBridge()->mDrawableType = 
+                        mAttachedObject->isHUDAttachment() ? LLPipeline::RENDER_TYPE_HUD : LLPipeline::RENDER_TYPE_VOLUME;
         }
         else
         {
-                //RN: sometimes we call this on objects that are already invisible, so check for that case
-                if (!mAttachedObject->mDrawable->isRenderType(LLPipeline::RENDER_TYPE_VOLUME) && 
-                        !mAttachedObject->mDrawable->isRenderType(0))
-                {
-                        llerrs << "Tried to attach non-volume to a joint, visibility hack dangerous!" << llendl;
-                }
-                mAttachedObject->mDrawable->setRenderType(0);
-                for (LLViewerObject::child_list_t::iterator iter = mAttachedObject->mChildList.begin();
-                         iter != mAttachedObject->mChildList.end(); ++iter)
-                {
-                        LLViewerObject* childp = *iter;
-                        if (childp && childp->mDrawable.notNull())
-                        {
-                                if (!childp->mDrawable->isRenderType(LLPipeline::RENDER_TYPE_VOLUME) && 
-                                        !mAttachedObject->mDrawable->isRenderType(0))
-                                {
-                                        llerrs << "Tried to attach non-volume to a joint, visibility hack dangerous!" << llendl;
-                                }
-                                childp->mDrawable->setRenderType(0);
-                        }
-                }
+                mAttachedObject->mDrawable->getSpatialBridge()->mDrawableType = 0;
         }
 }
 
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index 3d5f914..be671fb 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -56,7 +56,7 @@ public:
 
         // Draws the shape attached to a joint.
         // Called by render().
-        /*virtual*/ U32 drawShape( F32 pixelArea );
+        /*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass );
         
         /*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
 
@@ -79,7 +79,7 @@ public:
         S32 getGroup() { return mGroup; }
         S32 getPieSlice() { return mPieSlice; }
         BOOL getAttachmentDirty() { return mAttachmentDirty && mAttachedObject; }
-        LLViewerObject *getObject(S32 i) { return mAttachedObject; }
+        LLViewerObject *getObject() { return mAttachedObject; }
         S32     getNumObjects() { return (mAttachedObject ? 1 : 0); }
         const LLUUID& getItemID() { return mItemID; }
 
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index 96cdb88..3070cb4 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -38,7 +38,6 @@
 #include "llfasttimer.h"
 
 #include "llagent.h"
-#include "llagparray.h"
 #include "llbox.h"
 #include "lldrawable.h"
 #include "lldrawpoolavatar.h"
@@ -62,6 +61,10 @@ extern PFNGLVERTEXBLENDARBPROC glVertexBlendARB;
 #endif
 extern BOOL gRenderForSelect;
 
+static LLPointer<LLVertexBuffer> sRenderBuffer = NULL;
+static const U32 sRenderMask = LLVertexBuffer::MAP_VERTEX |
+                                                           LLVertexBuffer::MAP_NORMAL |
+                                                           LLVertexBuffer::MAP_TEXCOORD;
 LLMatrix4 gBlendMat;
 
 //-----------------------------------------------------------------------------
@@ -394,11 +397,11 @@ void LLViewerJointMesh::setupJoint(LLViewerJoint* current_joint)
         }
 
         // depth-first traversal
-        for (LLJoint *child_joint = current_joint->mChildren.getFirstData(); 
-                child_joint; 
-                child_joint = current_joint->mChildren.getNextData())
+        for (LLJoint::child_list_t::iterator iter = current_joint->mChildren.begin();
+                 iter != current_joint->mChildren.end(); ++iter)
         {
-                setupJoint((LLViewerJoint*)child_joint);
+                LLViewerJoint* child_joint = (LLViewerJoint*)(*iter);
+                setupJoint(child_joint);
         }
 }
 
@@ -431,7 +434,7 @@ void LLViewerJointMesh::uploadJointMatrices()
 
                 if (hardware_skinning)
                 {
-                        joint_mat *= gCamera->getModelview();
+                        joint_mat *= LLDrawPoolAvatar::getModelView();
                 }
                 gJointMat[joint_num] = joint_mat;
                 gJointRot[joint_num] = joint_mat.getMat3();
@@ -532,620 +535,39 @@ int compare_int(const void *a, const void *b)
         else return 0;
 }
 
-#if LL_WINDOWS || (LL_DARWIN && __i386__) // SSE optimizations in avatar code
-
-#if LL_DARWIN
-#include <xmmintrin.h>
-
-        // On Windows, this class is defined in fvec.h.  I've only reproduced the parts of it we use here for now.
-        #pragma pack(push,16) /* Must ensure class & union 16-B aligned */
-        class F32vec4
-        {
-        protected:
-                 __m128 vec;
-        public:
-
-                /* Constructors: __m128, 4 floats, 1 float */
-                F32vec4() {}
-
-                /* initialize 4 SP FP with __m128 data type */
-                F32vec4(__m128 m)                                       { vec = m;}
-
-                /* Explicitly initialize each of 4 SP FPs with same float */
-                explicit F32vec4(float f)       { vec = _mm_set_ps1(f); }
-        };
-        #pragma pack(pop) /* 16-B aligned */
-        
-        
-#endif
-
-void blend_SSE_32_32_batch(const int vert_offset, const int vert_count, float* output,
-                                         LLStrider<LLVector3>& vertices, LLStrider<LLVector2>& texcoords, LLStrider<LLVector3>& normals, LLStrider<F32>& weights)
+void llDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-        F32 last_weight = F32_MAX;
-        LLMatrix4 *blend_mat = &gBlendMat;
-
-        for (S32 index = vert_offset; index < vert_offset + vert_count; index++)
+        if (end-start+1 > (U32) gGLManager.mGLMaxVertexRange ||
+                count > gGLManager.mGLMaxIndexRange)
         {
-                F32     w  = weights  [index];        // register copy of weight
-                F32  *vin  = &vertices[index].mV[0];  // pointer to input vertex data, assumed to be V3+T2+N3+whatever
-                F32  *vout = output + index * (AVATAR_VERTEX_BYTES/sizeof(F32));    // pointer to the output vertex data, assumed to be 16 byte aligned
-
-                if (w == last_weight)
-                {
-                        // load input and output vertices, and last blended matrix
-                        __asm {
-                                mov             esi,  vin
-                                mov             edi,  vout
-
-                                mov             edx,  blend_mat
-                                movaps  xmm4, [edx]
-                                movaps  xmm5, [edx+0x10]
-                                movaps  xmm6, [edx+0x20]
-                                movaps  xmm7, [edx+0x30]
-                        }
-                }
-                else
-                {
-                        last_weight = w;
-                        S32 joint = llfloor(w);
-                        w -= joint;
-
-                        LLMatrix4 *m0 = &(gJointMat[joint+1]);
-                        LLMatrix4 *m1 = &(gJointMat[joint+0]);
-
-                        // some initial code to load Matrix 0 into SSE registers
-                        __asm {
-                                mov             esi,  vin
-                                mov             edi,  vout
-
-                                //matrix2
-                                mov             edx,  m0
-                                movaps  xmm4, [edx]
-                                movaps  xmm5, [edx+0x10]
-                                movaps  xmm6, [edx+0x20]
-                                movaps  xmm7, [edx+0x30]
-                        };
-
-                        // if w == 1.0f, we don't need to blend.
-                        // but since we do the trick of blending the matrices, here, if w != 1.0,
-                        // we load Matrix 1 into the other 4 SSE registers and blend both matrices
-                        // based on the weight (which we load ingo a 16-byte aligned vector: w,w,w,w)
-
-                        if (w != 1.0f) 
-                        {
-                                        F32vec4 weight(w);
-
-                                __asm { // do blending of matrices instead of verts and normals -- faster
-                                        mov             edx,  m1
-                                        movaps  xmm0, [edx]
-                                        movaps  xmm1, [edx+0x10]
-                                        movaps  xmm2, [edx+0x20]
-                                        movaps  xmm3, [edx+0x30]
-
-                                        subps   xmm4,  xmm0 // do blend for each matrix column
-                                        subps   xmm5,  xmm1 // diff, then multiply weight and re-add
-                                        subps   xmm6,  xmm2
-                                        subps   xmm7,  xmm3
-
-                                        mulps   xmm4,  weight
-                                        mulps   xmm5,  weight
-                                        mulps   xmm6,  weight
-                                        mulps   xmm7,  weight
-
-                                        addps   xmm4,  xmm0
-                                        addps   xmm5,  xmm1
-                                        addps   xmm6,  xmm2
-                                        addps   xmm7,  xmm3
-                                };
-                        }
-
-                        __asm {
-                                // save off blended matrix
-                                mov             edx,   blend_mat;
-                                movaps  [edx], xmm4;
-                                movaps  [edx+0x10], xmm5;
-                                movaps  [edx+0x20], xmm6;
-                                movaps  [edx+0x30], xmm7;
-                        }
-                }
-
-                // now, we have either a blended matrix in xmm4-7 or the original Matrix 0
-                // we then multiply each vertex and normal by this one matrix.
-
-                // For SSE2, we would try to keep the original two matrices in other registers
-                // and avoid reloading them. However, they should ramain in L1 cache in the 
-                // current case.
-
-                // One possible optimization would be to sort the vertices by weight instead
-                // of just index (we still want to uniqify). If we note when two or more vertices
-                // share the same weight, we can avoid doing the middle SSE code above and just
-                // re-use the blended matrix for those vertices
-
-
-                // now, we do the actual vertex blending
-                __asm {                 
-                        // load Vertex into xmm0.
-                        movaps  xmm0, [esi] // change aps to ups when input is no longer 16-baligned
-                        movaps  xmm1, xmm0  // copy vector into xmm0 through xmm2 (x,y,z)
-                        movaps  xmm2, xmm0
-                        shufps  xmm0, xmm0, _MM_SHUFFLE(0,0,0,0); // clone vertex (x) across vector
-                        shufps  xmm1, xmm1, _MM_SHUFFLE(1,1,1,1); // clone vertex (y) across vector
-                        shufps  xmm2, xmm2, _MM_SHUFFLE(2,2,2,2); // same for Z
-                        mulps   xmm0, xmm4 // do the actual matrix multipication for r0
-                        mulps   xmm1, xmm5 // for r1
-                        mulps   xmm2, xmm6 // for r2
-                        addps   xmm0, xmm1 // accumulate 
-                        addps   xmm0, xmm2 // accumulate
-                        addps   xmm0, xmm7 // add in the row 4 which holds the x,y,z translation. assumes w=1 (vertex-w, not weight)
-
-                        movaps  [edi], xmm0 // store aligned in output array
-
-                        // load Normal into xmm0.
-                        movaps  xmm0, [esi + 0x10]  // change aps to ups when input no longer 16-byte aligned
-                        movaps  xmm1, xmm0  // 
-                        movaps  xmm2, xmm0
-                        shufps  xmm0, xmm0, _MM_SHUFFLE(0,0,0,0); // since UV sits between vertex and normal, normal starts at element 1, not 0
-                        shufps  xmm1, xmm1, _MM_SHUFFLE(1,1,1,1);
-                        shufps  xmm2, xmm2, _MM_SHUFFLE(2,2,2,2);
-                        mulps   xmm0, xmm4 // multiply by matrix
-                        mulps   xmm1, xmm5 // multiply
-                        mulps   xmm2, xmm6 // multiply
-                        addps   xmm0, xmm1 // accumulate
-                        addps   xmm0, xmm2 // accumulate. note: do not add translation component to normals, save time too
-                        movaps  [edi + 0x10], xmm0 // store aligned 
-                }
-
-                *(LLVector2*)(vout + (AVATAR_OFFSET_TEX0/sizeof(F32))) = texcoords[index]; // write texcoord into appropriate spot. 
-        }
-}
-
-#elif LL_LINUX
-
-void blend_SSE_32_32_batch(const int vert_offset, const int vert_count, float* output,
-                                         LLStrider<LLVector3>& vertices, LLStrider<LLVector2>& texcoords, LLStrider<LLVector3>& normals, LLStrider<F32>& weights)
-{
-    assert(0);
-}
-
-#elif LL_DARWIN
-// AltiVec versions of the same...
-
-static inline vector float loadAlign(int offset, vector float *addr)
-{
-        vector float in0 = vec_ld(offset, addr);
-        vector float in1 = vec_ld(offset + 16, addr);
-        vector unsigned char perm = vec_lvsl(0, (unsigned char*)addr);
-        
-        return(vec_perm(in0, in1, perm));
-}
-
-static inline void storeAlign(vector float v, int offset, vector float *addr)
-{
-        vector float in0 = vec_ld(offset, addr);
-        vector float in1 = vec_ld(offset + 16, addr);
-        vector unsigned char perm = vec_lvsr(0, (unsigned char *)addr);
-        vector float temp = vec_perm(v, v, perm);
-        vector unsigned char mask = (vector unsigned char)vec_cmpgt(perm, vec_splat_u8(15));
-        
-        in0 = vec_sel(in0, temp, (vector unsigned int)mask);
-        in1 = vec_sel(temp, in1, (vector unsigned int)mask);
-
-        vec_st(in0, offset, addr);
-        vec_st(in1, offset + 16, addr);
-}
-
-void blend_SSE_32_32_batch(const int vert_offset, const int vert_count, float* output,
-                                         LLStrider<LLVector3>& vertices, LLStrider<LLVector2>& texcoords, LLStrider<LLVector3>& normals, LLStrider<F32>& weights)
-{
-        F32 last_weight = F32_MAX;
-//      LLMatrix4 &blend_mat = gBlendMat;
-
-        vector float matrix0_0, matrix0_1, matrix0_2, matrix0_3;
-        vector unsigned char out0perm = (vector unsigned char) ( 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B, 0x0C,0x0D,0x0E,0x0F ); 
-//      vector unsigned char out1perm = (vector unsigned char) ( 0x00,0x01,0x02,0x03, 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B ); 
-        vector unsigned char out1perm = (vector unsigned char) ( 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B, 0x0C,0x0D,0x0E,0x0F ); 
-
-        vector float zero = (vector float)vec_splat_u32(0);
-
-        for (U32 index = vert_offset; index < vert_offset + vert_count; index++)
-        {
-                F32     w  = weights  [index];        // register copy of weight
-                F32  *vin  = &vertices[index].mV[0];  // pointer to input vertex data, assumed to be V3+T2+N3+whatever
-                F32  *vout = output + index * (AVATAR_VERTEX_BYTES/sizeof(F32));    // pointer to the output vertex data, assumed to be 16 byte aligned
-                
-                // MBW -- XXX -- If this isn't the case, this code gets more complicated.
-                if(0x0000000F & (U32)vin)
-                {
-                        llerrs << "blend_SSE_batch: input not 16-byte aligned!" << llendl;
-                }
-                if(0x0000000F & (U32)vout)
-                {
-                        llerrs << "blend_SSE_batch: output not 16-byte aligned!" << llendl;
-                }
-//              if(0x0000000F & (U32)&(blend_mat.mMatrix))
-//              {
-//                      llerrs << "blend_SSE_batch: blend_mat not 16-byte aligned!" << llendl;
-//              }
-                
-                if (w == last_weight)
-                {
-                        // load last blended matrix
-                        // Still loaded from last time through the loop.
-//                      matrix0_0 = vec_ld(0x00, (vector float*)&(blend_mat.mMatrix));
-//                      matrix0_1 = vec_ld(0x10, (vector float*)&(blend_mat.mMatrix));
-//                      matrix0_2 = vec_ld(0x20, (vector float*)&(blend_mat.mMatrix));
-//                      matrix0_3 = vec_ld(0x30, (vector float*)&(blend_mat.mMatrix));
-                }
-                else
-                {
-                        last_weight = w;
-                        S32 joint = llfloor(w);
-                        w -= joint;
-
-                        LLMatrix4 &m0 = gJointMat[joint+1];
-                        LLMatrix4 &m1 = gJointMat[joint+0];
-
-                        // load Matrix 0 into vector registers
-                        matrix0_0 = vec_ld(0x00, (vector float*)&(m0.mMatrix));
-                        matrix0_1 = vec_ld(0x10, (vector float*)&(m0.mMatrix));
-                        matrix0_2 = vec_ld(0x20, (vector float*)&(m0.mMatrix));
-                        matrix0_3 = vec_ld(0x30, (vector float*)&(m0.mMatrix));
-
-                        // if w == 1.0f, we don't need to blend.
-                        // but since we do the trick of blending the matrices, here, if w != 1.0,
-                        // we load Matrix 1 into the other 4 SSE registers and blend both matrices
-                        // based on the weight (which we load ingo a 16-byte aligned vector: w,w,w,w)
-
-                        if (w != 1.0f) 
-                        {
-                                vector float matrix1_0, matrix1_1, matrix1_2, matrix1_3;
-
-                                // This loads the weight somewhere in the vector register
-                                vector float weight = vec_lde(0, &(w));
-                                // and this splats it to all elements.
-                                weight = vec_splat(vec_perm(weight, weight, vec_lvsl(0, &(w))), 0);
-
-                                // do blending of matrices instead of verts and normals -- faster
-                                matrix1_0 = vec_ld(0x00, (vector float*)&(m1.mMatrix));
-                                matrix1_1 = vec_ld(0x10, (vector float*)&(m1.mMatrix));
-                                matrix1_2 = vec_ld(0x20, (vector float*)&(m1.mMatrix));
-                                matrix1_3 = vec_ld(0x30, (vector float*)&(m1.mMatrix));
-                                
-                                // m0[col] = ((m0[col] - m1[col]) * weight) + m1[col];
-                                matrix0_0 = vec_madd(vec_sub(matrix0_0, matrix1_0), weight, matrix1_0);
-                                matrix0_1 = vec_madd(vec_sub(matrix0_1, matrix1_1), weight, matrix1_1);
-                                matrix0_2 = vec_madd(vec_sub(matrix0_2, matrix1_2), weight, matrix1_2);
-                                matrix0_3 = vec_madd(vec_sub(matrix0_3, matrix1_3), weight, matrix1_3);
-                        }
-
-                        // save off blended matrix
-//                      vec_st(matrix0_0, 0x00, (vector float*)&(blend_mat.mMatrix));
-//                      vec_st(matrix0_1, 0x10, (vector float*)&(blend_mat.mMatrix));
-//                      vec_st(matrix0_2, 0x20, (vector float*)&(blend_mat.mMatrix));
-//                      vec_st(matrix0_3, 0x30, (vector float*)&(blend_mat.mMatrix));
-                }
-
-                // now, we have either a blended matrix in matrix0_0-3 or the original Matrix 0
-                // we then multiply each vertex and normal by this one matrix.
-
-                // For SSE2, we would try to keep the original two matrices in other registers
-                // and avoid reloading them. However, they should ramain in L1 cache in the 
-                // current case.
-
-                // One possible optimization would be to sort the vertices by weight instead
-                // of just index (we still want to uniqify). If we note when two or more vertices
-                // share the same weight, we can avoid doing the middle SSE code above and just
-                // re-use the blended matrix for those vertices
-
-
-                // now, we do the actual vertex blending
-
-                vector float in0 = vec_ld(AVATAR_OFFSET_POS, (vector float*)vin);
-                vector float in1 = vec_ld(AVATAR_OFFSET_NORMAL, (vector float*)vin);
-        
-                // Matrix multiply vertex
-                vector float out0 = vec_madd
-                (
-                        vec_splat(in0, 0), 
-                        matrix0_0, 
-                        vec_madd
-                        (
-                                vec_splat(in0, 1),
-                                matrix0_1,
-                                vec_madd
-                                (
-                                        vec_splat(in0, 2),
-                                        matrix0_2,
-                                        matrix0_3
-                                )
-                        )
-                );
-                
-                // Matrix multiply normal
-                vector float out1 = vec_madd
-                (
-                        vec_splat(in1, 0), 
-                        matrix0_0, 
-                        vec_madd
-                        (
-                                vec_splat(in1, 1),
-                                matrix0_1,
-                                vec_madd
-                                (
-                                        vec_splat(in1, 2),
-                                        matrix0_2,
-                                        // no translation for normals
-                                        (vector float)vec_splat_u32(0)
-                                )
-                        )
-                );
-
-                // indexed store
-                vec_stl(vec_perm(in0, out0, out0perm), AVATAR_OFFSET_POS,    (vector float*)vout); // Pos
-                vec_stl(vec_perm(in1, out1, out1perm), AVATAR_OFFSET_NORMAL, (vector float*)vout); // Norm
-                *(LLVector2*)(vout + (AVATAR_OFFSET_TEX0/sizeof(F32))) = texcoords[index]; // write texcoord into appropriate spot. 
-        }
-}
-
-#endif
-
-
-void llDrawElementsBatchBlend(const U32 vert_offset, const U32 vert_count, LLFace *face, const S32 index_count, const U32 *indices)
-{
-        U8* gAGPVertices = gPipeline.bufferGetScratchMemory();
-        
-        if (gAGPVertices)
-        {
-                LLStrider<LLVector3> vertices;
-                LLStrider<LLVector3> normals; 
-                LLStrider<LLVector2> tcoords0;
-                LLStrider<F32>       weights; 
-
-                LLStrider<LLVector3> o_vertices;
-                LLStrider<LLVector3> o_normals;
-                LLStrider<LLVector2> o_texcoords0;
-
-                
-                LLStrider<LLVector3> binormals; 
-                LLStrider<LLVector2> o_texcoords1;
-                // get the source vertices from the draw pool. We index these ourselves, as there was
-                // no guarantee the indices for a single jointmesh were contigious
-                
-                LLDrawPool *pool = face->getPool();
-                pool->getVertexStrider      (vertices,  0);
-                pool->getTexCoordStrider   (tcoords0,  0, 0);
-                pool->getNormalStrider      (normals,   0);
-                pool->getBinormalStrider    (binormals, 0);
-                pool->getVertexWeightStrider(weights,   0);
-
-                // load the addresses of the output striders
-                o_vertices  = (LLVector3*)(gAGPVertices + AVATAR_OFFSET_POS);           o_vertices.setStride(  AVATAR_VERTEX_BYTES);
-                o_normals   = (LLVector3*)(gAGPVertices + AVATAR_OFFSET_NORMAL);        o_normals.setStride(   AVATAR_VERTEX_BYTES);
-                o_texcoords0= (LLVector2*)(gAGPVertices + AVATAR_OFFSET_TEX0);          o_texcoords0.setStride(AVATAR_VERTEX_BYTES);
-                o_texcoords1= (LLVector2*)(gAGPVertices + AVATAR_OFFSET_TEX1);          o_texcoords1.setStride(AVATAR_VERTEX_BYTES);
-
-#if !LL_LINUX // !!! *TODO: do the linux implementation
-                if (gGLManager.mSoftwareBlendSSE)
-                {
-                        // do SSE blend without binormals or extra texcoords
-                        blend_SSE_32_32_batch(vert_offset, vert_count, (float*)gAGPVertices,
-                                                                  vertices, tcoords0, normals, weights);
-                }
-                else // fully backwards compatible software blending, no SSE
-#endif
-                {
-                        LLVector4 tpos0, tnorm0, tpos1, tnorm1, tbinorm0, tbinorm1;
-                        F32 last_weight = F32_MAX;
-                        LLMatrix3 gBlendRotMat;
-
-                        {
-                                for (U32 index=vert_offset; index < vert_offset + vert_count; index++)
-                                {
-                                        // blend by first matrix
-                                        F32     w = weights [index];
-                                        
-                                        if (w != last_weight)
-                                        {
-                                                last_weight = w;
-
-                                                S32 joint = llfloor(w);
-                                                w -= joint;
-
-                                                LLMatrix4 &m0 = gJointMat[joint+1];
-                                                LLMatrix4 &m1 = gJointMat[joint+0];
-                                                LLMatrix3 &n0 = gJointRot[joint+1];
-                                                LLMatrix3 &n1 = gJointRot[joint+0];
-
-                                                if (w == 1.0f)
-                                                {
-                                                        gBlendMat = m0;
-                                                        gBlendRotMat = n0;
-                                                }       
-                                                else
-                                                {
-                                                        gBlendMat.mMatrix[VX][VX] = lerp(m1.mMatrix[VX][VX], m0.mMatrix[VX][VX], w);
-                                                        gBlendMat.mMatrix[VX][VY] = lerp(m1.mMatrix[VX][VY], m0.mMatrix[VX][VY], w);
-                                                        gBlendMat.mMatrix[VX][VZ] = lerp(m1.mMatrix[VX][VZ], m0.mMatrix[VX][VZ], w);
-
-                                                        gBlendMat.mMatrix[VY][VX] = lerp(m1.mMatrix[VY][VX], m0.mMatrix[VY][VX], w);
-                                                        gBlendMat.mMatrix[VY][VY] = lerp(m1.mMatrix[VY][VY], m0.mMatrix[VY][VY], w);
-                                                        gBlendMat.mMatrix[VY][VZ] = lerp(m1.mMatrix[VY][VZ], m0.mMatrix[VY][VZ], w);
-
-                                                        gBlendMat.mMatrix[VZ][VX] = lerp(m1.mMatrix[VZ][VX], m0.mMatrix[VZ][VX], w);
-                                                        gBlendMat.mMatrix[VZ][VY] = lerp(m1.mMatrix[VZ][VY], m0.mMatrix[VZ][VY], w);
-                                                        gBlendMat.mMatrix[VZ][VZ] = lerp(m1.mMatrix[VZ][VZ], m0.mMatrix[VZ][VZ], w);
-
-                                                        gBlendMat.mMatrix[VW][VX] = lerp(m1.mMatrix[VW][VX], m0.mMatrix[VW][VX], w);
-                                                        gBlendMat.mMatrix[VW][VY] = lerp(m1.mMatrix[VW][VY], m0.mMatrix[VW][VY], w);
-                                                        gBlendMat.mMatrix[VW][VZ] = lerp(m1.mMatrix[VW][VZ], m0.mMatrix[VW][VZ], w);
-
-                                                        gBlendRotMat.mMatrix[VX][VX] = lerp(n1.mMatrix[VX][VX], n0.mMatrix[VX][VX], w);
-                                                        gBlendRotMat.mMatrix[VX][VY] = lerp(n1.mMatrix[VX][VY], n0.mMatrix[VX][VY], w);
-                                                        gBlendRotMat.mMatrix[VX][VZ] = lerp(n1.mMatrix[VX][VZ], n0.mMatrix[VX][VZ], w);
-
-                                                        gBlendRotMat.mMatrix[VY][VX] = lerp(n1.mMatrix[VY][VX], n0.mMatrix[VY][VX], w);
-                                                        gBlendRotMat.mMatrix[VY][VY] = lerp(n1.mMatrix[VY][VY], n0.mMatrix[VY][VY], w);
-                                                        gBlendRotMat.mMatrix[VY][VZ] = lerp(n1.mMatrix[VY][VZ], n0.mMatrix[VY][VZ], w);
-
-                                                        gBlendRotMat.mMatrix[VZ][VX] = lerp(n1.mMatrix[VZ][VX], n0.mMatrix[VZ][VX], w);
-                                                        gBlendRotMat.mMatrix[VZ][VY] = lerp(n1.mMatrix[VZ][VY], n0.mMatrix[VZ][VY], w);
-                                                        gBlendRotMat.mMatrix[VZ][VZ] = lerp(n1.mMatrix[VZ][VZ], n0.mMatrix[VZ][VZ], w);
-                                                }
-                                        }
-
-                                        // write result
-                                        o_vertices  [index]     = vertices[index] * gBlendMat;
-                                        o_normals   [index]     = normals [index] * gBlendRotMat;
-                                        o_texcoords0[index]             = tcoords0[index];
-
-                                        /*
-                                        // Verification code.  Leave this here.  It's useful for keeping the SSE and non-SSE versions in sync.
-                                        LLVector3 temp;
-                                        temp = tpos0;
-                                        if( (o_vertices[index] - temp).magVecSquared() > 0.001f )
-                                        {
-                                                llerrs << "V SSE: " << o_vertices[index] << " v. " << temp << llendl;
-                                        }
-        
-                                        temp = tnorm0;
-                                        if( (o_normals[index] - temp).magVecSquared() > 0.001f )
-                                        {
-                                                llerrs << "N SSE: " << o_normals[index] << " v. " << temp << llendl;
-                                        }
-        
-                                        if( (o_texcoords0[index] - tcoords0[index]).magVecSquared() > 0.001f )
-                                        {
-                                                llerrs << "T0 SSE: " << o_texcoords0[index] << " v. " << tcoords0[index] << llendl;
-                                        }
-                                        */
-                                }
-                        }
-                }
-
-#if LL_DARWIN
-                // *HACK* *CHOKE* *PUKE*
-                // No way does this belong here.
-                glFlushVertexArrayRangeAPPLE(AVATAR_VERTEX_BYTES * vert_count, gAGPVertices + (AVATAR_VERTEX_BYTES * vert_offset));
-#endif
-                glDrawElements(GL_TRIANGLES, index_count, GL_UNSIGNED_INT, indices); // draw it!
+                glDrawElements(mode,count,type,indices);
         }
         else
         {
-                glDrawElements(GL_TRIANGLES, index_count, GL_UNSIGNED_INT, indices);
+                glDrawRangeElements(mode,start,end,count,type,indices);
         }
 }
 
-
-
-//--------------------------------------------------------------------
-// DrawElements
-
-// works just like glDrawElements, except it assumes GL_TRIANGLES and GL_UNSIGNED_INT indices
-
-// why? because the destination buffer may not be the AGP buffer and the eyes do not use blending
-// separate the eyes into their own drawpools and this code goes away.
-
-//--------------------------------------------------------------------
-
-void llDrawElements(const S32 count, const U32 *indices, LLFace *face)
-{
-        U8* gAGPVertices = gPipeline.bufferGetScratchMemory();
-        
-        if (gAGPVertices)
-        {
-#if LL_DARWIN
-                U32   minIndex = indices[0];
-                U32   maxIndex = indices[0];
-#endif
-                {
-                        LLStrider<LLVector3> vertices;
-                        LLStrider<LLVector3> normals; 
-                        LLStrider<LLVector2> tcoords;
-                        LLStrider<F32>       weights; 
-
-                        LLStrider<LLVector3> o_vertices;
-                        LLStrider<LLVector3> o_normals;
-                        LLStrider<LLVector2> o_texcoords0;
-
-                        LLDrawPool *pool = face->getPool();
-                        pool->getVertexStrider      (vertices,0);
-                        pool->getNormalStrider      (normals, 0);
-                        pool->getTexCoordStrider    (tcoords, 0);
-
-                        o_vertices  = (LLVector3*)(gAGPVertices + AVATAR_OFFSET_POS);           o_vertices.setStride(  AVATAR_VERTEX_BYTES);
-                        o_normals   = (LLVector3*)(gAGPVertices + AVATAR_OFFSET_NORMAL);        o_normals.setStride(   AVATAR_VERTEX_BYTES);
-                        o_texcoords0= (LLVector2*)(gAGPVertices + AVATAR_OFFSET_TEX0);          o_texcoords0.setStride(AVATAR_VERTEX_BYTES);
-
-                        for (S32 i=0; i < count; i++)
-                        {
-                                U32   index = indices[i];
-
-                                o_vertices  [index] = vertices[index];
-                                o_normals   [index] = normals [index];
-                                o_texcoords0[index] = tcoords [index];
-
-#if LL_DARWIN
-                                maxIndex = llmax(index, maxIndex);
-                                minIndex = llmin(index, minIndex);
-#endif
-                        }
-                }
-
-#if LL_DARWIN
-                // *HACK* *CHOKE* *PUKE*
-                // No way does this belong here.
-                glFlushVertexArrayRangeAPPLE(AVATAR_VERTEX_BYTES * (maxIndex + 1 - minIndex), gAGPVertices + (AVATAR_VERTEX_BYTES * minIndex));
-#endif
-
-                glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, indices);
-        }
-        else
-        {
-                glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_INT, indices);
-        }
-}
-
-
 //--------------------------------------------------------------------
 // LLViewerJointMesh::drawShape()
 //--------------------------------------------------------------------
-U32 LLViewerJointMesh::drawShape( F32 pixelArea )
+U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
 {
-        if (!mValid || !mVisible) return 0;
-
-        U32 triangle_count = 0;
-
-        //----------------------------------------------------------------
-        // if no mesh bail out now
-        //----------------------------------------------------------------
-        if ( !mMesh || !mFace)
+        if (!mValid || !mMesh || !mFace || !mVisible || 
+                mFace->mVertexBuffer.isNull() ||
+                mMesh->getNumFaces() == 0) 
         {
                 return 0;
         }
 
-        //----------------------------------------------------------------
-        // if we have no faces, bail out now
-        //----------------------------------------------------------------
-        if ( mMesh->getNumFaces() == 0 )
-        {
-                return 0;
-        }
+        U32 triangle_count = 0;
 
         stop_glerror();
         
         //----------------------------------------------------------------
         // setup current color
         //----------------------------------------------------------------
-        if (gRenderForSelect)
-        {
-                S32 name = mFace->getDrawable() ? mFace->getDrawable()->getVObj()->mGLName : 0;
-                LLColor4U color((U8)(name >> 16), (U8)(name >> 8), (U8)name, 0xff);
-                LLColor4 color_float(color);
-        
-                glColor4f(color_float.mV[0], color_float.mV[1], color_float.mV[2], 1.f);
-        }
-        else
+        if (!gRenderForSelect)
         {
                 if ((mFace->getPool()->getVertexShaderLevel() > 0))
                 {
@@ -1169,7 +591,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
 
         stop_glerror();
         
-//      LLGLSSpecular specular(mSpecular, gRenderForSelect ? 0.0f : mShiny);
         LLGLSSpecular specular(LLColor4(1.f,1.f,1.f,1.f), gRenderForSelect ? 0.0f : mShiny && !(mFace->getPool()->getVertexShaderLevel() > 0));
 
         LLGLEnable texture_2d((gRenderForSelect && isTransparent()) ? GL_TEXTURE_2D : 0);
@@ -1179,11 +600,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
         //----------------------------------------------------------------
         llassert( !(mTexture.notNull() && mLayerSet) );  // mutually exclusive
 
-        //GLuint test_image_name = 0;
-
-        // 
-        LLGLState force_alpha_test(GL_ALPHA_TEST, isTransparent());
-
         if (mTestImageName)
         {
                 LLImageGL::bindExternalTexture( mTestImageName, 0, GL_TEXTURE_2D ); 
@@ -1236,11 +652,12 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
                 gImageList.getImage(IMG_DEFAULT_AVATAR)->bind();
         }
         
+        LLGLDisable tex(gRenderForSelect && !isTransparent() ? GL_TEXTURE_2D : 0);
+
         if (gRenderForSelect)
         {
                 if (isTransparent())
                 {
-                        //gGLSObjectSelectDepthAlpha.set();
                         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
                         glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_REPLACE);
                         glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB,         GL_MODULATE);
@@ -1251,19 +668,14 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
                         glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);  // GL_TEXTURE_ENV_COLOR is set in renderPass1
                         glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
                 }
-                else
-                {
-                        //gGLSObjectSelectDepth.set();
-                }
         }
         else
         {
                 //----------------------------------------------------------------
                 // by default, backface culling is enabled
                 //----------------------------------------------------------------
-                if (sRenderPass == AVATAR_RENDER_PASS_CLOTHING_INNER)
+                /*if (sRenderPass == AVATAR_RENDER_PASS_CLOTHING_INNER)
                 {
-                        //LLGLSPipelineAvatar gls_pipeline_avatar;
                         LLImageGL::bindExternalTexture( sClothingMaskImageName, 1, GL_TEXTURE_2D );
 
                         glClientActiveTextureARB(GL_TEXTURE0_ARB);
@@ -1303,7 +715,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
                 }
                 else if (sRenderPass == AVATAR_RENDER_PASS_CLOTHING_OUTER)
                 {
-                        //gGLSPipelineAvatarAlphaPass1.set();
                         glAlphaFunc(GL_GREATER, 0.1f);
                         LLImageGL::bindExternalTexture( sClothingMaskImageName, 1, GL_TEXTURE_2D );
 
@@ -1334,81 +745,48 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
 
                         glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);
                         glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
-                }
-                else if ( isTransparent())
-                {
-                        //gGLSNoCullFaces.set();
-                }
-                else
-                {
-                        //gGLSCullFaces.set();
-                }
+                }*/
         }
 
-        if (mMesh->hasWeights())
-        {
-                uploadJointMatrices();
+        mFace->mVertexBuffer->setBuffer(sRenderMask);
 
+        U32 start = mMesh->mFaceVertexOffset;
+        U32 end = start + mMesh->mFaceVertexCount - 1;
+        U32 count = mMesh->mFaceIndexCount;
+        U32* indicesp = ((U32*) mFace->mVertexBuffer->getIndicesPointer()) + mMesh->mFaceIndexOffset;
 
+        if (mMesh->hasWeights())
+        {
                 if ((mFace->getPool()->getVertexShaderLevel() > 0))
                 {
-                        glMatrixMode(GL_MODELVIEW);
-                        glPushMatrix();
-                        glLoadIdentity();
-
-                        glDrawElements(GL_TRIANGLES, mMesh->mFaceIndexCount, GL_UNSIGNED_INT, mMesh->getIndices());
-
-                        glPopMatrix();
+                        if (first_pass)
+                        {
+                                uploadJointMatrices();
+                        }
+                        llDrawRangeElements(GL_TRIANGLES, start, end, count, GL_UNSIGNED_INT, indicesp);
                 }
                 else
                 {
-                        if (mFace->getGeomIndex() < 0)
-                        {
-                                llerrs << "Invalid geometry index in LLViewerJointMesh::drawShape() " << mFace->getGeomIndex() << llendl;
-                        }
-
-                        if ((S32)(mMesh->mFaceVertexOffset + mMesh->mFaceVertexCount) > mFace->getGeomCount())
-                        {
-                                ((LLVOAvatar*)mFace->getDrawable()->getVObj())->mRoot.dump();
-                                llerrs << "Rendering outside of vertex bounds with mesh " << mName << " at pixel area " << pixelArea << llendl;
-                        }
-                        llDrawElementsBatchBlend(mMesh->mFaceVertexOffset, mMesh->mFaceVertexCount,
-                                                                         mFace, mMesh->mFaceIndexCount, mMesh->getIndices());
+                        llDrawRangeElements(GL_TRIANGLES, start, end, count, GL_UNSIGNED_INT, indicesp);
                 }
-
         }
         else
         {
                 glPushMatrix();
                 LLMatrix4 jointToWorld = getWorldMatrix();
-                jointToWorld *= gCamera->getModelview();
-                glLoadMatrixf((GLfloat*)jointToWorld.mMatrix);
-
-                if ((mFace->getPool()->getVertexShaderLevel() > 0))
-                {
-                        glDrawElements(GL_TRIANGLES, mMesh->mFaceIndexCount, GL_UNSIGNED_INT, mMesh->getIndices());
-                }
-                else // this else clause handles non-weighted vertices. llDrawElements just copies and draws
-                {
-                        llDrawElements(mMesh->mFaceIndexCount, mMesh->getIndices(), mFace);
-                }
-                
+                glMultMatrixf((GLfloat*)jointToWorld.mMatrix);
+                llDrawRangeElements(GL_TRIANGLES, start, end, count, GL_UNSIGNED_INT, indicesp);
                 glPopMatrix();
         }
 
         triangle_count += mMesh->mFaceIndexCount;
-
-        if (gRenderForSelect)
-        {
-                glColor4fv(mColor.mV);
-        }
-
+        
         if (mTestImageName)
         {
                 glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
         }
 
-        if (sRenderPass != AVATAR_RENDER_PASS_SINGLE)
+        /*if (sRenderPass != AVATAR_RENDER_PASS_SINGLE)
         {
                 LLImageGL::unbindTexture(1, GL_TEXTURE_2D);
                 glActiveTextureARB(GL_TEXTURE1_ARB);
@@ -1421,7 +799,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
 
                 glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_MODULATE);
                 glAlphaFunc(GL_GREATER, 0.01f);
-        }
+        }*/
 
         if (mTexture.notNull()) {
                 if (!mTexture->getClampS()) {
@@ -1438,19 +816,20 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea )
 //-----------------------------------------------------------------------------
 // updateFaceSizes()
 //-----------------------------------------------------------------------------
-void LLViewerJointMesh::updateFaceSizes(U32 &num_vertices, F32 pixel_area)
+void LLViewerJointMesh::updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area)
 {
         // Do a pre-alloc pass to determine sizes of data.
         if (mMesh && mValid)
         {
                 mMesh->mFaceVertexOffset = num_vertices;
                 mMesh->mFaceVertexCount = mMesh->getNumVertices();
+                mMesh->mFaceIndexOffset = num_indices;
+                mMesh->mFaceIndexCount = mMesh->getSharedData()->mNumTriangleIndices;
+
                 mMesh->getReferenceMesh()->mCurVertexCount = mMesh->mFaceVertexCount;
-                num_vertices += mMesh->getNumVertices();
 
-                mMesh->mFaceIndexCount = mMesh->getSharedData()->mNumTriangleIndices;
-        
-                mMesh->getSharedData()->genIndices(mMesh->mFaceVertexOffset);
+                num_vertices += mMesh->getNumVertices();
+                num_indices += mMesh->mFaceIndexCount;
         }
 }
 
@@ -1460,9 +839,7 @@ void LLViewerJointMesh::updateFaceSizes(U32 &num_vertices, F32 pixel_area)
 void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind)
 {
         U32 i;
-
-        if (!mValid) return;
-
+        
         mFace = face;
 
         LLStrider<LLVector3> verticesp;
@@ -1471,13 +848,15 @@ void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_w
         LLStrider<LLVector2> tex_coordsp;
         LLStrider<F32>           vertex_weightsp;
         LLStrider<LLVector4> clothing_weightsp;
+        LLStrider<U32> indicesp;
 
         // Copy data into the faces from the polymesh data.
-        if (mMesh)
+        if (mMesh && mValid)
         {
                 if (mMesh->getNumVertices())
                 {
                         S32 index = face->getGeometryAvatar(verticesp, normalsp, binormalsp, tex_coordsp, vertex_weightsp, clothing_weightsp);
+                        face->mVertexBuffer->getIndexStrider(indicesp);
 
                         if (-1 == index)
                         {
@@ -1493,11 +872,20 @@ void LLViewerJointMesh::updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_w
                                 vertex_weightsp[mMesh->mFaceVertexOffset + i] = *(mMesh->getWeights() + i);
                                 if (damp_wind)
                                 {
-                                        clothing_weightsp[mMesh->mFaceVertexOffset + i].setVec(0,0,0,0);
+                                        clothing_weightsp[mMesh->mFaceVertexOffset + i] = LLVector4(0,0,0,0);
                                 }
                                 else
                                 {
-                                        clothing_weightsp[mMesh->mFaceVertexOffset + i].setVec(*(mMesh->getClothingWeights() + i));
+                                        clothing_weightsp[mMesh->mFaceVertexOffset + i] = (*(mMesh->getClothingWeights() + i));
+                                }
+                        }
+
+                        for (S32 i = 0; i < mMesh->getNumFaces(); i++)
+                        {
+                                for (U32 j = 0; j < 3; j++)
+                                {
+                                        U32 k = i*3+j+mMesh->mFaceIndexOffset;
+                                        indicesp[k] = mMesh->getFaces()[i][j] + mMesh->mFaceVertexOffset;
                                 }
                         }
                 }
@@ -1514,6 +902,92 @@ BOOL LLViewerJointMesh::updateLOD(F32 pixel_area, BOOL activate)
         return (valid != activate);
 }
 
+void LLViewerJointMesh::updateGeometry()
+{
+        if (mValid && mMesh && mFace &&
+                mMesh->hasWeights() &&
+                mFace->mVertexBuffer.notNull() &&
+                gPipeline.getVertexShaderLevel(LLPipeline::SHADER_AVATAR) == 0)
+        {
+                uploadJointMatrices();
+                LLStrider<LLVector3> o_vertices;
+                LLStrider<LLVector3> o_normals;
+
+                //get vertex and normal striders
+                LLVertexBuffer *buffer = mFace->mVertexBuffer;
+                buffer->getVertexStrider(o_vertices,  0);
+                buffer->getNormalStrider(o_normals,   0);
+
+                {
+                        LLVector4 tpos0, tnorm0, tpos1, tnorm1, tbinorm0, tbinorm1;
+                        F32 last_weight = F32_MAX;
+                        LLMatrix3 gBlendRotMat;
+
+                
+                        for (U32 index= 0; index < mMesh->getNumVertices(); index++)
+                        {
+                                // blend by first matrix
+                                F32 w = mMesh->getWeights()[index]; 
+                                
+                                if (w != last_weight)
+                                {
+                                        last_weight = w;
+
+                                        S32 joint = llfloor(w);
+                                        w -= joint;
+
+                                        LLMatrix4 &m0 = gJointMat[joint+1];
+                                        LLMatrix4 &m1 = gJointMat[joint+0];
+                                        LLMatrix3 &n0 = gJointRot[joint+1];
+                                        LLMatrix3 &n1 = gJointRot[joint+0];
+
+                                        if (w == 1.0f)
+                                        {
+                                                gBlendMat = m0;
+                                                gBlendRotMat = n0;
+                                        }       
+                                        else
+                                        {
+                                                gBlendMat.mMatrix[VX][VX] = lerp(m1.mMatrix[VX][VX], m0.mMatrix[VX][VX], w);
+                                                gBlendMat.mMatrix[VX][VY] = lerp(m1.mMatrix[VX][VY], m0.mMatrix[VX][VY], w);
+                                                gBlendMat.mMatrix[VX][VZ] = lerp(m1.mMatrix[VX][VZ], m0.mMatrix[VX][VZ], w);
+
+                                                gBlendMat.mMatrix[VY][VX] = lerp(m1.mMatrix[VY][VX], m0.mMatrix[VY][VX], w);
+                                                gBlendMat.mMatrix[VY][VY] = lerp(m1.mMatrix[VY][VY], m0.mMatrix[VY][VY], w);
+                                                gBlendMat.mMatrix[VY][VZ] = lerp(m1.mMatrix[VY][VZ], m0.mMatrix[VY][VZ], w);
+
+                                                gBlendMat.mMatrix[VZ][VX] = lerp(m1.mMatrix[VZ][VX], m0.mMatrix[VZ][VX], w);
+                                                gBlendMat.mMatrix[VZ][VY] = lerp(m1.mMatrix[VZ][VY], m0.mMatrix[VZ][VY], w);
+                                                gBlendMat.mMatrix[VZ][VZ] = lerp(m1.mMatrix[VZ][VZ], m0.mMatrix[VZ][VZ], w);
+
+                                                gBlendMat.mMatrix[VW][VX] = lerp(m1.mMatrix[VW][VX], m0.mMatrix[VW][VX], w);
+                                                gBlendMat.mMatrix[VW][VY] = lerp(m1.mMatrix[VW][VY], m0.mMatrix[VW][VY], w);
+                                                gBlendMat.mMatrix[VW][VZ] = lerp(m1.mMatrix[VW][VZ], m0.mMatrix[VW][VZ], w);
+
+                                                gBlendRotMat.mMatrix[VX][VX] = lerp(n1.mMatrix[VX][VX], n0.mMatrix[VX][VX], w);
+                                                gBlendRotMat.mMatrix[VX][VY] = lerp(n1.mMatrix[VX][VY], n0.mMatrix[VX][VY], w);
+                                                gBlendRotMat.mMatrix[VX][VZ] = lerp(n1.mMatrix[VX][VZ], n0.mMatrix[VX][VZ], w);
+
+                                                gBlendRotMat.mMatrix[VY][VX] = lerp(n1.mMatrix[VY][VX], n0.mMatrix[VY][VX], w);
+                                                gBlendRotMat.mMatrix[VY][VY] = lerp(n1.mMatrix[VY][VY], n0.mMatrix[VY][VY], w);
+                                                gBlendRotMat.mMatrix[VY][VZ] = lerp(n1.mMatrix[VY][VZ], n0.mMatrix[VY][VZ], w);
+
+                                                gBlendRotMat.mMatrix[VZ][VX] = lerp(n1.mMatrix[VZ][VX], n0.mMatrix[VZ][VX], w);
+                                                gBlendRotMat.mMatrix[VZ][VY] = lerp(n1.mMatrix[VZ][VY], n0.mMatrix[VZ][VY], w);
+                                                gBlendRotMat.mMatrix[VZ][VZ] = lerp(n1.mMatrix[VZ][VZ], n0.mMatrix[VZ][VZ], w);
+                                        }
+                                }
+
+                                // write result
+                                U32 bidx = index + mMesh->mFaceVertexOffset;
+
+                                o_vertices[bidx] = mMesh->getCoords()[index] * gBlendMat;
+                                o_normals[bidx] = mMesh->getNormals()[index] * gBlendRotMat;
+                        }
+                }
+        }
+}
+
 void LLViewerJointMesh::dump()
 {
         if (mValid)
diff --git a/linden/indra/newview/llviewerjointmesh.h b/linden/indra/newview/llviewerjointmesh.h
index 30b2f29..591b21c 100644
--- a/linden/indra/newview/llviewerjointmesh.h
+++ b/linden/indra/newview/llviewerjointmesh.h
@@ -133,11 +133,12 @@ public:
         // overloaded from base class
         /*virtual*/ void drawBone();
         /*virtual*/ BOOL isTransparent();
-        /*virtual*/ U32 drawShape( F32 pixelArea );
+        /*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass );
 
-        /*virtual*/ void updateFaceSizes(U32 &num_vertices, F32 pixel_area);
+        /*virtual*/ void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area);
         /*virtual*/ void updateFaceData(LLFace *face, F32 pixel_area, BOOL damp_wind = FALSE);
         /*virtual*/ BOOL updateLOD(F32 pixel_area, BOOL activate);
+        /*virtual*/ void updateGeometry();
         /*virtual*/ void dump();
 
         void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; }
diff --git a/linden/indra/newview/llviewerjointshape.cpp b/linden/indra/newview/llviewerjointshape.cpp
index d40d8c3..c22cfbe 100644
--- a/linden/indra/newview/llviewerjointshape.cpp
+++ b/linden/indra/newview/llviewerjointshape.cpp
@@ -155,7 +155,7 @@ BOOL LLViewerJointShape::isTransparent()
 //--------------------------------------------------------------------
 // drawShape()
 //--------------------------------------------------------------------
-U32 LLViewerJointShape::drawShape( F32 pixelArea )
+U32 LLViewerJointShape::drawShape( F32 pixelArea, BOOL first_pass )
 {
         U32 triangle_count = 0;
 
diff --git a/linden/indra/newview/llviewerjointshape.h b/linden/indra/newview/llviewerjointshape.h
index 029c588..28d2c09 100644
--- a/linden/indra/newview/llviewerjointshape.h
+++ b/linden/indra/newview/llviewerjointshape.h
@@ -86,7 +86,7 @@ public:
         virtual void drawBone();
         virtual BOOL isTransparent();
         /*virutal*/ BOOL isAnimatable() { return FALSE; }
-        /*virtual*/ U32 drawShape( F32 pixelArea );
+        /*virtual*/ U32 drawShape( F32 pixelArea, BOOL first_pass );
 };
 
 #endif // LL_LLVIEWERJOINTSHAPE_H
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index c5ada54..30fa19a 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -703,12 +703,12 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
 {
         FILE *fp;
         const S32 BUFFER_SIZE = 2048;
-        char buffer[BUFFER_SIZE];
+        char buffer[BUFFER_SIZE];       /* Flawfinder: ignore */
         // *NOTE: This buffer size is hard coded into scanf() below.
-        char mode_string[MAX_STRING];
-        char key_string[MAX_STRING];
-        char mask_string[MAX_STRING];
-        char function_string[MAX_STRING];
+        char mode_string[MAX_STRING];   /* Flawfinder: ignore */
+        char key_string[MAX_STRING];    /* Flawfinder: ignore */
+        char mask_string[MAX_STRING];   /* Flawfinder: ignore */
+        char function_string[MAX_STRING];       /* Flawfinder: ignore */
         S32 mode = MODE_THIRD_PERSON;
         KEY key = 0;
         MASK mask = 0;
@@ -716,10 +716,15 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
         S32 binding_count = 0;
         S32 line_count = 0;
 
-        fp = LLFile::fopen(filename, "r");
+        fp = LLFile::fopen(filename, "r");      /* Flawfinder: ignore */
 
         if (!fp)
         {
+                if(!filename)
+                {
+                        llerrs << " No filename specified" << llendl;
+                        return 0;
+                }
                 return 0;
         }
 
@@ -734,7 +739,13 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
                 if (buffer[0] == '#' || buffer[0] == '\n') continue;
 
                 // grab the binding strings
-                tokens_read = sscanf(buffer, "%254s %254s %254s %254s", mode_string, key_string, mask_string, function_string);
+                tokens_read = sscanf(   /* Flawfinder: ignore */
+                        buffer,
+                        "%254s %254s %254s %254s",
+                        mode_string,
+                        key_string,
+                        mask_string,
+                        function_string);
 
                 if (tokens_read == EOF)
                 {
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index ab400de..217fb80 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -63,6 +63,7 @@
 
 // newview includes
 #include "llagent.h"
+
 #include "llagentpilot.h"
 #include "llbox.h"
 #include "llcallingcard.h"
@@ -75,7 +76,6 @@
 #include "lldir.h"
 #include "lldrawable.h"
 #include "lldrawpoolalpha.h"
-#include "lldrawpoolhud.h"
 #include "lldrawpooltree.h"
 #include "llface.h"
 #include "llfirstuse.h"
@@ -107,7 +107,6 @@
 #include "llfloaterland.h"
 #include "llfloaterlandholdings.h"
 #include "llfloatermap.h"
-#include "llfloateraccounthistory.h"
 #include "llfloaterimagepreview.h"
 #include "llfloatermute.h"
 #include "llfloaternamedesc.h"
@@ -282,7 +281,6 @@ typedef LLMemberListener<LLView> view_listener_t;
 //
 // Local prototypes
 //
-BOOL enable_attach(void*);
 void handle_leave_group(void *);
 
 // File Menu
@@ -294,6 +292,7 @@ BOOL enable_save_as(void *);
 
 // Edit menu
 void handle_dump_group_info(void *);
+void handle_dump_capabilities_info(void *);
 void handle_dump_focus(void*);
 
 void handle_region_dump_settings(void*);
@@ -354,9 +353,6 @@ BOOL check_toggle_hacked_godmode(void*);
 void toggle_glow(void *);
 BOOL check_glow(void *);
 
-void toggle_vbo(void *);
-BOOL check_vbo(void *);
-
 void toggle_vertex_shaders(void *);
 BOOL check_vertex_shaders(void *);
 
@@ -438,9 +434,6 @@ BOOL get_visibility(void*);
 void request_friendship(const LLUUID& agent_id);
 
 // Tools menu
-void handle_first_tool(void*);
-void handle_next_tool(void*);
-void handle_previous_tool(void*);
 void handle_force_unlock(void*);
 void handle_selected_texture_info(void*);
 void handle_dump_image_list(void*);
@@ -448,8 +441,6 @@ void handle_dump_image_list(void*);
 void handle_fullscreen_debug(void*);
 void handle_crash(void*);
 void handle_dump_followcam(void*);
-void handle_viewer_enable_circuit_log(void*);
-void handle_viewer_disable_circuit_log(void*);
 void handle_viewer_enable_message_log(void*);
 void handle_viewer_disable_message_log(void*);
 void handle_send_postcard(void*);
@@ -565,52 +556,14 @@ void init_menus()
         // Main menu bar
         //
         gMenuHolder = new LLViewerMenuHolderGL();
-        gMenuHolder->setRect(LLRect(0, top - MENU_BAR_HEIGHT, width, STATUS_BAR_HEIGHT));
+        gMenuHolder->setRect(LLRect(0, top, width, 0));
         gMenuHolder->setFollowsAll();
 
-        LLMenuGL::sDefaultMenuContainer = gMenuHolder;
+        LLMenuGL::sMenuContainer = gMenuHolder;
 
         // Initialize actions
         initialize_menu_actions();
 
-        gMenuBarView = (LLMenuBarGL*)gUICtrlFactory->buildMenu("menu_viewer.xml", gMenuHolder);
-        gMenuBarView->setRect(LLRect(0, top, width, top - MENU_BAR_HEIGHT));
-        gViewerWindow->getRootView()->addChild(gMenuBarView);
-        
-        // menu holder appears on top of menu bar so you can see the menu title
-        // flash when an item is triggered (the flash occurs in the holder)
-        gViewerWindow->getRootView()->addChild(gMenuHolder);
-
-        gMenuHolder->childSetLabelArg("Upload Image", "[COST]", "10");
-        gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", "10");
-        gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", "10");
-        gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", "10");
-
-        gAFKMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Away", TRUE);
-        gBusyMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Busy", TRUE);
-        gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE);
-        gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE);
-
-        if (gAgent.mAccess < SIM_ACCESS_MATURE)
-        {
-                gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE);
-                gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE);
-        }
-
-        // TomY TODO convert these two
-        LLMenuGL*menu;
-        menu = new LLMenuGL(CLIENT_MENU_NAME);
-        init_client_menu(menu);
-        gMenuBarView->appendMenu( menu );
-        menu->updateParent(gMenuHolder);
-
-        menu = new LLMenuGL(SERVER_MENU_NAME);
-        init_server_menu(menu);
-        gMenuBarView->appendMenu( menu );
-        menu->updateParent(gMenuHolder);
-
-        gMenuBarView->createJumpKeys();
-
         ///
         /// Popup menu
         ///
@@ -653,6 +606,16 @@ void init_menus()
         ///
         LLColor4 color;
 
+        LLColor4 pie_color = gColors.getColor("PieMenuBgColor");
+        gPieSelf->setBackgroundColor( pie_color );
+        gPieAvatar->setBackgroundColor( pie_color );
+        gPieObject->setBackgroundColor( pie_color );
+        gPieAttachment->setBackgroundColor( pie_color );
+        gPieLand->setBackgroundColor( pie_color );
+
+        color = gColors.getColor( "MenuPopupBgColor" );
+        gPopupMenuView->setBackgroundColor( color );
+
         // If we are not in production, use a different color to make it apparent.
         if (gInProductionGrid)
         {
@@ -662,18 +625,45 @@ void init_menus()
         {
                 color = gColors.getColor( "MenuNonProductionBgColor" );
         }
-
+        gMenuBarView = (LLMenuBarGL*)gUICtrlFactory->buildMenu("menu_viewer.xml", gMenuHolder);
+        gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
         gMenuBarView->setBackgroundColor( color );
 
-        LLColor4 pie_color = gColors.getColor("PieMenuBgColor");
-        gPieSelf->setBackgroundColor( pie_color );
-        gPieAvatar->setBackgroundColor( pie_color );
-        gPieObject->setBackgroundColor( pie_color );
-        gPieAttachment->setBackgroundColor( pie_color );
-        gPieLand->setBackgroundColor( pie_color );
+        gMenuHolder->addChild(gMenuBarView);
+        
+        // menu holder appears on top of menu bar so you can see the menu title
+        // flash when an item is triggered (the flash occurs in the holder)
+        gViewerWindow->getRootView()->addChild(gMenuHolder);
 
-        color = gColors.getColor( "MenuPopupBgColor" );
-        gPopupMenuView->setBackgroundColor( color );
+        gMenuHolder->childSetLabelArg("Upload Image", "[COST]", "10");
+        gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", "10");
+        gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", "10");
+        gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", "10");
+
+        gAFKMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Away", TRUE);
+        gBusyMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Busy", TRUE);
+        gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE);
+        gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE);
+
+        if (gAgent.mAccess < SIM_ACCESS_MATURE)
+        {
+                gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE);
+                gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE);
+        }
+
+        // TomY TODO convert these two
+        LLMenuGL*menu;
+        menu = new LLMenuGL(CLIENT_MENU_NAME);
+        init_client_menu(menu);
+        gMenuBarView->appendMenu( menu );
+        menu->updateParent(LLMenuGL::sMenuContainer);
+
+        menu = new LLMenuGL(SERVER_MENU_NAME);
+        init_server_menu(menu);
+        gMenuBarView->appendMenu( menu );
+        menu->updateParent(LLMenuGL::sMenuContainer);
+
+        gMenuBarView->createJumpKeys();
 
         // Let land based option enable when parcel changes
         gMenuParcelObserver = new LLMenuParcelObserver();
@@ -746,6 +736,8 @@ void init_client_menu(LLMenuGL* menu)
                         &handle_region_dump_settings, NULL));
                 sub->append(new LLMenuItemCallGL("Group Info to Debug Console",
                         &handle_dump_group_info, NULL, NULL));
+                sub->append(new LLMenuItemCallGL("Capabilities Info to Debug Console",
+                        &handle_dump_capabilities_info, NULL, NULL));
                 sub->createJumpKeys();
         }
         
@@ -783,6 +775,12 @@ void init_client_menu(LLMenuGL* menu)
         menu->append(new LLMenuItemToggleGL("Quiet Snapshots to Disk",
                                                                                 &gQuietSnapshot));
 
+        menu->append(new LLMenuItemCheckGL( "Compress Snapshots to Disk",
+                                                                                &menu_toggle_control,
+                                                                                NULL,
+                                                                                &menu_check_control,
+                                                                                (void*)"CompressSnapshotsToDisk"));
+
         menu->append(new LLMenuItemCheckGL("Show Mouselook Crosshairs",
                                                                            &menu_toggle_control,
                                                                            NULL,
@@ -836,10 +834,6 @@ void init_client_menu(LLMenuGL* menu)
                 LLMenuGL* sub = NULL;
                 sub = new LLMenuGL("Network");
 
-                sub->append(new LLMenuItemCallGL("Enable Circuit Log",  
-                        &handle_viewer_enable_circuit_log,  NULL));
-                sub->append(new LLMenuItemCallGL("Disable Circuit Log", 
-                        &handle_viewer_disable_circuit_log, NULL));
                 sub->append(new LLMenuItemCallGL("Enable Message Log",  
                         &handle_viewer_enable_message_log,  NULL));
                 sub->append(new LLMenuItemCallGL("Disable Message Log", 
@@ -909,6 +903,11 @@ void init_client_menu(LLMenuGL* menu)
         menu->append(new LLMenuItemToggleGL("Disable Camera Constraints", 
                 &LLViewerCamera::sDisableCameraConstraints));
 
+        menu->append(new LLMenuItemCheckGL("Mouse Smoothing",
+                                                                                &menu_toggle_control,
+                                                                                NULL,
+                                                                                &menu_check_control,
+                                                                                (void*) "MouseSmooth"));
         menu->appendSeparator();
 
         menu->append(new LLMenuItemCheckGL( "Console Window", 
@@ -1004,6 +1003,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
         menu->append(new LLMenuItemToggleGL("Debug SelectMgr", &gDebugSelectMgr));
         menu->append(new LLMenuItemToggleGL("Debug Clicks", &gDebugClicks));
         menu->append(new LLMenuItemToggleGL("Debug Views", &LLView::sDebugRects));
+        menu->append(new LLMenuItemCheckGL("Show Name Tooltips", toggle_show_xui_names, NULL, check_show_xui_names, NULL));
         menu->append(new LLMenuItemToggleGL("Debug Mouse Events", &LLView::sDebugMouseHandling));
         menu->append(new LLMenuItemToggleGL("Debug Keys", &LLView::sDebugKeys));
         menu->append(new LLMenuItemToggleGL("Debug WindowProc", &gDebugWindowProc));
@@ -1036,56 +1036,56 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         menu->appendMenu(sub_menu);
 
         sub_menu->append(new LLMenuItemCheckGL("Simple",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_SIMPLE,  '1', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Alpha",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_ALPHA, '2', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Tree",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_TREE, '3', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Character",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_AVATAR, '4', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("SurfacePatch",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_TERRAIN, '5', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Sky",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_SKY, '6', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Water",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_WATER, '7', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Ground",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_GROUND, '8', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Volume",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_VOLUME, '9', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Grass",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_GRASS, '0', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Clouds",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_CLOUDS, '-', MASK_CONTROL|MASK_ALT| MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Particles",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_PARTICLES, '=', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->append(new LLMenuItemCheckGL("Bump",
-                                                                                        &LLPipeline::toggleRenderType, NULL,
-                                                                                        &LLPipeline::toggleRenderTypeControl,
+                                                                                        &LLPipeline::toggleRenderTypeControl, NULL,
+                                                                                        &LLPipeline::hasRenderTypeControl,
                                                                                         (void*)LLPipeline::RENDER_TYPE_BUMP, '\\', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
         sub_menu->createJumpKeys();
         sub_menu = new LLMenuGL("Features");
@@ -1106,6 +1106,10 @@ void init_debug_rendering_menu(LLMenuGL* menu)
                                                                                         &LLPipeline::toggleRenderDebugFeature, NULL,
                                                                                         &LLPipeline::toggleRenderDebugFeatureControl,
                                                                                         (void*)LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES, '4', MASK_ALT|MASK_CONTROL));
+        sub_menu->append(new LLMenuItemCheckGL( "Foot Shadows", 
+                                                                                        &LLPipeline::toggleRenderDebugFeature, NULL,
+                                                                                        &LLPipeline::toggleRenderDebugFeatureControl,
+                                                                                        (void*)LLPipeline::RENDER_DEBUG_FEATURE_FOOT_SHADOWS, '5', MASK_ALT|MASK_CONTROL));
         sub_menu->append(new LLMenuItemCheckGL("Fog",
                                                                                         &LLPipeline::toggleRenderDebugFeature, NULL,
                                                                                         &LLPipeline::toggleRenderDebugFeatureControl,
@@ -1119,13 +1123,9 @@ void init_debug_rendering_menu(LLMenuGL* menu)
                                                                                         &LLPipeline::toggleRenderDebugFeatureControl,
                                                                                         (void*)LLPipeline::RENDER_DEBUG_FEATURE_FR_INFO, '8', MASK_ALT|MASK_CONTROL));
         sub_menu->append(new LLMenuItemCheckGL( "Flexible Objects", 
-                                                                                &LLPipeline::toggleRenderDebugFeature, NULL,
+                                                                                        &LLPipeline::toggleRenderDebugFeature, NULL,
                                                                                         &LLPipeline::toggleRenderDebugFeatureControl,
                                                                                         (void*)LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE, '9', MASK_ALT|MASK_CONTROL));
-        sub_menu->append(new LLMenuItemCheckGL( "Chain Faces", 
-                                                                                &LLPipeline::toggleRenderDebugFeature, NULL,
-                                                                                        &LLPipeline::toggleRenderDebugFeatureControl,
-                                                                                        (void*)LLPipeline::RENDER_DEBUG_FEATURE_CHAIN_FACES, '0', MASK_ALT|MASK_CONTROL));
         sub_menu->createJumpKeys();
 
         /////////////////////////////
@@ -1138,9 +1138,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Verify",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_VERIFY));
-        sub_menu->append(new LLMenuItemCheckGL("AGP Map",       &LLPipeline::toggleRenderDebug, NULL,
-                                                                                                        &LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_AGP_MEM));
         sub_menu->append(new LLMenuItemCheckGL("BBoxes",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_BBOXES));
@@ -1153,12 +1150,24 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Occlusion",     &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_OCCLUSION));
-        sub_menu->append(new LLMenuItemCheckGL("Face Chains",   &LLPipeline::toggleRenderDebug, NULL,
+        sub_menu->append(new LLMenuItemCheckGL("Animated Textures",     &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_FACE_CHAINS));
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_TEXTURE_ANIM));
         sub_menu->append(new LLMenuItemCheckGL("Texture Priority",      &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY));                                                                                                     
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY));
+        sub_menu->append(new LLMenuItemCheckGL("Texture Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA));
+        sub_menu->append(new LLMenuItemCheckGL("Face Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_FACE_AREA));
+        sub_menu->append(new LLMenuItemCheckGL("Pick Render",   &LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_PICKING));
+        sub_menu->append(new LLMenuItemCheckGL("Particles",     &LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_PARTICLES));
         sub_menu->append(new LLMenuItemCheckGL("Composition", &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_COMPOSITION));
@@ -1168,16 +1177,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("LightTrace",&LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_LIGHT_TRACE));
-        sub_menu->append(new LLMenuItemCheckGL("Pools",     &LLPipeline::toggleRenderDebug, NULL,
-                                                                                                        &LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_POOLS));
-        sub_menu->append(new LLMenuItemCheckGL("Queues",    &LLPipeline::toggleRenderDebug, NULL,
-                                                                                                        &LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_QUEUES));
-        sub_menu->append(new LLMenuItemCheckGL("Map",       &LLPipeline::toggleRenderDebug, NULL,
-                                                                                                        LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_MAP));
-
+        
         sub_menu->append(new LLMenuItemCheckGL("Show Depth Buffer",
                                                                                    &menu_toggle_control,
                                                                                    NULL,
@@ -1202,8 +1202,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 
         menu->appendSeparator();
         menu->append(new LLMenuItemCheckGL("Axes", menu_toggle_control, NULL, menu_check_control, (void*)"ShowAxes"));
-        menu->append(new LLMenuItemCheckGL("Use VBO", toggle_vbo, NULL, check_vbo, NULL));
-        menu->append(new LLMenuItemCheckGL("Light Glows", toggle_glow, NULL, check_glow, NULL));
 //      menu->append(new LLMenuItemCheckGL("Cull Small Objects", toggle_cull_small, NULL, menu_check_control, (void*)"RenderCullBySize"));
 
         menu->appendSeparator();
@@ -1228,6 +1226,19 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         item = new LLMenuItemCheckGL("Disable Textures", menu_toggle_variable, NULL, menu_check_variable, (void*)&LLViewerImage::sDontLoadVolumeTextures);
         menu->append(item);
         
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+        item = new LLMenuItemCheckGL("HTTP Get Textures", menu_toggle_control, NULL, menu_check_control, (void*)"ImagePipelineUseHTTP");
+        menu->append(item);
+#endif
+        
+        item = new LLMenuItemCheckGL("Run Multiple Threads", menu_toggle_control, NULL, menu_check_control, (void*)"RunMultipleThreads");
+        menu->append(item);
+
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+        item = new LLMenuItemCheckGL("Dynamic Reflections", menu_toggle_control, NULL, menu_check_control, (void*)"RenderDynamicReflections");
+        menu->append(item);
+#endif
+        
         item = new LLMenuItemCheckGL("Cheesy Beacon", menu_toggle_control, NULL, menu_check_control, (void*)"CheesyBeacon");
         menu->append(item);
         
@@ -1284,10 +1295,6 @@ void init_debug_avatar_menu(LLMenuGL* menu)
         //menu->append(new LLMenuItemToggleGL("Show Attachment Points", &LLVOAvatar::sShowAttachmentPoints));
         menu->append(new LLMenuItemToggleGL("Show Collision Plane", &LLVOAvatar::sShowFootPlane));
         menu->append(new LLMenuItemToggleGL("Show Collision Skeleton", &LLVOAvatar::sShowCollisionVolumes));
-        menu->append(new LLMenuItemToggleGL("Software Blending SSE", &gGLManager.mSoftwareBlendSSE));
-#if 0 // Removed since this feature doesn't actually work as of 1.9.1 --TomY
-        menu->append(new LLMenuItemToggleGL("Character Load Test", &LLVOAvatar::sAvatarLoadTest));
-#endif
         menu->append(new LLMenuItemToggleGL( "Display Agent Target", &LLAgent::sDebugDisplayTarget));
         menu->append(new LLMenuItemToggleGL( "Debug Rotation", &gDebugAvatarRotation));
         menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
@@ -1325,11 +1332,6 @@ void init_server_menu(LLMenuGL* menu)
                         &handle_normal_llinfo_log, &enable_god_customer_service));
 
                 sub_menu->appendSeparator();
-                sub_menu->append(new LLMenuItemCallGL("Enable Circuit Log",  
-                        &handle_sim_enable_circuit_log,  &enable_god_customer_service));
-                sub_menu->append(new LLMenuItemCallGL("Disable Circuit Log", 
-                        &handle_sim_disable_circuit_log, &enable_god_customer_service));
-                sub_menu->appendSeparator();
                 sub_menu->append(new LLMenuItemCallGL("Enable Message Log",  
                         &handle_sim_enable_message_log,  &enable_god_customer_service));
                 sub_menu->append(new LLMenuItemCallGL("Disable Message Log", 
@@ -1352,7 +1354,8 @@ void init_server_menu(LLMenuGL* menu)
                 menu->appendMenu(sub);
 
                 sub->append(new LLMenuItemCallGL( "Take Copy",
-                                                                                   &force_take_copy, &enable_god_customer_service, NULL));
+                                                                                  &force_take_copy, &enable_god_customer_service, NULL,
+                                                                                  'O', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
 #ifdef _CORY_TESTING
                 sub->append(new LLMenuItemCallGL( "Export Copy",
                                                                                    &force_export_copy, NULL, NULL));
@@ -1456,7 +1459,7 @@ class LLObjectRateOwner : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 // Don't allow rating of group owned objects.
-                LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                 if (!node) return true;
                 if (node->mPermissions->isGroupOwned())
                 {
@@ -1542,36 +1545,6 @@ class LLObjectEnableReportAbuse : public view_listener_t
         }
 };
 
-
-BOOL enable_attach(void*)
-{
-        // All root objects must be owned by agent.
-        BOOL rv = FALSE;
-        LLViewerObject* obj = gSelectMgr->getFirstRootObject();
-        if(obj)
-        {
-                rv = TRUE;
-                for(obj = gSelectMgr->getFirstRootObject() ; obj != NULL; obj = gSelectMgr->getNextRootObject())
-                {
-                        for (U32 child_num = 0; child_num < obj->mChildList.size(); child_num++ )
-                        {
-                                LLViewerObject *child = obj->mChildList[child_num];
-                                if (child->isAvatar())
-                                {
-                                        return FALSE;
-                                }
-                        }
-                        if(!obj->permMove())
-                        {
-                                rv = FALSE;
-                                break;
-                        }
-                }
-        }
-        return rv;
-}
-
-
 class LLObjectTouch : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -1601,7 +1574,6 @@ class LLObjectTouch : public view_listener_t
                 msg->addU32Fast(_PREHASH_LocalID, object->mLocalID);
                 msg->sendMessage(object->getRegion()->getHost());
 
-                gSelectMgr->deselectTransient();
                 return true;
         }
 };
@@ -1617,7 +1589,7 @@ class LLObjectEnableTouch : public view_listener_t
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
                 // Update label based on the node touch name if available.
-                LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                 if (node && node->mValid && !node->mTouchName.empty())
                 {
                         gMenuHolder->childSetText("Object Touch", node->mTouchName);
@@ -1633,7 +1605,7 @@ class LLObjectEnableTouch : public view_listener_t
 
 void label_touch(LLString& label, void*)
 {
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
         if (node && node->mValid && !node->mTouchName.empty())
         {
                 label.assign(node->mTouchName);
@@ -1649,8 +1621,6 @@ bool handle_object_open()
         LLViewerObject* obj = gObjectList.findObject(gLastHitObjectID);
         if(!obj) return true;
 
-        // transient selection must be made permanent
-        gSelectMgr->convertTransient();
         LLFloaterOpenObject::show();
         return true;
 }
@@ -1711,8 +1681,8 @@ bool toggle_build_mode()
                         gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
                 }
 
-                gCurrentToolset = gBasicToolset;
-                gCurrentToolset->selectTool( gToolCreate );
+                gToolMgr->setCurrentToolset(gBasicToolset);
+                gToolMgr->getCurrentToolset()->selectTool( gToolCreate );
 
                 // Could be first use
                 LLFirstUse::useBuild();
@@ -1748,8 +1718,8 @@ class LLObjectBuild : public view_listener_t
                         gViewerWindow->moveCursorToCenter();
                 }
 
-                gCurrentToolset = gBasicToolset;
-                gCurrentToolset->selectTool( gToolCreate );
+                gToolMgr->setCurrentToolset(gBasicToolset);
+                gToolMgr->getCurrentToolset()->selectTool( gToolCreate );
 
                 // Could be first use
                 LLFirstUse::useBuild();
@@ -1762,12 +1732,12 @@ class LLObjectEdit : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 gParcelMgr->deselectLand();
-                // convert transient selections to permanent
-                gSelectMgr->convertTransient();
 
                 if (gAgent.getFocusOnAvatar() && !gToolMgr->inEdit())
                 {
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD || !gSavedSettings.getBOOL("EditCameraMovement"))
+                        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
+                        if (selection->getSelectType() == SELECT_TYPE_HUD || !gSavedSettings.getBOOL("EditCameraMovement"))
                         {
                                 // always freeze camera in space, even if camera doesn't move
                                 // so, for example, follow cam scripts can't affect you when in build mode
@@ -1785,9 +1755,9 @@ class LLObjectEdit : public view_listener_t
                         }
                 }
 
-                gFloaterTools->open();
+                gFloaterTools->open();          /* Flawfinder: ignore */
         
-                gCurrentToolset = gBasicToolset;
+                gToolMgr->setCurrentToolset(gBasicToolset);
                 gFloaterTools->setEditTool( gToolTranslate );
 
                 // Could be first use
@@ -1800,7 +1770,6 @@ class LLObjectInspect : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                gSelectMgr->convertTransient();
                 LLFloaterInspect::show();
                 return true;
         }
@@ -1833,8 +1802,8 @@ class LLLandBuild : public view_listener_t
                 }
 
 
-                gCurrentToolset = gBasicToolset;
-                gCurrentToolset->selectTool( gToolCreate );
+                gToolMgr->setCurrentToolset(gBasicToolset);
+                gToolMgr->getCurrentToolset()->selectTool( gToolCreate );
 
                 // Could be first use
                 LLFirstUse::useBuild();
@@ -1922,7 +1891,7 @@ class LLSelfEnableRemoveAllAttachments : public view_listener_t
                                 attachmentp;
                                 attachmentp = avatarp->mAttachmentPoints.getNextData())
                         {
-                                if (attachmentp->getObject(0))
+                                if (attachmentp->getObject())
                                 {
                                         new_value = true;
                                         break;
@@ -2003,7 +1972,7 @@ class LLObjectMute : public view_listener_t
                         // it's an object
                         id = object->getID();
 
-                        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                         if (node)
                         {
                                 name = node->mName;
@@ -2023,7 +1992,6 @@ class LLObjectMute : public view_listener_t
                         gFloaterMute->show();
                 }
                 
-                gSelectMgr->deselectAll();
                 return true;
         }
 };
@@ -2041,9 +2009,6 @@ bool handle_go_to()
         strings.push_back(val);
         send_generic_message("autopilot", strings);
 
-        // Don't select anything
-        gSelectMgr->deselectTransient();
-
         gParcelMgr->deselectLand();
 
         if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
@@ -2153,7 +2118,7 @@ class LLAvatarDebug : public view_listener_t
                 }
                 llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl;
                 std::vector<std::string> strings;
-                strings.push_back( avatar->getID().getString() );
+                strings.push_back(avatar->getID().asString());
                 LLUUID invoice;
                 send_generic_message("dumptempassetdata", strings, invoice);
                 LLFloaterAvatarTextures::show( avatar->getID() );
@@ -2336,18 +2301,18 @@ void handle_leave_group(void *)
 void append_aggregate(LLString& string, const LLAggregatePermissions& ag_perm, PermissionBit bit, const char* txt)
 {
         LLAggregatePermissions::EValue val = ag_perm.getValue(bit);
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         buffer[0] = '\0';
         switch(val)
         {
         case LLAggregatePermissions::AP_NONE:
-                sprintf(buffer, "* %s None\n", txt);
+                snprintf(buffer, MAX_STRING, "* %s None\n", txt);               /* Flawfinder: ignore */
                 break;
         case LLAggregatePermissions::AP_SOME:
-                sprintf(buffer, "* %s Some\n", txt);
+                snprintf(buffer, MAX_STRING, "* %s Some\n", txt);               /* Flawfinder: ignore */
                 break;
         case LLAggregatePermissions::AP_ALL:
-                sprintf(buffer, "* %s All\n", txt);
+                snprintf(buffer, MAX_STRING, "* %s All\n", txt);                /* Flawfinder: ignore */
                 break;
         case LLAggregatePermissions::AP_EMPTY:
         default:
@@ -2388,9 +2353,9 @@ BOOL enable_buy(void*)
 {
     // In order to buy, there must only be 1 purchaseable object in
     // the selection manger.
-        if(gSelectMgr->getRootObjectCount() != 1) return FALSE;
+        if(gSelectMgr->getSelection()->getRootObjectCount() != 1) return FALSE;
     LLViewerObject* obj = NULL;
-    LLSelectNode* node = gSelectMgr->getFirstRootNode();
+    LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
         if(node)
     {
         obj = node->getObject();
@@ -2451,14 +2416,12 @@ void handle_buy_object(LLSaleInfo sale_info)
                 return;
         }
 
-        gSelectMgr->convertTransient();
         LLFloaterBuy::show(sale_info);
 }
 
 
 void handle_buy_contents(LLSaleInfo sale_info)
 {
-        gSelectMgr->convertTransient();
         LLFloaterBuyContents::show(sale_info);
 }
 
@@ -2513,6 +2476,14 @@ void handle_dump_group_info(void *)
         //llinfos << "insig   " << gAgent.mGroupInsigniaID << llendl;
 }
 
+void handle_dump_capabilities_info(void *)
+{
+        LLViewerRegion* regionp = gAgent.getRegion();
+        if (regionp)
+        {
+                regionp->logActiveCapabilities();
+        }
+}
 
 void handle_dump_focus(void *)
 {
@@ -2590,10 +2561,12 @@ void set_god_level(U8 god_level)
                         if (gInProductionGrid)
                         {
                                 gMenuBarView->setBackgroundColor( gColors.getColor( "MenuBarGodBgColor" ) );
+                                gStatusBar->setBackgroundColor( gColors.getColor( "MenuBarGodBgColor" ) );
                         }
                         else
                         {
                                 gMenuBarView->setBackgroundColor( gColors.getColor( "MenuNonProductionGodBgColor" ) );
+                                gStatusBar->setBackgroundColor( gColors.getColor( "MenuNonProductionGodBgColor" ) );
                         }
                         LLNotifyBox::showXml("EnteringGodMode", args);
                 }
@@ -2603,10 +2576,12 @@ void set_god_level(U8 god_level)
                         if (gInProductionGrid)
                         {
                                 gMenuBarView->setBackgroundColor( gColors.getColor( "MenuBarBgColor" ) );
+                                gStatusBar->setBackgroundColor( gColors.getColor( "MenuBarBgColor" ) );
                         }
                         else
                         {
                                 gMenuBarView->setBackgroundColor( gColors.getColor( "MenuNonProductionBgColor" ) );
+                                gStatusBar->setBackgroundColor( gColors.getColor( "MenuNonProductionBgColor" ) );
                         }
                         LLNotifyBox::showXml("LeavingGodMode", args);
                 }
@@ -2801,7 +2776,6 @@ bool handle_sit_or_stand()
         if (sitting_on_selection())
         {
                 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-                gSelectMgr->deselectTransient();
                 return true;
         }
 
@@ -2822,8 +2796,6 @@ bool handle_sit_or_stand()
                 gMessageSystem->addVector3Fast(_PREHASH_Offset, offset_single);
 
                 object->getRegion()->sendReliableMessage();
-
-                gSelectMgr->deselectTransient();
         }
         return true;
 }
@@ -2838,11 +2810,14 @@ class LLObjectSitOrStand : public view_listener_t
 
 void near_sit_down_point(BOOL success, void *)
 {
-        gAgent.setFlying(FALSE);
-        gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+        if (success)
+        {
+                gAgent.setFlying(FALSE);
+                gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 
-        // Might be first sit
-        LLFirstUse::useSit();
+                // Might be first sit
+                LLFirstUse::useSit();
+        }
 }
 
 class LLLandSit : public view_listener_t
@@ -3182,13 +3157,12 @@ void reset_view_final( BOOL proceed, void* )
         gAgent.changeCameraToDefault();
         
         gAgent.resetView(!gFloaterTools->getVisible());
+        gFloaterTools->close();
         
         gViewerWindow->showCursor();
 
         // Switch back to basic toolset
-        gCurrentToolset = gBasicToolset;
-        gBasicToolset->selectFirstTool();
-        gToolMgr->useSelectedTool( gBasicToolset );
+        gToolMgr->setCurrentToolset(gBasicToolset);
 }
 
 class LLViewLookAtLastChatter : public view_listener_t
@@ -3261,7 +3235,7 @@ class LLEditEnableDuplicate : public view_listener_t
 
 void disabled_duplicate(void*)
 {
-        if (gSelectMgr->getFirstObject())
+        if (gSelectMgr->getSelection()->getFirstObject())
         {
                 LLNotifyBox::showXml("CopyFailed");
         }
@@ -3291,7 +3265,7 @@ void handle_deed_object_to_group(void*)
 
 BOOL enable_deed_object_to_group(void*)
 {
-        if(gSelectMgr->isEmpty()) return FALSE;
+        if(gSelectMgr->getSelection()->isEmpty()) return FALSE;
         LLPermissions perm;
         LLUUID group_id;
 
@@ -3350,8 +3324,8 @@ void handle_object_owner_permissive(void*)
         if(gAgent.isGodlike())
         {
                 // do the objects.
-                gSelectMgr->setObjectPermissions(PERM_BASE, TRUE, PERM_ALL, TRUE);
-                gSelectMgr->setObjectPermissions(PERM_OWNER, TRUE, PERM_ALL, TRUE);
+                gSelectMgr->selectionSetObjectPermissions(PERM_BASE, TRUE, PERM_ALL, TRUE);
+                gSelectMgr->selectionSetObjectPermissions(PERM_OWNER, TRUE, PERM_ALL, TRUE);
         }
 }
 
@@ -3367,7 +3341,7 @@ void handle_object_owner_self(void*)
 // Shortcut to set owner permissions to not editable.
 void handle_object_lock(void*)
 {
-        gSelectMgr->setObjectPermissions(PERM_OWNER, FALSE, PERM_MODIFY);
+        gSelectMgr->selectionSetObjectPermissions(PERM_OWNER, FALSE, PERM_MODIFY);
 }
 
 void handle_object_asset_ids(void*)
@@ -3412,17 +3386,17 @@ void handle_claim_public_land(void*)
         msg->nextBlock("MethodData");
         msg->addString("Method", "claimpublicland");
         msg->addUUID("Invoice", LLUUID::null);
-        char buffer[32];
-        sprintf(buffer, "%f", west_south.mV[VX]);
+        char buffer[32];                /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "%f", west_south.mV[VX]);              /* Flawfinder: ignore */
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buffer);
-        sprintf(buffer, "%f", west_south.mV[VY]);
+        snprintf(buffer, sizeof(buffer), "%f", west_south.mV[VY]);              /* Flawfinder: ignore */
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buffer);
-        sprintf(buffer, "%f", east_north.mV[VX]);
+        snprintf(buffer, sizeof(buffer), "%f", east_north.mV[VX]);              /* Flawfinder: ignore */
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buffer);
-        sprintf(buffer, "%f", east_north.mV[VY]);
+        snprintf(buffer, sizeof(buffer), "%f", east_north.mV[VY]);              /* Flawfinder: ignore */
         msg->nextBlock("ParamList");
         msg->addString("Parameter", buffer);
         gAgent.sendReliableMessage();
@@ -3519,8 +3493,9 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
         }
         //gInventoryView->setPanelOpen(TRUE);
 
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
         LLViewerObject* object = NULL;
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = selection->getFirstRootNode();
         if(!node) return;
         object = node->getObject();
         if(!object) return;
@@ -3531,7 +3506,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
         // everything that we'll actually be derezzing.
         LLDynamicArray<LLViewerObject*> derez_objects;
         BOOL can_derez_current;
-        for( ; node != NULL; node = gSelectMgr->getNextRootNode())
+        for( ; node != NULL; node = selection->getNextRootNode())
         {
                 object = node->getObject();
                 if(!object || !node->mValid) continue;
@@ -3665,42 +3640,47 @@ class LLToolsTakeCopy : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                if (gSelectMgr->isEmpty()) return true;
+                if (gSelectMgr->getSelection()->isEmpty()) return true;
 
                 const LLUUID& category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
                 derez_objects(DRD_ACQUIRE_TO_AGENT_INVENTORY, category_id);
 
-                // Only deselect if we're not building
-                if (!gToolMgr->inEdit())
-                {
-                        gSelectMgr->deselectTransient();
-                }
                 return true;
         }
 };
 
 
-void callback_return_to_owner(S32 option, void* data)
-{
-        if (0 == option)
-        {
-                // Ignore category ID for this derez destination.
-                derez_objects(DRD_RETURN_TO_OWNER, LLUUID::null);
-        }
-}
-
 // You can return an object to its owner if it is on your land.
 class LLObjectReturn : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                if (gSelectMgr->isEmpty()) return true;
+                if (gSelectMgr->getSelection()->isEmpty()) return true;
+                
+                mObjectSelection = gSelectMgr->getEditSelection();
 
                 gViewerWindow->alertXml("ReturnToOwner",
-                        callback_return_to_owner,
-                        NULL);
+                        onReturnToOwner,
+                        (void*)this);
                 return true;
         }
+
+        static void onReturnToOwner(S32 option, void* data)
+        {
+                LLObjectReturn* object_return = (LLObjectReturn*)data;
+
+                if (0 == option)
+                {
+                        // Ignore category ID for this derez destination.
+                        derez_objects(DRD_RETURN_TO_OWNER, LLUUID::null);
+                }
+
+                // drop reference to current selection
+                object_return->mObjectSelection = NULL;
+        }
+
+protected:
+        LLObjectSelectionHandle mObjectSelection;
 };
 
 
@@ -3730,10 +3710,11 @@ class LLObjectEnableReturn : public view_listener_t
                                 }
                                 else
                                 {
+                                        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
                                         LLViewerObject* obj = NULL;
-                                        for(obj = gSelectMgr->getFirstRootObject();
+                                        for(obj = selection->getFirstRootObject();
                                                 obj;
-                                                obj = gSelectMgr->getNextRootObject())
+                                                obj = selection->getNextRootObject())
                                         {
                                                 if (obj->isOverAgentOwnedLand()
                                                         || obj->isOverGroupOwnedLand()
@@ -3754,22 +3735,16 @@ class LLObjectEnableReturn : public view_listener_t
 
 void force_take_copy(void*)
 {
-        if (gSelectMgr->isEmpty()) return;
+        if (gSelectMgr->getSelection()->isEmpty()) return;
         const LLUUID& category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
         derez_objects(DRD_FORCE_TO_GOD_INVENTORY, category_id);
-
-        // Only deselect if we're not building
-        if (!gToolMgr->inEdit())
-        {
-                gSelectMgr->deselectTransient();
-        }
 }
 #ifdef _CORY_TESTING
 
 void force_export_copy(void*)
 {
         LLViewerObject* object = NULL;
-        LLSelectNode* node = gSelectMgr->getFirstNode();
+        LLSelectNode* node = gSelectMgr->getSelection()->getFirstNode();
         if(!node) return;
         object = node->getObject();
         if(!object) return;
@@ -3790,7 +3765,7 @@ void force_export_copy(void*)
 
         S32 object_index = 0;
 
-        for( ; node != NULL; node = gSelectMgr->getNextNode())
+        for( ; node != NULL; node = gSelectMgr->getSelection()->getNextNode())
         {
                 object = node->getObject();
                 if(!object || !node->mValid)
@@ -3831,8 +3806,9 @@ void force_export_copy(void*)
         }
 
         // Copy the directory + file name
-        char filepath[LL_MAX_PATH];
-        strcpy(filepath, picker.getFirstFile());
+        char filepath[LL_MAX_PATH];             /* Flawfinder: ignore */
+        strncpy(filepath, picker.getFirstFile(), LL_MAX_PATH -1);               /* Flawfinder: ignore */
+        filepath[LL_MAX_PATH -1] = '\0';
 
         apr_file_t* fp = ll_apr_file_open(filepath, LL_APR_W);
 
@@ -3876,7 +3852,7 @@ void force_export_copy(void*)
                         LLColor4 color = te->getColor();
                         apr_file_printf(fp, "\t<Face\n\t\tFaceColor='%d %5f %5f %5f %5f'\n", face, color.mV[VX], color.mV[VY], color.mV[VZ], color.mV[VW]);
                         
-                        char texture[UUID_STR_LENGTH];
+                        char texture[UUID_STR_LENGTH];          /* Flawfinder: ignore */
                         LLUUID texid = te->getID();
                         texid.toString(texture);
                         F32 sx, sy, ox, oy;
@@ -3942,8 +3918,9 @@ void force_import_geometry(void*)
                 return;
         }
 
-        char directory[LL_MAX_PATH];
-        strcpy(directory, picker.getFirstFile());
+        char directory[LL_MAX_PATH];            /* Flawfinder: ignore */
+        strncpy(directory, picker.getFirstFile(), LL_MAX_PATH -1);              /* Flawfinder: ignore */
+        directory[LL_MAX_PATH -1] = '\0';
 
         llinfos << "Loading LSG file " << directory << llendl;
         LLXmlTree *xmlparser = new LLXmlTree();
@@ -3966,8 +3943,8 @@ void force_import_geometry(void*)
         {
                 // get object data
                 // *NOTE: This buffer size is hard coded into scanf() below.
-                char name[255];                 // Shape
-                char description[255];  // Description
+                char name[255];         /* Flawfinder: ignore */                        // Shape
+                char description[255];          /* Flawfinder: ignore */                // Description
                 U32      material;                      // Material
                 F32  sx, sy, sz;                // Scale
                 LLVector3 scale;
@@ -3998,9 +3975,11 @@ void force_import_geometry(void*)
                 child->getAttributeString("PCode", &attribute);
                 pcode = atoi(attribute.c_str());
                 child->getAttributeString("Shape", &attribute);
-                sscanf(attribute.c_str(), "%254s", name);
+                sscanf( /* Flawfinder: ignore */
+                        attribute.c_str(), "%254s", name);
                 child->getAttributeString("Description", &attribute);
-                sscanf(attribute.c_str(), "%254s", description);
+                sscanf( /* Flawfinder: ignore */
+                        attribute.c_str(), "%254s", description);
                 child->getAttributeString("Material", &attribute);
                 material = atoi(attribute.c_str());
                 child->getAttributeString("Scale", &attribute);
@@ -4115,16 +4094,16 @@ void handle_take()
 {
         // we want to use the folder this was derezzed from if it's
         // available. Otherwise, derez to the normal place.
-        if(gSelectMgr->isEmpty()) return;
+        if(gSelectMgr->getSelection()->isEmpty()) return;
         LLSelectNode* node = NULL;
         LLViewerObject* object = NULL;
         BOOL you_own_everything = TRUE;
 
         BOOL locked_but_takeable_object = FALSE;
         LLUUID category_id;
-        for(node = gSelectMgr->getFirstRootNode();
+        for(node = gSelectMgr->getSelection()->getFirstRootNode();
                 node != NULL;
-                node = gSelectMgr->getNextRootNode())
+                node = gSelectMgr->getSelection()->getNextRootNode())
         {
                 object = node->getObject();
                 if(object)
@@ -4160,7 +4139,7 @@ void handle_take()
         if(category_id.notNull())
         {
                 // there is an unambiguous destination. See if this agent has
-                // such a location and it is not in the trash.
+                // such a location and it is not in the trash or library
                 if(!gInventory.getCategory(category_id))
                 {
                         // nope, set to NULL.
@@ -4168,12 +4147,20 @@ void handle_take()
                 }
                 if(category_id.notNull())
                 {
+                        // check trash
                         LLUUID trash;
                         trash = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
                         if(category_id == trash || gInventory.isObjectDescendentOf(category_id, trash))
                         {
                                 category_id.setNull();
                         }
+
+                        // check library
+                        if(gInventory.isObjectDescendentOf(category_id, gInventoryLibraryRoot))
+                        {
+                                category_id.setNull();
+                        }
+
                 }
         }
         if(category_id.isNull())
@@ -4185,10 +4172,8 @@ void handle_take()
 
            !you_own_everything)
         {
-
                 if(locked_but_takeable_object && you_own_everything)
                 {
-                        
                         gViewerWindow->alertXml("ConfirmObjectTakeLock",
                         confirm_take,
                         (void*)cat_id);
@@ -4196,7 +4181,6 @@ void handle_take()
                 }
                 else if(!locked_but_takeable_object && !you_own_everything)
                 {
-                        
                         gViewerWindow->alertXml("ConfirmObjectTakeNoOwn",
                         confirm_take,
                         (void*)cat_id);
@@ -4239,9 +4223,9 @@ BOOL enable_take()
         }
 
         LLViewerObject* object = NULL;
-        for(LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        for(LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                 node != NULL;
-                node = gSelectMgr->getNextRootNode())
+                node = gSelectMgr->getSelection()->getNextRootNode())
         {
                 object = node->getObject();
                 if(!object || !node->mValid) continue;
@@ -4275,7 +4259,7 @@ class LLToolsBuyOrTake : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                if (gSelectMgr->isEmpty())
+                if (gSelectMgr->getSelection()->isEmpty())
                 {
                         return true;
                 }
@@ -4355,9 +4339,9 @@ class LLToolsEnableBuyOrTake : public view_listener_t
 BOOL is_selection_buy_not_take()
 {
         LLViewerObject* obj = NULL;
-        for(LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        for(LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                 node != NULL;
-                node = gSelectMgr->getNextRootNode())
+                node = gSelectMgr->getSelection()->getNextRootNode())
         {
                 obj = node->getObject();
                 if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
@@ -4374,9 +4358,9 @@ S32 selection_price()
 {
         LLViewerObject* obj = NULL;
         S32 total_price = 0;
-        for(LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        for(LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                 node != NULL;
-                node = gSelectMgr->getNextRootNode())
+                node = gSelectMgr->getSelection()->getNextRootNode())
         {
                 obj = node->getObject();
                 if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
@@ -4425,7 +4409,7 @@ void handle_buy_currency(void*)
 
 void handle_buy(void*)
 {
-        if (gSelectMgr->isEmpty()) return;
+        if (gSelectMgr->getSelection()->isEmpty()) return;
 
         LLSaleInfo sale_info;
         BOOL valid = gSelectMgr->selectGetSaleInfo(sale_info);
@@ -4452,7 +4436,7 @@ class LLObjectBuy : public view_listener_t
 
 BOOL sitting_on_selection()
 {
-        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
         if (!node)
         {
                 return FALSE;
@@ -4497,7 +4481,7 @@ class LLToolsSaveToObjectInventory : public view_listener_t
         {
                 if(gSelectMgr)
                 {
-                        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                         if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
                         {
                                 // *TODO: check to see if the fromtaskid object exists.
@@ -4516,9 +4500,10 @@ class LLToolsSnapObjectXY : public view_listener_t
                 F64 snap_size = (F64)gSavedSettings.getF32("GridResolution");
 
                 LLViewerObject* obj;
-                for (obj = gSelectMgr->getFirstRootObject();
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                for (obj = selection->getFirstRootObject();
                         obj != NULL;
-                        obj = gSelectMgr->getNextRootObject())
+                        obj = selection->getNextRootObject())
                 {
                         if (obj->permModify())
                         {
@@ -4574,11 +4559,12 @@ class LLToolsEnableLink : public view_listener_t
                 // in component mode, can't link
                 if (gSavedSettings.getBOOL("SelectLinkedSet"))
                 {
-                        if(gSelectMgr->selectGetAllRootsValid() && gSelectMgr->getRootObjectCount() >= 2)
+                        if(gSelectMgr->selectGetAllRootsValid() && gSelectMgr->getSelection()->getRootObjectCount() >= 2)
                         {
-                                for(LLViewerObject* object = gSelectMgr->getFirstRootObject();
+                                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                                for(LLViewerObject* object = selection->getFirstRootObject();
                                         object != NULL;
-                                        object = gSelectMgr->getNextRootObject())
+                                        object = selection->getNextRootObject())
                                 {
                                         if(object->permModify())
                                         {
@@ -4603,7 +4589,7 @@ class LLToolsLink : public view_listener_t
                         return true;
                 }
 
-                S32 object_count = gSelectMgr->getObjectCount();
+                S32 object_count = gSelectMgr->getSelection()->getObjectCount();
                 if (object_count > MAX_CHILDREN_PER_TASK + 1)
                 {
                         LLStringBase<char>::format_map_t args;
@@ -4614,7 +4600,7 @@ class LLToolsLink : public view_listener_t
                         return true;
                 }
 
-                if(gSelectMgr->getRootObjectCount() < 2)
+                if(gSelectMgr->getSelection()->getRootObjectCount() < 2)
                 {
                         gViewerWindow->alertXml("CannotLinkIncompleteSet");
                         return true;
@@ -4644,8 +4630,8 @@ class LLToolsEnableUnlink : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 bool new_value = gSelectMgr->selectGetAllRootsValid() &&
-                        gSelectMgr->getFirstEditableObject() &&
-                        !gSelectMgr->getFirstEditableObject()->isAttachment();
+                        gSelectMgr->getSelection()->getFirstEditableObject() &&
+                        !gSelectMgr->getSelection()->getFirstEditableObject()->isAttachment();
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -4707,7 +4693,7 @@ void handle_dehinge(void*)
 
 BOOL enable_dehinge(void*)
 {
-        LLViewerObject* obj = gSelectMgr->getFirstEditableObject();
+        LLViewerObject* obj = gSelectMgr->getSelection()->getFirstEditableObject();
         return obj && !obj->isAttachment();
 }
 
@@ -5003,7 +4989,7 @@ void toggle_map( void* user_data )
         }
         else
         {
-                gFloaterMap->open();
+                gFloaterMap->open();            /* Flawfinder: ignore */        
         }
 }
 
@@ -5082,8 +5068,8 @@ const char* upload_pick(void* data)
                 {
                         const char* cur_token = token_iter->c_str();
 
-                        if (0 == strnicmp(cur_token, ext, strlen(cur_token)) ||
-                                0 == strnicmp(cur_token, "*.*", strlen(cur_token))) 
+                        if (0 == strnicmp(cur_token, ext, strlen(cur_token)) ||         /* Flawfinder: ignore */
+                                0 == strnicmp(cur_token, "*.*", strlen(cur_token)))             /* Flawfinder: ignore */
                         {
                                 //valid extension
                                 //or the acceptable extension is any
@@ -5110,7 +5096,7 @@ const char* upload_pick(void* data)
         if (type == LLFilePicker::FFLOAD_WAV)
         {
                 // pre-qualify wavs to make sure the format is acceptable
-                char error_msg[MAX_STRING];
+                char error_msg[MAX_STRING];             /* Flawfinder: ignore */        
                 if (check_for_invalid_wav_formats(filename,error_msg))
                 {
                         llinfos << error_msg << ": " << filename << llendl;
@@ -5213,7 +5199,7 @@ class LLFileUploadBulk : public view_listener_t
                         char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
                         if( !end_p )
                         {
-                                end_p = asset_name_str + strlen( asset_name_str );
+                                end_p = asset_name_str + strlen( asset_name_str );              /* Flawfinder: ignore */
                         }
                                 
                         S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
@@ -5241,15 +5227,23 @@ void upload_error(const char* error_message, const char* label, const std::strin
         LLFilePicker::instance().reset();                                               
 }
 
+class LLFileEnableCloseWindow : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
+                // horrendously opaque, this code
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 class LLFileCloseWindow : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLFloater *top = gFloaterView->getFrontmost();
-                if (top && top->hasFocus())
-                {
-                        LLFloater::closeByMenu( top );
-                }
+                LLFloater::closeFocusedFloater();
+
                 return true;
         }
 };
@@ -5394,7 +5388,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 
         LLString ext = src_filename.substr(src_filename.find_last_of('.'));
         LLAssetType::EType asset_type = LLAssetType::AT_NONE;
-        char error_message[MAX_STRING];
+        char error_message[MAX_STRING];         /* Flawfinder: ignore */        
         error_message[0] = '\0';
         LLString temp_str;
 
@@ -5408,7 +5402,8 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                 LLString short_name = filename.substr(offset);
                 
                 // No extension
-                sprintf(error_message,
+                snprintf(error_message,         /* Flawfinder: ignore */        
+                                MAX_STRING,
                                 "No file extension for the file: '%s'\nPlease make sure the file has a correct file extension",
                                 short_name.c_str());
                 args["[FILE]"] = short_name;
@@ -5422,7 +5417,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                                                                                  filename,
                                                                                                  IMG_CODEC_BMP ))
                 {
-                        sprintf(error_message, "Problem with file %s:\n\n%s\n",
+                        snprintf(error_message, MAX_STRING, "Problem with file %s:\n\n%s\n",            /* Flawfinder: ignore */
                                         src_filename.c_str(), LLImageBase::getLastError().c_str());
                         args["[FILE]"] = src_filename;
                         args["[ERROR]"] = LLImageBase::getLastError();
@@ -5437,7 +5432,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                                                                                  filename,
                                                                                                  IMG_CODEC_TGA ))
                 {
-                        sprintf(error_message, "Problem with file %s:\n\n%s\n",
+                        snprintf(error_message, MAX_STRING, "Problem with file %s:\n\n%s\n",            /* Flawfinder: ignore */
                                         src_filename.c_str(), LLImageBase::getLastError().c_str());
                         args["[FILE]"] = src_filename;
                         args["[ERROR]"] = LLImageBase::getLastError();
@@ -5452,7 +5447,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                                                                                  filename,
                                                                                                  IMG_CODEC_JPEG ))
                 {
-                        sprintf(error_message, "Problem with file %s:\n\n%s\n",
+                        snprintf(error_message, MAX_STRING, "Problem with file %s:\n\n%s\n",            /* Flawfinder: ignore */
                                         src_filename.c_str(), LLImageBase::getLastError().c_str());
                         args["[FILE]"] = src_filename;
                         args["[ERROR]"] = LLImageBase::getLastError();
@@ -5480,13 +5475,13 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                         switch(encode_result)
                         {
                                 case LLVORBISENC_DEST_OPEN_ERR:
-                    sprintf(error_message, "Couldn't open temporary compressed sound file for writing: %s\n", filename.c_str());
+                    snprintf(error_message, MAX_STRING, "Couldn't open temporary compressed sound file for writing: %s\n", filename.c_str());           /* Flawfinder: ignore */
                                         args["[FILE]"] = filename;
                                         upload_error(error_message, "CannotOpenTemporarySoundFile", filename, args);
                                         break;
 
                                 default:        
-                                  sprintf(error_message, "Unknown vorbis encode failure on: %s\n", src_filename.c_str());
+                                  snprintf(error_message, MAX_STRING, "Unknown vorbis encode failure on: %s\n", src_filename.c_str());          /* Flawfinder: ignore */
                                         args["[FILE]"] = src_filename;
                                         upload_error(error_message, "UnknownVorbisEncodeFailure", filename, args);
                                         break;  
@@ -5498,26 +5493,29 @@ void upload_new_resource(const LLString& src_filename, std::string name,
         {               
                 // This is a generic .lin resource file         
          asset_type = LLAssetType::AT_OBJECT;           
-         FILE *in = LLFile::fopen(src_filename.c_str(), "rb");          
+         FILE* in = LLFile::fopen(src_filename.c_str(), "rb");          /* Flawfinder: ignore */                
          if (in)                
          {              
                  // read in the file header             
-                 char buf[16384];               
-                 S32 read;              
+                 char buf[16384];               /* Flawfinder: ignore */        
+                 S32 read;              /* Flawfinder: ignore */                
                  S32  version;          
                  if (fscanf(in, "LindenResource\nversion %d\n", &version))              
                  {              
                          if (2 == version)              
                          {
                                                                 // *NOTE: This buffer size is hard coded into scanf() below.
-                                 char label[MAX_STRING];                
-                                 char value[MAX_STRING];                
+                                 char label[MAX_STRING];                /* Flawfinder: ignore */                
+                                 char value[MAX_STRING];                /* Flawfinder: ignore */                
                                  S32  tokens_read;              
                                  while (fgets(buf, 1024, in))           
                                  {              
                                          label[0] = '\0';               
                                          value[0] = '\0';               
-                                         tokens_read = sscanf(buf, "%254s %254s\n", label, value);              
+                                         tokens_read = sscanf(  /* Flawfinder: ignore */
+                                                                                         buf,
+                                                                                         "%254s %254s\n",
+                                                                                         label, value);         
 
                                          llinfos << "got: " << label << " = " << value          
                                                          << llendl;             
@@ -5525,7 +5523,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                          if (EOF == tokens_read)                
                                          {              
                                                  fclose(in);            
-                                                 sprintf(error_message, "corrupt resource file: %s", src_filename.c_str());
+                                                 snprintf(error_message, MAX_STRING, "corrupt resource file: %s", src_filename.c_str());                /* Flawfinder: ignore */
                                                                                                  args["[FILE]"] = src_filename;
                                                                                                  upload_error(error_message, "CorruptResourceFile", filename, args);
                                                  return;
@@ -5553,7 +5551,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                          else           
                          {              
                                  fclose(in);            
-                                 sprintf(error_message, "unknown linden resource file version in file: %s", src_filename.c_str());              
+                                 snprintf(error_message, MAX_STRING, "unknown linden resource file version in file: %s", src_filename.c_str());         /* Flawfinder: ignore */                
                                                                  args["[FILE]"] = src_filename;
                                                                  upload_error(error_message, "UnknownResourceFileVersion", filename, args);
                                  return;
@@ -5572,24 +5570,24 @@ void upload_new_resource(const LLString& src_filename, std::string name,
 
                          // read in and throw out most of the header except for the type                
                          fread(buf, header_size, 1, in);                
-                         memcpy(&type_num, buf + 16, sizeof(S16));              
+                         memcpy(&type_num, buf + 16, sizeof(S16));              /* Flawfinder: ignore */                
                          asset_type = (LLAssetType::EType)type_num;             
                  }              
 
                  // copy the file's data segment into another file for uploading                
-                 FILE *out = LLFile::fopen(filename.c_str(), "wb");             
+                 FILE* out = LLFile::fopen(filename.c_str(), "wb");             /* Flawfinder: ignore */        
                  if (out)               
                  {              
-                         while((read = fread(buf, 1, 16384, in)))               
+                         while((read = fread(buf, 1, 16384, in)))               /* Flawfinder: ignore */                
                          {              
-                                 fwrite(buf, 1, read, out);             
+                                 fwrite(buf, 1, read, out);             /* Flawfinder: ignore */                                
                          }              
                          fclose(out);           
                  }              
                  else           
                  {              
                          fclose(in);            
-                         sprintf(error_message, "Unable to create output file: %s", filename.c_str());          
+                         snprintf(error_message, MAX_STRING, "Unable to create output file: %s", filename.c_str());             /* Flawfinder: ignore */                
                                                  args["[FILE]"] = filename;
                                                  upload_error(error_message, "UnableToCreateOutputFile", filename, args);
                          return;
@@ -5604,14 +5602,14 @@ void upload_new_resource(const LLString& src_filename, std::string name,
         }
         else if (LLString::compareInsensitive(ext.c_str(),".bvh") == 0)
         {
-                sprintf(error_message, "We do not currently support bulk upload of animation files\n");
+                snprintf(error_message, MAX_STRING, "We do not currently support bulk upload of animation files\n");            /* Flawfinder: ignore */
                 upload_error(error_message, "DoNotSupportBulkAnimationUpload", filename, args);
                 return;
         }
         else
         {
                 // Unknown extension
-                sprintf(error_message, "Unknown file extension %s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", ext.c_str());
+                snprintf(error_message, MAX_STRING, "Unknown file extension %s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", ext.c_str());         /* Flawfinder: ignore */
                 error = TRUE;;
         }
 
@@ -5640,7 +5638,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                 }
                 else
                 {
-                        sprintf(error_message, "Unable to access output file: %s", filename.c_str());
+                        snprintf(error_message, MAX_STRING, "Unable to access output file: %s", filename.c_str());              /* Flawfinder: ignore */
                         error = TRUE;
                 }
         }
@@ -5724,7 +5722,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
         llinfos << "Desc: " << desc << llendl;
         lldebugs << "Folder: " << gInventory.findCategoryUUIDForType(destination_folder_type) << llendl;
         lldebugs << "Asset Type: " << LLAssetType::lookup(asset_type) << llendl;
-        std::string url = gAgent.getRegion()->getCapability("NewAgentInventory");
+        std::string url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
         if (!url.empty())
         {
                 llinfos << "New Agent Inventory via capability" << llendl;
@@ -5738,7 +5736,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
                 std::ostringstream llsdxml;
                 LLSDSerialize::toXML(body, llsdxml);
                 lldebugs << "posting body to capability: " << llsdxml.str() << llendl;
-                LLHTTPClient::post(url, body, new LLNewAgentInventoryResponder(uuid, body));
+                LLHTTPClient::post(url, body, new LLNewAgentInventoryResponder(body, uuid, asset_type));
         }
         else
         {
@@ -5884,7 +5882,7 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result) // St
                 char* end_p = strrchr(asset_name_str, '.');              // strip extension if exists
                 if( !end_p )
                 {
-                        end_p = asset_name_str + strlen( asset_name_str );
+                        end_p = asset_name_str + strlen( asset_name_str );              /* Flawfinder: ignore */
                 }
                         
                 S32 len = llmin( (S32) (DB_INV_ITEM_NAME_STR_LEN), (S32) (end_p - asset_name_str) );
@@ -5903,12 +5901,13 @@ LLUploadDialog *gExportDialog = NULL;
 
 void handle_export_selected( void * )
 {
-        if (gSelectMgr->isEmpty())
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        if (selection->isEmpty())
         {
                 return;
         }
         llinfos << "Exporting selected objects:" << llendl;
-        LLViewerObject *object = gSelectMgr->getFirstRootObject();
+        LLViewerObject *object = selection->getFirstRootObject();
 
         gExporterRequestID.generate();
         gExportDirectory = "";
@@ -5920,7 +5919,7 @@ void handle_export_selected( void * )
         msg->addUUIDFast(_PREHASH_RequestID, gExporterRequestID);
         msg->addS16Fast(_PREHASH_VolumeDetail, 4);
 
-        for (; object != NULL; object = gSelectMgr->getNextRootObject())
+        for (; object != NULL; object = selection->getNextRootObject())
         {
                 msg->nextBlockFast(_PREHASH_ObjectData);
                 msg->addUUIDFast(_PREHASH_ObjectID, object->getID());
@@ -5934,7 +5933,7 @@ void handle_export_selected( void * )
 BOOL menu_check_build_tool( void* user_data )
 {
         S32 index = (intptr_t) user_data;
-        return gCurrentToolset->isToolSelected( index );
+        return gToolMgr->getCurrentToolset()->isToolSelected( index );
 }
 
 void handle_reload_settings(void*)
@@ -6083,7 +6082,7 @@ class LLToolsLookAtSelection : public view_listener_t
         {
                 const F32 PADDING_FACTOR = 2.f;
                 BOOL zoom = (userdata.asString() == "zoom");
-                if (!gSelectMgr->isEmpty())
+                if (!gSelectMgr->getSelection()->isEmpty())
                 {
                         gAgent.setFocusOnAvatar(FALSE, ANIMATE);
 
@@ -6096,26 +6095,17 @@ class LLToolsLookAtSelection : public view_listener_t
 
                         if (zoom)
                         {
-                                gAgent.setCameraPosAndFocusGlobal(gSelectMgr->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), gSelectMgr->getSelectionCenterGlobal(), gSelectMgr->getFirstObject()->mID );
+                                gAgent.setCameraPosAndFocusGlobal(gSelectMgr->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), gSelectMgr->getSelectionCenterGlobal(), gSelectMgr->getSelection()->getFirstObject()->mID );
                         }
                         else
                         {
-                                gAgent.setFocusGlobal( gSelectMgr->getSelectionCenterGlobal(), gSelectMgr->getFirstObject()->mID );
+                                gAgent.setFocusGlobal( gSelectMgr->getSelectionCenterGlobal(), gSelectMgr->getSelection()->getFirstObject()->mID );
                         }
                 }
                 return true;
         }
 };
 
-/*
-void handle_reset_rotation(void*)
-{
-        gSelectMgr->selectionResetRotation();
-
-        dialog_refresh_all();
-}
-*/
-
 class LLAvatarAddFriend : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -6125,7 +6115,6 @@ class LLAvatarAddFriend : public view_listener_t
                 {
                         request_friendship(avatar->getID());
                 }
-                gSelectMgr->deselectTransient();
                 return true;
         }
 };
@@ -6137,54 +6126,47 @@ void complete_give_money(S32 option, void* user_data)
                 gAgent.clearBusy();
         }
 
-        LLUUID* object_id = (LLUUID*)user_data;
+        LLObjectSelectionHandle handle(*(LLObjectSelectionHandle*)user_data);
+        delete (LLObjectSelectionHandle*)user_data;
 
-        LLViewerObject* object = gObjectList.findObject(*object_id);
-        if (object)
+        LLViewerObject* objectp = handle->getPrimaryObject();
+
+        // Show avatar's name if paying attachment
+        if (objectp && objectp->isAttachment())
         {
-                if (object->isAvatar())
+                while (objectp && !objectp->isAvatar())
+                {
+                        objectp = (LLViewerObject*)objectp->getParent();
+                }
+        }
+
+        if (objectp)
+        {
+                if (objectp->isAvatar())
                 {
                         const BOOL is_group = FALSE;
                         LLFloaterPay::payDirectly(&give_money,
-                                                                          *object_id,
+                                                                          objectp->getID(),
                                                                           is_group);
                 }
                 else
                 {
-                        LLFloaterPay::payViaObject(&give_money, *object_id);
+                        LLFloaterPay::payViaObject(&give_money, objectp->getID());
                 }
         }
-        
-        delete object_id;
 }
 
 bool handle_give_money_dialog()
 {
-        LLViewerObject *objectp = gViewerWindow->lastObjectHit();
-        LLUUID* object_id = new LLUUID();
-
-        // Show avatar's name if paying attachment
-        if (objectp && objectp->isAttachment())
-        {
-                while (objectp && !objectp->isAvatar())
-                {
-                        objectp = (LLViewerObject*)objectp->getParent();
-                }
-        }
-
-        if (objectp)
-        {
-                *object_id = objectp->getID();
-        }
-        
+        LLObjectSelectionHandle* handlep = new LLObjectSelectionHandle(gSelectMgr->getSelection());
         if (gAgent.getBusy())
         {
                 // warn users of being in busy mode during a transaction
-                gViewerWindow->alertXml("BusyModePay", complete_give_money, object_id);
+                gViewerWindow->alertXml("BusyModePay", complete_give_money, handlep);
         }
         else
         {
-                complete_give_money(1, object_id);
+                complete_give_money(1, handlep);
         }
         return true;
 }
@@ -6252,7 +6234,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
                 }
                 else
                 {
-                        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                         if (node && node->mValid && !node->mSitName.empty())
                         {
                                 label.assign(node->mSitName);
@@ -6288,25 +6270,6 @@ void dump_inventory(void*)
         gInventory.dumpInventory();
 }
 
-
-void handle_first_tool(void*)
-{
-        gCurrentToolset->selectFirstTool();
-}
-
-
-void handle_next_tool(void*)
-{
-        gCurrentToolset->selectNextTool();
-}
-
-
-void handle_previous_tool(void*)
-{
-        gCurrentToolset->selectPrevTool();
-}
-
-
 // forcibly unlock an object
 void handle_force_unlock(void*)
 {
@@ -6315,7 +6278,7 @@ void handle_force_unlock(void*)
 
         // Second, lie to the viewer and mark it editable and unowned
         LLViewerObject* object;
-        for (object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() )
+        for (object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() )
         {
                 object->mFlags |= FLAGS_OBJECT_MOVE;
                 object->mFlags |= FLAGS_OBJECT_MODIFY;
@@ -6377,24 +6340,6 @@ void handle_dump_followcam(void*)
         LLFollowCamMgr::dump();
 }
 
-void handle_viewer_enable_circuit_log(void*)
-{
-        llinfos << "Showing circuit information every " << gMessageSystem->mCircuitPrintFreq << " seconds" << llendl;
-        gErrorStream.setLevel( LLErrorStream::DEBUG );
-        gErrorStream.setDebugFlag( LLERR_CIRCUIT_INFO );
-        // and dump stuff out immediately
-        gMessageSystem->dumpCircuitInfo();
-}
-
-void handle_viewer_disable_circuit_log(void*)
-{
-        llinfos << "Hiding circuit information" << llendl;
-#if !LL_DEBUG
-        gErrorStream.setLevel( LLErrorStream::INFO );
-#endif
-        gErrorStream.clearDebugFlag( LLERR_CIRCUIT_INFO );
-}
-
 void handle_viewer_enable_message_log(void*)
 {
         gMessageSystem->startLogging();
@@ -6470,10 +6415,6 @@ class LLShowFloater : public view_listener_t
                 {
                         gDebugView->mStatViewp->setVisible(!gDebugView->mStatViewp->getVisible());
                 }
-                else if (floater_name == "account history")
-                {
-                        LLFloaterAccountHistory::show(NULL);
-                }
                 else if (floater_name == "my land")
                 {
                         LLFloaterLandHoldings::show(NULL);
@@ -6624,7 +6565,15 @@ class LLPromptShowURL : public view_listener_t
                         LLString alert = param.substr(0, offset);
                         LLString url = param.substr(offset+1);
                         char *url_copy = new char[url.size()+1];
-                        strcpy(url_copy, url.c_str());
+                        if (url_copy != NULL)
+                        {
+                                strcpy(url_copy, url.c_str());          /* Flawfinder: ignore */
+                        }
+                        else
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return false;
+                        }
                         gViewerWindow->alertXml(alert, callback_show_url, url_copy);
                 }
                 else
@@ -6656,7 +6605,15 @@ class LLPromptShowFile : public view_listener_t
                         LLString alert = param.substr(0, offset);
                         LLString file = param.substr(offset+1);
                         char *file_copy = new char[file.size()+1];
-                        strcpy(file_copy, file.c_str());
+                        if (file_copy != NULL)
+                        {
+                                strcpy(file_copy, file.c_str());                /* Flawfinder: ignore */
+                        }
+                        else
+                        {
+                                llerrs << "Memory Allocation Failed" << llendl;
+                                return false;
+                        }
                         gViewerWindow->alertXml(alert, callback_show_file, file_copy);
                 }
                 else
@@ -6737,8 +6694,8 @@ void handle_focus(void *)
         gViewerWindow->moveCursorToCenter();
 
         // Switch to camera toolset
-//      gCurrentToolset = gCameraToolset;
-        gCurrentToolset->selectTool( gToolCamera );
+//      gToolMgr->setCurrentToolset(gCameraToolset);
+        gToolMgr->getCurrentToolset()->selectTool( gToolCamera );
 }
 
 class LLLandEdit : public view_listener_t
@@ -6764,10 +6721,10 @@ class LLLandEdit : public view_listener_t
                 gParcelMgr->selectParcelAt( gLastHitPosGlobal );
 
                 gFloaterTools->showMore(TRUE);
-        gFloaterView->bringToFront( gFloaterTools );
+                gFloaterView->bringToFront( gFloaterTools );
 
                 // Switch to land edit toolset
-                gCurrentToolset->selectTool( gToolParcel );
+                gToolMgr->getCurrentToolset()->selectTool( gToolParcel );
                 return true;
         }
 };
@@ -6779,7 +6736,7 @@ class LLWorldEnableBuyLand : public view_listener_t
                 bool new_value = gParcelMgr->canAgentBuyParcel(
                                                                 gParcelMgr->selectionEmpty()
                                                                         ? gParcelMgr->getAgentParcel()
-                                                                        : gParcelMgr->getSelectedParcel(),
+                                                                        : gParcelMgr->getParcelSelection()->getParcel(),
                                                                 false);
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
@@ -6789,7 +6746,7 @@ class LLWorldEnableBuyLand : public view_listener_t
 BOOL enable_buy_land(void*)
 {
         return gParcelMgr->canAgentBuyParcel(
-                                gParcelMgr->getSelectedParcel(), false);
+                                gParcelMgr->getParcelSelection()->getParcel(), false);
 }
 
 
@@ -6810,66 +6767,63 @@ void handle_move(void*)
 
         gViewerWindow->moveCursorToCenter();
 
-        gCurrentToolset = gBasicToolset;
-        gCurrentToolset->selectTool( gToolGrab );
-}
-
-
-void near_attach_object(BOOL success, void *user_data)
-{
-        LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
-        
-        U8 attachment_id;
-        if (attachment)
-        {
-                attachment_id = gAgent.getAvatarObject()->mAttachmentPoints.reverseLookup(attachment);
-        }
-        else
-        {
-                // interpret 0 as "default location"
-                attachment_id = 0;
-        }
-        
-        gSelectMgr->sendAttach(attachment_id);
+        gToolMgr->setCurrentToolset(gBasicToolset);
+        gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
 }
 
 class LLObjectAttachToAvatar : public view_listener_t
 {
+public:
+        static void setObjectSelection(LLObjectSelectionHandle selection) { sObjectSelection = selection; }
+
+private:
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLViewerObject* selectedObject = gSelectMgr->getFirstRootObject();
+                setObjectSelection(gSelectMgr->getSelection());
+                LLViewerObject* selectedObject = sObjectSelection->getFirstRootObject();
                 if (selectedObject)
                 {
-                        confirm_replace_attachment(0, NULL);
+                        S32 index = userdata.asInteger();
+                        LLViewerJointAttachment* attachment_point = index > 0 ?
+                                gAgent.getAvatarObject()->mAttachmentPoints[index] :
+                                NULL;
+                        confirm_replace_attachment(0, attachment_point);
                 }
                 return true;
         }
+
+protected:
+        static LLObjectSelectionHandle sObjectSelection;
 };
 
-// move this somewhere global
-void handle_attach_to_avatar(void* user_data)
-{
-    LLViewerObject* selectedObject = gSelectMgr->getFirstRootObject();
-    if (selectedObject)
-    {
-        LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
+LLObjectSelectionHandle LLObjectAttachToAvatar::sObjectSelection;
 
-        if (attachment && attachment->getObject(0))
-        {
-            gViewerWindow->alertXml("ReplaceAttachment", confirm_replace_attachment, user_data);
-        }
-        else
-        {
-            confirm_replace_attachment(0, user_data);
-        }
-    }
+void near_attach_object(BOOL success, void *user_data)
+{
+        if (success)
+        {
+                LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
+                
+                U8 attachment_id;
+                if (attachment)
+                {
+                        attachment_id = gAgent.getAvatarObject()->mAttachmentPoints.reverseLookup(attachment);
+                }
+                else
+                {
+                        // interpret 0 as "default location"
+                        attachment_id = 0;
+                }
+                gSelectMgr->sendAttach(attachment_id);
+        }               
+        LLObjectAttachToAvatar::setObjectSelection(NULL);
 }
+
 void confirm_replace_attachment(S32 option, void* user_data)
 {
         if (option == 0/*YES*/)
         {
-                gSelectMgr->convertTransient();
-                LLViewerObject* selectedObject = gSelectMgr->getFirstRootObject();
+                LLViewerObject* selectedObject = gSelectMgr->getSelection()->getFirstRootObject();
                 if (selectedObject)
                 {
                         const F32 MIN_STOP_DISTANCE = 1.f;      // meters
@@ -6936,12 +6890,7 @@ class LLAttachmentDrop : public view_listener_t
                 // objects.  Thus we need to clear the list, make sure it only
                 // contains the object the user clicked, send the message,
                 // then clear the list.
-                // We use deselectAll to update the simulator's notion of what's
-                // selected, and removeAll just to change things locally.
-                //gSelectMgr->deselectAll();
-                //gSelectMgr->selectObjectAndFamily(object);
                 gSelectMgr->sendDropAttachment();
-                gSelectMgr->deselectTransient();
                 return true;
         }
 };
@@ -6951,7 +6900,7 @@ void handle_detach_from_avatar(void* user_data)
 {
         LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
         
-        LLViewerObject* attached_object = attachment->getObject(0);
+        LLViewerObject* attached_object = attachment->getObject();
 
         if (attached_object)
         {
@@ -6972,7 +6921,7 @@ void attach_label(LLString& label, void* user_data)
         if (attachmentp)
         {
                 label = attachmentp->getName();
-                if (attachmentp->getObject(0))
+                if (attachmentp->getObject())
                 {
                         LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
                         if (itemp)
@@ -6989,7 +6938,7 @@ void detach_label(LLString& label, void* user_data)
         if (attachmentp)
         {
                 label = attachmentp->getName();
-                if (attachmentp->getObject(0))
+                if (attachmentp->getObject())
                 {
                         LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
                         if (itemp)
@@ -7044,10 +6993,9 @@ class LLAttachmentDetach : public view_listener_t
                 // We use deselectAll to update the simulator's notion of what's
                 // selected, and removeAll just to change things locally.
                 //RN: I thought it was more useful to detach everything that was selected
-                if (gSelectMgr->selectionIsAttachment())
+                if (gSelectMgr->getSelection()->isAttachment())
                 {
                         gSelectMgr->sendDetach();
-                        gSelectMgr->deselectAll();
                 }
                 return true;
         }
@@ -7164,8 +7112,10 @@ class LLAttachmentEnableDetach : public view_listener_t
 BOOL object_selected_and_point_valid(void *user_data)
 {
         //LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
+        if (gSelectMgr == NULL) return FALSE;
 
-        for (LLViewerObject *object = gSelectMgr->getFirstRootObject(); object; object = gSelectMgr->getNextRootObject())
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        for (LLViewerObject *object = selection->getFirstRootObject(); object; object = selection->getNextRootObject())
         {
                 for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++ )
                 {
@@ -7176,12 +7126,11 @@ BOOL object_selected_and_point_valid(void *user_data)
                 }
         }
 
-        return ((gSelectMgr != NULL) && 
-                (gSelectMgr->getRootObjectCount() == 1) && 
-                (gSelectMgr->getFirstRootObject()->getPCode() == LL_PCODE_VOLUME) && 
-                gSelectMgr->getFirstRootObject()->permYouOwner() &&
-                !((LLViewerObject*)gSelectMgr->getFirstRootObject()->getRoot())->isAvatar() && 
-                (gSelectMgr->getFirstRootObject()->getNVPair("AssetContainer") == NULL));
+        return (selection->getRootObjectCount() == 1) && 
+                (selection->getFirstRootObject()->getPCode() == LL_PCODE_VOLUME) && 
+                selection->getFirstRootObject()->permYouOwner() &&
+                !((LLViewerObject*)selection->getFirstRootObject()->getRoot())->isAvatar() && 
+                (selection->getFirstRootObject()->getNVPair("AssetContainer") == NULL);
 }
 
 // Also for seeing if object can be attached.  See above.
@@ -7189,22 +7138,7 @@ class LLObjectEnableWear : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = false;
-                if (gSelectMgr)
-                {
-                        LLViewerObject* first_root = gSelectMgr->getFirstRootObject();
-                        if (first_root)
-                        {
-                                new_value = gSelectMgr->getRootObjectCount() == 1
-                                                                && first_root->getPCode() == LL_PCODE_VOLUME
-                                                                && first_root->permYouOwner()
-                                                                && !((LLViewerObject*)gSelectMgr->getFirstRootObject()->getRoot())->isAvatar()
-                                                                && (first_root->getNVPair("AssetContainer") == NULL);
-                        }
-                }
-
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
+                return object_selected_and_point_valid(NULL);
         }
 };
 
@@ -7213,7 +7147,7 @@ BOOL object_attached(void *user_data)
 {
         LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
 
-        return attachment->getObject(0) != NULL;
+        return attachment->getObject() != NULL;
 }
 
 class LLAvatarSendIM : public view_listener_t
@@ -7281,9 +7215,9 @@ class LLToolsSelectedScriptAction : public view_listener_t
                 BOOL scripted = FALSE;
                 BOOL modifiable = FALSE;
 
-                for(LLViewerObject* obj = gSelectMgr->getFirstObject();
+                for(LLViewerObject* obj = gSelectMgr->getSelection()->getFirstObject();
                         obj;
-                        obj = gSelectMgr->getNextObject())
+                        obj = gSelectMgr->getSelection()->getNextObject())
                 {
                         scripted = obj->flagScripted();
                         modifiable = obj->permModify();
@@ -7316,9 +7250,9 @@ void handle_reset_selection(void*)
         BOOL scripted = FALSE;
         BOOL modifiable = FALSE;
 
-        for(LLViewerObject* obj = gSelectMgr->getFirstObject();
+        for(LLViewerObject* obj = gSelectMgr->getSelection()->getFirstObject();
                 obj;
-                obj = gSelectMgr->getNextObject())
+                obj = gSelectMgr->getSelection()->getNextObject())
         {
                 scripted = obj->flagScripted();
                 modifiable = obj->permModify();
@@ -7349,9 +7283,9 @@ void handle_set_run_selection(void*)
         BOOL scripted = FALSE;
         BOOL modifiable = FALSE;
 
-        for(LLViewerObject* obj = gSelectMgr->getFirstObject();
+        for(LLViewerObject* obj = gSelectMgr->getSelection()->getFirstObject();
                 obj;
-                obj = gSelectMgr->getNextObject())
+                obj = gSelectMgr->getSelection()->getNextObject())
         {
                 scripted = obj->flagScripted();
                 modifiable = obj->permModify();
@@ -7382,9 +7316,9 @@ void handle_set_not_run_selection(void*)
         BOOL scripted = FALSE;
         BOOL modifiable = FALSE;
 
-        for(LLViewerObject* obj = gSelectMgr->getFirstObject();
+        for(LLViewerObject* obj = gSelectMgr->getSelection()->getFirstObject();
                 obj;
-                obj = gSelectMgr->getNextObject())
+                obj = gSelectMgr->getSelection()->getNextObject())
         {
                 scripted = obj->flagScripted();
                 modifiable = obj->permModify();
@@ -7411,7 +7345,7 @@ void handle_set_not_run_selection(void*)
 void handle_selected_texture_info(void*)
 {
         LLSelectNode* node = NULL;
-        for (node = gSelectMgr->getFirstNode(); node != NULL; node = gSelectMgr->getNextNode())
+        for (node = gSelectMgr->getSelection()->getFirstNode(); node != NULL; node = gSelectMgr->getSelection()->getNextNode())
         {
                 if (!node->mValid) continue;
 
@@ -7446,7 +7380,7 @@ void handle_selected_texture_info(void*)
                         std::string image_id_string;
                         if (gAgent.isGodlike())
                         {
-                                image_id_string = image_id.getString() + " ";
+                                image_id_string = image_id.asString() + " ";
                         }
                         msg = llformat("%s%dx%d %s on face ",
                                                                 image_id_string.c_str(),
@@ -7510,16 +7444,16 @@ void handle_dump_attachments(void*)
                 attachment = avatar->mAttachmentPoints.getNextData() )
         {
                 S32 key = avatar->mAttachmentPoints.getCurrentKeyWithoutIncrement();
-                BOOL visible = (attachment->getObject(0) != NULL &&
-                                                attachment->getObject(0)->mDrawable.notNull() && 
-                                                !attachment->getObject(0)->mDrawable->isRenderType(0));
+                BOOL visible = (attachment->getObject() != NULL &&
+                                                attachment->getObject()->mDrawable.notNull() && 
+                                                !attachment->getObject()->mDrawable->isRenderType(0));
                 LLVector3 pos;
-                if (visible) pos = attachment->getObject(0)->mDrawable->getPosition();
+                if (visible) pos = attachment->getObject()->mDrawable->getPosition();
                 llinfos << "ATTACHMENT " << key << ": item_id=" << attachment->getItemID()
-                                << (attachment->getObject(0) ? " present " : " absent ")
+                                << (attachment->getObject() ? " present " : " absent ")
                                 << (visible ? "visible " : "invisible ")
                                 <<  " at " << pos
-                                << " and " << (visible ? attachment->getObject(0)->getPosition() : LLVector3::zero)
+                                << " and " << (visible ? attachment->getObject()->getPosition() : LLVector3::zero)
                                 << llendl;
         }
 }
@@ -7598,7 +7532,7 @@ class LLSomethingSelected : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = !(gSelectMgr->isEmpty());
+                bool new_value = !(gSelectMgr->getSelection()->isEmpty());
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -7608,7 +7542,8 @@ class LLSomethingSelectedNoHUD : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = !(gSelectMgr->isEmpty()) && !(gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                bool new_value = !(selection->isEmpty()) && !(selection->getSelectType() == SELECT_TYPE_HUD);
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -7616,14 +7551,14 @@ class LLSomethingSelectedNoHUD : public view_listener_t
 
 BOOL enable_more_than_one_selected(void* )
 {
-        return (gSelectMgr->getObjectCount() > 1);
+        return (gSelectMgr->getSelection()->getObjectCount() > 1);
 }
 
 class LLEditableSelected : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = (gSelectMgr->getFirstEditableObject() != NULL);
+                bool new_value = (gSelectMgr->getSelection()->getFirstEditableObject() != NULL);
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -7642,10 +7577,11 @@ class LLToolsEnableTakeCopy : public view_listener_t
                         if (gInProductionGrid || !gAgent.isGodlike())
 # endif
                         {
-                                LLViewerObject* obj = gSelectMgr->getFirstRootObject();
+                                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                                LLViewerObject* obj = selection->getFirstRootObject();
                                 if(obj)
                                 {
-                                        for( ; obj; obj = gSelectMgr->getNextRootObject())
+                                        for( ; obj; obj = selection->getNextRootObject())
                                         {
                                                 if(!(obj->permCopy()) || obj->isAttachment())
                                                 {
@@ -7665,11 +7601,15 @@ class LLToolsEnableTakeCopy : public view_listener_t
 BOOL enable_selection_you_own_all(void*)
 {
         LLViewerObject *obj;
-        for (obj = gSelectMgr->getFirstRootObject(); obj; obj = gSelectMgr->getNextRootObject())
+        if (gSelectMgr)
         {
-                if (!obj->permYouOwner())
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                for (obj = selection->getFirstRootObject(); obj; obj = selection->getNextRootObject())
                 {
-                        return FALSE;
+                        if (!obj->permYouOwner())
+                        {
+                                return FALSE;
+                        }
                 }
         }
 
@@ -7678,15 +7618,18 @@ BOOL enable_selection_you_own_all(void*)
 
 BOOL enable_selection_you_own_one(void*)
 {
-        LLViewerObject *obj;
-        for (obj = gSelectMgr->getFirstRootObject(); obj; obj = gSelectMgr->getNextRootObject())
+        if (gSelectMgr)
         {
-                if (obj->permYouOwner())
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                LLViewerObject *obj;
+                for (obj = selection->getFirstRootObject(); obj; obj = selection->getNextRootObject())
                 {
-                        return TRUE;
+                        if (obj->permYouOwner())
+                        {
+                                return TRUE;
+                        }
                 }
         }
-
         return FALSE;
 }
 
@@ -7720,9 +7663,9 @@ BOOL enable_save_into_inventory(void*)
         {
                 // find the last root
                 LLSelectNode* last_node = NULL;
-                for(LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                for(LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                         node != NULL;
-                        node = gSelectMgr->getNextRootNode())
+                        node = gSelectMgr->getSelection()->getNextRootNode())
                 {
                         last_node = node;
                 }
@@ -7766,7 +7709,7 @@ BOOL enable_save_into_task_inventory(void*)
 {
         if(gSelectMgr)
         {
-                LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                 if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
                 {
                         // *TODO: check to see if the fromtaskid object exists.
@@ -7807,7 +7750,7 @@ class LLFileEnableUpload : public view_listener_t
 
 BOOL enable_export_selected(void *)
 {
-        if (gSelectMgr->isEmpty())
+        if (gSelectMgr->getSelection()->isEmpty())
         {
                 return FALSE;
         }
@@ -7838,7 +7781,7 @@ class LLToolsEnableToolNotPie : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = ( gToolMgr->getCurrentTool(MASK_NONE) != gToolPie );
+                bool new_value = ( gToolMgr->getBaseTool() != gToolPie );
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -7866,6 +7809,18 @@ class LLWorldEnableSetHomeLocation : public view_listener_t
         }
 };
 
+class LLWorldEnableTeleportHome : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLViewerRegion* regionp = gAgent.getRegion();
+                bool agent_on_prelude = (regionp && regionp->isPrelude());
+                bool enable_teleport_home = gAgent.isGodlike() || !agent_on_prelude;
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(enable_teleport_home);
+                return true;
+        }
+};
+
 BOOL enable_region_owner(void*)
 {
         if(gAgent.getRegion() && gAgent.getRegion()->getOwner() == gAgent.getID())
@@ -7893,26 +7848,6 @@ BOOL enable_god_basic(void*)
         return gAgent.getGodLevel() > GOD_NOT;
 }
 
-void toggle_vbo(void *)
-{
-        gPipeline.mUseVBO = !gPipeline.mUseVBO;
-
-        if (!gPipeline.usingAGP())
-        {
-                return;
-        }
-
-        gPipeline.setUseAGP(FALSE);
-        gPipeline.setUseAGP(TRUE);
-
-        gSavedSettings.setBOOL("RenderUseVBO", gPipeline.mUseVBO);
-}
-
-BOOL check_vbo(void *)
-{
-        return gPipeline.mUseVBO;
-}
-
 #if 0 // 1.9.2
 void toggle_vertex_shaders(void *)
 {
@@ -7926,19 +7861,6 @@ BOOL check_vertex_shaders(void *)
 }
 #endif
 
-void toggle_glow(void *)
-{
-        gRenderLightGlows = !gRenderLightGlows;
-
-        gSavedSettings.setBOOL("RenderLightGlows", gRenderLightGlows);
-}
-
-BOOL check_glow(void *)
-{
-        return gRenderLightGlows;
-}
-
-
 void toggle_show_xui_names(void *)
 {
         BOOL showXUINames = gSavedSettings.getBOOL("ShowXUINames");
@@ -8213,10 +8135,10 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id )
 
 void handle_disconnect_viewer(void *)
 {
-        char message[2048];
+        char message[2048];             /* Flawfinder: ignore */
         message[0] = '\0';
 
-        sprintf(message, "Testing viewer disconnect");
+        snprintf(message, sizeof(message), "Testing viewer disconnect");                /* Flawfinder: ignore */
 
         do_disconnect(message);
 }
@@ -8227,10 +8149,10 @@ class LLToolsUseSelectionForGrid : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 gSelectMgr->clearGridObjects();
-
-                for (LLViewerObject* objectp = gSelectMgr->getFirstRootObject();
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                for (LLViewerObject* objectp = selection->getFirstRootObject();
                         objectp;
-                        objectp = gSelectMgr->getNextRootObject())
+                        objectp = selection->getNextRootObject())
                         {
                                 gSelectMgr->addGridObject(objectp);
                         }
@@ -8255,23 +8177,40 @@ void handle_test_load_url(void*)
 // LLViewerMenuHolderGL
 //
 
+LLViewerMenuHolderGL::LLViewerMenuHolderGL() : LLMenuHolderGL()
+{
+}
+
 BOOL LLViewerMenuHolderGL::hideMenus()
 {
         BOOL handled = LLMenuHolderGL::hideMenus();
-        if (handled)
-        {
-                gSelectMgr->deselectTransient();
-                if (!gFloaterTools->getVisible() && !LLFloaterLand::floaterVisible())
-                {
-                        gParcelMgr->deselectLand();     
-                }
-        }
+
+        // drop pie menu selection
+        mParcelSelection = NULL;
+        mObjectSelection = NULL;
+
         gMenuBarView->clearHoverItem();
         gMenuBarView->resetMenuTrigger();
 
         return handled;
 }
 
+void LLViewerMenuHolderGL::setParcelSelection(LLHandle<LLParcelSelection> selection) 
+{ 
+        mParcelSelection = selection; 
+}
+
+void LLViewerMenuHolderGL::setObjectSelection(LLHandle<LLObjectSelection> selection) 
+{ 
+        mObjectSelection = selection; 
+}
+
+
+const LLRect LLViewerMenuHolderGL::getMenuRect() const
+{
+        return LLRect(0, mRect.getHeight() - MENU_BAR_HEIGHT, mRect.getWidth(), STATUS_BAR_HEIGHT);
+}
+
 void handle_save_to_xml(void*)
 {
         LLFloater* frontmost = gFloaterView->getFrontmost();
@@ -8431,7 +8370,7 @@ class LLViewToggleRenderType : public view_listener_t
                 LLString type = userdata.asString();
                 if (type == "particles")
                 {
-                        LLPipeline::toggleRenderType((void *)(S32)LLPipeline::RENDER_TYPE_PARTICLES);
+                        LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
                 }
                 return true;
         }
@@ -8452,12 +8391,11 @@ class LLViewCheckRenderType : public view_listener_t
         }
 };
 
-// TomY TODO: Get rid of these?
 class LLViewShowHUDAttachments : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLDrawPoolHUD::sShowHUDAttachments = !LLDrawPoolHUD::sShowHUDAttachments;
+                LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
                 return true;
         }
 };
@@ -8466,7 +8404,7 @@ class LLViewCheckHUDAttachments : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = LLDrawPoolHUD::sShowHUDAttachments;
+                bool new_value = LLPipeline::sShowHUDAttachments;
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -8594,23 +8532,23 @@ class LLToolsSelectTool : public view_listener_t
                 LLString tool_name = userdata.asString();
                 if (tool_name == "focus")
                 {
-                        gCurrentToolset->selectToolByIndex(1);
+                        gToolMgr->getCurrentToolset()->selectToolByIndex(1);
                 }
                 else if (tool_name == "move")
                 {
-                        gCurrentToolset->selectToolByIndex(2);
+                        gToolMgr->getCurrentToolset()->selectToolByIndex(2);
                 }
                 else if (tool_name == "edit")
                 {
-                        gCurrentToolset->selectToolByIndex(3);
+                        gToolMgr->getCurrentToolset()->selectToolByIndex(3);
                 }
                 else if (tool_name == "create")
                 {
-                        gCurrentToolset->selectToolByIndex(4);
+                        gToolMgr->getCurrentToolset()->selectToolByIndex(4);
                 }
                 else if (tool_name == "land")
                 {
-                        gCurrentToolset->selectToolByIndex(5);
+                        gToolMgr->getCurrentToolset()->selectToolByIndex(5);
                 }
                 return true;
         }
@@ -8624,6 +8562,7 @@ void initialize_menu_actions()
         (new LLFileUploadAnim())->registerListener(gMenuHolder, "File.UploadAnim");
         (new LLFileUploadBulk())->registerListener(gMenuHolder, "File.UploadBulk");
         (new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow");
+        (new LLFileEnableCloseWindow())->registerListener(gMenuHolder, "File.EnableCloseWindow");
         (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
         (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
         (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
@@ -8698,6 +8637,7 @@ void initialize_menu_actions()
 
         (new LLWorldEnableCreateLandmark())->registerListener(gMenuHolder, "World.EnableCreateLandmark");
         (new LLWorldEnableSetHomeLocation())->registerListener(gMenuHolder, "World.EnableSetHomeLocation");
+        (new LLWorldEnableTeleportHome())->registerListener(gMenuHolder, "World.EnableTeleportHome");
         (new LLWorldEnableBuyLand())->registerListener(gMenuHolder, "World.EnableBuyLand");
 
         (new LLWorldCheckAlwaysRun())->registerListener(gMenuHolder, "World.CheckAlwaysRun");
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 9847e41..0c42426 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -37,6 +37,8 @@
 
 class LLUICtrl;
 class LLView;
+class LLParcelSelection;
+class LLObjectSelection;
 
 struct LLResourceData
 {
@@ -85,7 +87,6 @@ BOOL is_agent_mappable(const LLUUID& agent_id);
 
 void menu_toggle_control( void* user_data );
 void check_toggle_control( LLUICtrl *, void* user_data );
-void handle_attach_to_avatar(void* user_data);
 void confirm_replace_attachment(S32 option, void* user_data);
 void handle_detach_from_avatar(void* user_data);
 void attach_label(LLString& label, void* user_data);
@@ -145,10 +146,18 @@ class LLPermissions;
 class LLViewerMenuHolderGL : public LLMenuHolderGL
 {
 public:
-        LLViewerMenuHolderGL() : LLMenuHolderGL() {};
+        LLViewerMenuHolderGL();
 
         virtual BOOL hideMenus();
-        //virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        
+        void setParcelSelection(LLHandle<LLParcelSelection> selection);
+        void setObjectSelection(LLHandle<LLObjectSelection> selection);
+
+        virtual const LLRect getMenuRect() const;
+
+protected:
+        LLHandle<LLParcelSelection> mParcelSelection;
+        LLHandle<LLObjectSelection> mObjectSelection;
 };
 
 extern const LLString SAVE_INTO_INVENTORY;
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 1b91f9d..41d24fd 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -314,7 +314,7 @@ void export_complete()
                 gExporterRequestID.setNull();
                 gExportDirectory = "";
 
-                FILE *fXML = LLFile::fopen(gExportedFile.c_str(), "rb");
+                FILE* fXML = LLFile::fopen(gExportedFile.c_str(), "rb");                /* Flawfinder: ignore */
                 fseek(fXML, 0, SEEK_END);
                 U32 length = ftell(fXML);
                 fseek(fXML, 0, SEEK_SET);
@@ -330,8 +330,8 @@ void export_complete()
 
                         if (pos_check && pos_uuid)
                         {
-                                char image_uuid_str[UUID_STR_SIZE];
-                                memcpy(image_uuid_str, pos_uuid+2, UUID_STR_SIZE-1);
+                                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);
@@ -342,12 +342,15 @@ void export_complete()
                                 if (itor != gImageChecksums.end())
                                 {
                                         llinfos << "Replacing with checksum: " << itor->second << llendl;
-                                        memcpy(&pos_check[10], itor->second.c_str(), 32);
+                                        if (itor->second.c_str() != NULL)
+                                        {
+                                                memcpy(&pos_check[10], itor->second.c_str(), 32);               /* Flawfinder: ignore */
+                                        }
                                 }
                         }
                 }
 
-                FILE *fXMLOut = LLFile::fopen(gExportedFile.c_str(), "wb");
+                FILE* fXMLOut = LLFile::fopen(gExportedFile.c_str(), "wb");             /* Flawfinder: ignore */
                 fwrite(buffer, 1, length, fXMLOut);
                 fclose(fXMLOut);
 
@@ -400,7 +403,7 @@ void exported_j2c_complete(const LLTSCode status, void *user_data)
         }
         else
         {
-                FILE *fIn = LLFile::fopen(filename.c_str(), "rb");
+                FILE* fIn = LLFile::fopen(filename.c_str(), "rb");              /* Flawfinder: ignore */
                 if (fIn) 
                 {
                         LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C;
@@ -425,22 +428,22 @@ void exported_j2c_complete(const LLTSCode status, void *user_data)
                         S32 data_size = TargaUtility->getDataSize();
 
                         char *file_path = new char[filename.size()+1];
-                        strcpy(file_path, filename.c_str());
+                        strcpy(file_path, filename.c_str());            /* Flawfinder: ignore */
                         char *end = strrchr(file_path, gDirUtilp->getDirDelimiter()[0]);
                         end[0] = 0;
                         LLString output_file = llformat("%s/image-%03d.tga", file_path, image_num);//filename;
                         delete file_path;
                         //S32 name_len = output_file.length();
                         //strcpy(&output_file[name_len-3], "tga");
-                        FILE *fOut = LLFile::fopen(output_file.c_str(), "wb");
-                        char md5_hash_string[33];
-                        strcpy(md5_hash_string, "00000000000000000000000000000000");
+                        FILE* fOut = LLFile::fopen(output_file.c_str(), "wb");          /* Flawfinder: ignore */
+                        char md5_hash_string[33];               /* Flawfinder: ignore */
+                        strcpy(md5_hash_string, "00000000000000000000000000000000");            /* Flawfinder: ignore */
                         if (fOut)
                         {
                                 fwrite(data, 1, data_size, fOut);
                                 fseek(fOut, 0, SEEK_SET);
                                 fclose(fOut);
-                                fOut = LLFile::fopen(output_file.c_str(), "rb");
+                                fOut = LLFile::fopen(output_file.c_str(), "rb");                /* Flawfinder: ignore */
                                 LLMD5 my_md5_hash(fOut);
                                 my_md5_hash.hex_digest(md5_hash_string);
                         }
@@ -801,7 +804,7 @@ void inventory_offer_callback(S32 option, void* user_data)
         {
                 if (info->mFromGroup)
                 {
-                        char group_name[MAX_STRING];
+                        char group_name[MAX_STRING];            /* Flawfinder: ignore */
                         if (gCacheName->getGroupName(info->mFromID, group_name))
                         {
                                 from_string = LLString("An object named ") + info->mFromName + " owned by the group '" + group_name + "'";
@@ -813,8 +816,8 @@ void inventory_offer_callback(S32 option, void* user_data)
                 }
                 else
                 {
-                        char first_name[MAX_STRING];
-                        char last_name[MAX_STRING];
+                        char first_name[MAX_STRING];            /* Flawfinder: ignore */
+                        char last_name[MAX_STRING];             /* Flawfinder: ignore */
                         if (gCacheName->getName(info->mFromID, first_name, last_name))
                         {
                                 from_string = LLString("An object named ") + info->mFromName + " owned by " + first_name + " " + last_name;
@@ -938,9 +941,9 @@ void inventory_offer_callback(S32 option, void* user_data)
                         }
                         
                 }
-                if (!info->mFromGroup)
+                if (!info->mFromGroup && !info->mFromObject)
                 {
-                busy_message(msg,info->mFromID);
+                        busy_message(msg,info->mFromID);
                 }
                 break;
         }
@@ -1000,8 +1003,8 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                   // Name cache callbacks don't store userdata, so can't save
                   // off the LLOfferInfo.  Argh.  JC
                   BOOL name_found = FALSE;
-                  char first_name[MAX_STRING];
-                  char last_name[MAX_STRING];
+                  char first_name[MAX_STRING];          /* Flawfinder: ignore */
+                  char last_name[MAX_STRING];           /* Flawfinder: ignore */
                   if (info->mFromGroup)
                   {
                           if (gCacheName->getGroupName(info->mFromID, first_name))
@@ -1133,12 +1136,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         U8 d = 0;
         LLUUID session_id;
         U32 t;
-        char name[DB_FULL_NAME_BUF_SIZE];
-        char message[DB_IM_MSG_BUF_SIZE];
+        char name[DB_FULL_NAME_BUF_SIZE];               /* Flawfinder: ignore */
+        char message[DB_IM_MSG_BUF_SIZE];               /* Flawfinder: ignore */
         U32 parent_estate_id = 0;
         LLUUID region_id;
         LLVector3 position;
-        char buffer[DB_IM_MSG_BUF_SIZE * 2];
+        char buffer[DB_IM_MSG_BUF_SIZE * 2];            /* Flawfinder: ignore */
         U8 binary_bucket[MTUBYTES];
         S32 binary_bucket_size;
         LLChat chat;
@@ -1171,19 +1174,19 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         chat.mFromID = from_id;
         chat.mFromName = name;
 
-        LLViewerObject *source = gObjectList.findObject(session_id);
+        LLViewerObject *source = gObjectList.findObject(session_id); //Session ID is probably the wrong thing.
         if (source)
         {
                 is_owned_by_me = source->permYouOwner();
         }
 
-        char separator_string[3]=": ";
+        char separator_string[3]=": ";          /* Flawfinder: ignore */
         int message_offset=0;
 
                 //Handle IRC styled /me messages.
         if (!strncmp(message, "/me ", 4) || !strncmp(message, "/me'", 4))
         {
-                strcpy(separator_string,"");
+                strcpy(separator_string,"");            /* Flawfinder: ignore */
                 message_offset=3;
         }
 
@@ -1237,7 +1240,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
                         // now store incoming IM in chat history
 
-                        sprintf(buffer, "%s%s%s", name, separator_string, (message+message_offset));
+                        snprintf(buffer, sizeof(buffer), "%s%s%s", name, separator_string, (message+message_offset));           /* Flawfinder: ignore */
         
                         if(from_id == gAgentID)
                         {
@@ -1258,14 +1261,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 position);
 
                         // pretend this is chat generated by self, so it does not show up on screen
-                        sprintf(buffer, "IM: %s%s%s", name, separator_string, (message+message_offset));
+                        snprintf(buffer, sizeof(buffer), "IM: %s%s%s", name, separator_string, (message+message_offset));               /* Flawfinder: ignore */
                         chat.mText = buffer;
                         LLFloaterChat::addChat( chat, TRUE, TRUE );
                 }
                 else if (from_id.isNull())
                 {
                         // Messages from "Second Life" don't go to IM history
-                        sprintf(buffer, "%s: %s", name, message);
+                        snprintf(buffer, sizeof(buffer), "%s: %s", name, message);              /* Flawfinder: ignore */
                         chat.mText = buffer;
                         LLFloaterChat::addChat(chat, FALSE, FALSE);
                 }
@@ -1279,7 +1282,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         // Treat like a system message and put in chat history.
                         // Claim to be from a local agent so it doesn't go into
                         // console.
-                        sprintf(buffer, "%s%s%s", name, separator_string, (message+message_offset));
+                        snprintf(buffer, sizeof(buffer), "%s%s%s", name, separator_string, (message+message_offset));           /* Flawfinder: ignore */
                         chat.mText = buffer;
                         BOOL local_agent = TRUE;
                         LLFloaterChat::addChat(chat, FALSE, local_agent);
@@ -1287,15 +1290,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 else
                 {
                         // standard message, not from system
-                        char saved[MAX_STRING];
+                        char saved[MAX_STRING];         /* Flawfinder: ignore */
                         saved[0] = '\0';
                         if(offline == IM_OFFLINE)
                         {
-                                char time_buf[TIME_STR_LENGTH];
-                                sprintf(saved, "(Saved %s) ",
+                                char time_buf[TIME_STR_LENGTH];         /* Flawfinder: ignore */
+                                snprintf(saved, MAX_STRING, "(Saved %s) ",              /* Flawfinder: ignore */
                                                 formatted_time(timestamp, time_buf));
                         }
-                        sprintf(buffer, "%s%s%s%s", name, separator_string, saved,(message+message_offset));
+                        snprintf(buffer, sizeof(buffer), "%s%s%s%s", name, separator_string, saved,(message+message_offset));           /* Flawfinder: ignore */
                         if(from_id == gAgentID)
                         {
                                 from_id = LLUUID::null;
@@ -1314,7 +1317,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                         parent_estate_id,
                                         region_id,
                                         position);
-                                sprintf(buffer, "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));
+                                snprintf(buffer, sizeof(buffer), "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));              /* Flawfinder: ignore */
 
                                 chat.mText = buffer;
                                 BOOL local_agent = FALSE;
@@ -1373,7 +1376,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
                         // Make sure the binary bucket is big enough to hold the header 
                         // and a null terminated item name.
-                        if ( (binary_bucket_size < (sizeof(notice_bucket_header_t) + sizeof(U8)))
+                        if ( (binary_bucket_size < (S32)((sizeof(notice_bucket_header_t) + sizeof(U8))))
                                 || (binary_bucket[binary_bucket_size - 1] != '\0') )
                         {
                                 llwarns << "Malformed group notice binary bucket" << llendl;
@@ -1527,8 +1530,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         info->mFromName = name;
                         info->mDesc = message;
                         info->mHost = msg->getSender();
-                        //if (!is_linden && ((is_busy && !is_owned_by_me) || is_muted))
-                        if (((is_busy && !is_owned_by_me) || is_muted))
+                        //if (((is_busy && !is_owned_by_me) || is_muted))
+                        if ( is_muted )
                         {
                                 // Same as closing window
                                 inventory_offer_callback(-1, info);
@@ -1578,16 +1581,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
                         
                         // standard message, not from system
-                        char saved[MAX_STRING];
+                        char saved[MAX_STRING];         /* Flawfinder: ignore */
                         saved[0] = '\0';
                         if(offline == IM_OFFLINE)
                         {
-                                char time_buf[TIME_STR_LENGTH];
-                                sprintf(saved,
+                                char time_buf[TIME_STR_LENGTH];         /* Flawfinder: ignore */
+                                snprintf(saved,         /* Flawfinder: ignore */
+                                                MAX_STRING, 
                                                 "(Saved %s) ", 
                                                 formatted_time(timestamp, time_buf));
                         }
-                        sprintf(buffer, "%s%s%s%s", name, separator_string, saved, (message+message_offset));
+                        snprintf(buffer, sizeof(buffer), "%s%s%s%s", name, separator_string, saved, (message+message_offset));          /* Flawfinder: ignore */
                         BOOL is_this_agent = FALSE;
                         if(from_id == gAgentID)
                         {
@@ -1605,7 +1609,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 region_id,
                                 position);
                                 
-                        sprintf(buffer, "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));
+                        snprintf(buffer, sizeof(buffer), "IM: %s%s%s%s", name, separator_string, saved, (message+message_offset));              /* Flawfinder: ignore */
                         chat.mText = buffer;
                         LLFloaterChat::addChat(chat, TRUE, is_this_agent);
                 }
@@ -1616,7 +1620,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 {
                         return;
                 }
-                sprintf(buffer, "%s%s%s", name, separator_string, (message+message_offset));
+                snprintf(buffer, sizeof(buffer), "%s%s%s", name, separator_string, (message+message_offset));           /* Flawfinder: ignore */
                 // Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
                 // IMs from objcts don't open IM sessions.
                 chat.mText = buffer;
@@ -1636,7 +1640,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 }
                 break;
         case IM_BUSY_AUTO_RESPONSE:
-                gIMView->addMessage(session_id, from_id, name, message);
+                // fix for JIRA issue VWR-20 submitted 13-JAN-2007 - Paul Churchill
+                if (is_muted)
+                {
+                        lldebugs << "Ignoring busy response from " << from_id << llendl;
+                        return;
+                }
+                else
+                {
+                        // original code resumes
+                        gIMView->addMessage(session_id, from_id, name, message);
+                }
                 break;
                 
         case IM_LURE_USER:
@@ -1688,7 +1702,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         case IM_GOTO_URL:
                 {
                         char* url = new char[binary_bucket_size];
-                        strcpy(url, (char*)binary_bucket);
+                        if (url == NULL)
+                        {
+                                llerrs << "Memory Allocation failed" << llendl;
+                                return;
+                        }
+
+                        strncpy(url, (char*)binary_bucket, binary_bucket_size-1);               /* Flawfinder: ignore */
+                        url[binary_bucket_size-1] = '\0';
                         args["[MESSAGE]"] = message;
                         args["[URL]"] = url;
                         LLNotifyBox::showXml("GotoURL", args,
@@ -1730,7 +1751,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         LLAvatarTracker::formFriendship(from_id);
                         
                         std::vector<std::string> strings;
-                        strings.push_back( from_id.getString() );
+                        strings.push_back(from_id.asString());
                         send_generic_message("requestonlinenotification", strings);
                         
                         args["[NAME]"] = name;
@@ -1931,8 +1952,8 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
 void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 {
         LLChat          chat;
-        char            mesg[DB_CHAT_MSG_BUF_SIZE];
-        char            from_name[DB_FULL_NAME_BUF_SIZE];
+        char            mesg[DB_CHAT_MSG_BUF_SIZE];             /* Flawfinder: ignore */
+        char            from_name[DB_FULL_NAME_BUF_SIZE];               /* Flawfinder: ignore */
         U8                      source_temp;
         U8                      type_temp;
         U8                      audible_temp;
@@ -1976,6 +1997,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 is_linden = gMuteListp->isLinden(from_name);
         }
 
+        BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
         chatter = gObjectList.findObject(from_id);
         if (chatter)
         {
@@ -1995,7 +2017,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 }
 
                 // only pay attention to other people chatting
-                if ((is_linden || (!is_muted && !is_busy))
+                if (is_audible
+                        && (is_linden || (!is_muted && !is_busy))
                         && chatter != gAgent.getAvatarObject())
                 {
                         gAgent.heardChat(chat);
@@ -2008,7 +2031,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 is_owned_by_me = chatter->permYouOwner();
         }
 
-        BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
         if (is_audible)
         {
                 BOOL visible_in_chat_bubble = FALSE;
@@ -2283,7 +2305,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
         {
                 gViewerWindow->setProgressCancelButtonVisible(TRUE, "Cancel");
         }
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         msg->getString("Info", "Message", MAX_STRING, buffer);
         lldebugs << "teleport progress: " << buffer << llendl;
         gAgent.setTeleportMessage(buffer);
@@ -2373,7 +2395,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
         msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
         
         
-        char seedCap[STD_STRING_BUF_SIZE];
+        char seedCap[STD_STRING_BUF_SIZE];              /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability,
                 STD_STRING_BUF_SIZE, seedCap);
 
@@ -2657,7 +2679,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
         U64 region_handle;
         msg->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
         
-        char seedCap[STD_STRING_BUF_SIZE];
+        char seedCap[STD_STRING_BUF_SIZE];              /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, STD_STRING_BUF_SIZE, seedCap);
 
         send_complete_agent_movement(sim_host);
@@ -2891,7 +2913,8 @@ 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())
         {
@@ -2909,6 +2932,7 @@ void process_object_update(LLMessageSystem *mesgsys, void **user_data)
 
 void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data)
 {
+        LLMemType mt(LLMemType::MTYPE_OBJECT);
         // Update the data counters
         if (mesgsys->getReceiveCompressedSize())
         {
@@ -2926,6 +2950,7 @@ void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data
 
 void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data)
 {
+        LLMemType mt(LLMemType::MTYPE_OBJECT);
         // Update the data counters
         if (mesgsys->getReceiveCompressedSize())
         {
@@ -2944,6 +2969,7 @@ void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data)
 
 void process_terse_object_update_improved(LLMessageSystem *mesgsys, void **user_data)
 {
+        LLMemType mt(LLMemType::MTYPE_OBJECT);
         if (mesgsys->getReceiveCompressedSize())
         {
                 gObjectBits += mesgsys->getReceiveCompressedSize() * 8;
@@ -2988,7 +3014,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
                         //llinfos << "Kill message for local " << local_id << llendl;
                 }
 
-                gSelectMgr->selectionRemoveObject(id);
+                gSelectMgr->removeObjectFromSelections(id);
 
                 // ...don't kill the avatar
                 if (!(id == gAgentID))
@@ -3470,12 +3496,15 @@ void process_camera_constraint(LLMessageSystem *mesgsys, void **user_data)
 
 void near_sit_object(BOOL success, void *data)
 {
-        // Send message to sit on object
-        gMessageSystem->newMessageFast(_PREHASH_AgentSit);
-        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        gAgent.sendReliableMessage();
+        if (success)
+        {
+                // Send message to sit on object
+                gMessageSystem->newMessageFast(_PREHASH_AgentSit);
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                gAgent.sendReliableMessage();
+        }
 }
 
 void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
@@ -3516,9 +3545,6 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
                 {
                         gAgent.startAutoPilotGlobal(gAgent.getPosGlobalFromAgent(sit_spot), "Sit", &sitRotation, near_sit_object, NULL, 0.5f);
                 }
-
-                // deselect transient selections (pie menu) when sitting
-                gSelectMgr->deselectTransient();
         }
         else
         {
@@ -3658,7 +3684,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
 // Culled from newsim lltask.cpp
 void process_name_value(LLMessageSystem *mesgsys, void **user_data)
 {
-        char    temp_str[NAME_VALUE_BUF_SIZE];
+        char    temp_str[NAME_VALUE_BUF_SIZE];          /* Flawfinder: ignore */
         LLUUID  id;
         S32             i, num_blocks;
 
@@ -3684,7 +3710,7 @@ void process_name_value(LLMessageSystem *mesgsys, void **user_data)
 
 void process_remove_name_value(LLMessageSystem *mesgsys, void **user_data)
 {
-        char    temp_str[NAME_VALUE_BUF_SIZE];
+        char    temp_str[NAME_VALUE_BUF_SIZE];          /* Flawfinder: ignore */
         LLUUID  id;
         S32             i, num_blocks;
 
@@ -3710,7 +3736,7 @@ void process_remove_name_value(LLMessageSystem *mesgsys, void **user_data)
 
 void process_kick_user(LLMessageSystem *msg, void** /*user_data*/)
 {
-        char message[2048];
+        char message[2048];             /* Flawfinder: ignore */
         message[0] = '\0';
 
         msg->getStringFast(_PREHASH_UserInfo, _PREHASH_Reason, 2048, message);
@@ -3778,7 +3804,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
         S32 balance = 0;
         S32 credit = 0;
         S32 committed = 0;
-        char desc[STD_STRING_BUF_SIZE] = "";
+        char desc[STD_STRING_BUF_SIZE] = "";            /* Flawfinder: ignore */
 
         msg->getS32("MoneyData", "MoneyBalance", balance);
         msg->getS32("MoneyData", "SquareMetersCredit", credit);
@@ -3839,7 +3865,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 
 void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         msgsystem->getStringFast(_PREHASH_AlertData, _PREHASH_Message, MAX_STRING, buffer);
         BOOL modal = FALSE;
         msgsystem->getBOOL("AlertData", "Modal", modal);
@@ -3848,7 +3874,7 @@ void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
 
 void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         msgsystem->getStringFast(_PREHASH_AlertData, _PREHASH_Message, MAX_STRING, buffer);
         BOOL modal = FALSE;
         process_alert_core(buffer, modal);
@@ -3868,10 +3894,11 @@ void process_alert_core(const char* buffer, BOOL modal)
         else if( !strcmp( buffer, "Home position set." ) )
         {
                 // save the home location image to disk
-                char temp_str[LL_MAX_PATH];
-                strcpy(temp_str, gDirUtilp->getLindenUserDir().c_str());
-                strcat(temp_str, "/");
-                strcat(temp_str,SCREEN_HOME_FILENAME);
+                char temp_str[LL_MAX_PATH];             /* Flawfinder: ignore */
+                strncpy(temp_str, gDirUtilp->getLindenUserDir().c_str(), LL_MAX_PATH -1);               /* Flawfinder: ignore */
+                temp_str[LL_MAX_PATH -1] = '\0';
+                strcat(temp_str, "/");          /* Flawfinder: ignore */        
+                strcat(temp_str,SCREEN_HOME_FILENAME);          /* Flawfinder: ignore */
                 gViewerWindow->saveSnapshot(temp_str, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, FALSE);
         }
 
@@ -3949,8 +3976,10 @@ void mean_name_callback(const LLUUID &id, const char *first, const char *last, B
         {
                 if (mcd->mPerp == id)
                 {
-                        strcpy(mcd->mFirstName, first);
-                        strcpy(mcd->mLastName, last);
+                        strncpy(mcd->mFirstName, first, DB_FIRST_NAME_BUF_SIZE -1);             /* Flawfinder: ignore */
+                        mcd->mFirstName[DB_FIRST_NAME_BUF_SIZE -1] = '\0';
+                        strncpy(mcd->mLastName, last, DB_LAST_NAME_BUF_SIZE -1);                /* Flawfinder: ignore */
+                        mcd->mLastName[DB_LAST_NAME_BUF_SIZE -1] = '\0';
                 }
         }
 }
@@ -4101,8 +4130,8 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
         LLUUID taskid;
         LLUUID itemid;
         S32             questions;
-        char object_name[255];
-        char owner_name[DB_FULL_NAME_BUF_SIZE];
+        char object_name[255];          /* Flawfinder: ignore */
+        char owner_name[DB_FULL_NAME_BUF_SIZE];         /* Flawfinder: ignore */
 
         msg->getUUIDFast(_PREHASH_Data, _PREHASH_TaskID, taskid );
         msg->getUUIDFast(_PREHASH_Data, _PREHASH_ItemID, itemid );
@@ -4262,7 +4291,7 @@ char* formatted_time(const time_t& the_time, char* buffer)
 
 void process_teleport_failed(LLMessageSystem *msg, void**)
 {
-        char reason[STD_STRING_BUF_SIZE];
+        char reason[STD_STRING_BUF_SIZE];               /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_Info, _PREHASH_Reason, STD_STRING_BUF_SIZE, reason);
 
         LLStringBase<char>::format_map_t args;
@@ -4536,10 +4565,10 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
         
         BOOL im_via_email;
         msg->getBOOLFast(_PREHASH_UserData, _PREHASH_IMViaEMail, im_via_email);
-        char email[DB_USER_EMAIL_ADDR_BUF_SIZE];
+        char email[DB_USER_EMAIL_ADDR_BUF_SIZE];                /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_UserData, _PREHASH_EMail, DB_USER_EMAIL_ADDR_BUF_SIZE,
                                            email);
-        char dir_visibility[MAX_STRING];
+        char dir_visibility[MAX_STRING];                        /* Flawfinder: ignore */        
         msg->getString(
                 "UserData", "DirectoryVisibility", MAX_STRING, dir_visibility);
 
@@ -4596,11 +4625,11 @@ void process_script_dialog(LLMessageSystem* msg, void**)
         ScriptDialogInfo* info = new ScriptDialogInfo;
 
         const S32 messageLength = SCRIPT_DIALOG_MAX_MESSAGE_SIZE + sizeof(SCRIPT_DIALOG_HEADER);
-        char message[messageLength]; // Account for size of "Script Dialog:\n"
+        char message[messageLength];            /* Flawfinder: ignore */                // Account for size of "Script Dialog:\n"
 
-        char first_name[DB_FIRST_NAME_BUF_SIZE];
-        char last_name[DB_GROUP_NAME_BUF_SIZE];
-        char title[DB_INV_ITEM_NAME_BUF_SIZE];
+        char first_name[DB_FIRST_NAME_BUF_SIZE];                /* Flawfinder: ignore */
+        char last_name[DB_GROUP_NAME_BUF_SIZE];         /* Flawfinder: ignore */
+        char title[DB_INV_ITEM_NAME_BUF_SIZE];          /* Flawfinder: ignore */
         info->mSender = msg->getSender();
 
         msg->getUUID("Data", "ObjectID", info->mObjectID);
@@ -4622,7 +4651,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
         for (i = 0; i < button_count; i++)
         {
-                char tdesc[SCRIPT_DIALOG_BUTTON_STR_SIZE+1];
+                char tdesc[SCRIPT_DIALOG_BUTTON_STR_SIZE+1];            /* Flawfinder: ignore */
                 msg->getString("Buttons", "ButtonLabel", SCRIPT_DIALOG_BUTTON_STR_SIZE + 1,  tdesc, i);
                 info->mButtons.push_back(LLString(tdesc));
         }
@@ -4630,7 +4659,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
         LLStringBase<char>::format_map_t args;
         args["[TITLE]"] = title;
         args["[MESSAGE]"] = message;
-        if (strlen(first_name) > 0)
+        if (strlen(first_name) > 0)             /* Flawfinder: ignore */
         {
                 args["[FIRST]"] = first_name;
                 args["[LAST]"] = last_name;
@@ -4656,9 +4685,9 @@ struct LoadUrlInfo
         LLUUID mObjectID;
         LLUUID mOwnerID;
         BOOL mOwnerIsGroup;
-        char mObjectName[256];
-        char mMessage[256];
-        char mUrl[256];
+        char mObjectName[256];          /* Flawfinder: ignore */
+        char mMessage[256];             /* Flawfinder: ignore */
+        char mUrl[256];         /* Flawfinder: ignore */
 };
 
 std::vector<LoadUrlInfo*> gLoadUrlList;
@@ -4770,8 +4799,8 @@ void process_initiate_download(LLMessageSystem* msg, void**)
                 return;
         }
 
-        char sim_filename[MAX_PATH];
-        char viewer_filename[MAX_PATH];
+        char sim_filename[MAX_PATH];            /* Flawfinder: ignore */
+        char viewer_filename[MAX_PATH];         /* Flawfinder: ignore */
         msg->getString("FileData", "SimFilename", MAX_PATH, sim_filename);
         msg->getString("FileData", "ViewerFilename", MAX_PATH, viewer_filename);
 
@@ -4787,8 +4816,8 @@ void process_initiate_download(LLMessageSystem* msg, void**)
 
 void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
-        char object_name[256];
-        char sim_name[256];
+        char object_name[256];  /* Flawfinder: ignore */                
+        char sim_name[256];             /* Flawfinder: ignore */
         LLVector3 pos;
         LLVector3 look_at;
 
@@ -4804,7 +4833,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
 void process_covenant_reply(LLMessageSystem* msg, void**)
 {
         LLUUID covenant_id, estate_owner_id;
-        char estate_name[MAX_STRING];
+        char estate_name[MAX_STRING];           /* Flawfinder: ignore */
         U32 covenant_timestamp;
         msg->getUUID("Data", "CovenantID", covenant_id);
         msg->getU32("Data", "CovenantTimestamp", covenant_timestamp);
@@ -4816,10 +4845,10 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
         LLFloaterBuyLand::updateEstateName(estate_name);
 
         // standard message, not from system
-        char last_modified[MAX_STRING];
+        char last_modified[MAX_STRING];         /* Flawfinder: ignore */
         last_modified[0] = '\0';
-        char time_buf[TIME_STR_LENGTH];
-        sprintf(last_modified, "Last Modified %s",
+        char time_buf[TIME_STR_LENGTH];         /* Flawfinder: ignore */
+        snprintf(last_modified, MAX_STRING, "Last Modified %s",         /* Flawfinder: ignore */
         formatted_time((time_t)covenant_timestamp, time_buf));
 
         LLPanelEstateCovenant::updateLastModified(last_modified);
@@ -4898,7 +4927,13 @@ void onCovenantLoadComplete(LLVFS *vfs,
                 S32 file_length = file.getSize();
                 
                 char* buffer = new char[file_length+1];
-                file.read((U8*)buffer, file_length);
+                if (buffer == NULL)
+                {
+                        llerrs << "Memory Allocation failed" << llendl;
+                        return;
+                }
+
+                file.read((U8*)buffer, file_length);            /* Flawfinder: ignore */
                 
                 // put a EOS at the end
                 buffer[file_length] = 0;
@@ -5009,7 +5044,7 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**)
         // Handle Blacklisted feature simulator response...
         LLUUID  agentID;
         LLUUID  transactionID;
-        char    messageText[MAX_STRING];
+        char    messageText[MAX_STRING];                /* Flawfinder: ignore */
         msg->getStringFast(_PREHASH_FailureInfo,_PREHASH_ErrorMessage,MAX_STRING,&messageText[0],0);
         msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_AgentID,agentID);
         msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_TransactionID,transactionID);
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 84c5833..d870871 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -65,6 +65,10 @@ LLUserServerData gUserServerDomainName[USERSERVER_COUNT] =
           "userserver.ganga.lindenlab.com",
           "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
           "http://ganga-secondlife.webdev.lindenlab.com/helpers/" },
+        { "Vaak",
+          "userserver.vaak.lindenlab.com",
+          "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
+          "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
         { "Uma",
           "userserver.uma.lindenlab.com",
           "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
@@ -82,7 +86,7 @@ LLUserServerData gUserServerDomainName[USERSERVER_COUNT] =
 // Use this to figure out which domain name and login URI to use.
 
 EUserServerDomain gUserServerChoice = USERSERVER_NONE;
-char gUserServerName[MAX_STRING];
+char gUserServerName[MAX_STRING];               /* Flawfinder: ignore */
 
 LLHost gUserServer;
 
@@ -90,4 +94,4 @@ F32 gPacketDropPercentage = 0.f;
 F32 gInBandwidth = 0.f;
 F32 gOutBandwidth = 0.f;
 
-unsigned char gMACAddress[MAC_ADDRESS_BYTES];
+unsigned char gMACAddress[MAC_ADDRESS_BYTES];           /* Flawfinder: ignore */
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index ae5292c..4c90c5b 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -42,6 +42,7 @@ enum EUserServerDomain
         USERSERVER_SHAKTI,
         USERSERVER_SOMA,
         USERSERVER_GANGA,
+        USERSERVER_VAAK,
         USERSERVER_UMA,
         USERSERVER_LOCAL,
         USERSERVER_OTHER, // IP address set via -user or other command line option
@@ -64,9 +65,9 @@ extern F32 gInBandwidth;
 extern F32 gOutBandwidth;
 extern EUserServerDomain gUserServerChoice;
 extern LLUserServerData gUserServerDomainName[];
-extern char gUserServerName[MAX_STRING];
+extern char gUserServerName[MAX_STRING];                /* Flawfinder: ignore */
 
 const S32 MAC_ADDRESS_BYTES = 6;
-extern unsigned char gMACAddress[MAC_ADDRESS_BYTES];
+extern unsigned char gMACAddress[MAC_ADDRESS_BYTES];            /* Flawfinder: ignore */
 
 #endif
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 40930e6..a1a971f 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -80,14 +80,12 @@
 #include "llvoground.h"
 #include "llvolume.h"
 #include "llvolumemessage.h"
-#include "llvopart.h"
 #include "llvopartgroup.h"
 #include "llvosky.h"
 #include "llvostars.h"
 #include "llvosurfacepatch.h"
 #include "llvotextbubble.h"
 #include "llvotree.h"
-#include "llvotreenew.h"
 #include "llvovolume.h"
 #include "llvowater.h"
 #include "llworld.h"
@@ -125,14 +123,15 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
         case LL_PCODE_LEGACY_GRASS:
           res = new LLVOGrass(id, pcode, regionp); break;
         case LL_PCODE_LEGACY_PART_SYS:
-          res = new LLVOPart(id, pcode, regionp); break;
+//        llwarns << "Creating old part sys!" << llendl;
+//        res = new LLVOPart(id, pcode, regionp); break;
+          res = NULL; break;
         case LL_PCODE_LEGACY_TREE:
           res = new LLVOTree(id, pcode, regionp); break;
         case LL_PCODE_TREE_NEW:
-                llwarns << "Creating new tree!" << llendl;
-//              res = new LLVOTree(id, pcode, regionp); break;
-//              res = new LLVOTreeNew(id, pcode, regionp); break;
-                res = NULL; break;
+//        llwarns << "Creating new tree!" << llendl;
+//        res = new LLVOTree(id, pcode, regionp); break;
+          res = NULL; break;
         case LL_PCODE_LEGACY_TEXT_BUBBLE:
           res = new LLVOTextBubble(id, pcode, regionp); break;
         case LL_VO_CLOUDS:
@@ -173,10 +172,11 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
         mText(),
         mLastInterpUpdateSecs(0.f),
         mLastMessageUpdateSecs(0.f),
+        mLatestRecvPacketID(0),
         mData(NULL),
         mAudioSourcep(NULL),
         mAppAngle(0.f),
-        mPixelArea(0.f),
+        mPixelArea(1024.f),
         mInventory(NULL),
         mInventorySerialNum(0),
         mRegionp( regionp ),
@@ -188,7 +188,6 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
         mOnActiveList(FALSE),
         mOnMap(FALSE),
         mStatic(FALSE),
-        mFaceIndexOffset(0),
         mNumFaces(0),
         mLastUpdateFrame(0),
         mTimeDilation(1.f),
@@ -368,10 +367,12 @@ void LLViewerObject::dump() const
         llinfos << "Velocity: " << getVelocity() << llendl;
         if (mDrawable.notNull() && mDrawable->getNumFaces())
         {
-                LLDrawPool *poolp = mDrawable->getFace(0)->getPool();
-                llinfos << "Pool: " << poolp << llendl;
-                llinfos << "Pool reference count: " << poolp->mReferences.size() << llendl;
-                llinfos << "Pool vertex count: " << poolp->getVertexCount() << llendl;
+                LLFacePool *poolp = mDrawable->getFace(0)->getPool();
+                if (poolp)
+                {
+                        llinfos << "Pool: " << poolp << llendl;
+                        llinfos << "Pool reference count: " << poolp->mReferences.size() << llendl;
+                }
         }
         //llinfos << "BoxTree Min: " << mDrawable->getBox()->getMin() << llendl;
         //llinfos << "BoxTree Max: " << mDrawable->getBox()->getMin() << llendl;
@@ -423,7 +424,6 @@ void LLViewerObject::initVOClasses()
         }
         llinfos << "Viewer Object size: " << sizeof(LLViewerObject) << llendl;
         LLVOGrass::initClass();
-        LLVOPart::initClass();
         LLVOWater::initClass();
         LLVOSky::initClass();
         LLVOVolume::initClass();
@@ -615,11 +615,24 @@ BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp)
                 return FALSE;
         }
 
+        LLDrawable* old_parent = mDrawable->mParent;
+
         mDrawable->mParent = parentp; 
         
         BOOL ret = mDrawable->mXform.setParent(parentp ? &parentp->mXform : NULL);
         gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-        gPipeline.markMoved(mDrawable, FALSE);
+        if (old_parent || (parentp && parentp->isActive()))
+        {
+                gPipeline.markMoved(mDrawable, FALSE);
+        }
+        else
+        {
+                mDrawable->updateXform(TRUE);
+                if (!mDrawable->getSpatialGroup())
+                {
+                        mDrawable->movePartition();
+                }
+        }
         
         return ret;
 }
@@ -674,7 +687,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
         LLVector3 new_acc;
         LLVector3 new_angv;
         LLQuaternion new_rot;
-        LLVector3 new_scale;
+        LLVector3 new_scale = getScale();
 
         U32     parent_id = 0;
         U8      material = 0;
@@ -900,13 +913,6 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                 // ...new objects that should come in selected need to be added to the selected list
                                 mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
 
-                                // Set the change flags for scale
-                                if (new_scale != getScale())
-                                {
-                                        setChanged(SCALED | SILHOUETTE);
-                                        setScale(new_scale);  // Must follow setting permYouOwner()
-                                }
-
                                 // Set all name value pairs
                                 S32 nv_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_NameValue);
                                 if (nv_size > 0)
@@ -952,7 +958,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                                 mText->setOnHUDAttachment(isHUDAttachment());
                                         }
 
-                                        char temp_string[256];  // not MAX_STRING, must hold 255 chars + \0
+                                        char temp_string[256];                  /* Flawfinder: ignore */                // not MAX_STRING, must hold 255 chars + \0
                                         mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, 256, temp_string, block_num );
                                         
                                         LLColor4U coloru;
@@ -975,7 +981,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         mText = NULL;
                                 }
 
-                                char media_url[MAX_STRING+1];
+                                char media_url[MAX_STRING+1];           /* Flawfinder: ignore */
                                 mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, MAX_STRING+1, media_url, block_num);
                                 //if (media_url[0])
                                 //{
@@ -1419,8 +1425,14 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                 // Unpack particle system data
                                 //
                                 if (value & 0x8)
+                                {
                                         unpackParticleSource(*dp, owner_id);
-
+                                }
+                                else
+                                {
+                                        deleteParticleSource();
+                                }
+                                
                                 // Mark all extra parameters not used
                                 std::map<U16, ExtraParameter*>::iterator iter;
                                 for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
@@ -1484,14 +1496,6 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
                                         // ...new objects that should come in selected need to be added to the selected list
                                 mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
-
-                                // Set the change flags for scale
-                                if (new_scale != getScale())
-                                {
-                                        setChanged(SCALED | SILHOUETTE);
-                                        setScale(new_scale);  // Must follow setting permYouOwner()
-                                }
-
                         }
                         break;
 
@@ -1763,6 +1767,23 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
         //
         //
 
+        U32 packet_id = mesgsys->getCurrentRecvPacketID(); 
+        if (packet_id < mLatestRecvPacketID && 
+                mLatestRecvPacketID - packet_id < 65536)
+        {
+                //skip application of this message, it's old
+                return retval;
+        }
+
+        mLatestRecvPacketID = packet_id;
+
+        // Set the change flags for scale
+        if (new_scale != getScale())
+        {
+                setChanged(SCALED | SILHOUETTE);
+                setScale(new_scale);  // Must follow setting permYouOwner()
+        }
+
         // first, let's see if the new position is actually a change
 
         //static S32 counter = 0;
@@ -1790,14 +1811,10 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
         if (new_rot != mLastRot)
         {
-        //      if (getAngularVelocity().isExactlyZero() || 
-        //              new_angv != getAngularVelocity())
-                {
-                        mLastRot = new_rot;
-                        setChanged(ROTATED | SILHOUETTE);
-                        setRotation(new_rot);
-                        resetRot();
-                }
+                mLastRot = new_rot;
+                setChanged(ROTATED | SILHOUETTE);
+                setRotation(new_rot);
+                resetRot();
         }
 
 
@@ -2048,7 +2065,7 @@ BOOL LLViewerObject::setData(const U8 *datap, const U32 data_size)
                 {
                         return FALSE;
                 }
-                memcpy(mData, datap, data_size);
+                memcpy(mData, datap, data_size);                /* Flawfinder: ignore */
         }
         return TRUE;
 }
@@ -2300,7 +2317,7 @@ void LLViewerObject::requestInventory()
 struct LLFilenameAndTask
 {
         LLUUID mTaskID;
-        char mFilename[MAX_STRING];  // Just the filename, not the path
+        char mFilename[MAX_STRING];             /* Flawfinder: ignore */                // Just the filename, not the path
 #ifdef _DEBUG
         static S32 sCount;
         LLFilenameAndTask()
@@ -2331,41 +2348,45 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
         LLUUID task_id;
         msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_TaskID, task_id);
         LLViewerObject* object = gObjectList.findObject(task_id);
-        if(object)
+        if(!object)
+        {
+                llwarns << "LLViewerObject::processTaskInv object "
+                        << task_id << " does not exist." << llendl;
+                return;
+        }
+
+        msg->getS16Fast(_PREHASH_InventoryData, _PREHASH_Serial, object->mInventorySerialNum);
+        LLFilenameAndTask* ft = new LLFilenameAndTask;
+        ft->mTaskID = task_id;
+        msg->getStringFast(_PREHASH_InventoryData, _PREHASH_Filename, MAX_STRING, ft->mFilename);
+        if(!ft->mFilename[0])
         {
-                msg->getS16Fast(_PREHASH_InventoryData, _PREHASH_Serial, object->mInventorySerialNum);
-                LLFilenameAndTask* ft = new LLFilenameAndTask;
-                ft->mTaskID = task_id;
-                msg->getStringFast(_PREHASH_InventoryData, _PREHASH_Filename, MAX_STRING, ft->mFilename);
-                if(!ft->mFilename[0])
+                lldebugs << "Task has no inventory" << llendl;
+                // mock up some inventory to make a drop target.
+                if(object->mInventory)
                 {
-                        lldebugs << "Task has no inventory" << llendl;
-                        // mock up some inventory to make a drop target.
-                        if(object->mInventory)
-                        {
-                                object->mInventory->clear(); // will deref and delete it
-                        }
-                        else
-                        {
-                                object->mInventory = new InventoryObjectList();
-                        }
-                        LLPointer<LLInventoryObject> obj;
-                        obj = new LLInventoryObject(object->mID, LLUUID::null,
-                                                                                LLAssetType::AT_CATEGORY,
-                                                                                "Contents");
-                        object->mInventory->push_front(obj);
-                        object->doInventoryCallback();
-                        delete ft;
-                        return;
+                        object->mInventory->clear(); // will deref and delete it
                 }
-                gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename).c_str(), 
-                                                                  ft->mFilename, LL_PATH_CACHE,
-                                                                  object->mRegionp->getHost(),
-                                                                  TRUE,
-                                                                  &LLViewerObject::processTaskInvFile,
-                                                                  (void**)ft,
-                                                                  LLXferManager::HIGH_PRIORITY);
+                else
+                {
+                        object->mInventory = new InventoryObjectList();
+                }
+                LLPointer<LLInventoryObject> obj;
+                obj = new LLInventoryObject(object->mID, LLUUID::null,
+                                                                        LLAssetType::AT_CATEGORY,
+                                                                        "Contents");
+                object->mInventory->push_front(obj);
+                object->doInventoryCallback();
+                delete ft;
+                return;
         }
+        gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename).c_str(), 
+                                                                ft->mFilename, LL_PATH_CACHE,
+                                                                object->mRegionp->getHost(),
+                                                                TRUE,
+                                                                &LLViewerObject::processTaskInvFile,
+                                                                (void**)ft,
+                                                                LLXferManager::HIGH_PRIORITY);
 }
 
 void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code)
@@ -2395,9 +2416,9 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
         llifstream ifs(filename_and_local_path.c_str());
         if(ifs.good())
         {
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];        /* Flawfinder: ignore */
                 // *NOTE: This buffer size is hard coded into scanf() below.
-                char keyword[MAX_STRING];
+                char keyword[MAX_STRING];       /* Flawfinder: ignore */
                 if(mInventory)
                 {
                         mInventory->clear(); // will deref and delete it
@@ -2409,7 +2430,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
                 while(ifs.good())
                 {
                         ifs.getline(buffer, MAX_STRING);
-                        sscanf(buffer, " %254s", keyword);
+                        sscanf(buffer, " %254s", keyword);      /* Flawfinder: ignore */
                         if(0 == strcmp("inv_item", keyword))
                         {
                                 LLPointer<LLInventoryObject> inv = new LLViewerInventoryItem;
@@ -2590,6 +2611,18 @@ LLViewerInventoryItem* LLViewerObject::getInventoryItemByAsset(const LLUUID& ass
         return rv;
 }
 
+void LLViewerObject::updateViewerInventoryAsset(
+                                        const LLViewerInventoryItem* item,
+                                        const LLUUID& new_asset)
+{
+        LLPointer<LLViewerInventoryItem> task_item =
+                new LLViewerInventoryItem(item);
+        task_item->setAssetUUID(new_asset);
+
+        // do the internal logic
+        doUpdateInventory(task_item, TASK_INVENTORY_ITEM_KEY, false);
+}
+
 void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
 {
         if (getVolume())
@@ -2644,6 +2677,11 @@ BOOL LLViewerObject::updateGeometry(LLDrawable *drawable)
         return TRUE;
 }
 
+void LLViewerObject::updateFaceSize(S32 idx)
+{
+        
+}
+
 LLDrawable* LLViewerObject::createDrawable(LLPipeline *pipeline)
 {
         return NULL;
@@ -2684,13 +2722,23 @@ void LLViewerObject::setScale(const LLVector3 &scale, BOOL damped)
 void LLViewerObject::updateSpatialExtents(LLVector3& newMin, LLVector3 &newMax)
 {
         LLVector3 center = getRenderPosition();
-        F32 sz = llmin(mDrawable->getRadius(), 256.f);
-        LLVector3 size = LLVector3(sz,sz,sz);
+        LLVector3 size = getScale();
         newMin.setVec(center-size);
         newMax.setVec(center+size);
         mDrawable->setPositionGroup((newMin + newMax) * 0.5f);
 }
 
+F32 LLViewerObject::getBinRadius()
+{
+        if (mDrawable.notNull())
+        {
+                const LLVector3* ext = mDrawable->getSpatialExtents();
+                return (ext[1]-ext[0]).magVec();
+        }
+        
+        return getScale().magVec();
+}
+
 F32 LLViewerObject::getMaxScale() const
 {
         return llmax(getScale().mV[VX],getScale().mV[VY], getScale().mV[VZ]);
@@ -3593,11 +3641,6 @@ S32 LLViewerObject::setTETexGen(const U8 te, const U8 texgen)
         {
                 retval = LLPrimitive::setTETexGen(te, texgen);
                 setChanged(TEXTURE);
-                if (mDrawable.notNull() && retval)
-                {
-                        gPipeline.markTextured(mDrawable);
-                        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
-                }
         }
         return retval;
 }
@@ -3614,11 +3657,6 @@ S32 LLViewerObject::setTEShiny(const U8 te, const U8 shiny)
         {
                 retval = LLPrimitive::setTEShiny(te, shiny);
                 setChanged(TEXTURE);
-                if (mDrawable.notNull() && retval)
-                {
-                        gPipeline.markTextured(mDrawable);
-                        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
-                }
         }
         return retval;
 }
@@ -3763,7 +3801,7 @@ LLViewerImage *LLViewerObject::getTEImage(const U8 face) const
                 }
         }
 
-        llerrs << "Requested invalid face!" << llendl;
+        llerrs << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << llendl;
 
         return NULL;
 }
@@ -3857,6 +3895,11 @@ void LLViewerObject::setCanSelect(BOOL canSelect)
 
 void LLViewerObject::setDebugText(const std::string &utf8text)
 {
+        if (utf8text.empty() && !mText)
+        {
+                return;
+        }
+
         if (!mText)
         {
                 mText = (LLHUDText *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
@@ -4045,6 +4088,15 @@ void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_
         }
 }
 
+void LLViewerObject::deleteParticleSource()
+{
+        if (mPartSourcep.notNull())
+        {
+                mPartSourcep->setDead();
+                mPartSourcep = NULL;
+        }
+}
+
 // virtual
 void LLViewerObject::updateDrawable(BOOL force_damped)
 {
@@ -4577,6 +4629,7 @@ void LLViewerObject::markForUpdate(BOOL priority)
 void LLViewerObject::setRegion(LLViewerRegion *regionp)
 {
         llassert(regionp);
+        mLatestRecvPacketID = 0;
         mRegionp = regionp;
         setChanged(MOVED | SILHOUETTE);
         updateDrawable(FALSE);
@@ -4665,3 +4718,30 @@ void LLViewerObject::resetRot()
 {
         mRotTime = 0.0f;
 }
+
+U32 LLViewerObject::getPartitionType() const
+{ 
+        return LLPipeline::PARTITION_NONE; 
+}
+
+BOOL LLAlphaObject::isParticle()
+{
+        return FALSE;
+}
+
+F32 LLAlphaObject::getPartSize(S32 idx)
+{
+        return 0.f;
+}
+
+// virtual
+void LLStaticViewerObject::updateDrawable(BOOL force_damped)
+{
+        // Force an immediate rebuild on any update
+        if (mDrawable.notNull())
+        {
+                mDrawable->updateXform(TRUE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+        }
+        clearChanged(SHIFTED);
+}
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index a439a01..7176d24 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -37,6 +37,7 @@
 #include "llhudicon.h"
 #include "llinventory.h"
 #include "llmemory.h"
+#include "llmemtype.h"
 #include "llprimitive.h"
 #include "lluuid.h"
 #include "llvoinventorylistener.h"
@@ -44,6 +45,7 @@
 #include "llquaternion.h"
 #include "v3dmath.h"
 #include "v3math.h"
+#include "llvertexbuffer.h"
 
 class LLAgent;                  // TODO: Get rid of this.
 class LLAudioSource;
@@ -187,6 +189,7 @@ public:
         
         virtual LLDrawable* createDrawable(LLPipeline *pipeline);
         virtual BOOL            updateGeometry(LLDrawable *drawable);
+        virtual void            updateFaceSize(S32 idx);
         virtual BOOL            updateLOD();
         virtual BOOL            setDrawableParent(LLDrawable* parentp);
         virtual BOOL            updateLighting(BOOL do_lighting) { return TRUE; };
@@ -203,7 +206,7 @@ public:
         LLViewerRegion* getRegion() const                               { return mRegionp; }
 
         BOOL isSelected() const                                                 { return mUserSelected; }
-        void setSelected(BOOL sel)                                              { mUserSelected = sel; mRotTime = 0.f;}
+        virtual void setSelected(BOOL sel)                              { mUserSelected = sel; mRotTime = 0.f;}
 
         const LLUUID &getID() const                                             { return mID; }
         U32 getLocalID() const                                                  { return mLocalID; }
@@ -293,8 +296,6 @@ public:
         /*virtual*/     BOOL    setMaterial(const U8 material);
         virtual         void    setTEImage(const U8 te, LLViewerImage *imagep); // Not derived from LLPrimitive
         LLViewerImage           *getTEImage(const U8 te) const;
-
-        S32                                     getFaceIndexOffset() { return mFaceIndexOffset; }
         
         void fitFaceTexture(const U8 face);
         void sendTEUpdate() const;                      // Sends packed representation of all texture entry information
@@ -307,6 +308,8 @@ public:
         U8 getState()                                                   { return mState; }
 
         F32 getAppAngle() const                                 { return mAppAngle; }
+        F32 getPixelArea() const                                { return mPixelArea; }
+        void setPixelArea(F32 area)                             { mPixelArea = area; }
         F32 getMaxScale() const;
         F32 getMidScale() const;
         F32 getMinScale() const;
@@ -339,6 +342,7 @@ public:
         void markForUpdate(BOOL priority);
         void updateVolume(const LLVolumeParams& volume_params);
         virtual void updateSpatialExtents(LLVector3& min, LLVector3& max);
+        virtual F32 getBinRadius();
         
         LLBBox                          getBoundingBoxAgent() const;
 
@@ -378,6 +382,11 @@ public:
         LLViewerInventoryItem* getInventoryItemByAsset(const LLUUID& asset_id);
         S16 getInventorySerial() const { return mInventorySerialNum; }
 
+        // These functions does viewer-side only object inventory modifications
+        void updateViewerInventoryAsset(
+                const LLViewerInventoryItem* item,
+                const LLUUID& new_asset);
+
         // This function will make sure that we refresh the inventory.
         void dirtyInventory();
         BOOL isInventoryDirty() { return mInventoryDirty; }
@@ -436,6 +445,7 @@ public:
         void printNameValuePairs() const;
 
         virtual S32 getLOD() const { return 3; } 
+        virtual U32 getPartitionType() const;
 
         virtual LLNetworkData* getParameterEntry(U16 param_type) const;
         virtual bool setParameterEntry(U16 param_type, const LLNetworkData& new_value, bool local_origin);
@@ -536,6 +546,7 @@ protected:
 
         void unpackParticleSource(const S32 block_num, const LLUUID& owner_id);
         void unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_id);
+        void deleteParticleSource();
 
 private:
         void setNameValueList(const std::string& list);         // clears nv pairs and then individually adds \n separated NV pairs from \0 terminated string
@@ -547,7 +558,7 @@ protected:
 
         F64                             mLastInterpUpdateSecs;                  // Last update for purposes of interpolation
         F64                             mLastMessageUpdateSecs;                 // Last update from a message from the simulator
-
+        TPACKETID               mLatestRecvPacketID;                    // Latest time stamp on message from simulator
         // extra data sent from the sim...currently only used for tree species info
         U8* mData;
 
@@ -578,7 +589,6 @@ protected:
         BOOL                    mOnActiveList;
         BOOL                    mOnMap;                                         // On the map.
         BOOL                    mStatic;                                        // Object doesn't move.
-        S32                             mFaceIndexOffset;                       // offset into drawable's faces, zero except in special cases
         S32                             mNumFaces;
 
         S32                             mLastUpdateFrame;                       // frames in which an object had last moved for smart coalescing of drawables 
@@ -611,7 +621,6 @@ private:
         static S32 sNumObjects;
 };
 
-
 ///////////////////
 //
 // Inlines
@@ -642,4 +651,34 @@ public:
         U8 mMediaType;                  // see LLTextureEntry::WEB_PAGE, etc.
 };
 
+// subclass of viewer object that can be added to particle partitions
+class LLAlphaObject : public LLViewerObject
+{
+public:
+        LLAlphaObject(const LLUUID &id, const LLPCode type, LLViewerRegion *regionp)
+        : LLViewerObject(id,type,regionp) 
+        { mDepth = 0.f; }
+
+        virtual BOOL isParticle();
+        virtual F32 getPartSize(S32 idx);
+        virtual void getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp) = 0;
+
+        F32 mDepth;
+};
+
+class LLStaticViewerObject : public LLViewerObject
+{
+public:
+        LLStaticViewerObject(const LLUUID& id, const LLPCode type, LLViewerRegion* regionp)
+                : LLViewerObject(id,type,regionp)
+        { }
+
+        virtual void updateDrawable(BOOL force_damped);
+};
+
 #endif
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 49f2aae..8c15906 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -230,7 +230,7 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
                 && update_type != OUT_TERSE_IMPROVED 
                 && objectp->mCreateSelected)
         {
-                if ( gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) ) != gToolPie )
+                if ( gToolMgr->getCurrentTool() != gToolPie )
                 {
                         //llinfos << "DEBUG selecting " << objectp->mID << " " 
                         //              << objectp->mLocalID << llendl;
@@ -584,7 +584,8 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
         }
 
         // Selected
-        for (objectp = gSelectMgr->getFirstRootObject(); objectp; objectp = gSelectMgr->getNextRootObject())
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        for (objectp = selection->getFirstRootObject(); objectp; objectp = selection->getNextRootObject())
         {
                 objectp->boostTexturePriority();
         }
@@ -749,6 +750,15 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
         mNumVisCulledStat.addValue(mNumVisCulled);
 }
 
+void LLViewerObjectList::clearDebugText()
+{
+        for (S32 i = 0; i < mObjects.count(); i++)
+        {
+                mObjects[i]->setDebugText("");
+        }
+}
+
+
 void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
 {
         LLMemType mt(LLMemType::MTYPE_OBJECT);
@@ -1070,7 +1080,15 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
                 mSelectPickList.clear();
 
                 std::vector<LLDrawable*> pick_drawables;
-                gPipeline.mObjectPartition->cull(camera, &pick_drawables, TRUE);
+
+                for (i = 0; i < LLPipeline::NUM_PARTITIONS-1; i++)
+                {
+                        LLSpatialPartition* part = gPipeline.getSpatialPartition(i);
+                        if (part)
+                        {
+                                part->cull(camera, &pick_drawables, TRUE);
+                        }
+                }
 
                 for (std::vector<LLDrawable*>::iterator iter = pick_drawables.begin();
                         iter != pick_drawables.end(); iter++)
@@ -1092,10 +1110,10 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
 
                 LLHUDText::addPickable(mSelectPickList);
 
-                for (objectp = (LLVOAvatar*)LLCharacter::sInstances.getFirstData(); 
-                        objectp; 
-                        objectp = (LLVOAvatar*)LLCharacter::sInstances.getNextData())
+                for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                        iter != LLCharacter::sInstances.end(); ++iter)
                 {
+                        objectp = (LLVOAvatar*) *iter;
                         if (!objectp->isDead())
                         {
                                 if (objectp->mDrawable.notNull() && objectp->mDrawable->isVisible())
@@ -1116,7 +1134,7 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
                         {
                                 if (attachmentp->getIsHUDAttachment())
                                 {
-                                        LLViewerObject* objectp = attachmentp->getObject(0);
+                                        LLViewerObject* objectp = attachmentp->getObject();
                                         if (objectp)
                                         {
                                                 mSelectPickList.insert(objectp);                
@@ -1132,32 +1150,36 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
                                 }
                         }
                 }
-
+                
                 S32 num_pickables = (S32)mSelectPickList.size() + LLHUDIcon::getNumInstances();
 
-                S32 step = (0x000fffff - GL_NAME_INDEX_OFFSET) / num_pickables;
-
-                std::set<LLViewerObject*>::iterator pick_it;
-                i = 0;
-                for (pick_it = mSelectPickList.begin(); pick_it != mSelectPickList.end();)
+                if (num_pickables != 0)
                 {
-                        LLViewerObject* objp = (*pick_it);
-                        if (!objp || objp->isDead() || !objp->mbCanSelect)
+                        S32 step = (0x000fffff - GL_NAME_INDEX_OFFSET) / num_pickables;
+
+                        std::set<LLViewerObject*>::iterator pick_it;
+                        i = 0;
+                        for (pick_it = mSelectPickList.begin(); pick_it != mSelectPickList.end();)
                         {
-                                mSelectPickList.erase(pick_it++);
-                                continue;
+                                LLViewerObject* objp = (*pick_it);
+                                if (!objp || objp->isDead() || !objp->mbCanSelect)
+                                {
+                                        mSelectPickList.erase(pick_it++);
+                                        continue;
+                                }
+                                
+                                objp->mGLName = (i * step) + GL_NAME_INDEX_OFFSET;
+                                i++;
+                                ++pick_it;
                         }
 
-                        objp->mGLName = (i * step) + GL_NAME_INDEX_OFFSET;
-                        i++;
-                        ++pick_it;
+                        LLHUDIcon::generatePickIDs(i * step, step);
+                
+                        // At this point, we should only have live drawables/viewer objects
+                        gPipeline.renderForSelect(mSelectPickList);
                 }
-
-                LLHUDIcon::generatePickIDs(i * step, step);
         }
 
-        // At this point, we should only have live drawables/viewer objects
-        gPipeline.renderForSelect();
         //
         // Render pass for selected objects
         //
@@ -1214,7 +1236,7 @@ LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLVi
         LLViewerObject *objectp = LLViewerObject::createObject(fullid, pcode, regionp);
         if (!objectp)
         {
-                llwarns << "Couldn't create object of type " << LLPrimitive::pCodeToString(pcode) << llendl;
+//              llwarns << "Couldn't create object of type " << LLPrimitive::pCodeToString(pcode) << llendl;
                 return NULL;
         }
 
@@ -1248,7 +1270,7 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
         LLViewerObject *objectp = LLViewerObject::createObject(fullid, pcode, regionp);
         if (!objectp)
         {
-                llwarns << "Couldn't create object of type " << LLPrimitive::pCodeToString(pcode) << " id:" << fullid << llendl;
+//              llwarns << "Couldn't create object of type " << LLPrimitive::pCodeToString(pcode) << " id:" << fullid << llendl;
                 return NULL;
         }
 
@@ -1440,7 +1462,7 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
 
         if (orphans_found && objectp->isSelected())
         {
-                LLSelectNode* nodep = gSelectMgr->findSelectNode(objectp);
+                LLSelectNode* nodep = gSelectMgr->getSelection()->findNode(objectp);
                 if (nodep && !nodep->mIndividualSelection)
                 {
                         // rebuild selection with orphans
@@ -1450,6 +1472,7 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
         }
 }
 
+////////////////////////////////////////////////////////////////////////////
 
 LLViewerObjectList::OrphanInfo::OrphanInfo()
 {
diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index 3122d9d..f92c989 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -115,6 +115,7 @@ public:
         void addToMap(LLViewerObject *objectp);
         void removeFromMap(LLViewerObject *objectp);
 
+        void clearDebugText();
 
         ////////////////////////////////////////////
         //
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index af910e8..a21d2f7 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -65,6 +65,7 @@
 
 const F32 PARCEL_COLLISION_DRAW_SECS = 1.f;
 
+
 // Globals
 LLViewerParcelMgr *gParcelMgr = NULL;
 
@@ -72,6 +73,12 @@ U8* LLViewerParcelMgr::sPackedOverlay = NULL;
 
 LLUUID gCurrentMovieID = LLUUID::null;
 
+static LLParcelSelection* get_null_parcel_selection();
+template<> 
+        const LLHandle<LLParcelSelection>::NullFunc 
+                LLHandle<LLParcelSelection>::sNullFunc = get_null_parcel_selection;
+
+
 // Local functions
 void optionally_start_music(const LLString& music_url);
 void callback_start_music(S32 option, void* data);
@@ -102,8 +109,6 @@ struct LLGodForceOwnerData
 //
 LLViewerParcelMgr::LLViewerParcelMgr()
 :       mSelected(FALSE),
-        mSelectedMultipleOwners(FALSE),
-        mWholeParcelSelected(FALSE),
         mWestSouth(),
         mEastNorth(),
         mSelectedDwell(0.f),
@@ -113,11 +118,12 @@ LLViewerParcelMgr::LLViewerParcelMgr()
         mRenderCollision(FALSE),
         mRenderSelection(TRUE),
         mCollisionBanned(0),
-        mCollisionTimer(),
-        mMediaParcelId(0),
-        mMediaRegionId(0)
+        mCollisionTimer()
 {
-        mParcel = new LLParcel();
+        mCurrentParcel = new LLParcel();
+        mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel);
+        mFloatingParcelSelection = new LLParcelSelection(mCurrentParcel);
+
         mAgentParcel = new LLParcel();
         mHoverParcel = new LLParcel();
         mCollisionParcel = new LLParcel();
@@ -149,8 +155,14 @@ LLViewerParcelMgr::LLViewerParcelMgr()
 
 LLViewerParcelMgr::~LLViewerParcelMgr()
 {
-        delete mParcel;
-        mParcel = NULL;
+        mCurrentParcelSelection->setParcel(NULL);
+        mCurrentParcelSelection = NULL;
+
+        mFloatingParcelSelection->setParcel(NULL);
+        mFloatingParcelSelection = NULL;
+
+        delete mCurrentParcel;
+        mCurrentParcel = NULL;
 
         delete mAgentParcel;
         mAgentParcel = NULL;
@@ -175,32 +187,17 @@ LLViewerParcelMgr::~LLViewerParcelMgr()
         mAgentParcelOverlay = NULL;
 }
 
-
-void LLViewerParcelMgr::destroyGL()
-{
-        mBlockedImage = NULL;
-        mPassImage = NULL;
-}
-
-
-void LLViewerParcelMgr::restoreGL()
-{
-        mBlockedImage = gImageList.getImage(mBlockedImageID, TRUE, TRUE);
-        mPassImage = gImageList.getImage(mPassImageID, TRUE, TRUE);
-}
-
-
 void LLViewerParcelMgr::dump()
 {
         llinfos << "Parcel Manager Dump" << llendl;
         llinfos << "mSelected " << S32(mSelected) << llendl;
         llinfos << "Selected parcel: " << llendl;
         llinfos << mWestSouth << " to " << mEastNorth << llendl;
-        mParcel->dump();
-        llinfos << "banning " << mParcel->mBanList.size() << llendl;
+        mCurrentParcel->dump();
+        llinfos << "banning " << mCurrentParcel->mBanList.size() << llendl;
         
-        access_map_const_iterator cit = mParcel->mBanList.begin();
-        access_map_const_iterator end = mParcel->mBanList.end();
+        access_map_const_iterator cit = mCurrentParcel->mBanList.begin();
+        access_map_const_iterator end = mCurrentParcel->mBanList.end();
         for ( ; cit != end; ++cit)
         {
                 llinfos << "ban id " << (*cit).first << llendl;
@@ -233,27 +230,27 @@ void LLViewerParcelMgr::getDisplayInfo(S32* area_out, S32* claim_out,
 
         if (mSelected)
         {
-                if (mSelectedMultipleOwners)
+                if (mCurrentParcelSelection->mSelectedMultipleOwners)
                 {
-                        area = getClaimableArea();
+                        area = mCurrentParcelSelection->getClaimableArea();
                 }
                 else
                 {
                         area = getSelectedArea();
                 }
 
-                if (mParcel->getForSale())
+                if (mCurrentParcel->getForSale())
                 {
-                        price = mParcel->getSalePrice();
+                        price = mCurrentParcel->getSalePrice();
                         for_sale = TRUE;
                 }
                 else
                 {
-                        price = area * mParcel->getClaimPricePerMeter();
+                        price = area * mCurrentParcel->getClaimPricePerMeter();
                         for_sale = FALSE;
                 }
 
-                rent = mParcel->getTotalRent();
+                rent = mCurrentParcel->getTotalRent();
 
                 dwell = mSelectedDwell;
         }
@@ -267,51 +264,27 @@ void LLViewerParcelMgr::getDisplayInfo(S32* area_out, S32* claim_out,
 
 void LLViewerParcelMgr::getPrimInfo(S32 &sw_max, S32 &sw_total, S32 &max, S32 &total, S32 &owner, S32 &group, S32 &other, S32& selected, F32 &parcel_object_bonus, S32 &other_clean)
 {
-        if (mSelected && mParcel)
+        if (mSelected && mCurrentParcel)
         {
-                sw_max = mParcel->getSimWideMaxPrimCapacity();
-                sw_total = mParcel->getSimWidePrimCount();
-                max = llround(mParcel->getMaxPrimCapacity()*mParcel->getParcelPrimBonus());
-                total = mParcel->getPrimCount();
-                owner = mParcel->getOwnerPrimCount();
-                group = mParcel->getGroupPrimCount();
-                other = mParcel->getOtherPrimCount();
-                selected = mParcel->getSelectedPrimCount();
-                parcel_object_bonus = mParcel->getParcelPrimBonus();
-                other_clean = mParcel->getCleanOtherTime();
+                sw_max = mCurrentParcel->getSimWideMaxPrimCapacity();
+                sw_total = mCurrentParcel->getSimWidePrimCount();
+                max = llround(mCurrentParcel->getMaxPrimCapacity()*mCurrentParcel->getParcelPrimBonus());
+                total = mCurrentParcel->getPrimCount();
+                owner = mCurrentParcel->getOwnerPrimCount();
+                group = mCurrentParcel->getGroupPrimCount();
+                other = mCurrentParcel->getOtherPrimCount();
+                selected = mCurrentParcel->getSelectedPrimCount();
+                parcel_object_bonus = mCurrentParcel->getParcelPrimBonus();
+                other_clean = mCurrentParcel->getCleanOtherTime();
         }
 }
 
-BOOL LLViewerParcelMgr::getMultipleOwners() const
-{
-        return mSelectedMultipleOwners;
-}
-
-
-BOOL LLViewerParcelMgr::getWholeParcelSelected() const
-{
-        return mWholeParcelSelected;
-}
-
-
-S32 LLViewerParcelMgr::getClaimableArea() const
-{
-        const S32 UNIT_AREA = S32( PARCEL_GRID_STEP_METERS * PARCEL_GRID_STEP_METERS );
-        return mSelectedPublicCount * UNIT_AREA;
-}
-
-bool LLViewerParcelMgr::hasOthersSelected() const
-{
-        return mSelectedOtherCount != 0;
-}
-
-
 S32 LLViewerParcelMgr::getSelectedArea() const
 {
         S32 rv = 0;
-        if(mSelected && mParcel && mWholeParcelSelected)
+        if(mSelected && mCurrentParcel && mCurrentParcelSelection->mWholeParcelSelected)
         {
-                rv = mParcel->getArea();
+                rv = mCurrentParcel->getArea();
         }
         else if(mSelected)
         {
@@ -447,7 +420,7 @@ void LLViewerParcelMgr::writeAgentParcelFromBitmap(U8* bitmap)
 
 // Given a point, find the PARCEL_GRID_STEP x PARCEL_GRID_STEP block
 // containing it and select that.
-void LLViewerParcelMgr::selectParcelAt(const LLVector3d& pos_global)
+LLParcelSelectionHandle LLViewerParcelMgr::selectParcelAt(const LLVector3d& pos_global)
 {
         LLVector3d southwest = pos_global;
         LLVector3d northeast = pos_global;
@@ -461,14 +434,14 @@ void LLViewerParcelMgr::selectParcelAt(const LLVector3d& pos_global)
         northeast.mdV[VY] = llround( northeast.mdV[VY], (F64)PARCEL_GRID_STEP_METERS );
 
         // Snap to parcel
-        selectLand( southwest, northeast, TRUE );
+        return selectLand( southwest, northeast, TRUE );
 }
 
 
 // Tries to select the parcel inside the rectangle
-void LLViewerParcelMgr::selectParcelInRectangle()
+LLParcelSelectionHandle LLViewerParcelMgr::selectParcelInRectangle()
 {
-        selectLand(mWestSouth, mEastNorth, TRUE);
+        return selectLand(mWestSouth, mEastNorth, TRUE);
 }
 
 
@@ -498,28 +471,32 @@ void LLViewerParcelMgr::selectCollisionParcel()
         mRequestResult = PARCEL_RESULT_NO_DATA;
 
         // Hack: Copy some data over temporarily
-        mParcel->setName( mCollisionParcel->getName() );
-        mParcel->setDesc( mCollisionParcel->getDesc() );
-        mParcel->setPassPrice(mCollisionParcel->getPassPrice());
-        mParcel->setPassHours(mCollisionParcel->getPassHours());
+        mCurrentParcel->setName( mCollisionParcel->getName() );
+        mCurrentParcel->setDesc( mCollisionParcel->getDesc() );
+        mCurrentParcel->setPassPrice(mCollisionParcel->getPassPrice());
+        mCurrentParcel->setPassHours(mCollisionParcel->getPassHours());
 
         // clear the list of segments to prevent flashing
         resetSegments(mHighlightSegments);
 
+        mFloatingParcelSelection->setParcel(mCurrentParcel);
+        mCurrentParcelSelection->setParcel(NULL);
+        mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel);
+
         mSelected = TRUE;
-        mWholeParcelSelected = TRUE;
+        mCurrentParcelSelection->mWholeParcelSelected = TRUE;
         notifyObservers();
         return;
 }
 
 
 // snap_selection = auto-select the hit parcel, if there is exactly one
-void LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &corner2,
+LLParcelSelectionHandle LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &corner2,
                                                                    BOOL snap_selection)
 {
         if (!gWorldp)
         {
-                return;
+                return NULL;
         }
 
         sanitize_corners( corner1, corner2, mWestSouth, mEastNorth );
@@ -530,7 +507,7 @@ void LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &
         {
                 mSelected = FALSE;
                 notifyObservers();
-                return;
+                return NULL;
         }
 
         // ...y isn't more than one meter away
@@ -539,7 +516,7 @@ void LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &
         {
                 mSelected = FALSE;
                 notifyObservers();
-                return;
+                return NULL;
         }
 
         // Can't select across region boundary
@@ -556,7 +533,7 @@ void LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &
         {
                 // just in case they somehow selected no land.
                 mSelected = FALSE;
-                return;
+                return NULL;
         }
 
         if (region != region_other)
@@ -564,50 +541,13 @@ void LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &
                 LLNotifyBox::showXml("CantSelectLandFromMultipleRegions");
                 mSelected = FALSE;
                 notifyObservers();
-                return;
+                return NULL;
         }
 
         // Build region global copies of corners
         LLVector3 wsb_region = region->getPosRegionFromGlobal( mWestSouth );
         LLVector3 ent_region = region->getPosRegionFromGlobal( mEastNorth );
 
-        /*
-        // Check land to make sure all is either public, owned, or self
-        LLViewerParcelOverlay* overlay = region->getParcelOverlay();
-        if (!overlay)
-        {
-                llerrs << "No overlay in LLViewerParcelMgr::selectLand" << llendl;
-                return;
-        }
-
-        U8 start_ownership = overlay->ownership( wsb_region );
-        BOOL identical = TRUE;
-        S32 x_steps = S32( getSelectionWidth() / PARCEL_GRID_STEP_METERS );
-        S32 y_steps = S32( getSelectionHeight() / PARCEL_GRID_STEP_METERS );
-
-        for (S32 x = 0; x < x_steps && identical; x++ )
-        {
-                for (S32 y = 0; y < y_steps && identical; y++ )
-                {
-                        // strange recomputation each time to avoid error accumulation
-                        LLVector3 check = wsb_region;
-                        check.mV[VX] += x * PARCEL_GRID_STEP_METERS;
-                        check.mV[VY] += y * PARCEL_GRID_STEP_METERS;
-
-                        identical = (start_ownership == overlay->ownership(check));
-                }
-        }
-
-        if (!identical)
-        {
-                add_chat("Can't select mix of your own, other people's and public land.", FALSE, "", FALSE, CHAT_SOURCE_SYSTEM);
-                add_chat("Try selecting a smaller piece of land.", FALSE, "", FALSE, CHAT_SOURCE_SYSTEM);
-                mSelected = FALSE;
-                notifyObservers();
-                return;
-        }
-        */
-
         // Send request message
         LLMessageSystem *msg = gMessageSystem;
         msg->newMessageFast(_PREHASH_ParcelPropertiesRequest);
@@ -628,12 +568,24 @@ void LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &
         // clear the list of segments to prevent flashing
         resetSegments(mHighlightSegments);
 
+        mFloatingParcelSelection->setParcel(mCurrentParcel);
+        mCurrentParcelSelection->setParcel(NULL);
+        mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel);
+
         mSelected = TRUE;
-        mWholeParcelSelected = snap_selection;
+        mCurrentParcelSelection->mWholeParcelSelected = snap_selection;
         notifyObservers();
-        return;
+        return mCurrentParcelSelection;
 }
 
+void LLViewerParcelMgr::deselectUnused()
+{
+        // no more outstanding references to this selection, other than our own
+        if (mCurrentParcelSelection->getNumRefs() == 1 && mFloatingParcelSelection->getNumRefs() == 1)
+        {
+                deselectLand();
+        }
+}
 
 void LLViewerParcelMgr::deselectLand()
 {
@@ -642,14 +594,20 @@ void LLViewerParcelMgr::deselectLand()
                 mSelected = FALSE;
 
                 // Invalidate the selected parcel
-                mParcel->setLocalID(-1);
-                mParcel->mAccessList.clear();
-                mParcel->mBanList.clear();
-                //mParcel->mRenterList.reset();
+                mCurrentParcel->setLocalID(-1);
+                mCurrentParcel->mAccessList.clear();
+                mCurrentParcel->mBanList.clear();
+                //mCurrentParcel->mRenterList.reset();
 
                 mSelectedDwell = 0.f;
 
                 notifyObservers();
+
+                // invalidate parcel selection so that existing users of this selection can clean up
+                mCurrentParcelSelection->setParcel(NULL);
+                mFloatingParcelSelection->setParcel(NULL);
+                // create new parcel selection
+                mCurrentParcelSelection = new LLParcelSelection(mCurrentParcel);
         }
 }
 
@@ -694,18 +652,15 @@ BOOL LLViewerParcelMgr::selectionEmpty() const
 }
 
 
-LLParcel *LLViewerParcelMgr::getSelectedParcel() const
+LLParcelSelectionHandle LLViewerParcelMgr::getParcelSelection() const
 {
-        if (mSelected)
-        {
-                return mParcel;
-        }
-        else
-        {
-                return NULL;
-        }
+        return mCurrentParcelSelection;
 }
 
+LLParcelSelectionHandle LLViewerParcelMgr::getFloatingParcelSelection() const
+{
+        return mFloatingParcelSelection;
+}
 
 LLParcel *LLViewerParcelMgr::getAgentParcel() const
 {
@@ -717,9 +672,10 @@ BOOL LLViewerParcelMgr::agentCanBuild() const
 {
         if (mAgentParcel)
         {
-                return gAgent.isGodlike()
-                        || (mAgentParcel->getOwnerID() == gAgent.getID())
-                        || (mAgentParcel->getAllowModify());
+                return (gAgent.isGodlike()
+                                || (mAgentParcel->allowModifyBy(
+                                                gAgent.getID(),
+                                                gAgent.getGroupID())));
         }
         else
         {
@@ -923,11 +879,11 @@ void LLViewerParcelMgr::sendParcelAccessListRequest(U32 flags)
 
         if (flags & AL_BAN) 
         {
-                mParcel->mBanList.clear();
+                mCurrentParcel->mBanList.clear();
         }
         if (flags & AL_ACCESS) 
         {
-                mParcel->mAccessList.clear();
+                mCurrentParcel->mAccessList.clear();
         }               
 
         // Only the headers differ
@@ -938,7 +894,7 @@ void LLViewerParcelMgr::sendParcelAccessListRequest(U32 flags)
         msg->nextBlockFast(_PREHASH_Data);
         msg->addS32Fast(_PREHASH_SequenceID, 0);
         msg->addU32Fast(_PREHASH_Flags, flags);
-        msg->addS32("LocalID", mParcel->getLocalID() );
+        msg->addS32("LocalID", mCurrentParcel->getLocalID() );
         msg->sendReliable( region->getHost() );
 }
 
@@ -961,7 +917,7 @@ void LLViewerParcelMgr::sendParcelDwellRequest()
         msg->addUUID("AgentID", gAgent.getID() );
         msg->addUUID("SessionID", gAgent.getSessionID());
         msg->nextBlock("Data");
-        msg->addS32("LocalID", mParcel->getLocalID());
+        msg->addS32("LocalID", mCurrentParcel->getLocalID());
         msg->addUUID("ParcelID", LLUUID::null); // filled in on simulator
         msg->sendReliable( region->getHost() );
 }
@@ -1000,8 +956,8 @@ void LLViewerParcelMgr::sendParcelGodForceOwner(const LLUUID& owner_id)
 
         llinfos << "Region " << region->getOriginGlobal() << llendl;
 
-        LLGodForceOwnerData* data = new LLGodForceOwnerData(owner_id, mParcel->getLocalID(), region->getHost());
-        if(mParcel->getAuctionID())
+        LLGodForceOwnerData* data = new LLGodForceOwnerData(owner_id, mCurrentParcel->getLocalID(), region->getHost());
+        if(mCurrentParcel->getAuctionID())
         {
                 gViewerWindow->alertXml("ForceOwnerAuctionWarning",
                         callback_god_force_owner,
@@ -1051,7 +1007,7 @@ void LLViewerParcelMgr::sendParcelGodForceToContent()
         msg->addUUID("AgentID", gAgent.getID());
         msg->addUUID("SessionID", gAgent.getSessionID());
         msg->nextBlock("ParcelData");
-        msg->addS32("LocalID", mParcel->getLocalID());
+        msg->addS32("LocalID", mCurrentParcel->getLocalID());
         msg->sendReliable(region->getHost());
 }
 
@@ -1079,7 +1035,7 @@ void LLViewerParcelMgr::sendParcelRelease()
         msg->addUUID("AgentID", gAgent.getID() );
         msg->addUUID("SessionID", gAgent.getSessionID() );
         msg->nextBlock("Data");
-        msg->addS32("LocalID", mParcel->getLocalID() );
+        msg->addS32("LocalID", mCurrentParcel->getLocalID() );
         //msg->addU32("Flags", flags);
         msg->sendReliable( region->getHost() );
 
@@ -1117,7 +1073,7 @@ LLViewerParcelMgr::ParcelBuyInfo* LLViewerParcelMgr::setupParcelBuy(
         BOOL is_claim,
         BOOL remove_contribution)
 {
-        if (!mSelected || !mParcel)
+        if (!mSelected || !mCurrentParcel)
         {
                 gViewerWindow->alertXml("CannotBuyLandNothingSelected");
                 return NULL;
@@ -1162,7 +1118,7 @@ LLViewerParcelMgr::ParcelBuyInfo* LLViewerParcelMgr::setupParcelBuy(
         
         if (!is_claim)
         {
-                info->mParcelID = mParcel->getLocalID();
+                info->mParcelID = mCurrentParcel->getLocalID();
         }
         else
         {
@@ -1215,7 +1171,7 @@ void LLViewerParcelMgr::deleteParcelBuy(ParcelBuyInfo*& info)
 
 void LLViewerParcelMgr::sendParcelDeed(const LLUUID& group_id)
 {
-        if (!mSelected || !mParcel)
+        if (!mSelected || !mCurrentParcel)
         {
                 gViewerWindow->alertXml("CannotDeedLandNothingSelected");
                 return;
@@ -1239,7 +1195,7 @@ void LLViewerParcelMgr::sendParcelDeed(const LLUUID& group_id)
         msg->addUUID("SessionID", gAgent.getSessionID() );
         msg->nextBlock("Data");
         msg->addUUID("GroupID", group_id );
-        msg->addS32("LocalID", mParcel->getLocalID() );
+        msg->addS32("LocalID", mCurrentParcel->getLocalID() );
         //msg->addU32("JoinNeighbors", join);
         msg->sendReliable( region->getHost() );
 }
@@ -1253,7 +1209,7 @@ void LLViewerParcelMgr::sendParcelDeed(const LLUUID& group_id)
 void LLViewerParcelMgr::makeLandmarkAtSelection()
 {
         // Don't create for parcels you don't own
-        if (gAgent.getID() != mParcel->getOwnerID())
+        if (gAgent.getID() != mCurrentParcel->getOwnerID())
         {
                 return;
         }
@@ -1289,7 +1245,7 @@ const char* LLViewerParcelMgr::getAgentParcelName() const
 }
 
 
-void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, BOOL want_reply_to_update)
+void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel)
 {
         if (!parcel) return;
 
@@ -1306,7 +1262,8 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, BOOL want_r
         msg->addS32Fast(_PREHASH_LocalID, parcel->getLocalID() );
 
         U32 flags = 0x0;
-        if (want_reply_to_update) flags |= 0x01;
+        // request new properties update from simulator
+        flags |= 0x01;
         msg->addU32("Flags", flags);
 
         parcel->packMessage(msg);
@@ -1450,7 +1407,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
         {
                 // ...selected parcels report this sequence id
                 gParcelMgr->mRequestResult = PARCEL_RESULT_SUCCESS;
-                parcel = gParcelMgr->mParcel;
+                parcel = gParcelMgr->mCurrentParcel;
         }
         else if (sequence_id == HOVERED_PARCEL_SEQ_ID)
         {
@@ -1559,11 +1516,11 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
         if (sequence_id == SELECTED_PARCEL_SEQ_ID)
         {
                 // Update selected counts
-                gParcelMgr->mSelectedSelfCount = self_count;
-                gParcelMgr->mSelectedOtherCount = other_count;
-                gParcelMgr->mSelectedPublicCount = public_count;
+                gParcelMgr->mCurrentParcelSelection->mSelectedSelfCount = self_count;
+                gParcelMgr->mCurrentParcelSelection->mSelectedOtherCount = other_count;
+                gParcelMgr->mCurrentParcelSelection->mSelectedPublicCount = public_count;
 
-                gParcelMgr->mSelectedMultipleOwners =
+                gParcelMgr->mCurrentParcelSelection->mSelectedMultipleOwners =
                                                         (request_result == PARCEL_RESULT_MULTIPLE);
 
                 // Select the whole parcel
@@ -1583,7 +1540,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                                                 west_south.mV[VY],
                                                                 east_north.mV[VX],
                                                                 east_north.mV[VY] );
-                                gParcelMgr->mWholeParcelSelected = FALSE;
+                                gParcelMgr->mCurrentParcelSelection->mWholeParcelSelected = FALSE;
                         }
                         else if (0 == local_id)
                         {
@@ -1597,7 +1554,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                                                 aabb_min.mV[VY],
                                                                 aabb_max.mV[VX],
                                                                 aabb_max.mV[VY] );
-                                gParcelMgr->mWholeParcelSelected = TRUE;
+                                gParcelMgr->mCurrentParcelSelection->mWholeParcelSelected = TRUE;
                         }
                         else
                         {
@@ -1614,10 +1571,10 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                 gParcelMgr->resetSegments(gParcelMgr->mHighlightSegments);
                                 gParcelMgr->writeSegmentsFromBitmap( bitmap, gParcelMgr->mHighlightSegments );
 
-                                delete bitmap;
+                                delete[] bitmap;
                                 bitmap = NULL;
 
-                                gParcelMgr->mWholeParcelSelected = TRUE;
+                                gParcelMgr->mCurrentParcelSelection->mWholeParcelSelected = TRUE;
                         }
 
                         // Request access list information for this land
@@ -1666,7 +1623,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                 gParcelMgr->resetSegments(gParcelMgr->mCollisionSegments);
                 gParcelMgr->writeSegmentsFromBitmap( bitmap, gParcelMgr->mCollisionSegments );
 
-                delete bitmap;
+                delete[] bitmap;
                 bitmap = NULL;
 
         }
@@ -1815,10 +1772,10 @@ void optionally_start_music(const LLString& music_url)
 {
         if (gSavedSettings.getWarning("FirstStreamingMusic"))
         {
-                void* data = (void*)strdup(music_url.c_str());
+                std::string* newstring = new std::string(music_url);
                 gViewerWindow->alertXml("ParcelCanPlayMusic",
                         callback_start_music,
-                        (void*)data);
+                        (void*)newstring);
 
         }
         else if (gSavedSettings.getBOOL("AudioStreamingMusic"))
@@ -1841,7 +1798,7 @@ void optionally_start_music(const LLString& music_url)
 
 void callback_start_music(S32 option, void* data)
 {
-        const char* music_url = (const char*)data;
+        std::string* music_url = (std::string*)data;
 
         if (0 == option)
         {
@@ -1849,7 +1806,7 @@ void callback_start_music(S32 option, void* data)
                 llinfos << "Starting first parcel music " << music_url << llendl;
                 if (gAudiop) 
                 {
-                        gAudiop->startInternetStream(music_url);
+                        gAudiop->startInternetStream(music_url->c_str());
                         LLMediaRemoteCtrl* ctrl = gOverlayBar->getMusicRemoteControl();
                         ctrl->setTransportState( LLMediaRemoteCtrl::Play, FALSE );
                 }
@@ -1861,7 +1818,7 @@ void callback_start_music(S32 option, void* data)
 
         gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
 
-        delete [] music_url;
+        delete music_url;
         music_url = NULL;
 }
 
@@ -1962,7 +1919,7 @@ void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void
         msg->getU32Fast( _PREHASH_Data, _PREHASH_Flags, message_flags);
         msg->getS32Fast( _PREHASH_Data, _PREHASH_LocalID, parcel_id);
 
-        LLParcel* parcel = gParcelMgr->mParcel;
+        LLParcel* parcel = gParcelMgr->mCurrentParcel;
         if (!parcel) return;
 
         if (parcel_id != parcel->getLocalID())
@@ -2004,7 +1961,7 @@ void LLViewerParcelMgr::processParcelDwellReply(LLMessageSystem* msg, void**)
         F32 dwell;
         msg->getF32("Data", "Dwell", dwell);
 
-        if (local_id == gParcelMgr->mParcel->getLocalID())
+        if (local_id == gParcelMgr->mCurrentParcel->getLocalID())
         {
                 gParcelMgr->mSelectedDwell = dwell;
                 gParcelMgr->notifyObservers();
@@ -2028,7 +1985,7 @@ void LLViewerParcelMgr::sendParcelAccessListUpdate(U32 which)
 
         LLMessageSystem* msg = gMessageSystem;
 
-        LLParcel* parcel = mParcel;
+        LLParcel* parcel = mCurrentParcel;
         if (!parcel) return;
 
         if (which & AL_ACCESS)
@@ -2148,18 +2105,18 @@ void LLViewerParcelMgr::sendParcelAccessListUpdate(U32 which)
 
 void LLViewerParcelMgr::deedLandToGroup()
 {
-        char group_name[MAX_STRING];
-        gCacheName->getGroupName(mParcel->getGroupID(), group_name);
+        char group_name[MAX_STRING];            /* Flawfinder: ignore */
+        gCacheName->getGroupName(mCurrentParcel->getGroupID(), group_name);
         LLString::format_map_t args;
-        args["[AREA]"] = llformat("%d", mParcel->getArea());
+        args["[AREA]"] = llformat("%d", mCurrentParcel->getArea());
         args["[GROUP_NAME]"] = group_name;
-        if(mParcel->getContributeWithDeed())
+        if(mCurrentParcel->getContributeWithDeed())
         {
-                char first_name[DB_FIRST_NAME_BUF_SIZE];
+                char first_name[DB_FIRST_NAME_BUF_SIZE];                /* Flawfinder: ignore */
                 first_name[0] = '\0';
-                char last_name[DB_FIRST_NAME_BUF_SIZE];
+                char last_name[DB_FIRST_NAME_BUF_SIZE];         /* Flawfinder: ignore */
                 last_name[0] = '\0';            
-                gCacheName->getName(mParcel->getOwnerID(), first_name, last_name);
+                gCacheName->getName(mCurrentParcel->getOwnerID(), first_name, last_name);
                 args["[FIRST_NAME]"] = first_name;
                 args["[LAST_NAME]"] = last_name;
                 gViewerWindow->alertXml("DeedLandToGroupWithContribution",args, deedAlertCB, NULL);
@@ -2175,7 +2132,7 @@ void LLViewerParcelMgr::deedAlertCB(S32 option, void*)
 {
         if (option == 0)
         {
-                LLParcel* parcel = gParcelMgr->getSelectedParcel();
+                LLParcel* parcel = gParcelMgr->getParcelSelection()->getParcel();
                 LLUUID group_id;
                 if(parcel)
                 {
@@ -2206,7 +2163,7 @@ void LLViewerParcelMgr::startReleaseLand()
                 return;
         }
 
-        if (!isParcelOwnedByAgent(mParcel, GP_LAND_RELEASE)
+        if (!isParcelOwnedByAgent(mCurrentParcel, GP_LAND_RELEASE)
                 && !(gAgent.canManageEstate()))
         {
                 gViewerWindow->alertXml("CannotReleaseLandDontOwn");
@@ -2231,7 +2188,7 @@ void LLViewerParcelMgr::startReleaseLand()
         }
 */
 
-        if (!mWholeParcelSelected)
+        if (!mCurrentParcelSelection->mWholeParcelSelected)
         {
                 gViewerWindow->alertXml("CannotReleaseLandPartialSelection");
                 return;
@@ -2239,7 +2196,7 @@ void LLViewerParcelMgr::startReleaseLand()
 
         // Compute claim price
         LLStringBase<char>::format_map_t args;
-        args["[AREA]"] = llformat("%d",mParcel->getArea());
+        args["[AREA]"] = llformat("%d",mCurrentParcel->getArea());
         gViewerWindow->alertXml("ReleaseLandWarning", args,
                                 releaseAlertCB, this);
 }
@@ -2251,7 +2208,7 @@ bool LLViewerParcelMgr::canAgentBuyParcel(LLParcel* parcel, bool forGroup) const
                 return false;
         }
         
-        if (mSelected  &&  parcel == mParcel)
+        if (mSelected  &&  parcel == mCurrentParcel)
         {
                 if (mRequestResult == PARCEL_RESULT_NO_DATA)
                 {
@@ -2291,12 +2248,12 @@ bool LLViewerParcelMgr::canAgentBuyParcel(LLParcel* parcel, bool forGroup) const
 
 void LLViewerParcelMgr::startBuyLand(BOOL is_for_group)
 {
-        LLFloaterBuyLand::buyLand(getSelectionRegion(), mParcel, is_for_group == TRUE);
+        LLFloaterBuyLand::buyLand(getSelectionRegion(), mCurrentParcelSelection, is_for_group == TRUE);
 }
 
 void LLViewerParcelMgr::startSellLand()
 {
-        LLFloaterSellLand::sellLand(getSelectionRegion(), mParcel);
+        LLFloaterSellLand::sellLand(getSelectionRegion(), mCurrentParcelSelection);
 }
 
 void LLViewerParcelMgr::startDivideLand()
@@ -2307,7 +2264,7 @@ void LLViewerParcelMgr::startDivideLand()
                 return;
         }
 
-        if (mWholeParcelSelected)
+        if (mCurrentParcelSelection->mWholeParcelSelected)
         {
                 gViewerWindow->alertXml("CannotDivideLandPartialSelection");
                 return;
@@ -2359,13 +2316,13 @@ void LLViewerParcelMgr::startJoinLand()
                 return;
         }
 
-        if (mWholeParcelSelected)
+        if (mCurrentParcelSelection->mWholeParcelSelected)
         {
                 gViewerWindow->alertXml("CannotJoinLandEntireParcelSelected");
                 return;
         }
 
-        if (!mSelectedMultipleOwners)
+        if (!mCurrentParcelSelection->mSelectedMultipleOwners)
         {
                 gViewerWindow->alertXml("CannotJoinLandSelection");
                 return;
@@ -2411,7 +2368,7 @@ void LLViewerParcelMgr::callbackJoinLand(S32 option, void* data)
 
 void LLViewerParcelMgr::startDeedLandToGroup()
 {
-        if (!mSelected || !mParcel)
+        if (!mSelected || !mCurrentParcel)
         {
                 gViewerWindow->alertXml("CannotDeedLandNothingSelected");
                 return;
@@ -2441,7 +2398,7 @@ void LLViewerParcelMgr::startDeedLandToGroup()
         if(!gAgent.isGodlike())
         {
                 if((region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
-                        && (mParcel->getOwnerID() != region->getOwner()))
+                        && (mCurrentParcel->getOwnerID() != region->getOwner()))
                 {
                         LLStringBase<char>::format_map_t args;
                         args["[REGION]"] = region->getName();
@@ -2455,7 +2412,7 @@ void LLViewerParcelMgr::startDeedLandToGroup()
 }
 void LLViewerParcelMgr::reclaimParcel()
 {
-        LLParcel* parcel = gParcelMgr->getSelectedParcel();
+        LLParcel* parcel = gParcelMgr->getParcelSelection()->getParcel();
         LLViewerRegion* regionp = gParcelMgr->getSelectionRegion();
         if(parcel && parcel->getOwnerID().notNull()
            && (parcel->getOwnerID() != gAgent.getID())
@@ -2484,7 +2441,7 @@ void LLViewerParcelMgr::releaseAlertCB(S32 option, void *)
 
 void LLViewerParcelMgr::buyPass()
 {
-        LLParcel* parcel = getSelectedParcel();
+        LLParcel* parcel = getParcelSelection()->getParcel();
         if (!parcel) return;
 
         LLViewerRegion* region = getSelectionRegion();
@@ -2578,3 +2535,58 @@ void sanitize_corners(const LLVector3d &corner1,
         east_north_top.mdV[VZ] = llmax( corner1.mdV[VZ], corner2.mdV[VZ] );
 }
 
+//
+// LLParcelSelection
+//
+LLParcelSelection::LLParcelSelection() : 
+        mParcel(NULL),
+        mSelectedMultipleOwners(FALSE),
+        mWholeParcelSelected(FALSE),
+        mSelectedSelfCount(0),
+        mSelectedOtherCount(0),
+        mSelectedPublicCount(0)
+{
+}
+
+LLParcelSelection::LLParcelSelection(LLParcel* parcel)  : 
+        mParcel(parcel),
+        mSelectedMultipleOwners(FALSE),
+        mWholeParcelSelected(FALSE),
+        mSelectedSelfCount(0),
+        mSelectedOtherCount(0),
+        mSelectedPublicCount(0)
+{
+}
+
+LLParcelSelection::~LLParcelSelection()
+{
+}
+
+BOOL LLParcelSelection::getMultipleOwners() const
+{
+        return mSelectedMultipleOwners;
+}
+
+
+BOOL LLParcelSelection::getWholeParcelSelected() const
+{
+        return mWholeParcelSelected;
+}
+
+
+S32 LLParcelSelection::getClaimableArea() const
+{
+        const S32 UNIT_AREA = S32( PARCEL_GRID_STEP_METERS * PARCEL_GRID_STEP_METERS );
+        return mSelectedPublicCount * UNIT_AREA;
+}
+
+bool LLParcelSelection::hasOthersSelected() const
+{
+        return mSelectedOtherCount != 0;
+}
+
+LLParcelSelection* get_null_parcel_selection()
+{
+        static LLParcelSelectionHandle null_ptr = new LLParcelSelection();
+        return null_ptr;
+}
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index 781ba15..c970611 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -68,15 +68,56 @@ public:
         virtual void changed() = 0;
 };
 
+class LLParcelSelection : public LLRefCount
+{
+        friend class LLViewerParcelMgr;
+
+public:
+        LLParcelSelection(LLParcel* parcel);
+        LLParcelSelection();
+
+        ~LLParcelSelection();
+
+        // this can return NULL at any time, as parcel selection
+        // might have been invalidated.
+        LLParcel* getParcel() { return mParcel; }
+
+        // Return the number of grid units that are owned by you within
+        // the selection (computed by server).
+        S32 getSelfCount() const { return mSelectedSelfCount; }
+
+        // Returns area that will actually be claimed in meters squared.
+        S32             getClaimableArea() const;
+        bool    hasOthersSelected() const;
+
+        // Does the selection have multiple land owners in it?
+        BOOL    getMultipleOwners() const;
+
+        // Is the entire parcel selected, or just a part?
+        BOOL    getWholeParcelSelected() const;
+
+protected:
+        void setParcel(LLParcel* parcel) { mParcel = parcel; }
+
+protected:
+
+        LLParcel*       mParcel;
+        BOOL            mSelectedMultipleOwners;
+        BOOL            mWholeParcelSelected;
+        S32                     mSelectedSelfCount;
+        S32                     mSelectedOtherCount;
+        S32                     mSelectedPublicCount;
+};
+
+typedef LLHandle<LLParcelSelection> LLParcelSelectionHandle;
+
 class LLViewerParcelMgr
 {
+
 public:
         LLViewerParcelMgr();
         ~LLViewerParcelMgr();
 
-        void    destroyGL();
-        void    restoreGL();
-
         BOOL    selectionEmpty() const;
         F32             getSelectionWidth() const       { return F32(mEastNorth.mdV[VX] - mWestSouth.mdV[VX]); }
         F32             getSelectionHeight() const      { return F32(mEastNorth.mdV[VY] - mWestSouth.mdV[VY]); }
@@ -87,16 +128,6 @@ public:
 
         void    getPrimInfo(S32 &sw_max, S32 &sw_total, S32 &max, S32 &total, S32 &owner, S32 &group, S32 &other, S32& selected, F32 &parcel_object_bonus, S32 &other_clean);
 
-        // Does the selection have multiple land owners in it?
-        BOOL    getMultipleOwners() const;
-
-        // Is the entire parcel selected, or just a part?
-        BOOL    getWholeParcelSelected() const;
-
-        // Returns area that will actually be claimed in meters squared.
-        S32             getClaimableArea() const;
-        bool    hasOthersSelected() const;
-
         // Returns selected area
         S32 getSelectedArea() const;
 
@@ -115,18 +146,19 @@ public:
         void selectCollisionParcel();
 
         // Select the parcel at a specific point
-        void selectParcelAt(const LLVector3d& pos_global);
+        LLHandle<LLParcelSelection> selectParcelAt(const LLVector3d& pos_global);
 
         // Take the current rectangle select, and select the parcel contained
         // within it.
-        void selectParcelInRectangle();
+        LLParcelSelectionHandle selectParcelInRectangle();
 
         // Select a piece of land
-        void    selectLand(const LLVector3d &corner1, const LLVector3d &corner2, 
+        LLParcelSelectionHandle selectLand(const LLVector3d &corner1, const LLVector3d &corner2, 
                                            BOOL snap_to_parcel);
 
         // Clear the selection, and stop drawing the highlight.
         void    deselectLand();
+        void    deselectUnused();
 
         void addObserver(LLParcelObserver* observer);
         void removeObserver(LLParcelObserver* observer);
@@ -141,15 +173,23 @@ public:
 
         BOOL    canHearSound(const LLVector3d &pos_global) const;
 
-        LLParcel *getSelectedParcel() const;
+        // Returns a reference counted pointer to current parcel selection.  
+        // Selection does not change to reflect new selections made by user
+        // Use this when implementing a task UI that refers to a specific
+        // selection.
+        LLParcelSelectionHandle getParcelSelection() const;
+
+        // Returns a reference counted pointer to current parcel selection.
+        // Pointer tracks whatever the user has currently selected.
+        // Use this when implementing an inspector UI.
+        // http://en.wikipedia.org/wiki/Inspector_window
+        LLParcelSelectionHandle getFloatingParcelSelection() const;
+
+        //LLParcel *getParcelSelection() const;
         LLParcel *getAgentParcel() const;
 
         BOOL    inAgentParcel(const LLVector3d &pos_global) const;
 
-        // Return the number of grid units that are owned by you within
-        // the selection (computed by server).
-        S32 getSelfCount() const { return mSelectedSelfCount; }
-
         // Returns a pointer only when it has valid data.
         LLParcel*       getHoverParcel() const;
 
@@ -191,7 +231,7 @@ public:
         // containing the southwest corner of the selection.
         // If want_reply_to_update, simulator will send back a ParcelProperties
         // message.
-        void    sendParcelPropertiesUpdate(LLParcel* parcel, BOOL want_reply_to_update);
+        void    sendParcelPropertiesUpdate(LLParcel* parcel);
 
         // Takes an Access List flag, like AL_ACCESS or AL_BAN
         void    sendParcelAccessListUpdate(U32 which);
@@ -284,26 +324,23 @@ protected:
         //void  finishClaim(BOOL user_to_user_sale, U32 join);
 
 private:
-        BOOL            mSelected;
-        BOOL            mSelectedMultipleOwners;
-        BOOL            mWholeParcelSelected;
-        S32                     mSelectedSelfCount;
-        S32                     mSelectedOtherCount;
-        S32                     mSelectedPublicCount;
+        BOOL                                            mSelected;
 
-        LLParcel        *mParcel;                       // selected parcel info
-        S32                     mRequestResult;         // result of last parcel request
-        LLVector3d      mWestSouth;
-        LLVector3d      mEastNorth;
-        F32                     mSelectedDwell;
+        LLParcel*                                       mCurrentParcel;                 // selected parcel info
+        LLParcelSelectionHandle         mCurrentParcelSelection;
+        LLParcelSelectionHandle         mFloatingParcelSelection;
+        S32                                                     mRequestResult;         // result of last parcel request
+        LLVector3d                                      mWestSouth;
+        LLVector3d                                      mEastNorth;
+        F32                                                     mSelectedDwell;
 
-        LLParcel        *mAgentParcel;          // info for parcel agent is in
-        S32                     mAgentParcelSequenceID; // incrementing counter to suppress out of order updates
+        LLParcel                                        *mAgentParcel;          // info for parcel agent is in
+        S32                                                     mAgentParcelSequenceID; // incrementing counter to suppress out of order updates
 
-        LLParcel*       mHoverParcel;
-        S32                     mHoverRequestResult;
-        LLVector3d      mHoverWestSouth;
-        LLVector3d      mHoverEastNorth;
+        LLParcel*                                       mHoverParcel;
+        S32                                                     mHoverRequestResult;
+        LLVector3d                                      mHoverWestSouth;
+        LLVector3d                                      mHoverEastNorth;
 
         LLDynamicArray<LLParcelObserver*> mObservers;
 
@@ -312,30 +349,30 @@ private:
         // we can represent edges of the grid.
         // WEST_MASK = draw west edge
         // SOUTH_MASK = draw south edge
-        S32                     mParcelsPerEdge;
-        U8*                     mHighlightSegments;
-        U8*                     mAgentParcelOverlay;
+        S32                                                     mParcelsPerEdge;
+        U8*                                                     mHighlightSegments;
+        U8*                                                     mAgentParcelOverlay;
 
         // Raw data buffer for unpacking parcel overlay chunks
         // Size = parcels_per_edge * parcels_per_edge / parcel_overlay_chunks
-        static U8* sPackedOverlay;
+        static U8*                                      sPackedOverlay;
 
         // Watch for pending collisions with a parcel you can't access.
         // If it's coming, draw the parcel's boundaries.
-        LLParcel*               mCollisionParcel;
-        U8*                             mCollisionSegments;
-        BOOL                    mRenderCollision; 
-        BOOL                    mRenderSelection;
-        S32                             mCollisionBanned;     
-        LLFrameTimer    mCollisionTimer;
-        LLUUID                  mBlockedImageID;
-        LLUUID                  mPassImageID;
-        LLPointer<LLViewerImage> mBlockedImage;
-        LLPointer<LLViewerImage> mPassImage;
+        LLParcel*                                       mCollisionParcel;
+        U8*                                                     mCollisionSegments;
+        BOOL                                            mRenderCollision; 
+        BOOL                                            mRenderSelection;
+        S32                                                     mCollisionBanned;     
+        LLFrameTimer                            mCollisionTimer;
+        LLUUID                                          mBlockedImageID;
+        LLUUID                                          mPassImageID;
+        LLPointer<LLViewerImage>        mBlockedImage;
+        LLPointer<LLViewerImage>        mPassImage;
 
         // Media
-        S32 mMediaParcelId;
-        U64 mMediaRegionId;
+        S32                                             mMediaParcelId;
+        U64                                             mMediaRegionId;
 };
 
 extern LLViewerParcelMgr *gParcelMgr;
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index 91159f0..36a4449 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -293,7 +293,7 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay)
         S32     size    = mParcelGridsPerEdge * mParcelGridsPerEdge;
         S32 chunk_size = size / PARCEL_OVERLAY_CHUNKS;
 
-        memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size);
+        memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size);              /*Flawfinder: ignore*/
 
         // Force property lines and overlay texture to update
         setDirty();
@@ -780,27 +780,6 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
         const S32 GRID_STEP = S32( PARCEL_GRID_STEP_METERS );
         const S32 vertex_per_edge = 3 + 2 * (GRID_STEP-1) + 3;
 
-        /* JC - Don't do this.  Unbinding AGP stalls the draw process,
-        dropping frame rate.  Not unbinding AGP causes random crashes
-        on nVidia cards due to binding non-AGP arrays.
-
-        gPipeline.unbindAGP();
-        glEnableClientState(GL_VERTEX_ARRAY);
-        glEnableClientState(GL_COLOR_ARRAY);
-        glVertexPointer(3, GL_FLOAT,         0, mVertexArray );
-        glColorPointer( 4, GL_UNSIGNED_BYTE, 0, mColorArray );
-
-        S32 i;
-        for (i = 0; i < mVertexCount; i += vertex_per_edge)
-        {
-                // Each edge is several vertices
-                glDrawArrays(GL_LINE_STRIP, i, vertex_per_edge);
-        }
-        
-        glDisableClientState(GL_COLOR_ARRAY);
-        glDisableClientState(GL_VERTEX_ARRAY);
-        */
-
         // Stomp the camera into two dimensions
         LLVector3 camera_region = mRegion->getPosRegionFromGlobal( gAgent.getCameraPositionGlobal() );
 
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index be2c90f..2658e67 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -32,6 +32,7 @@
 #include "llviewercontrol.h"
 
 #include "llagent.h"
+#include "llviewercamera.h"
 #include "llviewerobjectlist.h"
 #include "llviewerpartsource.h"
 #include "llviewerregion.h"
@@ -41,7 +42,7 @@
 
 const S32 MAX_PART_COUNT = 4096;
 
-const F32 PART_SIM_BOX_SIDE = 32.f;
+const F32 PART_SIM_BOX_SIDE = 16.f;
 const F32 PART_SIM_BOX_OFFSET = 0.5f*PART_SIM_BOX_SIDE;
 const F32 PART_SIM_BOX_RAD = 0.5f*F_SQRT3*PART_SIM_BOX_SIDE;
 
@@ -52,18 +53,28 @@ S32 LLViewerPartSim::sParticleCount = 0;
 
 U32 LLViewerPart::sNextPartID = 1;
 
+F32 calc_desired_size(LLVector3 pos, LLVector2 scale)
+{
+        F32 desired_size = (pos-gCamera->getOrigin()).magVec();
+        desired_size /= 4;
+        return llclamp(desired_size, scale.magVec()*0.5f, PART_SIM_BOX_SIDE*2);
+}
+
 LLViewerPart::LLViewerPart()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartSourcep = NULL;
 }
 
 LLViewerPart::~LLViewerPart()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartSourcep = NULL;
 }
 
 LLViewerPart &LLViewerPart::operator=(const LLViewerPart &part)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartID = part.mPartID;
         mFlags = part.mFlags;
         mMaxAge = part.mMaxAge;
@@ -93,6 +104,7 @@ LLViewerPart &LLViewerPart::operator=(const LLViewerPart &part)
 
 void LLViewerPart::init(LLViewerPartSource *sourcep, LLViewerImage *imagep, LLVPCallback cb)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartID = LLViewerPart::sNextPartID;
         LLViewerPart::sNextPartID++;
         mFlags = 0x00f;
@@ -115,8 +127,13 @@ void LLViewerPart::init(LLViewerPartSource *sourcep, LLViewerImage *imagep, LLVP
 
 LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 box_side)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mVOPartGroupp = NULL;
+        mUniformParticles = TRUE;
+
         mRegionp = gWorldPointer->getRegionFromPosAgent(center_agent);
+        llassert_always(center_agent.isFinite());
+        
         if (!mRegionp)
         {
                 //llwarns << "No region at position, using agent region!" << llendl;
@@ -125,28 +142,39 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 bo
         mCenterAgent = center_agent;
         mBoxRadius = F_SQRT3*box_side*0.5f;
 
-        LLVector3 rad_vec(box_side*0.5f, box_side*0.5f, box_side*0.5f);
-        rad_vec += LLVector3(0.001f, 0.001f, 0.001f);
-        mMinObjPos = mCenterAgent - rad_vec;
-        mMaxObjPos = mCenterAgent + rad_vec;
+        mVOPartGroupp = (LLVOPartGroup *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_PART_GROUP, getRegion());
+        mVOPartGroupp->setViewerPartGroup(this);
+        mVOPartGroupp->setPositionAgent(getCenterAgent());
+        F32 scale = box_side * 0.5f;
+        mVOPartGroupp->setScale(LLVector3(scale,scale,scale));
+        gPipeline.addObject(mVOPartGroupp);
+
+        LLSpatialGroup* group = mVOPartGroupp->mDrawable->getSpatialGroup();
+
+        LLVector3 center(group->mOctreeNode->getCenter());
+        LLVector3 size(group->mOctreeNode->getSize());
+        size += LLVector3(0.01f, 0.01f, 0.01f);
+        mMinObjPos = center - size;
+        mMaxObjPos = center + size;
+
+        static U32 id_seed = 0;
+        mID = ++id_seed;
 }
 
 LLViewerPartGroup::~LLViewerPartGroup()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         cleanup();
-        S32 count = mParticles.count();
-        S32 i;
-
-        for (i = 0; i < count; i++)
-        {
-                mParticles[i].mPartSourcep = NULL;
-        }
-        mParticles.reset();
+        
+        S32 count = (S32) mParticles.size();
+        mParticles.clear();
+        
         LLViewerPartSim::decPartCount(count);
 }
 
 void LLViewerPartGroup::cleanup()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (mVOPartGroupp)
         {
                 if (!mVOPartGroupp->isDead())
@@ -157,8 +185,9 @@ void LLViewerPartGroup::cleanup()
         }
 }
 
-BOOL LLViewerPartGroup::posInGroup(const LLVector3 &pos)
+BOOL LLViewerPartGroup::posInGroup(const LLVector3 &pos, const F32 desired_size)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if ((pos.mV[VX] < mMinObjPos.mV[VX])
                 || (pos.mV[VY] < mMinObjPos.mV[VY])
                 || (pos.mV[VZ] < mMinObjPos.mV[VZ]))
@@ -173,29 +202,33 @@ BOOL LLViewerPartGroup::posInGroup(const LLVector3 &pos)
                 return FALSE;
         }
 
+        if (desired_size > 0 && 
+                (desired_size < mBoxRadius*0.5f ||
+                desired_size > mBoxRadius*2.f))
+        {
+                return FALSE;
+        }
+
         return TRUE;
 }
 
 
-BOOL LLViewerPartGroup::addPart(LLViewerPart &part)
+BOOL LLViewerPartGroup::addPart(LLViewerPart* part, F32 desired_size)
 {
-        if (!posInGroup(part.mPosAgent) || 
-                (mVOPartGroupp.notNull() && (part.mImagep != mVOPartGroupp->getTEImage(0))))
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
+        BOOL uniform_part = part->mScale.mV[0] == part->mScale.mV[1] && 
+                                        !(part->mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK);
+
+        if (!posInGroup(part->mPosAgent, desired_size) ||
+                (mUniformParticles && !uniform_part) ||
+                (!mUniformParticles && uniform_part))
         {
                 return FALSE;
         }
 
-        if (!mVOPartGroupp)
-        {
-                mVOPartGroupp = (LLVOPartGroup *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_PART_GROUP, getRegion());
-                mVOPartGroupp->setViewerPartGroup(this);
-                mVOPartGroupp->setPositionAgent(getCenterAgent());
-                mVOPartGroupp->setScale(LLVector3(PART_SIM_BOX_SIDE, PART_SIM_BOX_SIDE, PART_SIM_BOX_SIDE));
-                mVOPartGroupp->setTEImage(0, part.mImagep);
-                gPipeline.addObject(mVOPartGroupp);
-        }
+        gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
         
-        mParticles.put(part);
+        mParticles.push_back(part);
         LLViewerPartSim::incPartCount(1);
         return TRUE;
 }
@@ -203,33 +236,29 @@ BOOL LLViewerPartGroup::addPart(LLViewerPart &part)
 
 void LLViewerPartGroup::removePart(const S32 part_num)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         // Remove the entry for the particle we just deleted.
-        LLPointer<LLViewerPartSource> ps = mParticles[mParticles.count() - 1].mPartSourcep;
-
-        mParticles[mParticles.count() - 1].mPartSourcep = NULL;
-        mParticles.remove(part_num);
-        if (part_num < mParticles.count())
+        mParticles.erase(mParticles.begin() + part_num);
+        if (mVOPartGroupp.notNull())
         {
-                mParticles[part_num].mPartSourcep = ps;
+                gPipeline.markRebuild(mVOPartGroupp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
         }
-
         LLViewerPartSim::decPartCount(1);
 }
 
-
 void LLViewerPartGroup::updateParticles(const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         S32 i, count;
-
-
+        
         LLVector3 gravity(0.f, 0.f, -9.8f);
 
         LLViewerRegion *regionp = getRegion();
-        count = mParticles.count();
+        count = (S32) mParticles.size();
         for (i = 0; i < count; i++)
         {
                 LLVector3 a(0.f, 0.f, 0.f);
-                LLViewerPart &part = mParticles[i];
+                LLViewerPart& part = *((LLViewerPart*) mParticles[i]);
 
                 // Update current time
                 const F32 cur_time = part.mLastUpdateTime + dt;
@@ -271,8 +300,6 @@ void LLViewerPartGroup::updateParticles(const F32 dt)
 
                         part.mVelocity *= (1.f - step);
                         part.mVelocity += step*delta_pos;
-                        //part.mPosAgent *= 1.f - to_target_frac;
-                        //part.mPosAgent += to_target_frac*part.mPartSourcep->mTargetPosAgent;
                 }
 
 
@@ -341,18 +368,22 @@ void LLViewerPartGroup::updateParticles(const F32 dt)
                         i--;
                         count--;
                 }
-                else if (!posInGroup(part.mPosAgent))
+                else 
                 {
-                        // Transfer particles between groups
-                        gWorldPointer->mPartSim.put(part);
-                        removePart(i);
-                        i--;
-                        count--;
+                        F32 desired_size = calc_desired_size(part.mPosAgent, part.mScale);
+                        if (!posInGroup(part.mPosAgent, desired_size))
+                        {
+                                // Transfer particles between groups
+                                gWorldPointer->mPartSim.put(&part);
+                                removePart(i);
+                                i--;
+                                count--;
+                        }
                 }
         }
 
         // Kill the viewer object if this particle group is empty
-        if (!mParticles.count())
+        if (mParticles.empty())
         {
                 gObjectList.killObject(mVOPartGroupp);
                 mVOPartGroupp = NULL;
@@ -362,15 +393,16 @@ void LLViewerPartGroup::updateParticles(const F32 dt)
 
 void LLViewerPartGroup::shift(const LLVector3 &offset)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mCenterAgent += offset;
         mMinObjPos += offset;
         mMaxObjPos += offset;
 
-        S32 count = mParticles.count();
+        S32 count = (S32) mParticles.size();
         S32 i;
         for (i = 0; i < count; i++)
         {
-                mParticles[i].mPosAgent += offset;
+                mParticles[i]->mPosAgent += offset;
         }
 }
 
@@ -384,34 +416,34 @@ void LLViewerPartGroup::shift(const LLVector3 &offset)
 
 LLViewerPartSim::LLViewerPartSim()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         sMaxParticleCount = gSavedSettings.getS32("RenderMaxPartCount");
+        static U32 id_seed = 0;
+        mID = ++id_seed;
 }
 
 
 LLViewerPartSim::~LLViewerPartSim()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         S32 i;
         S32 count;
 
         // Kill all of the groups (and particles)
-        count = mViewerPartGroups.count();
+        count = (S32) mViewerPartGroups.size();
         for (i = 0; i < count; i++)
         {
                 delete mViewerPartGroups[i];
         }
-        mViewerPartGroups.reset();
+        mViewerPartGroups.clear();
 
         // Kill all of the sources 
-        count = mViewerPartSources.count();
-        for (i = 0; i < count; i++)
-        {
-                mViewerPartSources[i] = NULL;
-        }
-        mViewerPartSources.reset();
+        mViewerPartSources.clear();
 }
 
 BOOL LLViewerPartSim::shouldAddPart()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (sParticleCount > 0.75f*sMaxParticleCount)
         {
 
@@ -432,33 +464,35 @@ BOOL LLViewerPartSim::shouldAddPart()
         return TRUE;
 }
 
-void LLViewerPartSim::addPart(LLViewerPart &part)
+void LLViewerPartSim::addPart(LLViewerPart* part)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (sParticleCount < MAX_PART_COUNT)
         {
                 put(part);
         }
 }
 
-LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart &part)
+
+LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         const F32 MAX_MAG = 1000000.f*1000000.f; // 1 million
-        if (part.mPosAgent.magVecSquared() > MAX_MAG)
+        if (part->mPosAgent.magVecSquared() > MAX_MAG || !part->mPosAgent.isFinite())
         {
-#ifndef LL_RELEASE_FOR_DOWNLOAD
+#if !LL_RELEASE_FOR_DOWNLOAD
                 llwarns << "LLViewerPartSim::put Part out of range!" << llendl;
-                llwarns << part.mPosAgent << llendl;
+                llwarns << part->mPosAgent << llendl;
 #endif
                 return NULL;
         }
+        
+        F32 desired_size = calc_desired_size(part->mPosAgent, part->mScale);
 
-        S32 i;
-        S32 count;
-
-        count = mViewerPartGroups.count();
-        for (i = 0; i < count; i++)
+        S32 count = (S32) mViewerPartGroups.size();
+        for (S32 i = 0; i < count; i++)
         {
-                if (mViewerPartGroups[i]->addPart(part))
+                if (mViewerPartGroups[i]->addPart(part, desired_size))
                 {
                         // We found a spatial group that we fit into, add us and exit
                         return mViewerPartGroups[i];
@@ -467,43 +501,27 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart &part)
 
         // Hmm, we didn't fit in any of the existing spatial groups
         // Create a new one...
-        LLViewerPartGroup *groupp = createViewerPartGroup(part.mPosAgent);
+        llassert_always(part->mPosAgent.isFinite());
+        LLViewerPartGroup *groupp = createViewerPartGroup(part->mPosAgent, desired_size);
+        groupp->mUniformParticles = (part->mScale.mV[0] == part->mScale.mV[1] && 
+                                                        !(part->mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK));
         if (!groupp->addPart(part))
         {
                 llwarns << "LLViewerPartSim::put - Particle didn't go into its box!" << llendl;
                 llinfos << groupp->getCenterAgent() << llendl;
-                llinfos << part.mPosAgent << llendl;
+                llinfos << part->mPosAgent << llendl;
                 return NULL;
         }
         return groupp;
 }
 
-LLViewerPartGroup *LLViewerPartSim::createViewerPartGroup(const LLVector3 &pos_agent)
+LLViewerPartGroup *LLViewerPartSim::createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size)
 {
-        F32 x_origin = ((S32)(pos_agent.mV[VX]/PART_SIM_BOX_SIDE))*PART_SIM_BOX_SIDE;
-        if (x_origin > pos_agent.mV[VX])
-        {
-                x_origin -= PART_SIM_BOX_SIDE;
-        }
-
-        F32 y_origin = ((S32)(pos_agent.mV[VY]/PART_SIM_BOX_SIDE))*PART_SIM_BOX_SIDE;
-        if (y_origin > pos_agent.mV[VY])
-        {
-                y_origin -= PART_SIM_BOX_SIDE;
-        }
-
-        F32 z_origin = ((S32)(pos_agent.mV[VZ]/PART_SIM_BOX_SIDE))*PART_SIM_BOX_SIDE;
-        if (z_origin > pos_agent.mV[VZ])
-        {
-                z_origin -= PART_SIM_BOX_SIDE;
-        }
-
-        LLVector3 group_center(x_origin + PART_SIM_BOX_OFFSET,
-                                                        y_origin + PART_SIM_BOX_OFFSET,
-                                                        z_origin + PART_SIM_BOX_OFFSET);
-
-        LLViewerPartGroup *groupp = new LLViewerPartGroup(group_center, PART_SIM_BOX_SIDE);
-        mViewerPartGroups.put(groupp);
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
+        //find a box that has a center position divisible by PART_SIM_BOX_SIDE that encompasses
+        //pos_agent
+        LLViewerPartGroup *groupp = new LLViewerPartGroup(pos_agent, desired_size);
+        mViewerPartGroups.push_back(groupp);
         return groupp;
 }
 
@@ -513,7 +531,7 @@ void LLViewerPartSim::shift(const LLVector3 &offset)
         S32 i;
         S32 count;
 
-        count = mViewerPartSources.count();
+        count = (S32) mViewerPartSources.size();
         for (i = 0; i < count; i++)
         {
                 mViewerPartSources[i]->mPosAgent += offset;
@@ -521,13 +539,20 @@ void LLViewerPartSim::shift(const LLVector3 &offset)
                 mViewerPartSources[i]->mLastUpdatePosAgent += offset;
         }
 
-        count = mViewerPartGroups.count();
+        count = (S32) mViewerPartGroups.size();
         for (i = 0; i < count; i++)
         {
                 mViewerPartGroups[i]->shift(offset);
         }
 }
 
+S32 dist_rate_func(F32 distance)
+{
+        //S32 dist = (S32) sqrtf(distance);
+        //dist /= 2;
+        //return llmax(dist,1);
+        return 1;
+}
 
 void LLViewerPartSim::updateSimulation()
 {
@@ -542,13 +567,15 @@ void LLViewerPartSim::updateSimulation()
                 return;
         }
 
+        LLFastTimer ftm(LLFastTimer::FTM_SIMULATE_PARTICLES);
+
         // Start at a random particle system so the same
         // particle system doesn't always get first pick at the
         // particles.  Theoretically we'd want to do this in distance
         // order or something, but sorting particle sources will be a big
         // pain.
         S32 i;
-        S32 count = mViewerPartSources.count();
+        S32 count = (S32) mViewerPartSources.size();
         S32 start = (S32)ll_frand((F32)count);
         S32 dir = 1;
         if (ll_frand() > 0.5f)
@@ -570,12 +597,24 @@ void LLViewerPartSim::updateSimulation()
 
                 if (!mViewerPartSources[i]->isDead())
                 {
-                        mViewerPartSources[i]->update(dt);
+                        LLViewerObject* source_object = mViewerPartSources[i]->mSourceObjectp;
+                        if (source_object && source_object->mDrawable.notNull())
+                        {
+                S32 dist = dist_rate_func(source_object->mDrawable->mDistanceWRTCamera);
+                                if ((LLDrawable::getCurrentFrame()+mViewerPartSources[i]->mID)%dist == 0)
+                                {
+                                        mViewerPartSources[i]->update(dt*dist);
+                                }
+                        }
+                        else
+                        {
+                                mViewerPartSources[i]->update(dt);
+                        }
                 }
 
                 if (mViewerPartSources[i]->isDead())
                 {
-                        mViewerPartSources.remove(i);
+                        mViewerPartSources.erase(mViewerPartSources.begin() + i);
                         count--;
                 }
                 else
@@ -586,16 +625,36 @@ void LLViewerPartSim::updateSimulation()
         }
 
 
-        count = mViewerPartGroups.count();
+        count = (S32) mViewerPartGroups.size();
         for (i = 0; i < count; i++)
         {
-                mViewerPartGroups[i]->updateParticles(dt);
-                if (!mViewerPartGroups[i]->getCount())
+                LLViewerObject* vobj = mViewerPartGroups[i]->mVOPartGroupp;
+
+                S32 dist = vobj && !vobj->mDrawable->isState(LLDrawable::IN_REBUILD_Q1) ? 
+                                dist_rate_func(vobj->mDrawable->mDistanceWRTCamera) : 1;
+                if (vobj)
                 {
-                        delete mViewerPartGroups[i];
-                        mViewerPartGroups.remove(i);
-                        i--;
-                        count--;
+                        LLSpatialGroup* group = vobj->mDrawable->getSpatialGroup();
+                        if (group && !group->isVisible()) // && !group->isState(LLSpatialGroup::OBJECT_DIRTY))
+                        {
+                                dist *= 8;
+                        }
+                }
+
+                if ((LLDrawable::getCurrentFrame()+mViewerPartGroups[i]->mID)%dist == 0)
+                {
+                        if (vobj)
+                        {
+                                gPipeline.markRebuild(vobj->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+                        }
+                        mViewerPartGroups[i]->updateParticles(dt*dist);
+                        if (!mViewerPartGroups[i]->getCount())
+                        {
+                                delete mViewerPartGroups[i];
+                                mViewerPartGroups.erase(mViewerPartGroups.begin() + i);
+                                i--;
+                                count--;
+                        }
                 }
         }
         //llinfos << "Particles: " << sParticleCount << llendl;
@@ -604,42 +663,40 @@ void LLViewerPartSim::updateSimulation()
 
 void LLViewerPartSim::addPartSource(LLViewerPartSource *sourcep)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!sourcep)
         {
                 llwarns << "Null part source!" << llendl;
                 return;
         }
-        mViewerPartSources.put(sourcep);
+        mViewerPartSources.push_back(sourcep);
 }
 
 
 void LLViewerPartSim::cleanupRegion(LLViewerRegion *regionp)
 {
-        S32 i, count;
-        count = mViewerPartGroups.count();
-        for (i = 0; i < count; i++)
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
+        for (group_list_t::iterator i = mViewerPartGroups.begin(); i != mViewerPartGroups.end(); )
         {
-                if (mViewerPartGroups[i]->getRegion() == regionp)
+                group_list_t::iterator iter = i++;
+
+                if ((*iter)->getRegion() == regionp)
                 {
-                        delete mViewerPartGroups[i];
-                        mViewerPartGroups.remove(i);
-                        i--;
-                        count--;
+                        i = mViewerPartGroups.erase(iter);                      
                 }
         }
 }
 
 void LLViewerPartSim::cleanMutedParticles(const LLUUID& task_id)
 {
-        S32 i;
-        S32 count = mViewerPartSources.count();
-        for (i = 0; i < count; ++i)
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
+        for (source_list_t::iterator i = mViewerPartSources.begin(); i != mViewerPartSources.end(); )
         {
-                if (mViewerPartSources[i]->getOwnerUUID() == task_id)
+                source_list_t::iterator iter = i++;
+
+                if ((*iter)->getOwnerUUID() == task_id)
                 {
-                        mViewerPartSources.remove(i);
-                        i--;
-                        count--;
+                        i = mViewerPartSources.erase(iter);                     
                 }
         }
 }
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h
index 7983838..c1ef43b 100644
--- a/linden/indra/newview/llviewerpartsim.h
+++ b/linden/indra/newview/llviewerpartsim.h
@@ -50,7 +50,7 @@ typedef void (*LLVPCallback)(LLViewerPart &part, const F32 dt);
 //
 
 
-class LLViewerPart : public LLPartData
+class LLViewerPart : public LLPartData, public LLRefCount
 {
 public:
         LLViewerPart();
@@ -90,19 +90,26 @@ public:
 
         void cleanup();
 
-        BOOL addPart(LLViewerPart &part);
+        BOOL addPart(LLViewerPart* part, const F32 desired_size = -1.f);
         
         void updateParticles(const F32 dt);
 
-        BOOL posInGroup(const LLVector3 &pos);
+        BOOL posInGroup(const LLVector3 &pos, const F32 desired_size = -1.f);
 
         void shift(const LLVector3 &offset);
 
-        LLDynamicArray<LLViewerPart> mParticles;
+        typedef std::vector<LLPointer<LLViewerPart> > part_list_t;
+        part_list_t mParticles;
 
         const LLVector3 &getCenterAgent() const         { return mCenterAgent; }
-        S32 getCount() const                                    { return mParticles.count(); }
+        S32 getCount() const                                    { return (S32) mParticles.size(); }
         LLViewerRegion *getRegion() const               { return mRegionp; }
+
+        LLPointer<LLVOPartGroup> mVOPartGroupp;
+
+        BOOL mUniformParticles;
+        U32 mID;
+
 protected:
         void removePart(const S32 part_num);
 
@@ -112,11 +119,9 @@ protected:
         LLVector3 mMinObjPos;
         LLVector3 mMaxObjPos;
 
-        LLPointer<LLVOPartGroup> mVOPartGroupp;
         LLViewerRegion *mRegionp;
 };
 
-
 class LLViewerPartSim
 {
 public:
@@ -132,7 +137,7 @@ public:
         void cleanupRegion(LLViewerRegion *regionp);
 
         BOOL shouldAddPart(); // Just decides whether this particle should be added or not (for particle count capping)
-        void addPart(LLViewerPart &part);
+        void addPart(LLViewerPart* part);
         void cleanMutedParticles(const LLUUID& task_id);
 
         friend class LLViewerPartGroup;
@@ -144,15 +149,18 @@ public:
         static void incPartCount(const S32 count)                       { sParticleCount += count; }
         static void decPartCount(const S32 count)                       { sParticleCount -= count; }
         
+        U32 mID;
+
 protected:
-        LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent);
-        LLViewerPartGroup *put(LLViewerPart &part);
+        LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size);
+        LLViewerPartGroup *put(LLViewerPart* part);
 
 protected:
-        LLDynamicArray<LLViewerPartGroup *> mViewerPartGroups;
-        LLDynamicArrayPtr<LLPointer<LLViewerPartSource> > mViewerPartSources;
+        typedef std::vector<LLViewerPartGroup *> group_list_t;
+        typedef std::vector<LLPointer<LLViewerPartSource> > source_list_t;
+        group_list_t mViewerPartGroups;
+        source_list_t mViewerPartSources;
         LLFrameTimer mSimulationTimer;
-
         static S32 sMaxParticleCount;
         static S32 sParticleCount;
 };
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index 39869e2..33e6df4 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -37,6 +37,7 @@
 #include "llviewerobjectlist.h"
 #include "llvoavatar.h"
 #include "llworld.h"
+#include "pipeline.h"
 
 LLViewerPartSource::LLViewerPartSource(const U32 type) :
         mType(type),
@@ -45,6 +46,8 @@ LLViewerPartSource::LLViewerPartSource(const U32 type) :
         mLastUpdateTime = 0.f;
         mLastPartTime = 0.f;
         mIsDead = FALSE;
+        static U32 id_seed = 0;
+        mID = ++id_seed;
 }
 
 void LLViewerPartSource::setDead()
@@ -67,6 +70,7 @@ void LLViewerPartSource::update(const F32 dt)
 LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) :
         LLViewerPartSource(LL_PART_SOURCE_SCRIPT)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         llassert(source_objp);
         mSourceObjectp = source_objp;
         mPosAgent = mSourceObjectp->getPositionAgent();
@@ -80,18 +84,18 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp)
 
 void LLViewerPartSourceScript::setDead()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mIsDead = TRUE;
         mSourceObjectp = NULL;
         mTargetObjectp = NULL;
 }
 
-
-
 void LLViewerPartSourceScript::update(const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         F32 old_update_time = mLastUpdateTime;
         mLastUpdateTime += dt;
-
+        
         F32 dt_update = mLastUpdateTime - mLastPartTime;
 
         // Update this for objects which have the follow flag set...
@@ -142,6 +146,17 @@ void LLViewerPartSourceScript::update(const F32 dt)
                 return;
         }
 
+
+        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PARTICLES))
+        {
+                if (mSourceObjectp.notNull())
+                {
+                        std::ostringstream ostr;
+                        ostr << mPartSysData;
+                        mSourceObjectp->setDebugText(ostr.str());
+                }
+        }
+
         BOOL first_run = FALSE;
         if (old_update_time <= 0.f)
         {
@@ -153,21 +168,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
         while ((dt_update > mPartSysData.mBurstRate) || first_run)
         {
                 first_run = FALSE;
-                LLViewerPart part;
-
-                part.init(this, mImagep, NULL);
-                part.mFlags = mPartSysData.mPartData.mFlags;
-                part.mMaxAge = mPartSysData.mPartData.mMaxAge;
-                part.mStartColor = mPartSysData.mPartData.mStartColor;
-                part.mEndColor = mPartSysData.mPartData.mEndColor;
-                part.mColor = part.mStartColor;
-
-                part.mStartScale = mPartSysData.mPartData.mStartScale;
-                part.mEndScale = mPartSysData.mPartData.mEndScale;
-                part.mScale = part.mStartScale;
-
-                part.mAccel = mPartSysData.mPartAccel;
-
+                
                 // Update the rotation of the particle source by the angular velocity
                 // First check to see if there is still an angular velocity.
                 F32 angular_velocity_mag = mPartSysData.mAngularVelocity.magVec();
@@ -200,14 +201,29 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 continue;
                         }
 
+                        LLPointer<LLViewerPart> part = new LLViewerPart();
+
+                        part->init(this, mImagep, NULL);
+                        part->mFlags = mPartSysData.mPartData.mFlags;
+                        part->mMaxAge = mPartSysData.mPartData.mMaxAge;
+                        part->mStartColor = mPartSysData.mPartData.mStartColor;
+                        part->mEndColor = mPartSysData.mPartData.mEndColor;
+                        part->mColor = part->mStartColor;
+
+                        part->mStartScale = mPartSysData.mPartData.mStartScale;
+                        part->mEndScale = mPartSysData.mPartData.mEndScale;
+                        part->mScale = part->mStartScale;
+
+                        part->mAccel = mPartSysData.mPartAccel;
+
                         if (mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_DROP)
                         {
-                                part.mPosAgent = mPosAgent;
-                                part.mVelocity.setVec(0.f, 0.f, 0.f);
+                                part->mPosAgent = mPosAgent;
+                                part->mVelocity.setVec(0.f, 0.f, 0.f);
                         }
                         else if (mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE)
                         {
-                                part.mPosAgent = mPosAgent;
+                                part->mPosAgent = mPosAgent;
                                 LLVector3 part_dir_vector;
 
                                 F32 mvs;
@@ -221,19 +237,18 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 while ((mvs > 1.f) || (mvs < 0.01f));
 
                                 part_dir_vector.normVec();
-                                part.mPosAgent += mPartSysData.mBurstRadius*part_dir_vector;
-                                part.mVelocity = part_dir_vector;
+                                part->mPosAgent += mPartSysData.mBurstRadius*part_dir_vector;
+                                part->mVelocity = part_dir_vector;
                                 F32 speed = mPartSysData.mBurstSpeedMin + ll_frand(mPartSysData.mBurstSpeedMax - mPartSysData.mBurstSpeedMin);
-                                part.mVelocity *= speed;
+                                part->mVelocity *= speed;
                         }
                         else if (mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_ANGLE
                                 || mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE)
-                        {
-                                part.mPosAgent = mPosAgent;
+                        {                               
+                                part->mPosAgent = mPosAgent;
                                 
                                 // original implemenetation for part_dir_vector was just:                                       
                                 LLVector3 part_dir_vector(0.0, 0.0, 1.0);
-
                                 // params from the script...
                                 // outer = outer cone angle
                                 // inner = inner cone angle
@@ -243,13 +258,11 @@ void LLViewerPartSourceScript::update(const F32 dt)
 
                                 // generate a random angle within the given space...
                                 F32 angle = innerAngle + ll_frand(outerAngle - innerAngle);
-
                                 // split which side it will go on randomly...
                                 if (ll_frand() < 0.5) 
                                 {
                                         angle = -angle;
                                 }
-                                
                                 // Both patterns rotate around the x-axis first:
                                 part_dir_vector.rotVec(angle, 1.0, 0.0, 0.0);
 
@@ -258,31 +271,32 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                 {
                                         part_dir_vector.rotVec(ll_frand(4*F_PI), 0.0, 0.0, 1.0);
                                 }
-                                        
+                                                                
                                 // Only apply this rotation if using the deprecated angles. 
                                 if (! (mPartSysData.mFlags & LLPartSysData::LL_PART_USE_NEW_ANGLE))
                                 {
                                         // Deprecated...
                                         part_dir_vector.rotVec(outerAngle, 1.0, 0.0, 0.0);
                                 }
-
+                                
                                 if (mSourceObjectp)
                                 {
                                         part_dir_vector = part_dir_vector * mSourceObjectp->getRenderRotation();
                                 }
+                                                                
                                 part_dir_vector = part_dir_vector * mRotation;
+                                                                
+                                part->mPosAgent += mPartSysData.mBurstRadius*part_dir_vector;
 
-                                part.mPosAgent += mPartSysData.mBurstRadius*part_dir_vector;
-
-                                part.mVelocity = part_dir_vector;
+                                part->mVelocity = part_dir_vector;
 
                                 F32 speed = mPartSysData.mBurstSpeedMin + ll_frand(mPartSysData.mBurstSpeedMax - mPartSysData.mBurstSpeedMin);
-                                part.mVelocity *= speed;
+                                part->mVelocity *= speed;
                         }
                         else
                         {
-                                part.mPosAgent = mPosAgent;
-                                part.mVelocity.setVec(0.f, 0.f, 0.f);
+                                part->mPosAgent = mPosAgent;
+                                part->mVelocity.setVec(0.f, 0.f, 0.f);
                                 //llwarns << "Unknown source pattern " << (S32)mPartSysData.mPattern << llendl;
                         }
 
@@ -297,6 +311,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
 // static
 LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, const S32 block_num)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!pssp)
         {
                 if (LLPartSysData::isNullPS(block_num))
@@ -338,6 +353,7 @@ LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *so
 
 LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *source_objp, LLViewerPartSourceScript *pssp, LLDataPacker &dp)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!pssp)
         {
                 LLViewerPartSourceScript *new_pssp = new LLViewerPartSourceScript(source_objp);
@@ -369,11 +385,13 @@ LLViewerPartSourceScript *LLViewerPartSourceScript::unpackPSS(LLViewerObject *so
 
 void LLViewerPartSourceScript::setImage(LLViewerImage *imagep)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mImagep = imagep;
 }
 
 void LLViewerPartSourceScript::setTargetObject(LLViewerObject *objp)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mTargetObjectp = objp;
 }
 
@@ -389,6 +407,7 @@ LLViewerPartSourceSpiral::LLViewerPartSourceSpiral(const LLVector3 &pos) :
 
 void LLViewerPartSourceSpiral::setDead()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mIsDead = TRUE;
         mSourceObjectp = NULL;
 }
@@ -396,6 +415,7 @@ void LLViewerPartSourceSpiral::setDead()
 
 void LLViewerPartSourceSpiral::updatePart(LLViewerPart &part, const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         F32 frac = part.mLastUpdateTime/part.mMaxAge;
 
         LLVector3 center_pos;
@@ -420,6 +440,7 @@ void LLViewerPartSourceSpiral::updatePart(LLViewerPart &part, const F32 dt)
 
 void LLViewerPartSourceSpiral::update(const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!mImagep)
         {
                 LLUUID id;
@@ -448,18 +469,18 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
                 {
                         mPosAgent = mSourceObjectp->getRenderPosition();
                 }
-                LLViewerPart part;
-                part.init(this, mImagep, updatePart);
-                part.mStartColor = mColor;
-                part.mEndColor = mColor;
-                part.mEndColor.mV[3] = 0.f;
-                part.mPosAgent = mPosAgent;
-                part.mMaxAge = 1.f;
-                part.mFlags = LLViewerPart::LL_PART_INTERP_COLOR_MASK;
-                part.mLastUpdateTime = 0.f;
-                part.mScale.mV[0] = 0.25f;
-                part.mScale.mV[1] = 0.25f;
-                part.mParameter = ll_frand(F_TWO_PI);
+                LLPointer<LLViewerPart> part = new LLViewerPart();
+                part->init(this, mImagep, updatePart);
+                part->mStartColor = mColor;
+                part->mEndColor = mColor;
+                part->mEndColor.mV[3] = 0.f;
+                part->mPosAgent = mPosAgent;
+                part->mMaxAge = 1.f;
+                part->mFlags = LLViewerPart::LL_PART_INTERP_COLOR_MASK;
+                part->mLastUpdateTime = 0.f;
+                part->mScale.mV[0] = 0.25f;
+                part->mScale.mV[1] = 0.25f;
+                part->mParameter = ll_frand(F_TWO_PI);
 
                 gWorldPointer->mPartSim.addPart(part);
         }
@@ -467,6 +488,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
 
 void LLViewerPartSourceSpiral::setSourceObject(LLViewerObject *objp)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mSourceObjectp = objp;
 }
 
@@ -490,6 +512,7 @@ LLViewerPartSourceBeam::~LLViewerPartSourceBeam()
 
 void LLViewerPartSourceBeam::setDead()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mIsDead = TRUE;
         mSourceObjectp = NULL;
         mTargetObjectp = NULL;
@@ -503,6 +526,7 @@ void LLViewerPartSourceBeam::setColor(const LLColor4 &color)
 
 void LLViewerPartSourceBeam::updatePart(LLViewerPart &part, const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         F32 frac = part.mLastUpdateTime/part.mMaxAge;
 
         LLViewerPartSource *ps = (LLViewerPartSource*)part.mPartSourcep;
@@ -547,7 +571,7 @@ void LLViewerPartSourceBeam::updatePart(LLViewerPart &part, const F32 dt)
 
 void LLViewerPartSourceBeam::update(const F32 dt)
 {
-
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         const F32 RATE = 0.025f;
 
         mLastUpdateTime += dt;
@@ -595,25 +619,25 @@ void LLViewerPartSourceBeam::update(const F32 dt)
                         mImagep = gImageList.getImage(id);
                 }
 
-                LLViewerPart part;
-                part.init(this, mImagep, NULL);
+                LLPointer<LLViewerPart> part = new LLViewerPart();
+                part->init(this, mImagep, NULL);
 
-                part.mFlags = LLPartData::LL_PART_INTERP_COLOR_MASK |
+                part->mFlags = LLPartData::LL_PART_INTERP_COLOR_MASK |
                                                 LLPartData::LL_PART_INTERP_SCALE_MASK |
                                                 LLPartData::LL_PART_TARGET_POS_MASK |
                                                 LLPartData::LL_PART_FOLLOW_VELOCITY_MASK;
-                part.mMaxAge = 0.5f;
-                part.mStartColor = mColor;
-                part.mEndColor = part.mStartColor;
-                part.mEndColor.mV[3] = 0.4f;
-                part.mColor = part.mStartColor;
+                part->mMaxAge = 0.5f;
+                part->mStartColor = mColor;
+                part->mEndColor = part->mStartColor;
+                part->mEndColor.mV[3] = 0.4f;
+                part->mColor = part->mStartColor;
 
-                part.mStartScale = LLVector2(0.1f, 0.1f);
-                part.mEndScale = LLVector2(0.1f, 0.1f);
-                part.mScale = part.mStartScale;
+                part->mStartScale = LLVector2(0.1f, 0.1f);
+                part->mEndScale = LLVector2(0.1f, 0.1f);
+                part->mScale = part->mStartScale;
 
-                part.mPosAgent = mPosAgent;
-                part.mVelocity = mTargetPosAgent - mPosAgent;
+                part->mPosAgent = mPosAgent;
+                part->mVelocity = mTargetPosAgent - mPosAgent;
 
                 gWorldPointer->mPartSim.addPart(part);
         }
@@ -621,11 +645,13 @@ void LLViewerPartSourceBeam::update(const F32 dt)
 
 void LLViewerPartSourceBeam::setSourceObject(LLViewerObject* objp)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mSourceObjectp = objp;
 }
 
 void LLViewerPartSourceBeam::setTargetObject(LLViewerObject* objp)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mTargetObjectp = objp;
 }
 
@@ -640,6 +666,7 @@ LLViewerPartSourceChat::LLViewerPartSourceChat(const LLVector3 &pos) :
 
 void LLViewerPartSourceChat::setDead()
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mIsDead = TRUE;
         mSourceObjectp = NULL;
 }
@@ -647,6 +674,7 @@ void LLViewerPartSourceChat::setDead()
 
 void LLViewerPartSourceChat::updatePart(LLViewerPart &part, const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         F32 frac = part.mLastUpdateTime/part.mMaxAge;
 
         LLVector3 center_pos;
@@ -671,6 +699,7 @@ void LLViewerPartSourceChat::updatePart(LLViewerPart &part, const F32 dt)
 
 void LLViewerPartSourceChat::update(const F32 dt)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         if (!mImagep)
         {
                 LLUUID id;
@@ -709,18 +738,18 @@ void LLViewerPartSourceChat::update(const F32 dt)
                 {
                         mPosAgent = mSourceObjectp->getRenderPosition();
                 }
-                LLViewerPart part;
-                part.init(this, mImagep, updatePart);
-                part.mStartColor = mColor;
-                part.mEndColor = mColor;
-                part.mEndColor.mV[3] = 0.f;
-                part.mPosAgent = mPosAgent;
-                part.mMaxAge = 1.f;
-                part.mFlags = LLViewerPart::LL_PART_INTERP_COLOR_MASK;
-                part.mLastUpdateTime = 0.f;
-                part.mScale.mV[0] = 0.25f;
-                part.mScale.mV[1] = 0.25f;
-                part.mParameter = ll_frand(F_TWO_PI);
+                LLPointer<LLViewerPart> part = new LLViewerPart();
+                part->init(this, mImagep, updatePart);
+                part->mStartColor = mColor;
+                part->mEndColor = mColor;
+                part->mEndColor.mV[3] = 0.f;
+                part->mPosAgent = mPosAgent;
+                part->mMaxAge = 1.f;
+                part->mFlags = LLViewerPart::LL_PART_INTERP_COLOR_MASK;
+                part->mLastUpdateTime = 0.f;
+                part->mScale.mV[0] = 0.25f;
+                part->mScale.mV[1] = 0.25f;
+                part->mParameter = ll_frand(F_TWO_PI);
 
                 gWorldPointer->mPartSim.addPart(part);
         }
@@ -728,6 +757,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
 
 void LLViewerPartSourceChat::setSourceObject(LLViewerObject *objp)
 {
+        LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mSourceObjectp = objp;
 }
 
diff --git a/linden/indra/newview/llviewerpartsource.h b/linden/indra/newview/llviewerpartsource.h
index 66de36b..15f7ba2 100644
--- a/linden/indra/newview/llviewerpartsource.h
+++ b/linden/indra/newview/llviewerpartsource.h
@@ -70,13 +70,16 @@ public:
         LLVector3       mPosAgent; // Location of the particle source
         LLVector3       mTargetPosAgent; // Location of the target position
         LLVector3       mLastUpdatePosAgent;
+        LLPointer<LLViewerObject>       mSourceObjectp;
+        U32 mID;
+
 protected:
         U32                     mType;
         BOOL            mIsDead;
         F32                     mLastUpdateTime;
         F32                     mLastPartTime;
         LLUUID          mOwnerUUID;
-
+        
         // Particle information
         U32                     mPartFlags; // Flags for the particle
 };
@@ -115,7 +118,6 @@ public:
 protected:
         LLQuaternion                            mRotation;                      // Current rotation for particle source
         LLPointer<LLViewerImage>        mImagep;                        // Cached image pointer of the mPartSysData UUID
-        LLPointer<LLViewerObject>       mSourceObjectp;         // Source object that this particle system is attached to
         LLPointer<LLViewerObject>       mTargetObjectp;         // Target object for the particle source
 };
 
@@ -141,7 +143,6 @@ public:
         LLColor4 mColor;
 protected:
         LLPointer<LLViewerImage>        mImagep;
-        LLPointer<LLViewerObject>       mSourceObjectp;
         LLVector3d mLKGSourcePosGlobal;
 };
 
@@ -169,7 +170,6 @@ public:
 
         static void updatePart(LLViewerPart &part, const F32 dt);
         LLPointer<LLViewerImage>        mImagep;
-        LLPointer<LLViewerObject>       mSourceObjectp;
         LLPointer<LLViewerObject>       mTargetObjectp;
         LLVector3d              mLKGTargetPosGlobal;
         LLColor4 mColor;
@@ -199,7 +199,6 @@ public:
         LLColor4 mColor;
 protected:
         LLPointer<LLViewerImage>        mImagep;
-        LLPointer<LLViewerObject>       mSourceObjectp;
         LLVector3d mLKGSourcePosGlobal;
 };
 
diff --git a/linden/indra/newview/llviewerprecompiledheaders.h b/linden/indra/newview/llviewerprecompiledheaders.h
index 5478129..8ba45fc 100644
--- a/linden/indra/newview/llviewerprecompiledheaders.h
+++ b/linden/indra/newview/llviewerprecompiledheaders.h
@@ -82,8 +82,6 @@
 #include "lldqueueptr.h"
 #include "llendianswizzle.h"
 #include "llerror.h"
-#include "llerrorbuffer.h"
-#include "llerrorstream.h"
 #include "llfasttimer.h"
 #include "llfixedbuffer.h"
 #include "llframetimer.h"
@@ -165,7 +163,6 @@
 #include "llcachename.h"
 #include "llcallbacklisth.h"
 #include "llcircuit.h"
-#include "llcrypto.h"
 #include "lldatapacker.h"
 #include "lldbstrings.h"
 #include "lldispatcher.h"
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 9c741b4..88d8a40 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -178,14 +178,14 @@ void LLViewerRegion::loadCache()
 
         LLVOCacheEntry *entry;
 
-        char filename[256];
-        sprintf(filename, "%s%sobjects_%d_%d.slc", 
+        char filename[256];             /* Flawfinder: ignore */
+        snprintf(filename, sizeof(filename), "%s%sobjects_%d_%d.slc",           /* Flawfinder: ignore */
                 gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(), 
                 gDirUtilp->getDirDelimiter().c_str(),
                 U32(mHandle>>32)/REGION_WIDTH_UNITS, 
                 U32(mHandle)/REGION_WIDTH_UNITS );
 
-        FILE *fp = LLFile::fopen(filename, "rb");
+        FILE* fp = LLFile::fopen(filename, "rb");               /* Flawfinder: ignore */
         if (!fp)
         {
                 // might not have a file, which is normal
@@ -259,14 +259,14 @@ void LLViewerRegion::saveCache()
                 return;
         }
 
-        char filename[256];
-        sprintf(filename, "%s%sobjects_%d_%d.slc", 
+        char filename[256];             /* Flawfinder: ignore */
+        snprintf(filename, sizeof(filename), "%s%sobjects_%d_%d.slc",           /* Flawfinder: ignore */
                 gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(), 
                 gDirUtilp->getDirDelimiter().c_str(),
                 U32(mHandle>>32)/REGION_WIDTH_UNITS, 
                 U32(mHandle)/REGION_WIDTH_UNITS );
 
-        FILE *fp = LLFile::fopen(filename, "wb");
+        FILE* fp = LLFile::fopen(filename, "wb");               /* Flawfinder: ignore */
         if (!fp)
         {
                 llwarns << "Unable to write cache file " << filename << llendl;
@@ -500,9 +500,9 @@ char* SIM_ACCESS_STR[] = { "Free Trial",
                                                    "Unknown" };
                                                         
 // static
-const char* LLViewerRegion::accessToString(U8 access)
+const char* LLViewerRegion::accessToString(U8 access)           /* Flawfinder: ignore */
 {
-        switch(access)
+        switch(access)          /* Flawfinder: ignore */
         {
         case SIM_ACCESS_TRIAL:
                 return SIM_ACCESS_STR[0];
@@ -538,13 +538,13 @@ U8 LLViewerRegion::stringToAccess(const char* access_str)
         {
                 access = SIM_ACCESS_MATURE;
         }
-        return access;
+        return access;          /* Flawfinder: ignore */
 }
 
 // static
-const char* LLViewerRegion::accessToShortString(U8 access)
+const char* LLViewerRegion::accessToShortString(U8 access)              /* Flawfinder: ignore */
 {
-        switch(access)
+        switch(access)          /* Flawfinder: ignore */
         {
         case SIM_ACCESS_PG:
                 return "PG";
@@ -594,23 +594,25 @@ void LLViewerRegion::dirtyHeights()
         }
 }
 
-BOOL LLViewerRegion::idleUpdate(LLTimer &timer, const F32 max_time)
+BOOL LLViewerRegion::idleUpdate(F32 max_update_time)
 {
-        BOOL done = mLandp->idleUpdate();
-
+        // did_update returns TRUE if we did at least one significant update
+        BOOL did_update = mLandp->idleUpdate(max_update_time);
+        
         if (mParcelOverlay)
         {
+                // Hopefully not a significant time sink...
                 mParcelOverlay->idleUpdate();
         }
 
-        return done;
+        return did_update;
 }
 
 
 // As above, but forcibly do the update.
 void LLViewerRegion::forceUpdate()
 {
-        mLandp->idleUpdate();
+        mLandp->idleUpdate(0.f);
 
         if (mParcelOverlay)
         {
@@ -845,7 +847,7 @@ LLVector3 LLViewerRegion::getPosAgentFromRegion(const LLVector3 &pos_region) con
 
 LLVector3 LLViewerRegion::getPosRegionFromAgent(const LLVector3 &pos_agent) const
 {
-        return getPosRegionFromGlobal(gAgent.getPosGlobalFromAgent(pos_agent));
+        return pos_agent - getOriginAgent();
 }
 
 F32 LLViewerRegion::getLandHeightRegion(const LLVector3& region_pos)
@@ -916,7 +918,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
 
 LLString LLViewerRegion::getInfoString()
 {
-        char tmp_buf[256];
+        char tmp_buf[256];              /* Flawfinder: ignore */
         LLString info;
         
         info = "Region: ";
@@ -928,7 +930,7 @@ LLString LLViewerRegion::getInfoString()
 
         U32 x, y;
         from_region_handle(getHandle(), &x, &y);
-        sprintf(tmp_buf, "%d:%d", x, y);
+        snprintf(tmp_buf, sizeof(tmp_buf), "%d:%d", x, y);              /* Flawfinder: ignore */
         info += "Handle:";
         info += tmp_buf;
         info += "\n";
@@ -1140,7 +1142,7 @@ void LLViewerRegion::unpackRegionHandshake()
         const S32 SIM_NAME_BUF = 256;
         U32 region_flags;
         U8 sim_access;
-        char sim_name[SIM_NAME_BUF];
+        char sim_name[SIM_NAME_BUF];            /* Flawfinder: ignore */
         LLUUID sim_owner;
         BOOL is_estate_manager;
         F32 water_height;
@@ -1277,8 +1279,20 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         LLSD capabilityNames = LLSD::emptyArray();
         capabilityNames.append("MapLayer");
         capabilityNames.append("MapLayerGod");
-        capabilityNames.append("NewAgentInventory");
+        capabilityNames.append("NewFileAgentInventory");
         capabilityNames.append("EventQueueGet");
+        capabilityNames.append("UpdateGestureAgentInventory");
+        capabilityNames.append("UpdateNotecardAgentInventory");
+        capabilityNames.append("UpdateScriptAgentInventory");
+        capabilityNames.append("UpdateGestureTaskInventory");
+        capabilityNames.append("UpdateNotecardTaskInventory");
+        capabilityNames.append("UpdateScriptTaskInventory");
+        capabilityNames.append("SendPostcard");
+        capabilityNames.append("ViewerStartAuction");
+        capabilityNames.append("ParcelGodReserveForNewbie");
+        capabilityNames.append("SendUserReport");
+        capabilityNames.append("SendUserReportWithScreenshot");
+        capabilityNames.append("RequestTextureDownload");
         LLHTTPClient::post(url, capabilityNames, BaseCapabilitiesComplete::build(this));
 }
 
@@ -1320,3 +1334,16 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
         return iter->second;
 }
 
+void LLViewerRegion::logActiveCapabilities() const
+{
+        CapabilityMap::const_iterator iter;
+        for (iter = mCapabilities.begin(); iter != mCapabilities.end(); iter++)
+        {
+                if (!iter->second.empty())
+                {
+                        // llinfos << "Active capability is " << iter->first << llendl;
+                        llinfos << iter->first << " URL is " << iter->second << llendl;
+                }
+        }
+}
+
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index 76b9aaf..69a8f19 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -162,7 +162,7 @@ public:
         static U8 stringToAccess(const char* access_str);
 
         // Returns "M", "PG", etc.
-        static const char* accessToShortString(U8 access);
+        static const char* accessToShortString(U8 access);              /* Flawfinder: ignore */
 
         // helper function which just makes sure all interested parties
         // can process the message.
@@ -172,7 +172,7 @@ public:
 
         F32     getWidth() const                                                { return mWidth; }
 
-        BOOL idleUpdate(LLTimer &timer, const F32 max_time);
+        BOOL idleUpdate(F32 max_update_time);
 
         // Like idleUpdate, but forces everything to complete regardless of
         // how long it takes.
@@ -188,6 +188,7 @@ public:
         void setSeedCapability(const std::string& url);
         void setCapability(const std::string& name, const std::string& url);
         std::string getCapability(const std::string& name) const;
+        void logActiveCapabilities() const;
 
         const LLHost    &getHost() const                        { return mHost; }
         const U64               &getHandle() const                      { return mHandle; }
diff --git a/linden/indra/newview/llviewerreputation.cpp b/linden/indra/newview/llviewerreputation.cpp
index 8cccb6b..3ee4ab3 100644
--- a/linden/indra/newview/llviewerreputation.cpp
+++ b/linden/indra/newview/llviewerreputation.cpp
@@ -90,7 +90,7 @@ void send_reputation_agent_assign(const LLUUID& rator_id,
                 message.append(" rated you: ");
         }
 
-        if (text && strlen(text) > 0)
+        if (text && strlen(text) > 0)           /* Flawfinder: ignore */
         {
                 message.append(text);
         }
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index e04918e..f09b297 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -122,13 +122,13 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
         // ST_SIM_FPS_20_SECONDS
         StatAttributes("Seconds with sim FPS below 20", TRUE, TRUE),
         // ST_PHYS_FPS_20_SECONDS
-        StatAttributes("Seconds with physics FPS below 20", TRUE, TRUE),
+        StatAttributes("Seconds with physics FPS below 20", FALSE, TRUE),
         // ST_LOSS_05_SECONDS
         StatAttributes("Seconds with packet loss > 5%", TRUE, TRUE),
         // ST_FPS_DROP_50_RATIO
-        StatAttributes("Ratio of frames 2x longer than previous", TRUE, FALSE),
-        // ST_MEDIA_OBJECT_LIST_LENGTH
-        StatAttributes("Number of objects that want to display web pages", TRUE, FALSE),
+        StatAttributes("Ratio of frames 2x longer than previous", FALSE, FALSE),
+        // ST_ENABLE_VBO
+        StatAttributes("Vertex Buffers Enabled", TRUE, FALSE),
         // ST_DELTA_BANDWIDTH
         StatAttributes("Increase/Decrease in bandwidth based on packet loss", TRUE, FALSE),
         // ST_MAX_BANDWIDTH
diff --git a/linden/indra/newview/llviewerstats.h b/linden/indra/newview/llviewerstats.h
index a3eb4c1..22f6e57 100644
--- a/linden/indra/newview/llviewerstats.h
+++ b/linden/indra/newview/llviewerstats.h
@@ -133,7 +133,7 @@ public:
                 ST_PHYS_FPS_20_SECONDS = 32,
                 ST_LOSS_05_SECONDS = 33,
                 ST_FPS_DROP_50_RATIO = 34,
-                ST_MEDIA_OBJECT_LIST_LENGTH = 35,
+                ST_ENABLE_VBO = 35,
                 ST_DELTA_BANDWIDTH = 36,
                 ST_MAX_BANDWIDTH = 37,
                 ST_LIGHTING_DETAIL = 38,
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 00e25af..f84c875 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -72,6 +72,9 @@ public:
         LLEmbeddedItems(const LLViewerTextEditor* editor);
         ~LLEmbeddedItems();
         void clear();
+
+        // return true if there are no embedded items.
+        bool empty();
         
         void    bindEmbeddedChars(const LLFontGL* font);
         void    unbindEmbeddedChars(const LLFontGL* font);
@@ -134,6 +137,13 @@ void LLEmbeddedItems::clear()
                 removeEmbeddedItem(*nextiter);
         }
         mEmbeddedUsedChars.clear();
+        mEmbeddedIndexedChars.clear();
+}
+
+bool LLEmbeddedItems::empty()
+{
+        removeUnusedChars();
+        return mEmbeddedUsedChars.empty();
 }
 
 // Inserts a new unique entry
@@ -1386,10 +1396,11 @@ S32 LLViewerTextEditor::insertEmbeddedItem( S32 pos, LLInventoryItem* item )
 
 bool LLViewerTextEditor::importStream(std::istream& str)
 {
-        LLNotecard nc(MAX_NOTECARD_SIZE);
+        LLNotecard nc(LLNotecard::MAX_SIZE);
         bool success = nc.importStream(str);
         if (success)
         {
+                mEmbeddedItemList->clear();
                 const std::vector<LLPointer<LLInventoryItem> >& items = nc.getItems();
                 mEmbeddedItemList->addItems(items);
                 // Actually set the text
@@ -1415,6 +1426,11 @@ void LLViewerTextEditor::copyInventory(LLInventoryItem* item)
                                                                  item);
 }
 
+bool LLViewerTextEditor::hasEmbeddedInventory()
+{
+        return (!(mEmbeddedItemList->empty()));
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 BOOL LLViewerTextEditor::importBuffer( const LLString& buffer )
@@ -1425,7 +1441,7 @@ BOOL LLViewerTextEditor::importBuffer( const LLString& buffer )
 
 BOOL LLViewerTextEditor::exportBuffer( LLString& buffer )
 {
-        LLNotecard nc(MAX_NOTECARD_SIZE);
+        LLNotecard nc(LLNotecard::MAX_SIZE);
 
         std::vector<LLPointer<LLInventoryItem> > embedded_items;
         mEmbeddedItemList->getEmbeddedItemList(embedded_items);
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index b8452e3..da980d1 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -86,7 +86,14 @@ public:
                 // If this starts a line, you need to prepend a newline.
 
         void copyInventory(LLInventoryItem* item);
-        
+
+        // returns true if there is embedded inventory.
+        // *HACK: This is only useful because the notecard verifier may
+        // change the asset if there is embedded inventory. This mechanism
+        // should be changed to get a different asset id from the verifier
+        // rather than checking if a re-load is necessary. Phoenix 2007-02-27
+        bool hasEmbeddedInventory();
+
 protected:
         // Embedded object operations
         virtual llwchar pasteEmbeddedItem(llwchar ext_char);
diff --git a/linden/indra/newview/llviewertextureanim.cpp b/linden/indra/newview/llviewertextureanim.cpp
index 0766b83..bd4d0ef 100644
--- a/linden/indra/newview/llviewertextureanim.cpp
+++ b/linden/indra/newview/llviewertextureanim.cpp
@@ -36,6 +36,9 @@ LLViewerTextureAnim::LLViewerTextureAnim() : LLTextureAnim()
 {
         mLastFrame = -1.f;      // Force an update initially
         mLastTime = 0.f;
+        mOffS = mOffT = 0;
+        mScaleS = mScaleT = 1;
+        mRot = 0;
 }
 
 LLViewerTextureAnim::~LLViewerTextureAnim()
@@ -167,13 +170,13 @@ S32 LLViewerTextureAnim::animateTextures(F32 &off_s, F32 &off_t,
                 if (mMode & ROTATE)
                 {
                         result |= ROTATE;
-                        rot = frame_counter;
+                        mRot = rot = frame_counter;
                 }
                 else if (mMode & SCALE)
                 {
                         result |= SCALE;
-                        scale_s = frame_counter;
-                        scale_t = frame_counter;
+                        mScaleS = scale_s = frame_counter;
+                        mScaleT = scale_t = frame_counter;
                 }
                 else
                 {
@@ -187,22 +190,22 @@ S32 LLViewerTextureAnim::animateTextures(F32 &off_s, F32 &off_t,
                                 &&(mSizeY))
                         {
                                 result |= SCALE;
-                                scale_s = 1.f/mSizeX;
-                                scale_t = 1.f/mSizeY;
+                                mScaleS = scale_s = 1.f/mSizeX;
+                                mScaleT = scale_t = 1.f/mSizeY;
                                 x_frame = fmod(frame_counter, mSizeX);
                                 y_frame = (S32)(frame_counter / mSizeX);
                                 x_pos = x_frame * scale_s;
                                 y_pos = y_frame * scale_t;
-                                off_s = (-0.5f + 0.5f*scale_s)+ x_pos;
-                                off_t = (0.5f - 0.5f*scale_t) - y_pos;
+                                mOffS = off_s = (-0.5f + 0.5f*scale_s)+ x_pos;
+                                mOffT = off_t = (0.5f - 0.5f*scale_t) - y_pos;
                         }
                         else
                         {
-                                scale_s = 1.f;
-                                scale_t = 1.f;
+                                mScaleS = scale_s = 1.f;
+                                mScaleT = scale_t = 1.f;
                                 x_pos = frame_counter * scale_s;
-                                off_s = (-0.5f + 0.5f*scale_s)+ x_pos;
-                                off_t = 0.f;
+                                mOffS = off_s = (-0.5f + 0.5f*scale_s)+ x_pos;
+                                mOffT = off_t = 0.f;
                         }
                 }
         }
diff --git a/linden/indra/newview/llviewertextureanim.h b/linden/indra/newview/llviewertextureanim.h
index 2f95cae..c5b4e84 100644
--- a/linden/indra/newview/llviewertextureanim.h
+++ b/linden/indra/newview/llviewertextureanim.h
@@ -44,6 +44,13 @@ public:
         {
                 TRANSLATE = 0x01 // Result code JUST for animateTextures
         };
+
+        F32 mOffS;
+        F32 mOffT;
+        F32 mScaleS;
+        F32 mScaleT;
+        F32 mRot;
+
 protected:
         LLFrameTimer mTimer;
         F64 mLastTime;
diff --git a/linden/indra/newview/llviewerthrottle.h b/linden/indra/newview/llviewerthrottle.h
index 1ccef63..c9157bd 100644
--- a/linden/indra/newview/llviewerthrottle.h
+++ b/linden/indra/newview/llviewerthrottle.h
@@ -73,7 +73,7 @@ public:
 
         LLViewerThrottleGroup getThrottleGroup(const F32 bandwidth_kbps);
 
-        static const char *sNames[TC_EOF];
+        static const char* sNames[TC_EOF];              /* Flawfinder: ignore */
 protected:
         F32 mMaxBandwidth;
         F32 mCurrentBandwidth;
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index dc2db19..a4d38f8 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -133,6 +133,8 @@
 #include "llimview.h"
 #include "lltexlayer.h"
 #include "lltextbox.h"
+#include "lltexturecache.h"
+#include "lltexturefetch.h"
 #include "lltextureview.h"
 #include "lltool.h"
 #include "lltoolbar.h"
@@ -397,7 +399,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
         if (gToolMgr)
         {
                 // Don't let the user move the mouse out of the window until mouse up.
-                if( gToolMgr->getCurrentTool(mask)->clipMouseWhenDown() )
+                if( gToolMgr->getCurrentTool()->clipMouseWhenDown() )
                 {
                         mWindow->setMouseClipping(TRUE);
                 }
@@ -448,7 +450,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
 
         if (gToolMgr)
         {
-                if(gToolMgr->getCurrentTool(mask)->handleMouseDown( x, y, mask ) )
+                if(gToolMgr->getCurrentTool()->handleMouseDown( x, y, mask ) )
                 {
                         // This is necessary to force clicks in the world to cause edit
                         // boxes that might have keyboard focus to relinquish it, and hence
@@ -526,7 +528,7 @@ BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK ma
 
         if (gToolMgr)
         {
-                if(gToolMgr->getCurrentTool(mask)->handleDoubleClick( x, y, mask ) )
+                if(gToolMgr->getCurrentTool()->handleDoubleClick( x, y, mask ) )
                 {
                         return TRUE;
                 }
@@ -569,7 +571,7 @@ BOOL LLViewerWindow::handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
         LLTool *tool = NULL;
         if (gToolMgr)
         {
-                tool = gToolMgr->getCurrentTool(mask);
+                tool = gToolMgr->getCurrentTool();
 
                 if( tool->clipMouseWhenDown() )
                 {
@@ -668,7 +670,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
         if (gToolMgr)
         {
                 // Don't let the user move the mouse out of the window until mouse up.
-                if( gToolMgr->getCurrentTool(mask)->clipMouseWhenDown() )
+                if( gToolMgr->getCurrentTool()->clipMouseWhenDown() )
                 {
                         mWindow->setMouseClipping(TRUE);
                 }
@@ -711,7 +713,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
 
         if (gToolMgr)
         {
-                if(gToolMgr->getCurrentTool(mask)->handleRightMouseDown( x, y, mask ) )
+                if(gToolMgr->getCurrentTool()->handleRightMouseDown( x, y, mask ) )
                 {
                         // This is necessary to force clicks in the world to cause edit
                         // boxes that might have keyboard focus to relinquish it, and hence
@@ -769,7 +771,7 @@ BOOL LLViewerWindow::handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK m
         LLTool *tool = NULL;
         if (gToolMgr)
         {
-                tool = gToolMgr->getCurrentTool(mask);
+                tool = gToolMgr->getCurrentTool();
 
                 if( tool->clipMouseWhenDown() )
                 {
@@ -1080,19 +1082,19 @@ BOOL LLViewerWindow::handlePaint(LLWindow *window,  S32 x,  S32 y, S32 width,  S
                 gAgent.getName(name_str);
 
                 S32 len;
-                char temp_str[255];
-                sprintf(temp_str, "%s FPS %3.1f Phy FPS %2.1f Time Dil %1.3f",
+                char temp_str[255];             /* Flawfinder: ignore */
+                snprintf(temp_str, sizeof(temp_str), "%s FPS %3.1f Phy FPS %2.1f Time Dil %1.3f",               /* Flawfinder: ignore */
                                 name_str.c_str(),
                                 gViewerStats->mFPSStat.getMeanPerSec(),
                                 gViewerStats->mSimPhysicsFPS.getPrev(0),
                                 gViewerStats->mSimTimeDilation.getPrev(0));
-                len = strlen(temp_str);
+                len = strlen(temp_str);         /* Flawfinder: ignore */
                 TextOutA(hdc, 0, 0, temp_str, len); 
 
 
                 LLVector3d pos_global = gAgent.getPositionGlobal();
-                sprintf(temp_str, "Avatar pos %6.1lf %6.1lf %6.1lf", pos_global.mdV[0], pos_global.mdV[1], pos_global.mdV[2]);
-                len = strlen(temp_str);
+                snprintf(temp_str, sizeof(temp_str), "Avatar pos %6.1lf %6.1lf %6.1lf", pos_global.mdV[0], pos_global.mdV[1], pos_global.mdV[2]);               /* Flawfinder: ignore */
+                len = strlen(temp_str);         /* Flawfinder: ignore */
                 TextOutA(hdc, 0, 25, temp_str, len); 
 
                 TextOutA(hdc, 0, 50, "Set \"DisableRendering FALSE\" in settings.ini file to reenable", 61);
@@ -1169,15 +1171,13 @@ LLViewerWindow::LLViewerWindow(
         mSuppressToolbox( FALSE ),
         mHideCursorPermanent( FALSE ),
         mPickPending(FALSE),
-        mIgnoreActivate( FALSE ),
-        mRenderFullFrame(FALSE)
+        mIgnoreActivate( FALSE )
 {
         // Default to application directory.
-        strcpy(LLViewerWindow::sSnapshotBaseName, "Snapshot");
-        strcpy(LLViewerWindow::sMovieBaseName, "SLmovie");
+        strcpy(LLViewerWindow::sSnapshotBaseName, "Snapshot");  /* Flawfinder: ignore */
+        strcpy(LLViewerWindow::sMovieBaseName, "SLmovie");      /* Flawfinder: ignore */
         LLViewerWindow::sSnapshotDir[0] = '\0';
 
-        mFastFrameTimer.stop();
 
         // create window
         mWindow = LLWindowManager::createWindow(
@@ -1224,6 +1224,13 @@ LLViewerWindow::LLViewerWindow(
         
         LLFontManager::initClass();
 
+        if (!gFeatureManagerp->isFeatureAvailable("RenderVBO") ||
+                !gGLManager.mHasVertexBufferObject)
+        {
+                gSavedSettings.setBOOL("RenderVBOEnable", FALSE);
+        }
+        LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"));
+
         //
         // We want to set this stuff up BEFORE we initialize the pipeline, so we can turn off
         // stuff like AGP if we think that it'll crash the viewer.
@@ -1252,7 +1259,6 @@ LLViewerWindow::LLViewerWindow(
                 gPipeline.init();
                 stop_glerror();
                 initGLDefaults();
-                LLViewerImage::initClass();
         }
 
         //
@@ -1265,11 +1271,11 @@ LLViewerWindow::LLViewerWindow(
         // Init the image list.  Must happen after GL is initialized and before the images that
         // LLViewerWindow needs are requested.
         gImageList.init();
+        LLViewerImage::initClass();
         gBumpImageList.init();
 
         // Create container for all sub-views
         mRootView = new LLRootView("root", mVirtualWindowRect, FALSE);
-        mRootView->setRenderInFastFrame(FALSE);
 
         if (!gNoRender)
         {
@@ -1632,8 +1638,14 @@ void LLViewerWindow::initWorldUI()
 
         gStatusBar->reshape(root_rect.getWidth(), gStatusBar->getRect().getHeight(), TRUE);
         gStatusBar->translate(0, root_rect.getHeight() - gStatusBar->getRect().getHeight());
+        // sync bg color with menu bar
+        gStatusBar->setBackgroundColor( gMenuBarView->getBackgroundColor() );
+
 
         gViewerWindow->getRootView()->addChild(gStatusBar);
+
+        // menu holder appears on top to get first pass at all mouse events
+        gViewerWindow->getRootView()->sendChildToFront(gMenuHolder);
 }
 
 
@@ -1693,11 +1705,23 @@ LLViewerWindow::~LLViewerWindow()
 
         LLWorldMapView::cleanupTextures();
 
+        llinfos << "Cleaning up pipeline" << llendl;
+        gPipeline.cleanup();
+        stop_glerror();
+
         LLViewerImage::cleanupClass();
         
         delete[] mPickBuffer;
         mPickBuffer = NULL;
 
+        if (gSelectMgr)
+        {
+                llinfos << "Cleaning up select manager" << llendl;
+                gSelectMgr->cleanup();
+        }
+
+        LLVertexBuffer::cleanupClass();
+
         llinfos << "Stopping GL during shutdown" << llendl;
         if (!gNoRender)
         {
@@ -1705,15 +1729,7 @@ LLViewerWindow::~LLViewerWindow()
                 stop_glerror();
         }
 
-        if (gSelectMgr)
-        {
-                llinfos << "Cleaning up select manager" << llendl;
-                gSelectMgr->cleanup();
-        }
 
-        llinfos << "Cleaning up pipeline" << llendl;
-        gPipeline.cleanup();
-        stop_glerror();
         llinfos << "Destroying Window" << llendl;
         destroyWindow();
 }
@@ -1876,7 +1892,7 @@ void LLViewerWindow::draw()
         if (gSavedSettings.getBOOL("DisplayTimecode"))
         {
                 // draw timecode block
-                char text[256];
+                char text[256];         /* Flawfinder: ignore */
 
                 glLoadIdentity();
 
@@ -1925,7 +1941,7 @@ void LLViewerWindow::draw()
                 if (gToolMgr)
                 {
                         // Draw tool specific overlay on world
-                        gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) )->draw();
+                        gToolMgr->getCurrentTool()->draw();
                 }
 
                 if( gAgent.cameraMouselook() )
@@ -2113,7 +2129,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 
         if (gToolMgr)
         {
-                if( gToolMgr->getCurrentTool(mask)->handleKey(key, mask) )
+                if( gToolMgr->getCurrentTool()->handleKey(key, mask) )
                 {
                         return TRUE;
                 }
@@ -2175,7 +2191,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
         }
 
         // don't pass keys on to world when something in ui has focus
-        return gFocusMgr.childHasKeyboardFocus(mRootView) || (gMenuBarView && gMenuBarView->getHighlightedItem());
+        return gFocusMgr.childHasKeyboardFocus(mRootView) 
+                || LLMenuGL::getKeyboardMode() 
+                || (gMenuBarView && gMenuBarView->getHighlightedItem() && gMenuBarView->getHighlightedItem()->isActive());
 }
 
 
@@ -2279,44 +2297,15 @@ void LLViewerWindow::handleScrollWheel(S32 clicks)
 
 void LLViewerWindow::moveCursorToCenter()
 {
-#if 1 // old version
-
-#if 0 // Dave's changes - this reportedly is making the drift worse on some systems?
-        S32 x = llround((F32) mVirtualWindowRect.getWidth() / 2);
-        S32 y = llround((F32) mVirtualWindowRect.getHeight() / 2);
-#else
         S32 x = mVirtualWindowRect.getWidth() / 2;
         S32 y = mVirtualWindowRect.getHeight() / 2;
-#endif
         
         //on a forced move, all deltas get zeroed out to prevent jumping
         mCurrentMousePoint.set(x,y);
         mLastMousePoint.set(x,y);
         mCurrentMouseDelta.set(0,0);    
 
-        LLUI::setCursorPositionScreen(x, y);
-        
-#else // Richard's version - fails on intel macs
-
-        S32 x = llround((F32) mWindowRect.getWidth() / 2);
-        S32 y = llround((F32) mWindowRect.getHeight() / 2);
-        
-        LLCoordWindow window_point;
-        mWindow->convertCoords(LLCoordGL(x, y), &window_point);
-        mWindow->setCursorPosition(window_point);
-        
-        // read back cursor position
-        mWindow->getCursorPosition(&window_point);
-        LLCoordGL new_mouse_pos;
-        mWindow->convertCoords(window_point, &new_mouse_pos);
-        new_mouse_pos.mX = llround((F32)new_mouse_pos.mX / mDisplayScale.mV[VX]);
-        new_mouse_pos.mY = llround((F32)new_mouse_pos.mY / mDisplayScale.mV[VY]);
-
-        //on a forced move, all deltas get zeroed out to prevent jumping
-        mCurrentMousePoint = new_mouse_pos;
-        mLastMousePoint = new_mouse_pos;
-        mCurrentMouseDelta.set(0,0);
-#endif
+        LLUI::setCursorPositionScreen(x, y);    
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2345,10 +2334,29 @@ BOOL LLViewerWindow::handlePerFrameHover()
                 mMouseInWindow = TRUE;
         }
 
-        S32 dx = mCurrentMousePoint.mX - mLastMousePoint.mX;
-        S32 dy = mCurrentMousePoint.mY - mLastMousePoint.mY;
-        mCurrentMouseDelta.set(dx,dy);
-        LLVector2 mouse_vel((F32)dx, (F32)dy);
+        S32 dx = lltrunc((F32) (mCurrentMousePoint.mX - mLastMousePoint.mX) * LLUI::sGLScaleFactor.mV[VX]);
+        S32 dy = lltrunc((F32) (mCurrentMousePoint.mY - mLastMousePoint.mY) * LLUI::sGLScaleFactor.mV[VY]);
+
+        LLVector2 mouse_vel; 
+
+        if (gSavedSettings.getBOOL("MouseSmooth"))
+        {
+                static F32 fdx = 0.f;
+                static F32 fdy = 0.f;
+
+                F32 amount = 16.f;
+                fdx = fdx + ((F32) dx - fdx) * llmin(gFrameIntervalSeconds*amount,1.f);
+                fdy = fdy + ((F32) dy - fdy) * llmin(gFrameIntervalSeconds*amount,1.f);
+
+                mCurrentMouseDelta.set(llround(fdx), llround(fdy));
+                mouse_vel.setVec(fdx,fdy);
+        }
+        else
+        {
+                mCurrentMouseDelta.set(dx, dy);
+                mouse_vel.setVec((F32) dx, (F32) dy);
+        }
+    
         mMouseVelocityStat.addValue(mouse_vel.magVec());
 
         if (gNoRender)
@@ -2473,7 +2481,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
         LLTool *tool = NULL;
         if (gToolMgr && gHoverView)
         {
-                tool = gToolMgr->getCurrentTool(mask);
+                tool = gToolMgr->getCurrentTool();
 
                 if(!handled && tool)
                 {
@@ -2493,8 +2501,8 @@ BOOL LLViewerWindow::handlePerFrameHover()
                 // Suppress the toolbox view if our source tool was the pie tool,
                 // and we've overridden to something else.
                 mSuppressToolbox = 
-                        (gToolMgr->getCurrentTool(MASK_NONE) == gToolPie) &&
-                        (gToolMgr->getCurrentTool(mask) != gToolPie);
+                        (gToolMgr->getBaseTool() == gToolPie) &&
+                        (gToolMgr->getCurrentTool() != gToolPie);
 
         }
 
@@ -2555,15 +2563,15 @@ BOOL LLViewerWindow::handlePerFrameHover()
                         (tool != gToolPie                                               // not default tool
                         && tool != gToolGun                                             // not coming out of mouselook
                         && !mSuppressToolbox                                    // not override in third person
-                        && gCurrentToolset != gFaceEditToolset  // not special mode
-                        && gCurrentToolset != gMouselookToolset
+                        && gToolMgr->getCurrentToolset() != gFaceEditToolset    // not special mode
+                        && gToolMgr->getCurrentToolset() != gMouselookToolset
                         && (!captor || captor->isView())) // not dragging
                         )
                 {
                         // Force floater tools to be visible (unless minimized)
                         if (!gFloaterTools->getVisible())
                         {
-                                gFloaterTools->open();
+                                gFloaterTools->open();          /* Flawfinder: ignore */
                         }
                         // Update the location of the blue box tool popup
                         LLCoordGL select_center_screen;
@@ -2669,7 +2677,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
         mLastMousePoint = mCurrentMousePoint;
 
         // last ditch force of edit menu to selection manager
-        if (gEditMenuHandler == NULL && gSelectMgr && gSelectMgr->getObjectCount())
+        if (gEditMenuHandler == NULL && gSelectMgr && gSelectMgr->getSelection()->getObjectCount())
         {
                 gEditMenuHandler = gSelectMgr;
         }
@@ -2705,15 +2713,15 @@ BOOL LLViewerWindow::handlePerFrameHover()
                 gChatBar->startChat(NULL);
         }
 
-        // sync land selection with edit and about land dialogs
-        if (gParcelMgr
-                && !gMenuHolder->hasVisibleMenu()
-                && !LLFloaterLand::floaterVisible()
-                && !LLFloaterBuyLand::isOpen()
-                && !LLPanelLandGeneral::buyPassDialogVisible()
-                && (!gFloaterTools || !gFloaterTools->getVisible()))
+        // cleanup unused selections when no modal dialogs are open
+        if (gParcelMgr && LLModalDialog::activeCount() == 0)
+        {
+                gParcelMgr->deselectUnused();
+        }
+
+        if (gSelectMgr && LLModalDialog::activeCount() == 0)
         {
-                gParcelMgr->deselectLand();
+                gSelectMgr->deselectUnused();
         }
 
         return handled;
@@ -2761,6 +2769,7 @@ void LLViewerWindow::saveLastMouse(const LLCoordGL &point)
 void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL for_hud )
 {
         LLViewerObject* object;
+        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
 
         if (!for_hud && !for_gl_pick)
         {
@@ -2776,15 +2785,15 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                         gParcelMgr->renderParcelCollision();
                 }
         }
-        else if (( for_hud && gSelectMgr->getSelectType() == SELECT_TYPE_HUD) ||
-                         (!for_hud && gSelectMgr->getSelectType() != SELECT_TYPE_HUD))
+        else if (( for_hud && selection->getSelectType() == SELECT_TYPE_HUD) ||
+                         (!for_hud && selection->getSelectType() != SELECT_TYPE_HUD))
         {               
                 gSelectMgr->renderSilhouettes(for_hud);
                 
                 stop_glerror();
 
                 // setup HUD render
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD && gSelectMgr->getObjectCount())
+                if (selection->getSelectType() == SELECT_TYPE_HUD && gSelectMgr->getSelection()->getObjectCount())
                 {
                         LLBBox hud_bbox = gAgent.getAvatarObject()->getHUDBBox();
 
@@ -2810,12 +2819,12 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                         LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE);
                         glMatrixMode(GL_MODELVIEW);
                         glPushMatrix();
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                        if (selection->getSelectType() == SELECT_TYPE_HUD)
                         {
                                 F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
                                 glScalef(zoom, zoom, zoom);
                         }
-                        for( object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() )
+                        for( object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() )
                         {
                                 LLDrawable* drawable = object->mDrawable;
                                 if (drawable && drawable->isLight())
@@ -2850,7 +2859,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                 // not be recalculated at this time.  If they are, then group rotations will break.
 
                 // Draw arrows at average center of all selected objects
-                LLTool* tool = gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) );
+                LLTool* tool = gToolMgr->getCurrentTool();
                 if (tool)
                 {
                         if(tool->isAlwaysRendered())
@@ -2859,13 +2868,13 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                         }
                         else
                         {
-                                if( !gSelectMgr->isEmpty() )
+                                if( !gSelectMgr->getSelection()->isEmpty() )
                                 {
                                         BOOL moveable_object_selected = FALSE;
                                         BOOL all_selected_objects_move = TRUE;
                                         BOOL all_selected_objects_modify = TRUE;
                                         BOOL selecting_linked_set = gSavedSettings.getBOOL("SelectLinkedSet");
-                                        for( object = gSelectMgr->getFirstObject(); object; object = gSelectMgr->getNextObject() )
+                                        for( object = gSelectMgr->getSelection()->getFirstObject(); object; object = gSelectMgr->getSelection()->getNextObject() )
                                         {
                                                 BOOL this_object_movable = FALSE;
                                                 if (object->permMove() && (object->permModify() || selecting_linked_set))
@@ -2900,7 +2909,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                                         }
                                 }
                         }
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD && gSelectMgr->getObjectCount())
+                        if (selection->getSelectType() == SELECT_TYPE_HUD && selection->getObjectCount())
                         {
                                 glMatrixMode(GL_PROJECTION);
                                 glPopMatrix();
@@ -2963,8 +2972,6 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
         S32 scaled_x = llround((F32)x * mDisplayScale.mV[VX]);
         S32 scaled_y = llround((F32)y_from_bot * mDisplayScale.mV[VY]);
 
-        F32 delta_time = gAlphaFadeTimer.getElapsedTimeAndResetF32();
-
         BOOL in_build_mode = gFloaterTools && gFloaterTools->getVisible();
         if (in_build_mode || LLDrawPoolAlpha::sShowDebugAlpha)
         {
@@ -2974,17 +2981,6 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
         }
         gPickTransparent = pick_transparent;
 
-        if (gPickTransparent)
-        {
-                gPickAlphaTargetThreshold = 0.f;
-                gPickAlphaThreshold = llmax(gPickAlphaTargetThreshold, gPickAlphaThreshold - (delta_time * 0.7f));
-        }
-        else
-        {
-                gPickAlphaTargetThreshold = 1.f;
-                gPickAlphaThreshold = llmin(gPickAlphaTargetThreshold, gPickAlphaThreshold + (delta_time * 0.7f));
-        }
-
         gUseGLPick = FALSE;
         mPickCallback = callback;
 
@@ -3151,8 +3147,6 @@ void LLViewerWindow::performPick()
                 return;
         }
 
-        finishFastFrame();
-
         mPickPending = FALSE;
         U32     te_offset = NO_FACE;
         
@@ -3407,8 +3401,8 @@ void LLViewerWindow::analyzeHit(
                                 const S32 UV_PICK_WIDTH = 41;
                                 const S32 UV_PICK_HALF_WIDTH = (UV_PICK_WIDTH - 1) / 2;
                                 U8 uv_pick_buffer[UV_PICK_WIDTH * UV_PICK_WIDTH * 4];
-                                S32 pick_face = ((LLVOVolume*)objectp)->getAllTEsSame() ? 0 : face;
-                                LLFace* facep = objectp->mDrawable->getFace(objectp->getFaceIndexOffset() + pick_face);
+                                S32 pick_face = face;
+                                LLFace* facep = objectp->mDrawable->getFace(pick_face);
                                 gCamera->setPerspective(FOR_SELECTION, scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH, FALSE);
                                 glViewport(scaled_x - UV_PICK_HALF_WIDTH, scaled_y - UV_PICK_HALF_WIDTH, UV_PICK_WIDTH, UV_PICK_WIDTH);
                                 gPipeline.renderFaceForUVSelect(facep);
@@ -3438,45 +3432,6 @@ void LLViewerWindow::analyzeHit(
         //llinfos << "DEBUG Hit Nothing " << llendl;
 }
 
-
-void LLViewerWindow::requestFastFrame(LLView *view) 
-{ 
-        if (!mPickPending && 
-                mWindow->getSwapMethod() != LLWindow::SWAP_METHOD_UNDEFINED &&
-                gStartupState >= STATE_STARTED && 
-                gSavedSettings.getBOOL("RenderFastUI") && 
-                !gbCapturing)
-        {
-                if (!mFastFrameTimer.getStarted())
-                {
-                        // we're double buffered, so when first requesting a fast ui update 
-                        // we need to render the scene again so that the front and back buffers
-                        // are synced
-                        mRenderFullFrame = TRUE;
-                }
-                // calculation new expiration time and reset timer
-                F32 expiration;
-                if (mFastFrameTimer.hasExpired())
-                {
-                        expiration =  FAST_FRAME_INCREMENT;
-                }
-                else
-                {
-                        expiration = llmin(MAX_FAST_FRAME_TIME, mFastFrameTimer.getTimeToExpireF32() + FAST_FRAME_INCREMENT);
-                }
-
-                mFastFrameTimer.start();
-                mFastFrameTimer.setTimerExpirySec(expiration);
-
-                LLView::sFastFrameView = view->getRootMostFastFrameView();
-                if (!LLView::sFastFrameView)
-                {
-                        LLView::sFastFrameView = view;
-                }
-        }
-}
-
-
 // Returns unit vector relative to camera
 // indicating direction of point on screen x,y
 LLVector3 LLViewerWindow::mouseDirectionGlobal(const S32 x, const S32 y) const
@@ -3673,37 +3628,54 @@ BOOL LLViewerWindow::mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d
 }
 
 // Saves an image to the harddrive as "SnapshotX" where X >= 1.
-BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw)
+BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw, const LLString& extension_in)
 {
         if (! raw)
         {
                 return FALSE;
         }
+
+        LLString extension(extension_in);
+        if (extension.empty())
+        {
+                extension = (gSavedSettings.getBOOL("CompressSnapshotsToDisk")) ? ".j2c" : ".bmp";
+        }
+
+        LLFilePicker::ESaveFilter pick_type;
+        if (extension == ".j2c")
+                pick_type = LLFilePicker::FFSAVE_J2C;
+        else if (extension == ".bmp")
+                pick_type = LLFilePicker::FFSAVE_BMP;
+        else if (extension == ".tga")
+                pick_type = LLFilePicker::FFSAVE_TGA;
+        else
+                pick_type = LLFilePicker::FFSAVE_ALL; // ???
         
         // Get a directory if this is the first time.
-        if (strlen(sSnapshotDir) == 0)
+        if (strlen(sSnapshotDir) == 0)          /* Flawfinder: ignore */
         {
                 LLString proposed_name( sSnapshotBaseName );
-                proposed_name.append( ".bmp" );
+                proposed_name.append( extension );
 
                 // pick a directory in which to save
                 LLFilePicker& picker = LLFilePicker::instance();
-                if (!picker.getSaveFile(LLFilePicker::FFSAVE_BMP, proposed_name.c_str()))
+                if (!picker.getSaveFile(pick_type, proposed_name.c_str()))
                 {
                         // Clicked cancel
                         return FALSE;
                 }
 
                 // Copy the directory + file name
-                char directory[LL_MAX_PATH];
-                strcpy(directory, picker.getFirstFile());
+                char directory[LL_MAX_PATH];            /* Flawfinder: ignore */
+                strncpy(directory, picker.getFirstFile(), LL_MAX_PATH -1);              /* Flawfinder: ignore */
+                directory[LL_MAX_PATH -1] = '\0';
 
                 // Smash the file extension
-                S32 length = strlen(directory);
+                S32 length = strlen(directory);         /* Flawfinder: ignore */
                 S32 index = length;
 
-                // Back up over ".bmp"
-                index -= 4;
+                // Back up over extension
+                index -= extension.length();
                 if (index >= 0 && directory[index] == '.')
                 {
                         directory[index] = '\0';
@@ -3724,12 +3696,14 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw)
                 {
                         if (index + 1 <= length)
                         {
-                                strcpy(LLViewerWindow::sSnapshotBaseName, directory + index + 1);
+                                strncpy(LLViewerWindow::sSnapshotBaseName, directory + index + 1, LL_MAX_PATH -1);              /* Flawfinder: ignore */
+                                LLViewerWindow::sSnapshotBaseName[LL_MAX_PATH -1] = '\0';
                         }
 
                         index++;
                         directory[index] = '\0';
-                        strcpy(LLViewerWindow::sSnapshotDir, directory);
+                        strncpy(LLViewerWindow::sSnapshotDir, directory, LL_MAX_PATH -1);               /* Flawfinder: ignore */
+                        LLViewerWindow::sSnapshotDir[LL_MAX_PATH -1] = '\0';
                 }
         }
 
@@ -3740,10 +3714,9 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw)
 
         do
         {
-                char extension[100];
-                sprintf( extension, "_%.3d.bmp", i );
                 filepath = sSnapshotDir;
                 filepath += sSnapshotBaseName;
+                filepath += llformat("_%.3d",i);
                 filepath += extension;
 
                 struct stat stat_info;
@@ -3752,12 +3725,12 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw)
         }
         while( -1 != err );  // search until the file is not found (i.e., stat() gives an error).
 
-        LLPointer<LLImageBMP> bmp_image = new LLImageBMP;
+        LLPointer<LLImageFormatted> formatted_image = LLImageFormatted::createFromExtension(extension);
         LLImageBase::setSizeOverride(TRUE);
-        BOOL success = bmp_image->encode(raw);
+        BOOL success = formatted_image->encode(raw);
         if( success )
         {
-                success = bmp_image->save(filepath);
+                success = formatted_image->save(filepath);
         }
         else
         {
@@ -3773,7 +3746,7 @@ void LLViewerWindow::saveMovieNumbered(void*)
         if (!gbCapturing)
         {
                 // Get a directory if this is the first time.
-                if (strlen(sSnapshotDir) == 0)
+                if (strlen(sSnapshotDir) == 0)          /* Flawfinder: ignore */
                 {
                         LLString proposed_name( sMovieBaseName );
 #if LL_DARWIN
@@ -3791,11 +3764,12 @@ void LLViewerWindow::saveMovieNumbered(void*)
                         }
 
                         // Copy the directory + file name
-                        char directory[LL_MAX_PATH];
-                        strcpy(directory, picker.getFirstFile());
+                        char directory[LL_MAX_PATH];            /* Flawfinder: ignore */
+                        strncpy(directory, picker.getFirstFile(), LL_MAX_PATH -1);              /* Flawfinder: ignore */
+                        directory[LL_MAX_PATH -1] = '\0';
 
                         // Smash the file extension
-                        S32 length = strlen(directory);
+                        S32 length = strlen(directory);         /* Flawfinder: ignore */
                         S32 index = length;
 
                         // Back up over ".bmp"
@@ -3820,12 +3794,14 @@ void LLViewerWindow::saveMovieNumbered(void*)
                         {
                                 if (index + 1 <= length)
                                 {
-                                        strcpy(LLViewerWindow::sMovieBaseName, directory + index + 1);
+                                        strncpy(LLViewerWindow::sMovieBaseName, directory + index + 1, LL_MAX_PATH -1);         /* Flawfinder: ignore */
+                                        LLViewerWindow::sMovieBaseName[LL_MAX_PATH -1] = '\0';
                                 }
 
                                 index++;
                                 directory[index] = '\0';
-                                strcpy(LLViewerWindow::sSnapshotDir, directory);
+                                strncpy(LLViewerWindow::sSnapshotDir, directory, LL_MAX_PATH -1);               /* Flawfinder: ignore */
+                                LLViewerWindow::sSnapshotDir[LL_MAX_PATH -1] = '\0';
                         }
                 }
 
@@ -3836,11 +3812,11 @@ void LLViewerWindow::saveMovieNumbered(void*)
 
                 do
                 {
-                        char extension[100];
+                        char extension[100];            /* Flawfinder: ignore */
 #if LL_DARWIN
-                        sprintf( extension, "_%.3d.mov", i );
+                        snprintf( extension, sizeof(extension), "_%.3d.mov", i );               /* Flawfinder: ignore */
 #else
-                        sprintf( extension, "_%.3d.avi", i );
+                        snprintf( extension, sizeof(extension), "_%.3d.avi", i );               /* Flawfinder: ignore */
 #endif
                         filepath.assign( sSnapshotDir );
                         filepath.append( sMovieBaseName );
@@ -3944,9 +3920,6 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 return FALSE;
         }
 
-        // IW 3/5/04 We don'a wan' nunna yer fest frumes har!
-        finishFastFrame();
-
         // PRE SNAPSHOT
 
         glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -3960,10 +3933,11 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 LLPipeline::toggleRenderDebugFeature((void*)LLPipeline::RENDER_DEBUG_FEATURE_UI);
         }
 
-        BOOL hide_hud = !gSavedSettings.getBOOL("RenderHUDInSnapshot") && gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD);
+
+        BOOL hide_hud = !gSavedSettings.getBOOL("RenderHUDInSnapshot") && LLPipeline::sShowHUDAttachments;
         if (hide_hud)
         {
-                LLPipeline::toggleRenderType((void*)LLPipeline::RENDER_TYPE_HUD);
+                LLPipeline::sShowHUDAttachments = FALSE;
         }
 
         // Copy screen to a buffer
@@ -4027,7 +4001,6 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                                 setupViewport();
                                 BOOL first_time_through = (subimage_x + subimage_y == 0);
                                 gPickTransparent = FALSE;
-                                gPickAlphaThreshold = 0.1f;
                                 gObjectList.renderObjectsForSelect(*gCamera, FALSE, !first_time_through);
                         }
                         else
@@ -4101,7 +4074,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
 
         if (hide_hud)
         {
-                LLPipeline::toggleRenderType((void*)LLPipeline::RENDER_TYPE_HUD);
+                LLPipeline::sShowHUDAttachments = TRUE;
         }
 
         if (high_res)
@@ -4363,6 +4336,12 @@ void LLViewerWindow::stopGL(BOOL save_state)
         if (!gGLManager.mIsDisabled)
         {
                 llinfos << "Shutting down GL..." << llendl;
+
+                // Pause texture decode threads (will get unpaused during main loop)
+                gTextureCache->pause();
+                gImageDecodeThread->pause();
+                gTextureFetch->pause();
+                
                 gSky.destroyGL();
                 stop_glerror();
         
@@ -4381,8 +4360,6 @@ void LLViewerWindow::stopGL(BOOL save_state)
                 LLDynamicTexture::destroyGL();
                 stop_glerror();
 
-                if(gParcelMgr) gParcelMgr->destroyGL();
-
                 gPipeline.destroyGL();
                 
                 gCone.cleanupGL();
@@ -4415,10 +4392,8 @@ void LLViewerWindow::restoreGL(const LLString& progress_message)
                 LLManipTranslate::restoreGL();
                 gImageList.restoreGL();
                 gBumpImageList.restoreGL();
-                gPipeline.setUseAGP(gSavedSettings.getBOOL("RenderUseAGP"));
                 LLDynamicTexture::restoreGL();
                 LLVOAvatar::restoreGL();
-                if (gParcelMgr) gParcelMgr->restoreGL();
 
                 if (gFloaterCustomize && gFloaterCustomize->getVisible())
                 {
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 8c6d812..debe509 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -208,7 +208,7 @@ public:
         BOOL                    saveSnapshot(const LLString&  filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR);
         BOOL                    rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, 
                 BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR );
-        BOOL                saveImageNumbered(LLImageRaw *raw);
+        BOOL                saveImageNumbered(LLImageRaw *raw, const LLString& extension = "");
 
         void                    playSnapshotAnimAndSound();
         
@@ -224,12 +224,6 @@ public:
 
         LLViewerObject* getObjectUnderCursor(const F32 depth = 16.0f);
         
-        void                    requestFastFrame(LLView* view);
-        BOOL                    renderingFastFrame() { return mFastFrameTimer.getStarted() && !firstFastFrame(); }
-        void                    finishFastFrame() { mFastFrameTimer.stop(); mRenderFullFrame = FALSE; }
-        BOOL                    firstFastFrame() { return mRenderFullFrame; }
-        void                    finishFirstFastFrame() { mRenderFullFrame = FALSE; }
-
         // Returns a pointer to the last object hit
         LLViewerObject  *lastObjectHit();
         LLViewerObject  *lastNonFloraObjectHit();
@@ -339,14 +333,12 @@ protected:
 
         LLString                mOverlayTitle;          // Used for special titles such as "Second Life - Special E3 2003 Beta"
 
-        static char             sSnapshotBaseName[LL_MAX_PATH];
-        static char             sSnapshotDir[LL_MAX_PATH];
+        static char             sSnapshotBaseName[LL_MAX_PATH];         /* Flawfinder: ignore */
+        static char             sSnapshotDir[LL_MAX_PATH];              /* Flawfinder: ignore */
 
-        static char             sMovieBaseName[LL_MAX_PATH];
+        static char             sMovieBaseName[LL_MAX_PATH];            /* Flawfinder: ignore */
 
         BOOL                    mIgnoreActivate;
-        LLFrameTimer    mFastFrameTimer;
-        BOOL                    mRenderFullFrame;
         U8*                             mPickBuffer;
 };      
 
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index ece24e0..7113177 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -47,7 +47,6 @@
 #include "timing.h"
 
 #include "llagent.h"                    //  Get state values from here
-#include "llagparray.h"
 #include "llviewercontrol.h"
 #include "llcriticaldamp.h"
 #include "lldir.h"
@@ -210,7 +209,7 @@ const F32 UNDERWATER_FREQUENCY_DAMP = 0.33f;
 const F32 APPEARANCE_MORPH_TIME = 0.65f;
 const F32 CAMERA_SHAKE_ACCEL_THRESHOLD_SQUARED = 5.f * 5.f;
 const F32 TIME_BEFORE_MESH_CLEANUP = 5.f; // seconds
-const S32 AVATAR_AGP_RELEASE_THRESHOLD = 10; // number of avatar instances before releasing AGP memory
+const S32 AVATAR_RELEASE_THRESHOLD = 10; // number of avatar instances before releasing memory
 const F32 FOOT_GROUND_COLLISION_TOLERANCE = 0.25f;
 const F32 AVATAR_LOD_TWEAK_RANGE = 0.7f;
 const S32 MAX_LOD_CHANGES_PER_FRAME = 2;
@@ -768,9 +767,9 @@ LLVOAvatar::LLVOAvatar(
         mLastSkirtBakedID( IMG_DEFAULT_AVATAR ),
         mIsDummy(FALSE),
         mSpecialRenderMode(0),
+        mTurning(FALSE),
         mPelvisToFoot(0.f),
         mLastSkeletonSerialNum( 0 ),
-        mTurning(FALSE),
         mHeadOffset(),
         mIsSitting(FALSE),
         mTimeVisible(),
@@ -789,7 +788,6 @@ LLVOAvatar::LLVOAvatar(
         mEyesLayerSet( NULL ),
         mSkirtLayerSet( NULL ),
         mRenderPriority(1.0f),
-        mNumAGPVertices(0),
         mNameString(),
         mTitle(),
         mNameAway(FALSE),
@@ -848,7 +846,7 @@ LLVOAvatar::LLVOAvatar(
         mSpeed = 0.f;
         setAnimationData("Speed", &mSpeed);
 
-        strcpy(mAvatarDefinition, AVATAR_DEFAULT_CHAR);
+        strcpy(mAvatarDefinition, AVATAR_DEFAULT_CHAR);         /* Flawfinder: ignore */
 
         if (id == gAgentID)
         {
@@ -1007,7 +1005,7 @@ LLVOAvatar::LLVOAvatar(
         //-------------------------------------------------------------------------
         // register motions
         //-------------------------------------------------------------------------
-        if (LLCharacter::sInstances.getLength() == 1)
+        if (LLCharacter::sInstances.size() == 1)
         {
                 LLKeyframeMotion::setVFS(gStaticVFS);
                 addMotion( ANIM_AGENT_BUSY,                                             LLNullMotion::create );
@@ -1151,7 +1149,8 @@ void LLVOAvatar::markDead()
 BOOL LLVOAvatar::isFullyBaked()
 {
         if (mIsDummy) return TRUE;
-
+        if (getNumTEs() == 0) return FALSE;
+        
         BOOL head_baked = ( getTEImage( TEX_HEAD_BAKED )->getID() != IMG_DEFAULT_AVATAR );
         BOOL upper_baked = ( getTEImage( TEX_UPPER_BAKED )->getID() != IMG_DEFAULT_AVATAR );
         BOOL lower_baked = ( getTEImage( TEX_LOWER_BAKED )->getID() != IMG_DEFAULT_AVATAR );
@@ -1180,10 +1179,10 @@ void LLVOAvatar::deleteLayerSetCaches()
 // static 
 BOOL LLVOAvatar::areAllNearbyInstancesBaked()
 {
-        for( LLVOAvatar* inst = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                inst;
-                inst = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* inst = (LLVOAvatar*) *iter;
                 if( inst->isDead() )
                 {
                         continue;
@@ -1213,10 +1212,10 @@ void LLVOAvatar::dumpBakedStatus()
 {
         LLVector3d camera_pos_global = gAgent.getCameraPositionGlobal();
 
-        for( LLVOAvatar* inst = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                inst;
-                inst = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* inst = (LLVOAvatar*) *iter;
                 llinfos << "Avatar ";
 
                 LLNameValue* firstname = inst->getNVPair("FirstName");
@@ -1405,11 +1404,10 @@ void LLVOAvatar::initVertexPrograms()
 //static
 void LLVOAvatar::restoreGL()
 {
-        LLVOAvatar* inst;
-        for( inst = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                inst;
-                inst = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* inst = (LLVOAvatar*) *iter;
                 inst->setCompositeUpdatesEnabled( TRUE );
                 inst->invalidateComposite( inst->mHeadLayerSet,         FALSE );
                 inst->invalidateComposite( inst->mLowerBodyLayerSet,    FALSE );
@@ -1433,10 +1431,10 @@ void LLVOAvatar::deleteCachedImages()
         if (LLTexLayerSet::sHasCaches)
         {
                 lldebugs << "Deleting layer set caches" << llendl;
-                for( LLVOAvatar* inst = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                        inst;
-                        inst = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+                for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
                 {
+                        LLVOAvatar* inst = (LLVOAvatar*) *iter;
                         inst->deleteLayerSetCaches();
                 }
                 LLTexLayerSet::sHasCaches = FALSE;
@@ -1472,9 +1470,9 @@ void LLVOAvatar::initClass()
 { 
         LLVOAvatar::sMaxOtherAvatarsToComposite = gSavedSettings.getS32("AvatarCompositeLimit");
 
-        char xmlFile[MAX_PATH];
+        char xmlFile[MAX_PATH];         /* Flawfinder: ignore */
 
-        sprintf(xmlFile, "%s_lad.xml", gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,AVATAR_DEFAULT_CHAR).c_str());
+        snprintf(xmlFile, MAX_PATH, "%s_lad.xml", gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,AVATAR_DEFAULT_CHAR).c_str());               /* Flawfinder: ignore */
         BOOL success = sXMLTree.parseFile( xmlFile, FALSE );
         if (!success)
         {
@@ -1537,30 +1535,30 @@ void LLVOAvatar::initClass()
         sSkeletonInfo = new LLVOAvatarSkeletonInfo;
         if (!sSkeletonInfo->parseXml(sSkeletonXMLTree.getRoot()))
         {
-                llerrs << "Error parsing skeleton XML file" << llendl;
+                llerrs << "Error parsing skeleton XML file: " << skeleton_path << llendl;
         }
         // parse avatar_lad.xml
         llassert(!sAvatarInfo);
         sAvatarInfo = new LLVOAvatarInfo;
         if (!sAvatarInfo->parseXmlSkeletonNode(root))
         {
-                llerrs << "Error parsing skeleton node in avatar XML file" << llendl;
+                llerrs << "Error parsing skeleton node in avatar XML file: " << skeleton_path << llendl;
         }
         if (!sAvatarInfo->parseXmlMeshNodes(root))
         {
-                llerrs << "Error parsing skeleton node in avatar XML file" << llendl;
+                llerrs << "Error parsing skeleton node in avatar XML file: " << skeleton_path << llendl;
         }
         if (!sAvatarInfo->parseXmlColorNodes(root))
         {
-                llerrs << "Error parsing skeleton node in avatar XML file" << llendl;
+                llerrs << "Error parsing skeleton node in avatar XML file: " << skeleton_path << llendl;
         }
         if (!sAvatarInfo->parseXmlLayerNodes(root))
         {
-                llerrs << "Error parsing skeleton node in avatar XML file" << llendl;
+                llerrs << "Error parsing skeleton node in avatar XML file: " << skeleton_path << llendl;
         }
         if (!sAvatarInfo->parseXmlDriverNodes(root))
         {
-                llerrs << "Error parsing skeleton node in avatar XML file" << llendl;
+                llerrs << "Error parsing skeleton node in avatar XML file: " << skeleton_path << llendl;
         }
 }
 
@@ -1576,6 +1574,19 @@ void LLVOAvatar::cleanupClass()
 }
 
 
+void LLVOAvatar::updateSpatialExtents(LLVector3& newMin, LLVector3 &newMax)
+{
+        LLVector3 center = getRenderPosition();
+        LLVector3 size = getScale();
+        //maximum amount an animation can move avatar from drawable position
+        LLVector3 animation_buffer(5, 5, 5);
+
+        newMin.setVec((center-size)-animation_buffer);
+        newMax.setVec(center+size+animation_buffer);
+        mDrawable->setPositionGroup((newMin + newMax) * 0.5f);
+}
+
+
 //-----------------------------------------------------------------------------
 // parseSkeletonFile()
 //-----------------------------------------------------------------------------
@@ -1728,10 +1739,16 @@ BOOL LLVOAvatar::buildSkeleton(LLVOAvatarSkeletonInfo *info)
         }
 
         // add special-purpose "screen" joint
-        mScreenp = new LLViewerJoint("mScreen", NULL);
-        // for now, put screen at origin, as it is only used during special
-        // HUD rendering mode
-        mScreenp->setWorldPosition(LLVector3::zero);
+        if (mIsSelf)
+        {
+                mScreenp = new LLViewerJoint("mScreen", NULL);
+                // for now, put screen at origin, as it is only used during special
+                // HUD rendering mode
+                F32 aspect = gCamera->getAspect();
+                LLVector3 scale(1.f, aspect, 1.f);
+                mScreenp->setScale(scale);
+                mScreenp->setWorldPosition(LLVector3::zero);
+        }
 
         return TRUE;
 }
@@ -1812,7 +1829,7 @@ void LLVOAvatar::buildCharacter()
                 return;
         }
 
-        gPrintMessagesThisFrame = TRUE;
+//      gPrintMessagesThisFrame = TRUE;
         lldebugs << "Avatar load took " << timer.getElapsedTimeF32() << " seconds." << llendl;
 
         if ( ! status )
@@ -1944,9 +1961,10 @@ void LLVOAvatar::buildCharacter()
                                         {
                                                 LLMenuItemCallGL* item;
                                                 item = new LLMenuItemCallGL(attachment->getName(), 
-                                                        &handle_attach_to_avatar, 
-                                                        object_selected_and_point_valid, 
-                                                        attachment);
+                                                        NULL, 
+                                                        object_selected_and_point_valid);
+                                                item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", mAttachmentPoints.reverseLookup(attachment));
+                                                
                                                 gAttachPieMenu->append(item);
 
                                                 attachment_found = TRUE;
@@ -1998,9 +2016,9 @@ void LLVOAvatar::buildCharacter()
                         {
                                 LLMenuItemCallGL* item;
                                 item = new LLMenuItemCallGL(attachment->getName(), 
-                                        &handle_attach_to_avatar, 
-                                        object_selected_and_point_valid, 
-                                        attachment);
+                                        NULL, 
+                                        object_selected_and_point_valid);
+                                item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", mAttachmentPoints.reverseLookup(attachment));
                                 gAttachScreenPieMenu->append(item);
                                 gDetachScreenPieMenu->append(new LLMenuItemCallGL(attachment->getName(), 
                                                         &handle_detach_from_avatar, object_attached, attachment));
@@ -2017,8 +2035,11 @@ void LLVOAvatar::buildCharacter()
                                 {
                                         continue;
                                 }
-                                gAttachSubMenu->append(new LLMenuItemCallGL(attachment->getName(), 
-                                        &handle_attach_to_avatar, object_selected_and_point_valid, &attach_label, attachment));
+                                LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
+                                        NULL, &object_selected_and_point_valid, &attach_label, attachment);
+                                item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", mAttachmentPoints.reverseLookup(attachment));
+                                gAttachSubMenu->append(item);
+
                                 gDetachSubMenu->append(new LLMenuItemCallGL(attachment->getName(), 
                                         &handle_detach_from_avatar, object_attached, &detach_label, attachment));
                                 
@@ -2068,8 +2089,10 @@ void LLVOAvatar::buildCharacter()
 
                                 LLViewerJointAttachment* attachment = attach_it->second;
 
-                                gAttachBodyPartPieMenus[group]->append(new LLMenuItemCallGL(attachment->getName(), 
-                                        &handle_attach_to_avatar, object_selected_and_point_valid, attachment));
+                                LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
+                                        NULL, object_selected_and_point_valid);
+                                gAttachBodyPartPieMenus[group]->append(item);
+                                item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", mAttachmentPoints.reverseLookup(attachment));
                                 gDetachBodyPartPieMenus[group]->append(new LLMenuItemCallGL(attachment->getName(), 
                                         &handle_detach_from_avatar, object_attached, attachment));
 
@@ -2089,7 +2112,7 @@ void LLVOAvatar::releaseMeshData()
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
         
-        if (sInstances.getLength() < AVATAR_AGP_RELEASE_THRESHOLD || mIsDummy)
+        if (sInstances.size() < AVATAR_RELEASE_THRESHOLD || mIsDummy)
         {
                 return;
         }
@@ -2106,18 +2129,11 @@ void LLVOAvatar::releaseMeshData()
         mEyeBallRightLOD.setValid(FALSE, TRUE);
         mSkirtLOD.setValid(FALSE, TRUE);
 
-        //cleanup AGP data
+        //cleanup data
         if (mDrawable.notNull())
         {
                 LLFace* facep = mDrawable->getFace(0);
                 facep->setSize(0, 0);
-                mNumAGPVertices = 0;
-
-                // You need to reset the vertex data in order to guarantee
-                // that the data is deallocated, AND you start at the 0 index
-                // when you restore the face.  We're assuming ONLY ONE FACE per
-                // avatar pool, this logic is broken if that isn't the case!
-                facep->getPool()->resetVertexData(0);
         }
         
         for (LLViewerJointAttachment *attachmentPoint = mAttachmentPoints.getFirstData();
@@ -2161,7 +2177,7 @@ void LLVOAvatar::restoreMeshData()
         }
 
         // force mesh update as LOD might not have changed to trigger this
-        updateMeshData();
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
 }
 
 //-----------------------------------------------------------------------------
@@ -2174,29 +2190,28 @@ void LLVOAvatar::updateMeshData()
                 LLFace* facep = mDrawable->getFace(0);
 
                 U32 num_vertices = 0;
+                U32 num_indices = 0;
 
                 // this order is determined by number of LODS
                 // if a mesh earlier in this list changed LODs while a later mesh doesn't,
                 // the later mesh's index offset will be inaccurate
-                mEyeBallLeftLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mEyeBallRightLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mEyeLashLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mHeadLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mLowerBodyLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mSkirtLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mUpperBodyLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-                mHairLOD.updateFaceSizes(num_vertices, mAdjustedPixelArea);
-
-                if (num_vertices != mNumAGPVertices)
-                {
-                        // resize immediately
-//                      llinfos << "Resizing avatar AGP buffer!" << llendl;
-                        facep->getPool()->resetVertexData(num_vertices);
-                        facep->setSize(0,0);
-                        facep->setSize(num_vertices, 0);
-                        mNumAGPVertices = num_vertices;
-                }
-
+                mEyeBallLeftLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mEyeBallRightLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mEyeLashLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mHeadLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mLowerBodyLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mSkirtLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mUpperBodyLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+                mHairLOD.updateFaceSizes(num_vertices, num_indices, mAdjustedPixelArea);
+
+                // resize immediately
+                facep->setSize(num_vertices, num_indices);
+
+                facep->mVertexBuffer = new LLVertexBufferAvatar();
+                facep->mVertexBuffer->allocateBuffer(num_vertices, num_indices, TRUE);
+                facep->setGeomIndex(0);
+                facep->setIndicesIndex(0);
+                
                 // This is a hack! Avatars have their own pool, so we are detecting
                 //   the case of more than one avatar in the pool (thus > 0 instead of >= 0)
                 if (facep->getGeomIndex() > 0)
@@ -2379,13 +2394,8 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
         setPixelAreaAndAngle(gAgent);
 
         // Update the LOD of the joints
-        static const F32 UPDATE_TIME = .5f;
-        if (mUpdateLODTimer.hasExpired())
-        {
-                mUpdateLODTimer.setTimerExpirySec(UPDATE_TIME * (.75f + ll_frand(0.5f)));
-                updateJointLODs();
-        }
-        
+        //static const F32 UPDATE_TIME = .5f;
+        
         // force asynchronous drawable update
         if(mDrawable.notNull() && !gNoRender)
         {       
@@ -2445,6 +2455,17 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 
         updateCharacter(agent);
         
+
+                
+        if (LLVOAvatar::sJointDebug)
+        {
+                llinfos << getNVPair("FirstName")->getString() << getNVPair("LastName")->getString() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << llendl;
+        }
+
+        LLJoint::sNumUpdates = 0;
+        LLJoint::sNumTouches = 0;
+
+
         if (gNoRender)
         {
                 return TRUE;
@@ -2453,7 +2474,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
         // *NOTE: this is necessary for the floating name text above your head.
         if (mDrawable.notNull())
         {
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_SHADOW, TRUE);
         }
 
         // update attachments positions
@@ -2463,11 +2484,15 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                         attachment;
                         attachment = mAttachmentPoints.getNextData())
                 {
-                        LLViewerObject *attached_object = attachment->getObject(0);
-                        if (attached_object && !attached_object->isDead() && attachment->getValid())
+                        LLViewerObject *attached_object = attachment->getObject();
+
+                        BOOL visibleAttachment = isVisible() || !(attached_object && attached_object->mDrawable->getSpatialBridge()
+                                                                                  && (attached_object->mDrawable->getSpatialBridge()->getRadius() < 2.0));
+
+                        if (visibleAttachment && attached_object && !attached_object->isDead() && attachment->getValid())
                         {
                                 // if selecting any attachments, update all of them as non-damped
-                                if (gSelectMgr->getObjectCount() && gSelectMgr->selectionIsAttachment())
+                                if (gSelectMgr->getSelection()->getObjectCount() && gSelectMgr->getSelection()->isAttachment())
                                 {
                                         gPipeline.updateMoveNormalAsync(attached_object->mDrawable);
                                 }
@@ -2618,9 +2643,9 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
         const F32 FADE_DURATION = gSavedSettings.getF32("RenderNameFadeDuration"); // seconds
         BOOL visible_chat = gSavedSettings.getBOOL("UseChatBubbles") && (mChats.size() || mTyping);
         BOOL render_name =      visible_chat ||
-                                                (mVisible &&
-                                                (sRenderName == RENDER_NAME_ALWAYS) ||
-                                                (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME));
+                                                (isVisible() &&
+                                                ((sRenderName == RENDER_NAME_ALWAYS) ||
+                                                (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
         // If it's your own avatar, don't draw in mouselook, and don't
         // draw if we're specifically hiding our own name.
         if (mIsSelf)
@@ -2737,53 +2762,55 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                                 (is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute)
                                 || is_appearance != mNameAppearance)
                         {
-                                char line[MAX_STRING];
+                                char line[MAX_STRING];          /* Flawfinder: ignore */
                                 if (title && title->getString() && title->getString()[0] != '\0')
                                 {
-                                        strcpy(line, title->getString() );
-                                        strcat(line, "\n");
-                                        strcat(line, firstname->getString() );
+                                        strncpy(line, title->getString(), MAX_STRING -1 );              /* Flawfinder: ignore */
+                                        line[MAX_STRING -1] = '\0';
+                                        strcat(line, "\n");             /* Flawfinder: ignore */
+                                        strncat(line, firstname->getString(), MAX_STRING - strlen(line) -1 );           /* Flawfinder: ignore */
                                 }
                                 else
                                 {
-                                        strcpy(line, firstname->getString() );
+                                        strncpy(line, firstname->getString(), MAX_STRING -1 );          /* Flawfinder: ignore */
+                                        line[MAX_STRING -1] = '\0';
                                 }
 
-                                strcat(line, " ");
-                                strcat(line, lastname->getString());
+                                strcat(line, " ");              /* Flawfinder: ignore */
+                                strncat(line, lastname->getString(), MAX_STRING - strlen(line) -1);             /* Flawfinder: ignore */
                                 BOOL need_comma = FALSE;
 
                                 if (is_away || is_muted || is_busy)
                                 {
-                                        strcat(line, " (");
+                                        strcat(line, " (");             /* Flawfinder: ignore */
                                         if (is_away)
                                         {
-                                                strcat(line, "Away");
+                                                strcat(line, "Away");           /* Flawfinder: ignore */
                                                 need_comma = TRUE;
                                         }
                                         if (is_busy)
                                         {
                                                 if (need_comma)
                                                 {
-                                                        strcat(line, ", ");
+                                                        strcat(line, ", ");             /* Flawfinder: ignore */
                                                 }
-                                                strcat(line, "Busy");
+                                                strcat(line, "Busy");           /* Flawfinder: ignore */
                                                 need_comma = TRUE;
                                         }
                                         if (is_muted)
                                         {
                                                 if (need_comma)
                                                 {
-                                                        strcat(line, ", ");
+                                                        strcat(line, ", ");             /* Flawfinder: ignore */
                                                 }
-                                                strcat(line, "Muted");
+                                                strcat(line, "Muted");          /* Flawfinder: ignore */
                                                 need_comma = TRUE;
                                         }
-                                        strcat(line,")");
+                                        strcat(line,")");               /* Flawfinder: ignore */
                                 }
                                 if (is_appearance)
                                 {
-                                        strcat(line, "\n(Editing Appearance)");
+                                        strcat(line, "\n(Editing Appearance)");         /* Flawfinder: ignore */
                                 }
                                 mNameAway = is_away;
                                 mNameBusy = is_busy;
@@ -2805,7 +2832,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                                         mNameText->setLabel(mNameString);
                                 }
                         
-                                char line[MAX_STRING];
+                                char line[MAX_STRING];          /* Flawfinder: ignore */
                                 line[0] = '\0';
                                 std::deque<LLChat>::iterator chat_iter = mChats.begin();
                                 mNameText->clearString();
@@ -2922,22 +2949,24 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 
         if (!mBeam.isNull())
         {
+                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+
                 if (gAgent.mPointAt.notNull())
                 {
                         // get point from pointat effect
                         mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal());
                         mBeam->triggerLocal();
                 }
-                else if (gSelectMgr->getFirstRootObject() && 
-                                gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+                else if (selection->getFirstRootObject() && 
+                                selection->getSelectType() != SELECT_TYPE_HUD)
                 {
-                        LLViewerObject* objectp = gSelectMgr->getFirstRootObject();
+                        LLViewerObject* objectp = selection->getFirstRootObject();
                         mBeam->setTargetObject(objectp);
                 }
                 else
                 {
                         mBeam->setTargetObject(NULL);
-                        LLTool *tool = gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) );
+                        LLTool *tool = gToolMgr->getCurrentTool();
                         if (tool->isEditing())
                         {
                                 if (tool->getEditingObject())
@@ -2993,6 +3022,16 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
 
+        // update screen joint size
+        if (mScreenp)
+        {
+                F32 aspect = gCamera->getAspect();
+                LLVector3 scale(1.f, aspect, 1.f);
+                mScreenp->setScale(scale);
+                mScreenp->updateWorldMatrixChildren();
+                resetHUDAttachments();
+        }
+
         // clear debug text
         mDebugText.clear();
 
@@ -3005,28 +3044,30 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
                         {
                                 if (motionp->getMinPixelArea() < getPixelArea())
                                 {
-                                        char output[256];
+                                        char output[MAX_STRING];        /* Flawfinder: ignore */
                                         if (motionp->getName().empty())
                                         {
-                                                sprintf(output, "%s - %d", motionp->getID().getString().c_str(), (U32)motionp->getPriority());
+                                                snprintf( /* Flawfinder: ignore */
+                                                        output,
+                                                        MAX_STRING,
+                                                        "%s - %d",
+                                                        motionp->getID().asString().c_str(),
+                                                        (U32)motionp->getPriority());
                                         }
                                         else
                                         {
-                                                sprintf(output, "%s - %d", motionp->getName().c_str(), (U32)motionp->getPriority());
+                                                snprintf(       /* Flawfinder: ignore */
+                                                        output,
+                                                        MAX_STRING,
+                                                        "%s - %d",
+                                                        motionp->getName().c_str(),
+                                                        (U32)motionp->getPriority());
                                         }
                                         addDebugText(output);
                                 }
                         }
         }
 
-        if (LLVOAvatar::sJointDebug)
-        {
-                llinfos << getNVPair("FirstName")->getString() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << llendl;
-
-                LLJoint::sNumUpdates = 0;
-                LLJoint::sNumTouches = 0;
-        }
-//      llinfos << mPixelArea << llendl;
         if (gNoRender)
         {
                 // Hack if we're running drones...
@@ -3045,10 +3086,15 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
                 return;
         }
 
+        if (!mIsSelf && !isVisible())
+        {
+                return;
+        }
+
         // change animation time quanta based on avatar render load
         if (!mIsSelf)
         {
-                F32 time_quantum = clamp_rescale((F32)sInstances.getLength(), 10.f, 35.f, 0.f, 0.25f);
+                F32 time_quantum = clamp_rescale((F32)sInstances.size(), 10.f, 35.f, 0.f, 0.25f);
                 F32 pixel_area_scale = clamp_rescale(mPixelArea, 100, 5000, 1.f, 0.f);
                 F32 time_step = time_quantum * pixel_area_scale;
                 if (time_step != 0.f)
@@ -3077,10 +3123,6 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
                 mTimeVisible.reset();
         }
 
-        // update screen joint size
-        mScreenp->setScale(LLVector3(1.f, gCamera->getAspect(), 1.f));
-        mScreenp->updateWorldMatrixChildren();
-        
         //--------------------------------------------------------------------
         // create local variables in world coords for region position values
         //--------------------------------------------------------------------
@@ -3091,6 +3133,8 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
         xyVel.mV[VZ] = 0.0f;
         speed = xyVel.magVec();
 
+        BOOL throttle = TRUE;
+
         if (!(mIsSitting && getParent()))
         {
                 //--------------------------------------------------------------------
@@ -3101,6 +3145,7 @@ void 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
@@ -3144,7 +3189,16 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
                 // correct for the fact that the pelvis is not necessarily the center 
                 // of the agent's physical representation
                 root_pos.mdV[VZ] -= (0.5f * mBodySize.mV[VZ]) - mPelvisToFoot;
-                mRoot.setWorldPosition(gAgent.getPosAgentFromGlobal(root_pos) ); // regular update
+                
+
+                LLVector3 newPosition = gAgent.getPosAgentFromGlobal(root_pos);
+
+                if (newPosition != mRoot.getXform()->getWorldPosition())
+                {               
+                        mRoot.touch();
+                        mRoot.setWorldPosition(newPosition ); // regular update
+                }
+
 
                 //--------------------------------------------------------------------
                 // Propagate viewer object rotation to root of avatar
@@ -3314,9 +3368,10 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
                         //}
                         //end Ventrella
 
-                        F32 u = llclamp((deltaTime / pelvis_lag_time), 0.0f, 1.0f);
-                        
+                        F32 u = llclamp((deltaTime / pelvis_lag_time), 0.0f, 1.0f);     
+
                         mRoot.setWorldRotation( slerp(u, mRoot.getWorldRotation(), wQv) );
+                        
                 }
         }
         else if (mDrawable.notNull())
@@ -3328,8 +3383,17 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
         //--------------------------------------------------------------------
         // the rest should only be done when close enough to see it
         //--------------------------------------------------------------------
+        
+
+        if (mPixelArea > 12.0f)
+                throttle = FALSE;
+        if (mPixelArea < 400.0f)
+        {
+                throttle = (LLDrawable::getCurrentFrame()+mID.mData[0])%2 != 0;
+        }
+
         if ( !(mIsSitting && getParent()) && 
-                ((mPixelArea < 12.0f) || 
+                (throttle || 
                 (!isVisible() && (mPixelArea < MIN_PIXEL_AREA_FOR_COMPOSITE))) )
         {
                 mRoot.setWorldRotation( getRotation() );
@@ -3433,7 +3497,7 @@ void LLVOAvatar::updateCharacter(LLAgent &agent)
                         }
                 }
         }
-        
+
         mRoot.updateWorldMatrixChildren();
 
         if (!mDebugText.size() && mText.notNull())
@@ -3490,10 +3554,8 @@ void LLVOAvatar::updateVisibility(BOOL force_invisible)
         else if (!force_invisible)
         {
                 // calculate avatar distance wrt head
-                LLVector3         pos = mDrawable->getPositionAgent();
-                pos                  -= gCamera->getOrigin();
-                mDrawable->mDistanceWRTCamera   = pos.magVec();
-
+                mDrawable->updateDistance(*gCamera);
+                
                 if (!mDrawable->getSpatialGroup() || mDrawable->getSpatialGroup()->isVisible())
                 {
                         visible = TRUE;
@@ -3565,9 +3627,9 @@ void LLVOAvatar::updateVisibility(BOOL force_invisible)
                                 attachment;
                                 attachment = mAttachmentPoints.getNextData())
                         {
-                                if (attachment->getObject(0))
+                                if (attachment->getObject())
                                 {
-                                        if(attachment->getObject(0)->mDrawable->isVisible())
+                                        if(attachment->getObject()->mDrawable->isVisible())
                                         {
                                                 llinfos << attachment->getName() << " visible" << llendl;
                                         }
@@ -3591,7 +3653,6 @@ void LLVOAvatar::updateVisibility(BOOL force_invisible)
                 {
                         restoreMeshData();
                 }
-                gPipeline.markVisible(mDrawable);
         }
         else
         {
@@ -3618,11 +3679,12 @@ void LLVOAvatar::updateVisibility(BOOL force_invisible)
 void LLVOAvatar::updateAllAvatarVisiblity()
 {
         LLVOAvatar::sNumVisibleAvatars = 0;
-        LLVOAvatar *avatarp;
-
+        
         F32 render_priority = (F32)LLVOAvatar::sMaxVisible;
-        for (avatarp = (LLVOAvatar*)sInstances.getFirstData(); avatarp; avatarp = (LLVOAvatar*)sInstances.getNextData())
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
                 if (avatarp->isDead())
                 {
                         continue;
@@ -3661,7 +3723,7 @@ BOOL LLVOAvatar::needsRenderBeam()
         {
                 return FALSE;
         }
-        LLTool *tool = gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) );
+        LLTool *tool = gToolMgr->getCurrentTool();
 
         BOOL is_touching_or_grabbing = (tool == gToolGrab && gToolGrab->isEditing());
         if (gToolGrab->getEditingObject() && 
@@ -3760,26 +3822,22 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
 
         if (pass == AVATAR_RENDER_PASS_SINGLE)
         {
+                BOOL first_pass = TRUE;
                 if (!mIsSelf || gAgent.needsRenderHead())
                 {
                         num_indices += mHeadLOD.render(mAdjustedPixelArea);
+                        first_pass = FALSE;
                 }
-                num_indices += mUpperBodyLOD.render(mAdjustedPixelArea);
-                num_indices += mLowerBodyLOD.render(mAdjustedPixelArea);
-                if( isWearingWearableType( WT_SKIRT ) )
-                {
-                        glAlphaFunc(GL_GREATER,0.25f);
-                        num_indices += mSkirtLOD.render(mAdjustedPixelArea);
-                        glAlphaFunc(GL_GREATER,0.01f);
-                }
+                num_indices += mUpperBodyLOD.render(mAdjustedPixelArea, first_pass);
+                num_indices += mLowerBodyLOD.render(mAdjustedPixelArea, FALSE);
 
-                if (!mIsSelf || gAgent.needsRenderHead())
                 {
-                        num_indices += mEyeLashLOD.render(mAdjustedPixelArea);
-                        num_indices += mHairLOD.render(mAdjustedPixelArea);
+                        LLGLEnable blend(GL_BLEND);
+                        LLGLEnable test(GL_ALPHA_TEST);
+                        num_indices += renderTransparent();
                 }
         }
-        else if (pass == AVATAR_RENDER_PASS_CLOTHING_INNER)
+        /*else if (pass == AVATAR_RENDER_PASS_CLOTHING_INNER)
         {
                 if (!mIsSelf || gAgent.needsRenderHead())
                 {
@@ -3812,7 +3870,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
                 LLViewerJointMesh::sClothingMaskImageName = mLowerMaskTexName;
                 num_indices += mLowerBodyLOD.render(mAdjustedPixelArea);
                 LLViewerJointMesh::sClothingMaskImageName = 0;
-        }
+        }*/
 
         LLViewerJointMesh::sRenderPass = AVATAR_RENDER_PASS_SINGLE;
         
@@ -3823,6 +3881,27 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
         return num_indices;
 }
 
+U32 LLVOAvatar::renderTransparent()
+{
+        U32 num_indices = 0;
+        BOOL first_pass = FALSE;
+        if( isWearingWearableType( WT_SKIRT ) )
+        {
+                glAlphaFunc(GL_GREATER,0.25f);
+                num_indices += mSkirtLOD.render(mAdjustedPixelArea, FALSE);
+                first_pass = FALSE;
+                glAlphaFunc(GL_GREATER,0.01f);
+        }
+
+        if (!mIsSelf || gAgent.needsRenderHead())
+        {
+                num_indices += mEyeLashLOD.render(mAdjustedPixelArea, first_pass);
+                num_indices += mHairLOD.render(mAdjustedPixelArea, FALSE);
+        }
+
+        return num_indices;
+}
+
 //-----------------------------------------------------------------------------
 // renderRigid()
 //-----------------------------------------------------------------------------
@@ -3851,6 +3930,39 @@ U32 LLVOAvatar::renderRigid()
         return num_indices;
 }
 
+U32 LLVOAvatar::renderFootShadows()
+{
+        U32 num_indices = 0;
+
+        if (!mIsBuilt)
+        {
+                return 0;
+        }
+
+        if (mIsSelf && (!gAgent.needsRenderAvatar() || !gAgent.needsRenderHead()))
+        {
+                return 0;
+        }
+        
+        if (!mIsBuilt)
+        {
+                return 0;
+        }
+
+        U32 foot_mask = LLVertexBuffer::MAP_VERTEX |
+                                        LLVertexBuffer::MAP_TEXCOORD;
+
+        //render foot shadows
+        LLGLEnable blend(GL_BLEND);
+        mShadowImagep->bind();
+        glColor4fv(mShadow0Facep->getRenderColor().mV);
+        mShadow0Facep->renderIndexed(foot_mask);
+        glColor4fv(mShadow1Facep->getRenderColor().mV);
+        mShadow1Facep->renderIndexed(foot_mask);
+        
+        return num_indices;
+}
+
 //-----------------------------------------------------------------------------
 // renderCollisionVolumes()
 //-----------------------------------------------------------------------------
@@ -3867,6 +3979,7 @@ void LLVOAvatar::renderCollisionVolumes()
 //------------------------------------------------------------------------
 void LLVOAvatar::updateTextures(LLAgent &agent)
 {
+//      LLFastTimer ftm(LLFastTimer::FTM_TEMP5);
         BOOL render_avatar = TRUE;
 
         if (mIsDummy || gNoRender)
@@ -3941,6 +4054,8 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
         }
         */
 
+        mMaxPixelArea = 0.f;
+        mMinPixelArea = 99999999.f;
         for (U32 i = 0; i < getNumTEs(); i++)
         {
                 LLViewerImage *imagep = getTEImage(i);
@@ -3965,9 +4080,10 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
                                 && imagep->getID() != IMG_DEFAULT_AVATAR
                                 && !imagep->getTargetHost().isOk())
                         {
-                                llwarns << "LLVOAvatar::updateTextures No host for texture " << imagep->getID() 
-                                                << " for avatar " << (mIsSelf ? "<myself>" : getID().getString()) 
-                                                << " on host " << getRegion()->getHost() << llendl;
+                                llwarns << "LLVOAvatar::updateTextures No host for texture "
+                                        << imagep->getID() << " for avatar "
+                                        << (mIsSelf ? "<myself>" : getID().asString().c_str()) 
+                                        << " on host " << getRegion()->getHost() << llendl;
                         }
                         
                         switch( i )
@@ -4037,40 +4153,35 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
                         case TEX_HEAD_BAKED:
                                 if (head_baked)
                                 {
-                                        imagep->setBoostLevel(boost_level);
-                                        imagep->addTextureStats(mPixelArea, texel_area_ratio);
+                                        addBakedTextureStats( imagep, mPixelArea, texel_area_ratio, boost_level );
                                 }
                                 break;
 
                         case TEX_UPPER_BAKED:
                                 if (upper_baked)
                                 {
-                                        imagep->setBoostLevel(boost_level);
-                                        imagep->addTextureStats(mPixelArea, texel_area_ratio);
+                                        addBakedTextureStats( imagep, mPixelArea, texel_area_ratio, boost_level );
                                 }
                                 break;
                         
                         case TEX_LOWER_BAKED:
                                 if (lower_baked)
                                 {
-                                        imagep->setBoostLevel(boost_level);
-                                        imagep->addTextureStats(mPixelArea, texel_area_ratio);
+                                        addBakedTextureStats( imagep, mPixelArea, texel_area_ratio, boost_level );
                                 }
                                 break;
                         
                         case TEX_EYES_BAKED:
                                 if (eyes_baked)
                                 {
-                                        imagep->setBoostLevel(boost_level);
-                                        imagep->addTextureStats(mPixelArea, texel_area_ratio);
+                                        addBakedTextureStats( imagep, mPixelArea, texel_area_ratio, boost_level );
                                 }
                                 break;
 
                         case TEX_SKIRT_BAKED:
                                 if (skirt_baked)
                                 {
-                                        imagep->setBoostLevel(boost_level);
-                                        imagep->addTextureStats(mPixelArea, texel_area_ratio);
+                                        addBakedTextureStats( imagep, mPixelArea, texel_area_ratio, boost_level );
                                 }
                                 break;
 
@@ -4078,15 +4189,8 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
                                 // Hair is neither a local texture used for baking, nor the output
                                 // of the baking process.  It's just a texture that happens to be
                                 // used to draw avatars.  Hence BOOST_AVATAR.  JC
-                                if (mIsSelf)
-                                {
-                                        imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR_SELF);
-                                }
-                                else
-                                {
-                                        imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR);
-                                }
-                                imagep->addTextureStats(mPixelArea, texel_area_ratio);
+                                boost_level = mIsSelf ? LLViewerImage::BOOST_AVATAR_SELF : LLViewerImage::BOOST_AVATAR;
+                                addBakedTextureStats( imagep, mPixelArea, texel_area_ratio, boost_level );
                                 break;
                         
                         default:
@@ -4096,6 +4200,11 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
                 }
         }
 
+        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA))
+        {
+                setDebugText(llformat("%4.0f:%4.0f", fsqrtf(mMinPixelArea),fsqrtf(mMaxPixelArea)));
+        }       
+        
         if( render_avatar )
         {
                 mShadowImagep->addTextureStats(mPixelArea, 1.f);
@@ -4125,6 +4234,15 @@ void LLVOAvatar::addLocalTextureStats( LLVOAvatar::ELocTexIndex idx, LLViewerIma
         }
 }
 
+                            
+void LLVOAvatar::addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level)
+{
+        mMaxPixelArea = llmax(pixel_area, mMaxPixelArea);
+        mMinPixelArea = llmin(pixel_area, mMinPixelArea);
+        imagep->addTextureStats(pixel_area, texel_area_ratio);
+        imagep->setBoostLevel(boost_level);
+}
+
 //-----------------------------------------------------------------------------
 // resolveHeight()
 //-----------------------------------------------------------------------------
@@ -4409,14 +4527,7 @@ BOOL LLVOAvatar::stopMotion(const LLUUID& id, BOOL stop_immediate)
 {
         if (mIsSelf)
         {
-                if (id == ANIM_AGENT_STAND)
-                {
-                        LLAgent::stopFidget();
-                }
-                else if (id == ANIM_AGENT_AWAY)
-                {
-                        gAgent.clearAFK();
-                }
+                gAgent.onAnimStop(id);
         }
 
         if (id == ANIM_AGENT_WALK)
@@ -4609,7 +4720,7 @@ F32 LLVOAvatar::getTimeDilation()
 //-----------------------------------------------------------------------------
 // LLVOAvatar::getPixelArea()
 //-----------------------------------------------------------------------------
-F32 LLVOAvatar::getPixelArea()
+F32 LLVOAvatar::getPixelArea() const
 {
         if (mIsDummy)
         {
@@ -4971,6 +5082,11 @@ BOOL LLVOAvatar::loadSkeletonNode ()
                          iter != sAvatarInfo->mAttachmentInfoList.end(); iter++)
                 {
                         LLVOAvatarInfo::LLVOAvatarAttachmentInfo *info = *iter;
+                        if (!isSelf() && info->mJointName == "mScreen")
+                        { //don't process screen joint for other avatars
+                                continue;
+                        }
+
                         LLViewerJointAttachment* attachment = new LLViewerJointAttachment();
 
                         attachment->setName(info->mName);
@@ -5321,15 +5437,6 @@ void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent)
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
                 
-        LLVector3 viewer_pos_agent = agent.getCameraPositionAgent();
-        LLVector3 pos_agent;
-        
-        pos_agent = getRenderPosition();
-
-        F32 dx = viewer_pos_agent.mV[VX] - pos_agent.mV[VX];
-        F32 dy = viewer_pos_agent.mV[VY] - pos_agent.mV[VY];
-        F32 dz = viewer_pos_agent.mV[VZ] - pos_agent.mV[VZ];
-
         F32 max_scale = getMaxScale();
         F32 mid_scale = getMidScale();
         F32 min_scale = llmin( getScale().mV[VX], llmin( getScale().mV[VY], getScale().mV[VZ] ) );
@@ -5338,7 +5445,7 @@ void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent)
         // to try to get a min distance from face, subtract min_scale/2 from the range.
         // This means we'll load too much detail sometimes, but that's better than not enough
         // I don't think there's a better way to do this without calculating distance per-poly
-        F32 range = sqrt(dx*dx + dy*dy + dz*dz) - min_scale/2;
+        F32 range = (getRenderPosition()-gCamera->getOrigin()).magVec() - min_scale/2;
 
         if (range < 0.001f)             // range == zero
         {
@@ -5373,17 +5480,11 @@ void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent)
 //-----------------------------------------------------------------------------
 // updateJointLODs()
 //-----------------------------------------------------------------------------
-void LLVOAvatar::updateJointLODs()
+BOOL LLVOAvatar::updateJointLODs()
 {
-        if (!mMeshValid)
-        {
-                return;
-        }
-
         F32 lod_factor = (sLODFactor * AVATAR_LOD_TWEAK_RANGE + (1.f - AVATAR_LOD_TWEAK_RANGE));
         F32 avatar_num_min_factor = clamp_rescale(sLODFactor, 0.f, 1.f, 0.25f, 0.6f);
         F32 avatar_num_factor = clamp_rescale((F32)sNumVisibleAvatars, 8, 25, 1.f, avatar_num_min_factor);
-
         {
                 if (mIsSelf)
                 {
@@ -5406,16 +5507,17 @@ void LLVOAvatar::updateJointLODs()
                         mAdjustedPixelArea = (F32)mPixelArea * lod_factor * lod_factor * avatar_num_factor * avatar_num_factor;
                 }
 
-                // now select meshes to render based on adjusted pixel area, and perform AGP data push as necessary
+                // now select meshes to render based on adjusted pixel area
                 BOOL res = mRoot.updateLOD(mAdjustedPixelArea, TRUE);
                 if (res)
                 {
                         sNumLODChangesThisFrame++;
-                        updateMeshData();
+                        dirtyMesh();
+                        return TRUE;
                 }
         }
 
-        return;
+        return FALSE;
 }
 
 //-----------------------------------------------------------------------------
@@ -5426,24 +5528,22 @@ LLDrawable *LLVOAvatar::createDrawable(LLPipeline *pipeline)
         pipeline->allocDrawable(this);
         mDrawable->setLit(FALSE);
 
-        LLDrawPool *poolp = gPipeline.getPool(LLDrawPool::POOL_AVATAR);
+        LLDrawPoolAvatar *poolp = (LLDrawPoolAvatar*) gPipeline.getPool(LLDrawPool::POOL_AVATAR);
 
         // Only a single face (one per avatar)
         mDrawable->setState(LLDrawable::ACTIVE);
         mDrawable->addFace(poolp, NULL);
+        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_AVATAR);
         
-        poolp = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-
         LLFace *facep;
 
         // Add faces for the foot shadows
-        facep = mDrawable->addFace(poolp, mShadowImagep);
+        facep = mDrawable->addFace((LLFacePool*) NULL, mShadowImagep);
         mShadow0Facep = facep;
 
-        facep = mDrawable->addFace(poolp, mShadowImagep);
+        facep = mDrawable->addFace((LLFacePool*) NULL, mShadowImagep);
         mShadow1Facep = facep;
 
-        gPipeline.markMaterialed(mDrawable);
         dirtyMesh();
         return mDrawable;
 }
@@ -5454,6 +5554,7 @@ LLDrawable *LLVOAvatar::createDrawable(LLPipeline *pipeline)
 //-----------------------------------------------------------------------------
 BOOL LLVOAvatar::updateGeometry(LLDrawable *drawable)
 {
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_AVATAR);
         if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_AVATAR)))
         {
                 return TRUE;
@@ -5469,30 +5570,9 @@ BOOL LLVOAvatar::updateGeometry(LLDrawable *drawable)
                 llerrs << "LLVOAvatar::updateGeometry() called with NULL drawable" << llendl;
         }
 
-        // Update the shadow, tractor, and text label geometry.
-
-        updateShadowFaces();
-
-        if (!drawable->isVisible())
-        {
-                return TRUE;
-        }
-
-        LLFace* facep = drawable->getFace(0);
-        if (!mDirtyMesh && !facep->getDirty())
-        {
-                return TRUE;
-        }
-
-        // U32 num_vertices = 0;
-
-        updateMeshData();
-
-        mDirtyMesh = FALSE;
         return TRUE;
 }
 
-
 //-----------------------------------------------------------------------------
 // updateShadowFaces()
 //-----------------------------------------------------------------------------
@@ -5708,28 +5788,26 @@ void LLVOAvatar::removeChild(LLViewerObject *childp)
         detachObject(childp);
 }
 
-//-----------------------------------------------------------------------------
-// attachObject()
-//-----------------------------------------------------------------------------
-BOOL LLVOAvatar::attachObject(LLViewerObject *viewer_object)
+LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* viewer_object)
 {
         S32 attachmentID = ATTACHMENT_ID_FROM_STATE(viewer_object->getState());
-        //clamp((S32)(viewer_object->getState() & AGENT_ATTACH_MASK) >> AGENT_ATTACH_OFFSET, 1, 0xff);
-
-        //if (mIsSelf)
-        //{
-        //      gSelectMgr->deselectObjectAndFamily(viewer_object);
-        //}
 
         LLViewerJointAttachment* attachment = mAttachmentPoints.getIfThere(attachmentID);
 
         if (!attachment)
         {
-                llwarns << "Tried to attach object to invalid attachment point: " << attachmentID << llendl;
-                return FALSE;
+                llwarns << "Object attachment point invalid: " << attachmentID << llendl;
         }
 
-//      LLQuaternion object_world_rot = viewer_object->getWorldRotation();
+        return attachment;
+}
+
+//-----------------------------------------------------------------------------
+// attachObject()
+//-----------------------------------------------------------------------------
+BOOL LLVOAvatar::attachObject(LLViewerObject *viewer_object)
+{
+        LLViewerJointAttachment* attachment = getTargetAttachmentPoint(viewer_object);
 
         if (!attachment->addObject(viewer_object))
         {
@@ -5742,10 +5820,6 @@ BOOL LLVOAvatar::attachObject(LLViewerObject *viewer_object)
                 gSelectMgr->updatePointAt();
         }
 
-//      LLQuaternion desired_rot = (object_world_rot * ~attachment->getWorldRotation());
-
-        lldebugs << "Attaching object (" << attachmentID << ") item_id=" << attachment->getItemID() << " task_id=" << viewer_object->getID() << "to " << attachment->getName() << llendl;
-        
         if (mIsSelf)
         {
                 updateAttachmentVisibility(gAgent.getCameraMode());
@@ -5778,6 +5852,23 @@ void LLVOAvatar::lazyAttach()
                 }
 }
 
+void LLVOAvatar::resetHUDAttachments()
+{
+        for(LLViewerJointAttachment* attachment = mAttachmentPoints.getFirstData();
+                attachment;
+                attachment = mAttachmentPoints.getNextData())
+        {
+                if (attachment->getIsHUDAttachment())
+                {
+                        LLViewerObject* obj = attachment->getObject();
+                        if (obj && obj->mDrawable.notNull())
+                        {
+                                gPipeline.markMoved(obj->mDrawable);
+                        }
+                }
+        }
+}
+
 //-----------------------------------------------------------------------------
 // detachObject()
 //-----------------------------------------------------------------------------
@@ -5788,7 +5879,7 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
                 attachment = mAttachmentPoints.getNextData())
         {
                 // only one object per attachment point for now
-                if (attachment->getObject(0) == viewer_object)
+                if (attachment->getObject() == viewer_object)
                 {
                         LLUUID item_id = attachment->getItemID();
                         attachment->removeObject(viewer_object);
@@ -5981,7 +6072,7 @@ LLViewerObject* LLVOAvatar::getWornAttachment( const LLUUID& inv_item_id )
         {
                 if( attachment_point->getItemID() == inv_item_id )
                 {
-                        return attachment_point->getObject(0);
+                        return attachment_point->getObject();
                 }
         }
         return NULL;
@@ -6319,10 +6410,10 @@ const LLUUID& LLVOAvatar::getLocalTextureID( S32 index )
 void LLVOAvatar::dumpTotalLocalTextureByteCount()
 {
         S32 total_gl_bytes = 0;
-        for( LLVOAvatar* cur = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                cur;
-                cur = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* cur = (LLVOAvatar*) *iter;
                 S32 gl_bytes = 0;
                 cur->getLocalTextureByteCount(&gl_bytes );
                 total_gl_bytes += gl_bytes;
@@ -7722,7 +7813,7 @@ BOOL LLVOAvatar::hasHUDAttachment()
                 attachment;
                 attachment = mAttachmentPoints.getNextData())
                 {
-                        if (attachment->getIsHUDAttachment() && attachment->getObject(0))
+                        if (attachment->getIsHUDAttachment() && attachment->getObject())
                         {
                                 return TRUE;
                         }
@@ -7737,9 +7828,9 @@ LLBBox LLVOAvatar::getHUDBBox()
         attachment;
         attachment = mAttachmentPoints.getNextData())
         {
-                if (attachment->getIsHUDAttachment() && attachment->getObject(0))
+                if (attachment->getIsHUDAttachment() && attachment->getObject())
                 {
-                        LLViewerObject* hud_object = attachment->getObject(0);
+                        LLViewerObject* hud_object = attachment->getObject();
 
                         // initialize bounding box to contain identity orientation and center point for attached object
                         bbox.addPointLocal(hud_object->getPosition());
@@ -7757,52 +7848,6 @@ LLBBox LLVOAvatar::getHUDBBox()
 
 void LLVOAvatar::rebuildHUD()
 {
-        if (!mIsSelf)
-        {
-                return;
-        }
-
-        for(LLViewerJointAttachment *attachment = mAttachmentPoints.getFirstData();
-        attachment;
-        attachment = mAttachmentPoints.getNextData())
-        {
-                if (attachment->getIsHUDAttachment() && attachment->getObject(0))
-                {
-                        LLViewerObject* hud_object = attachment->getObject(0);
-                        LLDrawable* hud_drawable = hud_object->mDrawable;
-
-                        if (hud_drawable)
-                        {
-                                // this assumes that an AGP sync will happen because face has been backlisted, 
-                                // so that pool has been rebuilt this frame and is scheduled for a sync
-                                for(S32 face_index = 0; face_index < hud_drawable->getNumFaces(); ++face_index)
-                                {
-                                        LLFace* facep = hud_drawable->getFace(face_index);
-                                        if (facep->isState(LLFace::BACKLIST))
-                                        {
-                                                facep->restore();
-                                        }
-                                }
-                        }
-                        for (U32 child_num = 0; child_num < hud_object->mChildList.size(); ++child_num)
-                        {
-                                LLViewerObject* childp = hud_object->mChildList[child_num];
-                                LLDrawable* child_drawable = childp->mDrawable;
-
-                                if (child_drawable)
-                                {
-                                        for(S32 face_index = 0; face_index < child_drawable->getNumFaces(); ++face_index)
-                                        {
-                                                LLFace* facep = child_drawable->getFace(face_index);
-                                                if (facep->isState(LLFace::BACKLIST))
-                                                {
-                                                        facep->restore();
-                                                }
-                                        }
-                                }
-                        }
-                }
-        }
 }
 
 //-----------------------------------------------------------------------------
@@ -8059,8 +8104,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerImage *src_vi,
                 {
                         if (!aux_src->getData())
                         {
-                                llwarns << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl;
-                                src_vi->startImageDecode();
+                                llerrs << "No auxiliary source data for onBakedTextureMasksLoaded" << llendl;
                                 return;
                         }
 
@@ -8351,7 +8395,7 @@ void LLVOAvatar::dumpArchetypeXML( void* )
                                 LLViewerImage* te_image = avatar->getTEImage( te );
                                 if( te_image )
                                 {
-                                        char uuid_str[UUID_STR_LENGTH];
+                                        char uuid_str[UUID_STR_LENGTH];         /* Flawfinder: ignore */
                                         te_image->getID().toString( uuid_str );
                                         apr_file_printf( file, "\t\t<texture te=\"%i\" uuid=\"%s\"/>\n", te, uuid_str);
                                 }
@@ -8368,10 +8412,10 @@ void LLVOAvatar::dumpArchetypeXML( void* )
 S32 LLVOAvatar::getUnbakedPixelAreaRank()
 {
         S32 rank = 1;
-        for( LLVOAvatar* inst = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                inst; 
-                inst = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* inst = (LLVOAvatar*) *iter;
                 if( inst == this )
                 {
                         return rank;
@@ -8390,16 +8434,15 @@ S32 LLVOAvatar::getUnbakedPixelAreaRank()
 // static
 void LLVOAvatar::cullAvatarsByPixelArea()
 {
-        LLVOAvatar::sInstances.bubbleSortList();
-
-
+        std::sort(LLCharacter::sInstances.begin(), LLCharacter::sInstances.end(), CompareScreenAreaGreater());
+        
         // Update the avatars that have changed status
         S32 rank = 1;
 
-        for( LLVOAvatar* inst = (LLVOAvatar*)LLCharacter::sInstances.getFirstData();
-                inst; 
-                inst = (LLVOAvatar*)LLCharacter::sInstances.getNextData() )
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end(); ++iter)
         {
+                LLVOAvatar* inst = (LLVOAvatar*) *iter;
                 BOOL culled;
                 if( inst->isDead() )
                 {
@@ -8589,8 +8632,6 @@ void LLVOAvatar::dumpLocalTextures()
                         else
                         {
                                 LLViewerImage* image = mLocalTexture[i];
-                                F32 data_progress = 0.0f;
-                                F32 decode_progress = image->getDecodeProgress(&data_progress);
 
                                 llinfos << "LocTex " << names[i] << ": "
                                                 << "Discard " << image->getDiscardLevel() << ", "
@@ -8600,10 +8641,7 @@ void LLVOAvatar::dumpLocalTextures()
                                         // makes textures easier to steal
                                                 << image->getID() << " "
 #endif
-                                                << "Data: " << (data_progress * 100) << "% "
-                                                << "Decode: " << (decode_progress * 100) << "% "
-                                                << "Priority: " << image->getDecodePriority() << " "
-                                                << (image->needsDecode() ? "pending decode" : "not pending decode")
+                                                << "Priority: " << image->getDecodePriority()
                                                 << llendl;
                         }
                 }
@@ -8705,7 +8743,7 @@ BOOL LLVOAvatarBoneInfo::parseXml(LLXmlTreeNode* node)
         }
         else
         {
-                llerrs << "Invalid node " << node->getName() << llendl;
+                llwarns << "Invalid node " << node->getName() << llendl;
                 return FALSE;
         }
 
@@ -8763,7 +8801,7 @@ BOOL LLVOAvatarSkeletonInfo::parseXml(LLXmlTreeNode* node)
         static LLStdStringHandle num_bones_string = LLXmlTree::addAttributeString("num_bones");
         if (!node->getFastAttributeS32(num_bones_string, mNumBones))
         {
-                llerrs << "Couldn't find number of bones." << llendl;
+                llwarns << "Couldn't find number of bones." << llendl;
                 return FALSE;
         }
 
@@ -8777,7 +8815,8 @@ BOOL LLVOAvatarSkeletonInfo::parseXml(LLXmlTreeNode* node)
                 if (!info->parseXml(child))
                 {
                         delete info;
-                        llerrs << "Error parsing bone in skeleton file" << llendl;
+                        llwarns << "Error parsing bone in skeleton file" << llendl;
+                        return FALSE;
                 }
                 mBoneInfoList.push_back(info);
         }
@@ -9099,7 +9138,7 @@ BOOL LLVOAvatarInfo::parseXmlDriverNodes(LLXmlTreeNode* root)
 
 void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
 {
-        char filename[MAX_PATH];
+        char filename[MAX_PATH];                /* Flawfinder: ignore */
 
         // reset animated morphs
         setVisualParamWeight("Blink_Left", 0.f);
@@ -9119,7 +9158,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
         setVisualParamWeight("Hands_Spread_R", 0.f);
         updateVisualParams();
 
-        sprintf(filename, "%s\\%s_skeleton.xsf", path.c_str(), file_base.c_str());
+        snprintf(filename, MAX_PATH, "%s\\%s_skeleton.xsf", path.c_str(), file_base.c_str());           /* Flawfinder: ignore */
         apr_file_t* fp = ll_apr_file_open(filename, LL_APR_W);
         if (!fp)
         {
@@ -9131,7 +9170,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
         apr_file_printf(fp, "</SKELETON>\n");
         apr_file_close(fp);
 
-        sprintf(filename, "%s\\%s_mesh_body.xmf", path.c_str(), file_base.c_str());
+        snprintf(filename, MAX_PATH, "%s\\%s_mesh_body.xmf", path.c_str(), file_base.c_str());          /* Flawfinder: ignore */
         //gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"avatar.cal").c_str()
         fp = ll_apr_file_open(filename, LL_APR_W);
         if (!fp)
@@ -9162,7 +9201,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
 
         for (S32 i = 0; i < (has_skirt ? BAKED_TEXTURE_COUNT : BAKED_TEXTURE_COUNT - 1); i++)
         {
-                sprintf(filename, "%s\\%s_material_tex_%d.tga", path.c_str(), file_base.c_str(), i);
+                snprintf(filename, MAX_PATH, "%s\\%s_material_tex_%d.tga", path.c_str(), file_base.c_str(), i);         /* Flawfinder: ignore */
 
                 LLViewerImage* viewer_imagep = mTEImages[sBakedTextureIndices[i]];
                 if (!viewer_imagep->getHasGLTexture())
@@ -9177,7 +9216,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
         }
 
         // output image for hair
-        sprintf(filename, "%s\\%s_material_tex_5.tga", path.c_str(), file_base.c_str());
+        snprintf(filename, MAX_PATH, "%s\\%s_material_tex_5.tga", path.c_str(), file_base.c_str());             /* Flawfinder: ignore */
         LLViewerImage* viewer_imagep = mTEImages[TEX_HAIR];
         if (!viewer_imagep->getHasGLTexture())
         {
@@ -9192,7 +9231,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
         }
 
         // save out attachments
-        sprintf(filename, "%s\\%s_mesh_attachments.xmf", path.c_str(), file_base.c_str());
+        snprintf(filename, MAX_PATH, "%s\\%s_mesh_attachments.xmf", path.c_str(), file_base.c_str());           /* Flawfinder: ignore */
         fp = ll_apr_file_open(filename, LL_APR_W);
         if (!fp)
         {
@@ -9208,7 +9247,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
                 attachment;
                 attachment = mAttachmentPoints.getNextData())
                 {
-                        LLViewerObject *attached_object = attachment->getObject(0);
+                        LLViewerObject *attached_object = attachment->getObject();
                         if (attached_object && !attached_object->isDead() && attached_object->mDrawable.notNull() &&
                                 attached_object->getPCode() == LL_PCODE_VOLUME)
                         {
@@ -9229,7 +9268,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
                 attachment;
                 attachment = mAttachmentPoints.getNextData())
                 {
-                        LLViewerObject *attached_object = attachment->getObject(0);
+                        LLViewerObject *attached_object = attachment->getObject();
                         if (attached_object && !attached_object->isDead() && attached_object->getPCode() == LL_PCODE_VOLUME)
                         {
                                 LLVOVolume* attached_volume = (LLVOVolume*)attached_object;
@@ -9254,7 +9293,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
                 getSex() == SEX_MALE ? (LLKeyframeMotion*)findMotion(ANIM_AGENT_WALK) : (LLKeyframeMotion*)findMotion(ANIM_AGENT_FEMALE_WALK);
         if (FALSE)//(walk_motion)
         {
-                sprintf(filename, "%s\\%s_anim.xaf", path.c_str(), file_base.c_str());
+                snprintf(filename, MAX_PATH, "%s\\%s_anim.xaf", path.c_str(), file_base.c_str());               /* Flawfinder: ignore */
                 apr_file_t* fp = ll_apr_file_open(filename, LL_APR_W);
                 if (!fp)
                 {
@@ -9268,7 +9307,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
         }
 
         // finally, write out .cfg file
-        sprintf(filename, "%s\\%s_avatar.cfg", path.c_str(), file_base.c_str());
+        snprintf(filename, MAX_PATH, "%s\\%s_avatar.cfg", path.c_str(), file_base.c_str());             /* Flawfinder: ignore */
         fp = ll_apr_file_open(filename, LL_APR_W);
         if (!fp)
         {
@@ -9289,7 +9328,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
 
         for(S32 i = 0; i < 6; i++)
         {
-                sprintf(filename, "%s\\%s_material_%d.xrf", path.c_str(), file_base.c_str(), i);
+                snprintf(filename, MAX_PATH, "%s\\%s_material_%d.xrf", path.c_str(), file_base.c_str(), i);             /* Flawfinder: ignore */
                 apr_file_t* fp = ll_apr_file_open(filename, LL_APR_W);
                 if (!fp)
                 {
@@ -9316,7 +9355,7 @@ void LLVOAvatar::writeCAL3D(std::string& path, std::string& file_base)
         {
                 LLMaterialExportInfo* export_info = material_it->second;
 
-                sprintf(filename, "%s\\%s_material_%d.xrf", path.c_str(), file_base.c_str(), export_info->mMaterialIndex);
+                snprintf(filename, MAX_PATH, "%s\\%s_material_%d.xrf", path.c_str(), file_base.c_str(), export_info->mMaterialIndex);           /* Flawfinder: ignore */
                 apr_file_t* fp = ll_apr_file_open(filename, LL_APR_W);
                 if (!fp)
                 {
@@ -9441,3 +9480,58 @@ LLHost LLVOAvatar::getObjectHost() const
                 return LLHost::invalid;
         }
 }
+
+BOOL LLVOAvatar::updateLOD()
+{
+        BOOL res = updateJointLODs();
+
+        LLFace* facep = mDrawable->getFace(0);
+        if (facep->mVertexBuffer.isNull() ||
+                LLVertexBuffer::sEnableVBOs &&
+                ((facep->mVertexBuffer->getUsage() == GL_STATIC_DRAW ? TRUE : FALSE) !=
+                (facep->getPool()->getVertexShaderLevel() > 0 ? TRUE : FALSE)))
+        {
+                mDirtyMesh = TRUE;
+        }
+
+        if (mDirtyMesh || mDrawable->isState(LLDrawable::REBUILD_GEOMETRY))
+        {       //LOD changed or new mesh created, allocate new vertex buffer if needed
+                updateMeshData();
+        mDirtyMesh = FALSE;
+                mDrawable->clearState(LLDrawable::REBUILD_GEOMETRY);
+        }
+        
+        if (facep->getPool()->getVertexShaderLevel() <= 0)
+        {
+                //generate animated mesh
+                mLowerBodyLOD.updateGeometry();
+                mUpperBodyLOD.updateGeometry();
+
+                if( isWearingWearableType( WT_SKIRT ) )
+                {
+                        mSkirtLOD.updateGeometry();
+                }
+
+                if (!mIsSelf || gAgent.needsRenderHead())
+                {
+                        mEyeLashLOD.updateGeometry();
+                        mHeadLOD.updateGeometry();
+                        mHairLOD.updateGeometry();
+                }
+        }
+
+        // Update the shadow, tractor, and text label geometry.
+        if (mDrawable->isState(LLDrawable::REBUILD_SHADOW))
+        {
+                updateShadowFaces();
+                mDrawable->clearState(LLDrawable::REBUILD_SHADOW);
+        }
+
+        return res;
+}
+
+U32 LLVOAvatar::getPartitionType() const
+{ //avatars merely exist as drawables in the bridge partition
+        return LLPipeline::PARTITION_BRIDGE;
+}
+
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index f942273..ff37848 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -76,6 +76,13 @@ class LLDriverParamInfo;
 class LLHUDText;
 class LLHUDEffectSpiral;
 
+class LLVertexBufferAvatar : public LLVertexBuffer
+{
+public:
+        LLVertexBufferAvatar();
+        virtual void setupVertexBuffer(U32 data_mask) const;
+};
+
 typedef enum e_mesh_id
 {
         MESH_ID_HAIR,
@@ -232,6 +239,25 @@ protected:
         virtual ~LLVOAvatar();
 
 public:
+
+        struct CompareScreenAreaGreater
+        {               
+                bool operator()(const LLCharacter* const& lhs, const LLCharacter* const& rhs)
+                {
+                        return lhs->getPixelArea() > rhs->getPixelArea();
+                }
+        };
+
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD) |
+                                                        (1 << LLVertexBuffer::TYPE_WEIGHT) |
+                                                        (1 << LLVertexBuffer::TYPE_CLOTHWEIGHT)                                                 
+        }
+        eVertexDataMask;
+
         LLVOAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
         /*virtual*/ void markDead();
 
@@ -247,20 +273,24 @@ public:
                                                                                 const EObjectUpdateType update_type,
                                                                                 LLDataPacker *dp);
         virtual BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+        virtual BOOL updateLOD();
         void setFootPlane(const LLVector4 &plane) { mFootPlane = plane; }
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
 
         // Graphical stuff for objects - maybe broken out into render class later?
 
-        U32 renderSkinned(EAvatarRenderPass pass);
+        U32 renderFootShadows();
         U32 renderRigid();
-
+        U32 renderSkinned(EAvatarRenderPass pass);
+        U32 renderTransparent();
         void renderCollisionVolumes();
         
         /*virtual*/ void updateTextures(LLAgent &agent);
         // If setting a baked texture, need to request it from a non-local sim.
         /*virtual*/ S32 setTETexture(const U8 te, const LLUUID& uuid);
-
+        
+        virtual U32 getPartitionType() const;
+        
         void updateVisibility(BOOL force_invisible);
         void updateAttachmentVisibility(U32 camera_mode);
         void clampAttachmentPositions();
@@ -278,11 +308,14 @@ public:
         void updateShadowFaces();
 
         /*virtual*/ void                setPixelAreaAndAngle(LLAgent &agent);
-        void                                    updateJointLODs();
+        BOOL                                    updateJointLODs();
 
         void writeCAL3D(std::string& path, std::string& file_base);
 
         virtual void updateRegion(LLViewerRegion *regionp);
+
+        
+        void updateSpatialExtents(LLVector3& newMin, LLVector3 &newMax);
         
         //--------------------------------------------------------------------
         // texture entry assignment
@@ -342,7 +375,7 @@ public:
         virtual BOOL allocateCharacterJoints( U32 num );
         virtual LLJoint *getCharacterJoint( U32 num );
         virtual void requestStopMotion( LLMotion* motion );
-        virtual F32 getPixelArea();
+        virtual F32 getPixelArea() const;
         virtual LLPolyMesh*     getHeadMesh();
         virtual LLPolyMesh*     getUpperBodyMesh();
         virtual LLVector3d      getPosGlobalFromAgent(const LLVector3 &position);
@@ -362,7 +395,7 @@ public:
         // Other public functions
         //--------------------------------------------------------------------
         BOOL                    allocateCollisionVolumes( U32 num );
-
+        void                    resetHUDAttachments();
         static void             getAnimLabels( LLDynamicArray<const char*>* labels );
         static void             getAnimNames( LLDynamicArray<const char*>* names );
 
@@ -439,6 +472,7 @@ public:
         virtual void addChild(LLViewerObject *childp);
         virtual void removeChild(LLViewerObject *childp);
 
+        LLViewerJointAttachment* getTargetAttachmentPoint(LLViewerObject* viewer_object);
         BOOL attachObject(LLViewerObject *viewer_object);
         BOOL detachObject(LLViewerObject *viewer_object);
         void lazyAttach();
@@ -543,7 +577,7 @@ public:
         //--------------------------------------------------------------------
         // avatar definition name
         //--------------------------------------------------------------------
-        char mAvatarDefinition[64];
+        char mAvatarDefinition[64];             /* Flawfinder: ignore */
 
         //--------------------------------------------------------------------
         // skeleton for skinned avatar
@@ -836,7 +870,6 @@ protected:
 
         F32             mRenderPriority;
         F32             mAdjustedPixelArea;
-        S32             mNumAGPVertices;
 
         LLWString mNameString;
         LLString  mTitle;
@@ -877,6 +910,8 @@ protected:
         U32                                     mLowerMaskTexName;
 
         BOOL                            mCulled;
+        F32                                     mMinPixelArea; // debug
+        F32                                     mMaxPixelArea; // debug
         
         //--------------------------------------------------------------------
         // Global Colors
@@ -903,6 +938,7 @@ protected:
         
         void                    requestLayerSetUpdate(LLVOAvatar::ELocTexIndex i);
         void                    addLocalTextureStats(LLVOAvatar::ELocTexIndex i, LLViewerImage* imagep, F32 texel_area_ratio, BOOL rendered, BOOL covered_by_baked);
+        void                    addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level);
         static void             onInitialBakedTextureLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata );
         static void             onBakedTextureLoaded(BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);
         void                    useBakedTexture(const LLUUID& id);
diff --git a/linden/indra/newview/llvoclouds.cpp b/linden/indra/newview/llvoclouds.cpp
index a4e424a..7d1d958 100644
--- a/linden/indra/newview/llvoclouds.cpp
+++ b/linden/indra/newview/llvoclouds.cpp
@@ -29,6 +29,8 @@
 
 #include "llvoclouds.h"
 
+#include "lldrawpoolalpha.h"
+
 #include "llviewercontrol.h"
 
 #include "llagent.h"            // to get camera position
@@ -46,7 +48,7 @@
 #include "viewer.h"
 
 LLVOClouds::LLVOClouds(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, LL_VO_CLOUDS, regionp)
+:       LLAlphaObject(id, LL_VO_CLOUDS, regionp)
 {
         mCloudGroupp = NULL;
         mbCanSelect = FALSE;
@@ -99,77 +101,132 @@ LLDrawable* LLVOClouds::createDrawable(LLPipeline *pipeline)
         mDrawable->setLit(FALSE);
         mDrawable->setRenderType(LLPipeline::RENDER_TYPE_CLOUDS);
 
-        LLDrawPool *pool = gPipeline.getPool(LLDrawPool::POOL_CLOUDS);
-
-        mDrawable->setNumFaces(1, pool, getTEImage(0));
-
         return mDrawable;
 }
 
 BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
 {
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_CLOUDS);
         if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS)))
                 return TRUE;
         
-        LLVector3 at;
-        LLVector3 up;
-        LLVector3 right;
-        LLVector3 normal(0.f,0.f,-1.f);
-        LLVector3 position_agent;
-        //LLVector3 v[4];
         LLFace *facep;
-        const LLVector3 region_pos_agent = mRegionp->getOriginAgent();
-        const LLVector3 camera_agent = gAgent.getCameraPositionAgent();
-        LLVector3 center_offset = getPositionRegion();
-        LLVector2 uvs[4];
-
-        uvs[0].setVec(0.f, 1.f);
-        uvs[1].setVec(0.f, 0.f);
-        uvs[2].setVec(1.f, 1.f);
-        uvs[3].setVec(1.f, 0.f);
-
-        LLVector3 vtx[4];
-
+        
         S32 num_faces = mCloudGroupp->getNumPuffs();
 
-        drawable->setNumFacesFast(num_faces, gPipeline.getPool(LLDrawPool::POOL_CLOUDS), getTEImage(0));
+        if (num_faces > drawable->getNumFaces())
+        {
+                drawable->setNumFacesFast(num_faces, NULL, getTEImage(0));
+        }
+
+        mDepth = (getPositionAgent()-gCamera->getOrigin())*gCamera->getAtAxis();
 
         S32 face_indx = 0;
         for ( ; face_indx < num_faces; face_indx++)
         {
                 facep = drawable->getFace(face_indx);
-
-                LLStrider<LLVector3> verticesp, normalsp;
-                LLStrider<LLVector2> texCoordsp;
-                U32 *indicesp;
-                S32 index_offset;
-
-                facep->setPrimType(LLTriangles);
-                facep->setSize(4, 6);
-                index_offset = facep->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
-                if (-1 == index_offset)
+                if (isParticle())
                 {
-                        return TRUE;
+                        facep->setSize(1,1);
                 }
-
+                else
+                {
+                        facep->setSize(4, 6);
+                }
+                facep->setTEOffset(face_indx);
+                facep->setTexture(getTEImage(0));
                 const LLCloudPuff &puff = mCloudGroupp->getPuff(face_indx);
                 const LLVector3 puff_pos_agent = gAgent.getPosAgentFromGlobal(puff.getPositionGlobal());
-                facep->mCenterAgent = puff_pos_agent;
+                facep->mCenterLocal = puff_pos_agent;
+        }
+        for ( ; face_indx < drawable->getNumFaces(); face_indx++)
+        {
+                facep = drawable->getFace(face_indx);
+                facep->setTEOffset(face_indx);
+                facep->setSize(0,0);
+        }
+
+        drawable->movePartition();
+
+        return TRUE;
+}
+
+BOOL LLVOClouds::isParticle()
+{
+        return FALSE; // gGLManager.mHasPointParameters;
+}
+
+F32 LLVOClouds::getPartSize(S32 idx)
+{
+        return (CLOUD_PUFF_HEIGHT+CLOUD_PUFF_WIDTH)*0.5f;
+}
+
+void LLVOClouds::getGeometry(S32 te, 
+                                                        LLStrider<LLVector3>& verticesp, 
+                                                        LLStrider<LLVector3>& normalsp, 
+                                                        LLStrider<LLVector2>& texcoordsp, 
+                                                        LLStrider<LLColor4U>& colorsp, 
+                                                        LLStrider<U32>& indicesp)
+{
 
-                LLVector3 from_camera_vec = gCamera->getAtAxis();//puff_pos_agent - camera_agent;
-                at = from_camera_vec;
+        if (te >= mCloudGroupp->getNumPuffs())
+        {
+                return;
+        }
+
+        LLDrawable* drawable = mDrawable;
+        LLFace *facep = drawable->getFace(te);
+
+        if (!facep->hasGeometry())
+        {
+                return;
+        }
+        
+        LLVector3 normal(0.f,0.f,-1.f);
+
+        const LLCloudPuff &puff = mCloudGroupp->getPuff(te);
+        S32 index_offset = facep->getGeomIndex();
+        LLColor4U color(255, 255, 255, (U8) (puff.getAlpha()*255));
+        facep->setFaceColor(LLColor4(color));
+                
+        
+        if (isParticle())
+        {
+                *verticesp++ = facep->mCenterLocal;
+                *texcoordsp++ = LLVector2(0.5f, 0.5f);
+                *colorsp++ = color;
+                *normalsp++ = normal;
+                *indicesp++ = facep->getGeomIndex();
+        }
+        else
+        {
+                LLVector3 up;
+                LLVector3 right;
+                LLVector3 at;
+
+                const LLVector3& puff_pos_agent = facep->mCenterLocal;
+                LLVector2 uvs[4];
+
+                uvs[0].setVec(0.f, 1.f);
+                uvs[1].setVec(0.f, 0.f);
+                uvs[2].setVec(1.f, 1.f);
+                uvs[3].setVec(1.f, 0.f);
+
+                LLVector3 vtx[4];
+
+                at = gCamera->getAtAxis();
                 right = at % LLVector3(0.f, 0.f, 1.f);
                 right.normVec();
                 up = right % at;
                 up.normVec();
                 right *= 0.5f*CLOUD_PUFF_WIDTH;
                 up *= 0.5f*CLOUD_PUFF_HEIGHT;;
-
-                facep->mCenterAgent = puff_pos_agent;
-
-                LLColor4 color(1.f, 1.f, 1.f, puff.getAlpha());
-                facep->setFaceColor(color);
                 
+                *colorsp++ = color;
+                *colorsp++ = color;
+                *colorsp++ = color;
+                *colorsp++ = color;
+
                 vtx[0] = puff_pos_agent - right + up;
                 vtx[1] = puff_pos_agent - right - up;
                 vtx[2] = puff_pos_agent + right + up;
@@ -180,10 +237,10 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
                 *verticesp++  = vtx[2];
                 *verticesp++  = vtx[3];
 
-                *texCoordsp++ = uvs[0];
-                *texCoordsp++ = uvs[1];
-                *texCoordsp++ = uvs[2];
-                *texCoordsp++ = uvs[3];
+                *texcoordsp++ = uvs[0];
+                *texcoordsp++ = uvs[1];
+                *texcoordsp++ = uvs[2];
+                *texcoordsp++ = uvs[3];
 
                 *normalsp++   = normal;
                 *normalsp++   = normal;
@@ -198,10 +255,28 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
                 *indicesp++ = index_offset + 3;
                 *indicesp++ = index_offset + 2;
         }
-        for ( ; face_indx < drawable->getNumFaces(); face_indx++) 
+}
+
+U32 LLVOClouds::getPartitionType() const
+{
+        return LLPipeline::PARTITION_CLOUD;
+}
+
+// virtual
+void LLVOClouds::updateDrawable(BOOL force_damped)
+{
+        // Force an immediate rebuild on any update
+        if (mDrawable.notNull())
         {
-                drawable->getFace(face_indx)->setSize(0,0);
+                mDrawable->updateXform(TRUE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
         }
+        clearChanged(SHIFTED);
+}
 
-        return TRUE;
+LLCloudPartition::LLCloudPartition()
+{
+        mDrawableType = LLPipeline::RENDER_TYPE_CLOUDS;
+        mPartitionType = LLPipeline::PARTITION_CLOUD;
 }
+
diff --git a/linden/indra/newview/llvoclouds.h b/linden/indra/newview/llvoclouds.h
index 1618ab6..a8846e9 100644
--- a/linden/indra/newview/llvoclouds.h
+++ b/linden/indra/newview/llvoclouds.h
@@ -38,7 +38,7 @@ class LLViewerCloudGroup;
 class LLCloudGroup;
 
 
-class LLVOClouds : public LLViewerObject
+class LLVOClouds : public LLAlphaObject
 {
 public:
         LLVOClouds(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp );
@@ -47,16 +47,29 @@ public:
         // Initialize data that's only inited once per class.
         static void initClass();
 
+        void updateDrawable(BOOL force_damped); 
+
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
+        /*virtual*/ void                getGeometry(S32 te, 
+                                                        LLStrider<LLVector3>& verticesp, 
+                                                        LLStrider<LLVector3>& normalsp, 
+                                                        LLStrider<LLVector2>& texcoordsp, 
+                                                        LLStrider<LLColor4U>& colorsp, 
+                                                        LLStrider<U32>& indicesp);
 
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
+        BOOL isParticle();
+        F32 getPartSize(S32 idx);
 
         /*virtual*/ void updateTextures(LLAgent &agent);
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
-
+        
+        void updateFaceSize(S32 idx) { }
         BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
 
+        virtual U32 getPartitionType() const;
+
         void setCloudGroup(LLCloudGroup *cgp)           { mCloudGroupp = cgp; }
 protected:
         LLCloudGroup *mCloudGroupp;
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index 58e5378..9201549 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -68,7 +68,7 @@ S32 LLVOGrass::sMaxGrassSpecies = 0;
 
 
 LLVOGrass::LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, pcode, regionp)
+:       LLAlphaObject(id, pcode, regionp)
 {
         mPatch               = NULL;
         mLastPatchUpdateTime = 0;
@@ -206,13 +206,13 @@ void LLVOGrass::initClass()
 
         BOOL have_all_grass = TRUE;
         LLString err;
-        char buffer[10];
+        char buffer[10];                /* Flawfinder: ignore */
 
         for (S32 i=0;i<sMaxGrassSpecies;++i)
         {
                 if (!sSpeciesTable.count(i))
                 {
-                        snprintf(buffer,10," %d",i);
+                        snprintf(buffer,10," %d",i);            /* Flawfinder: ignore */
                         err.append(buffer);
                         have_all_grass = FALSE;
                 }
@@ -318,38 +318,45 @@ void LLVOGrass::setPixelAreaAndAngle(LLAgent &agent)
 {
         // This should be the camera's center, as soon as we move to all region-local.
         LLVector3 relative_position = getPositionAgent() - agent.getCameraPositionAgent();
-        F32 range = relative_position.magVec();                         // ugh, square root
+        F32 range = relative_position.magVec();
 
         F32 max_scale = getMaxScale();
 
         mAppAngle = (F32) atan2( max_scale, range) * RAD_TO_DEG;
 
         // Compute pixels per meter at the given range
-        F32 pixels_per_meter = gCamera->getViewHeightInPixels() / 
-                                                (tan(gCamera->getView()) * range);
+        F32 pixels_per_meter = gCamera->getViewHeightInPixels() / (tan(gCamera->getView()) * range);
 
-        // Assume grass texture is a 1 meter by 1 meter sprite at the grass object's center
-        mPixelArea = (pixels_per_meter) * (pixels_per_meter);
+        // Assume grass texture is a 5 meter by 5 meter sprite at the grass object's center
+        mPixelArea = (pixels_per_meter) * (pixels_per_meter) * 25.f;
 }
 
 
 // BUG could speed this up by caching the relative_position and range calculations
 void LLVOGrass::updateTextures(LLAgent &agent)
 {
-        // dot_product = A B cos T
-        // BUT at_axis is unit, so dot_product = B cos T
-        LLVector3 relative_position = getPositionAgent() - agent.getCameraPositionAgent();
-        F32 dot_product = relative_position * agent.getFrameAgent().getAtAxis();
-        F32 cos_angle = dot_product / relative_position.magVec();
+        F32 texel_area_ratio = 1.f;
+        F32 cos_angle = 1.f;
 
         if (getTEImage(0))
         {
-                getTEImage(0)->addTextureStats(mPixelArea*20.f, 1.f, cos_angle);
+                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA))
+                {
+                        setDebugText(llformat("%4.0f", fsqrtf(mPixelArea)));
+                }
+                getTEImage(0)->addTextureStats(mPixelArea, texel_area_ratio, cos_angle);
         }
 }
 
 BOOL LLVOGrass::updateLOD()
 {
+        if (mDrawable->getNumFaces() <= 0)
+        {
+                return FALSE;
+        }
+        
+        LLFace* face = mDrawable->getFace(0);
+
         F32 tan_angle = 0.f;
         S32 num_blades = 0;
 
@@ -363,6 +370,7 @@ BOOL LLVOGrass::updateLOD()
                         mNumBlades <<= 1;
                 }
 
+                face->setSize(mNumBlades*8, mNumBlades*12);
                 gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
         }
         else if (num_blades <= (mNumBlades >> 1))
@@ -372,6 +380,7 @@ BOOL LLVOGrass::updateLOD()
                         mNumBlades >>=1;
                 }
 
+                face->setSize(mNumBlades*8, mNumBlades*12);
                 gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
                 return TRUE;
         }
@@ -382,53 +391,20 @@ BOOL LLVOGrass::updateLOD()
 LLDrawable* LLVOGrass::createDrawable(LLPipeline *pipeline)
 {
         pipeline->allocDrawable(this);
-//      mDrawable->setLit(FALSE);
         mDrawable->setRenderType(LLPipeline::RENDER_TYPE_GRASS);
-
-        LLDrawPool *pool = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-
-        mDrawable->setNumFaces(1, pool, getTEImage(0));
-
+        
         return mDrawable;
 }
 
 BOOL LLVOGrass::updateGeometry(LLDrawable *drawable)
 {
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_GRASS);
         plantBlades();
         return TRUE;
 }
 
 void LLVOGrass::plantBlades()
 {
-        mPatch               = mRegionp->getLand().resolvePatchRegion(getPositionRegion());
-        mLastPatchUpdateTime = mPatch->getLastUpdateTime();
-        
-        LLVector3 position;
-        // Create random blades of grass with gaussian distribution
-        F32 x,y,xf,yf,dzx,dzy;
-
-        LLVector3 normal(0,0,1);
-        LLColor4U color(0,0,0,1);
-
-        LLFace *face = mDrawable->getFace(0);
-
-        LLStrider<LLVector3> verticesp;
-        LLStrider<LLVector3> normalsp;
-        LLStrider<LLVector2> texCoordsp;
-        LLStrider<LLColor4U> colorsp;
-
-        U32 *indicesp;
-
-        face->setPool(face->getPool(), getTEImage(0));
-        face->setState(LLFace::GLOBAL);
-        face->setSize(mNumBlades * 4, mNumBlades * 12);
-        face->setPrimType(LLTriangles);
-        S32 index_offset = face->getGeometryColors(verticesp,normalsp,texCoordsp,colorsp,indicesp);
-        if (-1 == index_offset)
-        {
-                return;
-        }
-
         // It is possible that the species of a grass is not defined
         // This is bad, but not the end of the world.
         if (!sSpeciesTable.count(mSpecies))
@@ -437,9 +413,49 @@ void LLVOGrass::plantBlades()
                 return;
         }
         
+        if (mDrawable->getNumFaces() < 1)
+        {
+                mDrawable->setNumFaces(1, NULL, getTEImage(0));
+        }
+                
+        LLFace *face = mDrawable->getFace(0);
+
+        face->setTexture(getTEImage(0));
+        face->setState(LLFace::GLOBAL);
+        face->setSize(mNumBlades * 8, mNumBlades * 12);
+        face->mVertexBuffer = NULL;
+        face->setTEOffset(0);
+        face->mCenterLocal = mPosition + mRegionp->getOriginAgent();
+        
+        mDepth = (face->mCenterLocal - gCamera->getOrigin())*gCamera->getAtAxis();
+        mDrawable->setPosition(face->mCenterLocal);
+        mDrawable->movePartition();
+        LLPipeline::sCompiles++;
+}
+
+void LLVOGrass::getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp)
+{
+        mPatch = mRegionp->getLand().resolvePatchRegion(getPositionRegion());
+        mLastPatchUpdateTime = mPatch->getLastUpdateTime();
+        
+        LLVector3 position;
+        // Create random blades of grass with gaussian distribution
+        F32 x,y,xf,yf,dzx,dzy;
+
+        LLColor4U color(255,255,255,255);
+
+        LLFace *face = mDrawable->getFace(idx);
+
         F32 width  = sSpeciesTable[mSpecies]->mBladeSizeX;
         F32 height = sSpeciesTable[mSpecies]->mBladeSizeY;
 
+        U32 index_offset = face->getGeomIndex();
+
         for (S32 i = 0;  i < mNumBlades; i++)
         {
                 x   = exp_x[i] * mScale.mV[VX];
@@ -449,70 +465,113 @@ void LLVOGrass::plantBlades()
                 dzx = dz_x [i];
                 dzy = dz_y [i];
 
+                LLVector3 v1,v2,v3;
                 F32 blade_height= GRASS_BLADE_HEIGHT * height * w_mod[i];
 
-                *texCoordsp++   = LLVector2(0, 0);
-                *texCoordsp++   = LLVector2(0, 0.98f);
-                *texCoordsp++   = LLVector2(1, 0);
-                *texCoordsp++   = LLVector2(1, 0.98f);
+                *texcoordsp++   = LLVector2(0, 0);
+                *texcoordsp++   = LLVector2(0, 0);
+                *texcoordsp++   = LLVector2(0, 0.98f);
+                *texcoordsp++   = LLVector2(0, 0.98f);
+                *texcoordsp++   = LLVector2(1, 0);
+                *texcoordsp++   = LLVector2(1, 0);
+                *texcoordsp++   = LLVector2(1, 0.98f);
+                *texcoordsp++   = LLVector2(1, 0.98f);
 
                 position.mV[0]  = mPosition.mV[VX] + x + xf;
                 position.mV[1]  = mPosition.mV[VY] + y + yf;
-                position.mV[2]  = 0.f;
                 position.mV[2]  = mRegionp->getLand().resolveHeightRegion(position);
-                *verticesp++    = position + mRegionp->getOriginAgent();
+                *verticesp++    = v1 = position + mRegionp->getOriginAgent();
+                *verticesp++    = v1;
+
 
                 position.mV[0] += dzx;
                 position.mV[1] += dzy;
                 position.mV[2] += blade_height;
-                *verticesp++    = position + mRegionp->getOriginAgent();
+                *verticesp++    = v2 = position + mRegionp->getOriginAgent();
+                *verticesp++    = v2;
 
                 position.mV[0]  = mPosition.mV[VX] + x - xf;
                 position.mV[1]  = mPosition.mV[VY] + y - xf;
-                position.mV[2]  = 0.f;
                 position.mV[2]  = mRegionp->getLand().resolveHeightRegion(position);
-                *verticesp++    = position + mRegionp->getOriginAgent();
+                *verticesp++    = v3 = position + mRegionp->getOriginAgent();
+                *verticesp++    = v3;
+
+                LLVector3 normal1 = (v1-v2) % (v2-v3);
+                normal1.mV[VZ] = 0.75f;
+                normal1.normVec();
+                LLVector3 normal2 = -normal1;
+                normal2.mV[VZ] = -normal2.mV[VZ];
 
                 position.mV[0] += dzx;
                 position.mV[1] += dzy;
                 position.mV[2] += blade_height;
-                *verticesp++    = position + mRegionp->getOriginAgent();
+                *verticesp++    = v1 = position + mRegionp->getOriginAgent();
+                *verticesp++    = v1;
+
+                *(normalsp++)   = normal1;
+                *(normalsp++)   = normal2;
+                *(normalsp++)   = normal1;
+                *(normalsp++)   = normal2;
 
-                *(normalsp++)   = normal;
-                *(normalsp++)   = normal;
-                *(normalsp++)   = normal;
-                *(normalsp++)   = normal;
+                *(normalsp++)   = normal1;
+                *(normalsp++)   = normal2;
+                *(normalsp++)   = normal1;
+                *(normalsp++)   = normal2;
 
                 *(colorsp++)   = color;
                 *(colorsp++)   = color;
                 *(colorsp++)   = color;
                 *(colorsp++)   = color;
+                *(colorsp++)   = color;
+                *(colorsp++)   = color;
+                *(colorsp++)   = color;
+                *(colorsp++)   = color;
                 
                 *indicesp++     = index_offset + 0;
-                *indicesp++     = index_offset + 1;
                 *indicesp++     = index_offset + 2;
+                *indicesp++     = index_offset + 4;
 
-                *indicesp++     = index_offset + 1;
-                *indicesp++     = index_offset + 3;
                 *indicesp++     = index_offset + 2;
+                *indicesp++     = index_offset + 6;
+                *indicesp++     = index_offset + 4;
 
-                *indicesp++     = index_offset + 0;
-                *indicesp++     = index_offset + 2;
                 *indicesp++     = index_offset + 1;
+                *indicesp++     = index_offset + 5;
+                *indicesp++     = index_offset + 3;
 
-                *indicesp++     = index_offset + 1;
-                *indicesp++     = index_offset + 2;
                 *indicesp++     = index_offset + 3;
-                index_offset   += 4;
+                *indicesp++     = index_offset + 5;
+                *indicesp++     = index_offset + 7;
+                index_offset   += 8;
         }
 
         LLPipeline::sCompiles++;
-
-        face->mCenterLocal = mPosition;
-
 }
 
+U32 LLVOGrass::getPartitionType() const
+{
+        return LLPipeline::PARTITION_GRASS;
+}
 
+LLGrassPartition::LLGrassPartition()
+{
+        mDrawableType = LLPipeline::RENDER_TYPE_GRASS;
+        mPartitionType = LLPipeline::PARTITION_GRASS;
+        mLODPeriod = 16;
+        mDepthMask = TRUE;
+        mSlopRatio = 0.1f;
+        mRenderPass = LLRenderPass::PASS_GRASS;
+        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
+}
 
-
-
+// virtual
+void LLVOGrass::updateDrawable(BOOL force_damped)
+{
+        // Force an immediate rebuild on any update
+        if (mDrawable.notNull())
+        {
+                mDrawable->updateXform(TRUE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+        }
+        clearChanged(SHIFTED);
+}
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 50d5460..023db03 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -36,7 +36,7 @@ class LLSurfacePatch;
 class LLViewerImage;
 
 
-class LLVOGrass : public LLViewerObject
+class LLVOGrass : public LLAlphaObject
 {
 public:
         LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
@@ -46,6 +46,8 @@ public:
         static void initClass();
         static void cleanupClass();
 
+        virtual U32 getPartitionType() const;
+
         /*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys,
                                                                                         void **user_data,
                                                                                         U32 block_num, 
@@ -53,11 +55,19 @@ public:
                                                                                         LLDataPacker *dp);
         static void import(FILE *file, LLMessageSystem *mesgsys, const LLVector3 &pos);
         /*virtual*/ void exportFile(FILE *file, const LLVector3 &position);
-        
+
+        void updateDrawable(BOOL force_damped);
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL                updateGeometry(LLDrawable *drawable);
-
+        /*virtual*/ void                getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp);
+
+        void updateFaceSize(S32 idx) { }
         /*virtual*/ void updateTextures(LLAgent &agent);                                                                                        
         /*virtual*/ BOOL updateLOD();
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
diff --git a/linden/indra/newview/llvoground.cpp b/linden/indra/newview/llvoground.cpp
index 7001cb8..0ae6ed8 100644
--- a/linden/indra/newview/llvoground.cpp
+++ b/linden/indra/newview/llvoground.cpp
@@ -28,6 +28,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llvoground.h"
+#include "lldrawpoolground.h"
 
 #include "llviewercontrol.h"
 
@@ -40,7 +41,7 @@
 #include "pipeline.h"
 
 LLVOGround::LLVOGround(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, pcode, regionp)
+:       LLStaticViewerObject(id, pcode, regionp)
 {
         mbCanSelect = FALSE;
 }
@@ -57,10 +58,10 @@ BOOL LLVOGround::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                 return TRUE;
         }
         
-        if (mDrawable)
+        /*if (mDrawable)
         {
                 gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-        }
+        }*/
         return TRUE;
 }
 
@@ -75,7 +76,8 @@ LLDrawable *LLVOGround::createDrawable(LLPipeline *pipeline)
         pipeline->allocDrawable(this);
         mDrawable->setLit(FALSE);
 
-        LLDrawPool *poolp = gPipeline.getPool(LLDrawPool::POOL_GROUND);
+        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_GROUND);
+        LLDrawPoolGround *poolp = (LLDrawPoolGround*) gPipeline.getPool(LLDrawPool::POOL_GROUND);
 
         mDrawable->addFace(poolp, NULL);
 
@@ -87,15 +89,25 @@ BOOL LLVOGround::updateGeometry(LLDrawable *drawable)
         LLStrider<LLVector3> verticesp;
         LLStrider<LLVector3> normalsp;
         LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
         LLFace *face;   
 
+        LLDrawPoolGround *poolp = (LLDrawPoolGround*) gPipeline.getPool(LLDrawPool::POOL_GROUND);
+
         if (drawable->getNumFaces() < 1)
-                drawable->addFace(gPipeline.getPool(LLDrawPool::POOL_GROUND), NULL);
+                drawable->addFace(poolp, NULL);
         face = drawable->getFace(0); 
-        face->setPrimType(LLTriangles);
-        face->setSize(6, 12);
+                
+        if (face->mVertexBuffer.isNull())
+        {
+                face->setSize(5, 12);
+                face->mVertexBuffer = new LLVertexBuffer(LLDrawPoolGround::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
+                face->mVertexBuffer->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE);
+                face->setGeomIndex(0);
+                face->setIndicesIndex(0);
+        }
+        
         index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
         if (-1 == index_offset)
         {
@@ -117,68 +129,40 @@ BOOL LLVOGround::updateGeometry(LLDrawable *drawable)
         left_dir.normVec();
 
         // Our center top point
-        LLVector3 center_top, center_bottom;
-
         LLColor4 ground_color = gSky.getFogColor();
         ground_color.mV[3] = 1.f;
         face->setFaceColor(ground_color);
         
-        if (gCamera->getOrigin().mV[VZ] < gAgent.getRegion()->getWaterHeight())
-        {
-                // Underwater
-                //center_top = gCamera->getOrigin() + at_dir*gCamera->getFar();
-                center_top = gCamera->getOrigin() - LLVector3(0, 0, 5);
-                center_bottom = gCamera->getOrigin() + at_dir*gCamera->getFar();;
-                //center_top.mV[VZ] = gAgent.getRegion()->getWaterHeight() + 0.5f;
-                center_bottom.mV[VZ] = -100.f;
-        }
-        else
-        {
-                // Above water
-                center_top = gCamera->getOrigin() - LLVector3(0, 0, 30);
-                if ((gPipeline.getVertexShaderLevel(LLPipeline::SHADER_ENVIRONMENT) > 0))
-                {
-                        center_top.mV[VZ] = gAgent.getRegion()->getWaterHeight();
-                }
-                //center_top = gCamera->getOrigin() + at_dir*9000.f;
-                center_bottom = gCamera->getOrigin() - at_dir*gCamera->getFar();
-                //center_top.mV[VZ] = 0.f;
-                //center_bottom.mV[VZ] = gAgent.getRegion()->getWaterHeight();
-        }
-
-        *(verticesp++)  = center_top + LLVector3(6000, 6000, 0);
-        *(verticesp++)  = center_top + LLVector3(-6000, 6000, 0);
-        *(verticesp++)  = center_top + LLVector3(-6000, -6000, 0);
-        
-        *(verticesp++)  = center_top + LLVector3(-6000, -6000, 0);
-        *(verticesp++)  = center_top + LLVector3(6000, -6000, 0);
-        *(verticesp++)  = center_top + LLVector3(6000, 6000, 0);
+        *(verticesp++)  = LLVector3(64, 64, 0);
+        *(verticesp++)  = LLVector3(-64, 64, 0);
+        *(verticesp++)  = LLVector3(-64, -64, 0);
+        *(verticesp++)  = LLVector3(64, -64, 0);
+        *(verticesp++)  = LLVector3(0, 0, -1024);
         
         
         // Triangles for each side
         *indicesp++ = index_offset + 0;
         *indicesp++ = index_offset + 1;
-        *indicesp++ = index_offset + 3;
+        *indicesp++ = index_offset + 4;
 
-        *indicesp++ = index_offset + 0;
-        *indicesp++ = index_offset + 3;
+        *indicesp++ = index_offset + 1;
         *indicesp++ = index_offset + 2;
+        *indicesp++ = index_offset + 4;
 
         *indicesp++ = index_offset + 2;
         *indicesp++ = index_offset + 3;
-        *indicesp++ = index_offset + 5;
+        *indicesp++ = index_offset + 4;
 
-        *indicesp++ = index_offset + 2;
-        *indicesp++ = index_offset + 5;
+        *indicesp++ = index_offset + 3;
+        *indicesp++ = index_offset + 0;
         *indicesp++ = index_offset + 4;
 
         *(texCoordsp++) = LLVector2(0.f, 0.f);
         *(texCoordsp++) = LLVector2(1.f, 0.f);
-        *(texCoordsp++) = LLVector2(0.f, 1.f);
         *(texCoordsp++) = LLVector2(1.f, 1.f);
-        *(texCoordsp++) = LLVector2(0.f, 2.f);
-        *(texCoordsp++) = LLVector2(1.f, 2.f);
-
+        *(texCoordsp++) = LLVector2(0.f, 1.f);
+        *(texCoordsp++) = LLVector2(0.5f, 0.5f);
+        
         LLPipeline::sCompiles++;
         return TRUE;
 }
diff --git a/linden/indra/newview/llvoground.h b/linden/indra/newview/llvoground.h
index e0d4700..5b995f8 100644
--- a/linden/indra/newview/llvoground.h
+++ b/linden/indra/newview/llvoground.h
@@ -34,7 +34,7 @@
 #include "llviewerimage.h"
 #include "llviewerobject.h"
 
-class LLVOGround : public LLViewerObject
+class LLVOGround : public LLStaticViewerObject
 {
 protected:
 public:
diff --git a/linden/indra/newview/llvopart.cpp b/linden/indra/newview/llvopart.cpp
deleted file mode 100644
index 6b38cf9..0000000
--- a/linden/indra/newview/llvopart.cpp
+++ /dev/null
@@ -1,1358 +0,0 @@
-/** 
- * @file llvopart.cpp
- * @brief Viewer-object derived particle system.
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llvopart.h"
-
-#include "llfasttimer.h"
-#include "message.h"
-
-#include "llagent.h"
-#include "lldrawable.h"
-#include "llface.h"
-#include "llsky.h"
-#include "llviewercamera.h"
-#include "llviewerimagelist.h"
-#include "llviewerregion.h"
-#include "pipeline.h"
-
-const F32 MAX_PART_LIFETIME = 120.f;
-
-extern U64 gFrameTime;
-
-LLVOPart::LLVOPart(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, pcode, regionp)
-{
-        mParticlesDead = FALSE;
-        setNumTEs(1);
-        setDefaultValues();
-
-        mbCanSelect = FALSE;                    // users can't select particle systems
-        mNumLiveParticles = 0;
-}
-
-
-LLVOPart::~LLVOPart()
-{
-        delete [] mParticleState;
-        mParticleState = NULL;
-
-        delete [] mDeadArr;
-        mDeadArr = NULL;
-}
-
-void LLVOPart::initClass()
-{
-}
-
-U32 LLVOPart::processUpdateMessage(LLMessageSystem *mesgsys,
-                                                                                  void **user_data,
-                                                                                  U32 block_num,
-                                                                                  const EObjectUpdateType update_type,
-                                                                                  LLDataPacker *dp)
-{
-        S32 dataSize;
-        U8 packed_psys_data[180];
-        // Do base class updates...
-        mTimeLastFrame = gFrameTime;
-        U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
-
-        if (update_type == OUT_TERSE_IMPROVED)
-        {
-                // Nothing else needs to be done for the terse message.
-                return retval;
-        }
-        
-        dataSize = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Data);
-
-        if(dataSize == sizeof(LLPartInitData)) 
-        {
-                // Uncompressed particle.  Is this used?  JC
-                mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, &mInitSysData, dataSize, block_num);
-
-                if(mInitSysData.createMe)
-                {
-                        if (mInitSysData.initialParticles >= mInitSysData.maxParticles)
-                        {
-                                mInitSysData.initialParticles = mInitSysData.maxParticles - 1;
-                        }
-                        setParticleParams(mInitSysData.bounce_b, 
-                                                          getPositionRegion().mV, 
-                                                          getRotation().mQ, 
-                                                          mInitSysData.maxParticles, 
-                                                          mInitSysData.mImageUuid,
-                                                          mInitSysData.mFlags);
-                        initializeParticlesAndConstraints(mInitSysData.initialParticles,
-                                                                                                                mInitSysData.diffEqAlpha,
-                                                                                                                mInitSysData.diffEqScale,
-                                                                                                                mInitSysData.scale_range,
-                                                                                                                mInitSysData.alpha_range,
-                                                                                                                mInitSysData.vel_offset,
-                                                                                                                mInitSysData.killPlaneZ,
-                                                                                                                mInitSysData.killPlaneNormal,
-                                                                                                                mInitSysData.bouncePlaneZ,
-                                                                                                                mInitSysData.bouncePlaneNormal,
-                                                                                                                mInitSysData.spawnRange,
-                                                                                                                mInitSysData.spawnFrequency,
-                                                                                                                mInitSysData.spawnFreqencyRange,
-                                                                                                                mInitSysData.spawnDirection,
-                                                                                                                mInitSysData.spawnDirectionRange,
-                                                                                                                mInitSysData.spawnVelocity,
-                                                                                                                mInitSysData.spawnVelocityRange,
-                                                                                                                mInitSysData.speedLimit,
-                                                                                                                mInitSysData.windWeight,
-                                                                                                                mInitSysData.currentGravity,
-                                                                                                                mInitSysData.gravityWeight,
-                                                                                                                mInitSysData.globalLifetime,
-                                                                                                                mInitSysData.individualLifetime,
-                                                                                                                mInitSysData.individualLifetimeRange,
-                                                                                                                mInitSysData.alphaDecay,
-                                                                                                                mInitSysData.scaleDecay,
-                                                                                                                mInitSysData.distanceDeath,
-                                                                                                                mInitSysData.dampMotionFactor,
-                                                                                                                mInitSysData.windDiffusionFactor);
-                        setParticlesDistFadeout(mInitSysData.mDistBeginFadeout, 
-                                        mInitSysData.mDistEndFadeout);
-                }
-        }
-        else if(dataSize > 4) 
-        {
-                mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, packed_psys_data, dataSize, block_num);  
-        
-                LLPartSysCompressedPacket  CompObjectData;
-                U32 sizeUsed;
-        
-                CompObjectData.fromUnsignedBytes(packed_psys_data, dataSize);
-                CompObjectData.toLLPartInitData(&mInitSysData, &sizeUsed);
-                
-                if(mInitSysData.createMe)
-                {
-                        if (mInitSysData.initialParticles >= mInitSysData.maxParticles)
-                        {
-                                mInitSysData.initialParticles = mInitSysData.maxParticles - 1;
-                        }
-                        setParticleParams(mInitSysData.bounce_b, 
-                                                          getPositionRegion().mV, 
-                                                          getRotation().mQ, 
-                                                          mInitSysData.maxParticles, 
-                                                          mInitSysData.mImageUuid, 
-                                                          mInitSysData.mFlags);
-                        initializeParticlesAndConstraints(mInitSysData.initialParticles,
-                                                                                                        mInitSysData.diffEqAlpha,
-                                                                                                        mInitSysData.diffEqScale,
-                                                                                                        mInitSysData.scale_range,
-                                                                                                        mInitSysData.alpha_range,
-                                                                                                        mInitSysData.vel_offset,
-                                                                                                        mInitSysData.killPlaneZ,
-                                                                                                        mInitSysData.killPlaneNormal,
-                                                                                                        mInitSysData.bouncePlaneZ,
-                                                                                                        mInitSysData.bouncePlaneNormal,
-                                                                                                        mInitSysData.spawnRange,
-                                                                                                        mInitSysData.spawnFrequency,
-                                                                                                        mInitSysData.spawnFreqencyRange,
-                                                                                                        mInitSysData.spawnDirection,
-                                                                                                        mInitSysData.spawnDirectionRange,
-                                                                                                        mInitSysData.spawnVelocity,
-                                                                                                        mInitSysData.spawnVelocityRange,
-                                                                                                        mInitSysData.speedLimit,
-                                                                                                        mInitSysData.windWeight,
-                                                                                                        mInitSysData.currentGravity,
-                                                                                                        mInitSysData.gravityWeight,
-                                                                                                        mInitSysData.globalLifetime,
-                                                                                                        mInitSysData.individualLifetime,
-                                                                                                        mInitSysData.individualLifetimeRange,
-                                                                                                        mInitSysData.alphaDecay,
-                                                                                                        mInitSysData.scaleDecay,
-                                                                                                        mInitSysData.distanceDeath,
-                                                                                                        mInitSysData.dampMotionFactor,
-                                                                                                        mInitSysData.windDiffusionFactor);
-                        setParticlesDistFadeout(mInitSysData.mDistBeginFadeout, 
-                                mInitSysData.mDistEndFadeout);
-                }
-        }
-
-        translateParticlesTo(getPositionRegion());
-        rotateParticlesTo(getRotation());
-        return retval;
-}
-
-
-BOOL LLVOPart::isActive() const
-{
-        return TRUE;
-}
-
-BOOL LLVOPart::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
-{
-        if (mDeathTimer.getElapsedTimeF32() > MAX_PART_LIFETIME)
-        {
-                //llinfos << "LLVOPart dead due to extended lifetime" << llendl;
-                return FALSE;
-        }
-
-        if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES))
-        {
-                if (!mDrawable)
-                {
-                        llwarns << "LLVOPart idle with no drawable!" << llendl;
-                        return FALSE;
-                }
-                // I don't know why you'd want to do ANYTHING with invisible particles. ??? - Doug
-                if(mFlags[PART_SYS_INVISIBLE_BYTE] & PART_SYS_INVISIBLE_BIT)
-                {
-                        llwarns << "Invisible particle, killing" << llendl;
-                        return FALSE;
-                }
-
-                F64 delta_time = ((S64)(gFrameTime - mTimeLastFrame))*(1.0/((F64)USEC_PER_SEC));
-                mParticlesDead = !iterateParticles((F32)delta_time);
-
-                if(mParticlesDead)
-                {
-                        return FALSE;
-                }
-
-                translateParticlesTo(getPositionRegion());
-
-                mTimeLastFrame = gFrameTime;
-                setChanged(GEOMETRY);
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-
-        }
-        LLViewerObject::idleUpdate(agent, world, time);
-        return TRUE;
-}
-
-
-void LLVOPart::updateTextures(LLAgent &agent)
-{
-        if (getTEImage(0))
-        {
-                LLVector3 relative_position = getPositionAgent() - agent.getCameraPositionAgent();
-                F32 dot_product = relative_position * agent.getFrameAgent().getAtAxis();
-                F32 cos_angle = dot_product / relative_position.magVec();
-
-                if (cos_angle > 1.f)
-                {
-                        cos_angle = 1.f;
-                }
-
-                getTEImage(0)->addTextureStats(mPixelArea, 1.f, cos_angle);
-        }
-}
-
-
-LLDrawable* LLVOPart::createDrawable(LLPipeline *pipeline)
-{
-        pipeline->allocDrawable(this);
-        mDrawable->setLit(FALSE);
-        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
-
-        LLDrawPool *pool = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-        mDrawable->setNumFaces(mNumPart, pool, getTEImage(0));
-        return mDrawable;
-}
-
-BOOL LLVOPart::updateGeometry(LLDrawable *drawable)
-{
-        if (isChanged(LLPrimitive::GEOMETRY))
-        {
-                LLFace *face;
-
-                ///////////////////////
-                //
-                // Allocate/deallocate faces based on number of particles we need to render
-                //
-                //
-                if (drawable->getNumFaces())
-                {
-                        face = drawable->getFace(0);
-                        drawable->setNumFaces(mNumPart, face->getPool(), getTEImage(0));
-                }
-                else
-                {
-                        LLDrawPool *pool = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-                        drawable->setNumFaces(mNumPart, pool, getTEImage(0));
-                }
-
-                LLVector3 light_norm;
-
-                if (gSky.sunUp())
-                {
-                        light_norm = -gSky.getSunDirection();
-                }
-                else
-                {
-                        light_norm = -gSky.getMoonDirection();
-                }
-                light_norm.normVec();
-                
-                // Figure out the lighting for the particle system.
-                LLColor4 color(1.f,1.f,1.f,1.f);
-                LLVector3 at, left, up;
-
-                at = gCamera->getAtAxis();
-                left = gCamera->getLeftAxis();
-                up = gCamera->getUpAxis();
-
-                LLVector3 v_agent[4];
-
-                LLMatrix3 cached_oo;
-                cached_oo.setRot(mOriginOrientation);
-                U32 i;
-                U32 cur_face = 0;
-                for (i = 0; i < mNumPart; i++)
-                {
-                        face = drawable->getFace(cur_face++);
-
-                        if (0 != mDeadArr[i])
-                        {
-                                face->setSize(0);
-                                continue; // if this particle is dead, don't render it
-                        }
-
-
-                        LLStrider<LLVector3> verticesp;
-                        LLStrider<LLVector3> normalsp;
-                        LLStrider<LLVector2> texCoordsp;
-                        U32 *indicesp;
-                        S32 index_offset;
-
-                        face->setPrimType(LLTriangles);
-                        face->setSize(4, 6);
-                        index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
-                        if (-1 == index_offset)
-                        {
-                                llerrs << "Error allocating geometry!" << llendl;
-                        }
-
-                        LLVector3 position_agent;
-                        LLVector3 part_pos_local;
-                        F32 alpha = 1.0f;
-                        F32 scale = 1.0f; // elements of the particle system have random scales too! -- MDS
-
-                        position_agent = mSpawnPoint + getRegion()->getOriginAgent();
-
-                        if(mFlags[PART_SYS_FOLLOW_VEL_BYTE] & PART_SYS_FOLLOW_VEL_BIT)
-                        {
-                                part_pos_local.mV[0] = mParticleState[i].position[0]*cached_oo.mMatrix[0][0]+
-                                        mParticleState[i].position[1]*cached_oo.mMatrix[0][1]+
-                                        mParticleState[i].position[2]*cached_oo.mMatrix[0][2];
-                        
-                                part_pos_local.mV[1] = mParticleState[i].position[0]*cached_oo.mMatrix[1][0]+
-                                        mParticleState[i].position[1]*cached_oo.mMatrix[1][1]+
-                                        mParticleState[i].position[2]*cached_oo.mMatrix[1][2];
-
-                                part_pos_local.mV[2] = mParticleState[i].position[0]*cached_oo.mMatrix[2][0]+
-                                        mParticleState[i].position[1]*cached_oo.mMatrix[2][1]+
-                                        mParticleState[i].position[2]*cached_oo.mMatrix[2][2];
-
-                                scale = mParticleState[i].scale[0];
-                                alpha = mParticleState[i].alpha[0]; 
-
-                                //26 September 2001 - alter alpha and scale as approach death
-                                //j = death_offset_i(i);
-                                scale *= ((1.f - mScaleDecay) + (mScaleDecay * mParticleState[i].deathOffset));
-                                alpha *= ((1.f - mAlphaDecay) + (mAlphaDecay * mParticleState[i].deathOffset));
-
-                                up.mV[0] = -mParticleState[i].position[0]; 
-                                up.mV[1] = -mParticleState[i].position[1];
-                                up.mV[2] = -mParticleState[i].position[2]; // set "up" to trail velocity
-                                
-                                if(up.magVec() == 0.0f) // alleviate potential divide by zero bug
-                                {
-                                        up.mV[2] += 1.0f;
-                                }
-
-                                up.normVec();
-                                up = up - (up*at) * at;  
-                                
-                                left = up % at;
-
-                                up *= scale * 0.5f;
-                                left *= scale * 0.5f;
-                                position_agent += part_pos_local;
-                                face->mCenterAgent = position_agent;
-                                v_agent[0] = position_agent + left + up;
-                                v_agent[1] = position_agent - left + up;
-                                v_agent[2] = position_agent - left - up;
-                                v_agent[3] = position_agent + left - up;
-                                *(texCoordsp) = LLVector2(0.f, 1.f);
-                                texCoordsp++;
-                                *(texCoordsp) = LLVector2(0.f, 0.f);
-                                texCoordsp++;
-                                *(texCoordsp) = LLVector2(1.f, 1.f);
-                                texCoordsp++;
-                                *(texCoordsp) = LLVector2(1.f, 0.f);
-                                texCoordsp++;
-                        }
-                        else
-                        {
-                                part_pos_local.mV[0] = mParticleState[i].position[0]*cached_oo.mMatrix[0][0]+
-                                        mParticleState[i].position[1]*cached_oo.mMatrix[0][1]+
-                                        mParticleState[i].position[2]*cached_oo.mMatrix[0][2];
-                        
-                                part_pos_local.mV[1] = mParticleState[i].position[0]*cached_oo.mMatrix[1][0]+
-                                        mParticleState[i].position[1]*cached_oo.mMatrix[1][1]+
-                                        mParticleState[i].position[2]*cached_oo.mMatrix[1][2];
-
-                                part_pos_local.mV[2] = mParticleState[i].position[0]*cached_oo.mMatrix[2][0]+
-                                        mParticleState[i].position[1]*cached_oo.mMatrix[2][1]+
-                                        mParticleState[i].position[2]*cached_oo.mMatrix[2][2];
-
-
-                                scale = mParticleState[i].scale[0];
-                                alpha = mParticleState[i].alpha[0]; 
-
-                                //26 September 2001 - alter alpha and scale as approach death
-                                scale *= ((1.f - mScaleDecay) + (mScaleDecay * mParticleState[i].deathOffset));
-                                alpha *= ((1.f - mAlphaDecay) + (mAlphaDecay * mParticleState[i].deathOffset));
-                                
-                                LLVector3 part_up = scale * 0.5f * up;
-                                LLVector3 part_left = scale * 0.5f * left;
-
-                                position_agent += part_pos_local;
-                                face->mCenterAgent = position_agent;
-                                v_agent[0] = position_agent + part_left + part_up;
-                                v_agent[1] = position_agent - part_left + part_up;
-                                v_agent[2] = position_agent - part_left - part_up;
-                                v_agent[3] = position_agent + part_left - part_up;
-                                *(texCoordsp) = LLVector2(0.f, 1.f);
-                                texCoordsp++;
-                                *(texCoordsp) = LLVector2(0.f, 0.f);
-                                texCoordsp++;
-                                *(texCoordsp) = LLVector2(1.f, 1.f);
-                                texCoordsp++;
-                                *(texCoordsp) = LLVector2(1.f, 0.f);
-                                texCoordsp++;
-                        }
-
-                        color.mV[3] = alpha;
-                        face->setFaceColor(color);
-                        
-                        *(verticesp++)  = v_agent[1];
-                        *(verticesp++)  = v_agent[2];
-                        *(verticesp++)  = v_agent[0];
-                        *(verticesp++)  = v_agent[3];
-
-                        *(indicesp++) = index_offset + 0;
-                        *(indicesp++) = index_offset + 2;
-                        *(indicesp++) = index_offset + 1;
-
-                        *(indicesp++) = index_offset + 1;
-                        *(indicesp++) = index_offset + 2;
-                        *(indicesp++) = index_offset + 3;
-                }
-                LLPipeline::sCompiles++;
-        }
-
-        return TRUE;
-}
-
-
-void LLVOPart::setDefaultValues() 
-{
-        U32     i;
-
-        // initialize to safe but meaningless values : no other constructors 
-        mParticleState = NULL;
-        mNumPart = 0;
-        mAlpha = 1.0f;
-        mLastTime = mCurrTime = 0.0f;
-        //mOriginPosition[0] = mOriginPosition[1] = mOriginPosition[2] = 0.0f;
-        mOriginOrientation.setQuatInit(0.0f, 0.0f, 0.0f, 1.0f);
-        mDeadArr = NULL;
-        
-        mKillPlaneNormal.mV[VX] = 0.0f;//Straight up - needs to be unit
-        mKillPlaneNormal.mV[VY] = 0.0f;
-        mKillPlaneNormal.mV[VZ] = 1.0f;
-
-        mBouncePlaneNormal.mV[VX] = 0.0f;//Straight up - needs to be unit
-        mBouncePlaneNormal.mV[VY] = 0.0f;
-        mBouncePlaneNormal.mV[VZ] = 1.0f;
-
-        mSpawnPoint.mV[VX] = 0.0f;
-        mSpawnPoint.mV[VY] = 0.0f;
-        mSpawnPoint.mV[VZ] = 0.0f;
-
-        mSpawnDirection.mV[VX] = 0.0f;//Straight up - needs to be unit
-        mSpawnDirection.mV[VY] = 0.0f;
-        mSpawnDirection.mV[VZ] = 1.0f;
-
-        mCurrentWind.mV[VX] = 0.0f;
-        mCurrentWind.mV[VY] = 0.0f;
-        mCurrentWind.mV[VZ] = 0.0f;
-
-        mCurrentWindMagnitude = 0.0f;
-        mCurrentWindMagnitudeSquareRoot = 0.0f;
-
-        mCurrentGravity.mV[VX] = 0.0f;//Straight down
-        mCurrentGravity.mV[VY] = 0.0f;
-        mCurrentGravity.mV[VZ] = -9.81f;
-
-        mVelocityOffset.mV[VX] = 0.0f;
-        mVelocityOffset.mV[VY] = 0.0f;
-        mVelocityOffset.mV[VZ] = 0.0f;
-
-        for(i = 0; i < PART_SYS_BYTES_OF_FLAGS; i++) 
-        {
-                mFlags[i] = 0x00;
-        }
-
-        //set default action and kill flags
-        //These defaults are for an explosion - a short lived set of debris affected by gravity.
-                //Action flags default to PART_SYS_AFFECTED_BY_WIND + PART_SYS_AFFECTED_BY_GRAVITY + PART_SYS_DISTANCE_DEATH 
-        mFlags[PART_SYS_ACTION_BYTE] = PART_SYS_AFFECTED_BY_WIND | PART_SYS_AFFECTED_BY_GRAVITY | PART_SYS_DISTANCE_DEATH;
-        mFlags[PART_SYS_KILL_BYTE] = PART_SYS_DISTANCE_DEATH + PART_SYS_TIME_DEATH;
-
-        for (i = 0; i < 3; i++)
-        {
-                mDiffEqAlpha[i] = 0.0f;
-                mDiffEqScale[i] = 0.0f;
-        }
-
-        mScale_range[0] = 1.00f;
-        mScale_range[1] = 5.00f;
-        mScale_range[2] = mScale_range[3] = 0.0f;
-
-        mAlpha_range[0] = mAlpha_range[1] = 1.0f;
-        mAlpha_range[2] = mAlpha_range[3] = 0.0f;
-
-
-        mKillPlaneZ = 0.0f;
-        mBouncePlaneZ = 0.0f;
-
-        mSpawnRange = 1.0f;
-        mSpawnFrequency = 0.0f;
-        mSpawnFrequencyRange = 0.0f;
-        mSpawnDirectionRange = 1.0f;    //everywhere
-        mSpawnVelocity = 0.75f;
-        mSpawnVelocityRange = 0.25f;    //velocity +/- 0.25
-        mSpeedLimitSquared = 1.0f;
-        mWindWeight = 0.5f;     //0.0f means looks like a heavy object (if gravity is on), 1.0f means light and fluffy
-        mGravityWeight = 0.5f;  //0.0f means boyed by air, 1.0f means it's a lead weight
-        mGlobalLifetime = 0.0f; //Arbitrary, but default is no global die, so doesn't matter
-        mOriginalGlobalLifetime = 0.0f;
-        mIndividualLifetime = 5.0f;
-        if (mIndividualLifetime > 0.0f)
-        {
-                mOneOverIndividualLifetime = 1.0f / mIndividualLifetime;
-        }
-        else
-        {
-                mOneOverIndividualLifetime = 0.0f;
-        }
-        mIndividualLifetimeRange = 1.0f;        //Particles last 5 secs +/- 1
-        mAlphaDecay = 1.0f;     //normal alpha fadeout
-        mScaleDecay = 0.0f;     //no scale decay
-        mDistanceDeathSquared = 10.0f;  //die if hit unit radius
-        if (mDistanceDeathSquared > 0.0f)
-        {
-                mOneOverDistanceDeathSquared = 1.0f / mDistanceDeathSquared;
-        }
-        else
-        {
-                mOneOverDistanceDeathSquared = 0.0f;
-        }
-        mDampMotionFactor = 0.0f;
-
-        mWindDiffusionFactor.mV[VX] = 0.0f;
-        mWindDiffusionFactor.mV[VY] = 0.0f;
-        mWindDiffusionFactor.mV[VZ] = 0.0f;
-
-        mUpdatePhysicsInputsTime = mCurrTime;
-}
-
-
-U8 LLVOPart::setParticlesDistFadeout(F32 beginFadeout, F32 endFadeout)
-{
-        // This doesn't do anything...
-        return 1;
-}
-
-unsigned char LLVOPart::setParticleParams(F32 bounce_b, 
-                                                                                 const F32 o_pos[3], 
-                                                                                 const F32 o_or[3], 
-                                                                                 U32 n, 
-                                                                                 LLUUID image_uuid,
-                                                                                 U8 flags[PART_SYS_BYTES_OF_FLAGS]) 
-{
-        mBounceBehavior = bounce_b;
-        mSpawnPoint.setVec(o_pos[0], o_pos[1], o_pos[2]);
-
-        mOriginOrientation.setQuatInit(o_or[0], o_or[1], o_or[2], 
-                (F32)sqrt(1.0f - o_or[0]*o_or[0] - o_or[1]*o_or[1] - o_or[2]*o_or[2]));
-
-        if(mNumPart < n ) 
-        { 
-                // this crazy logic is just in case "setParams" gets called multiple times 
-                if(mNumPart != 0) 
-                {
-                        if(mParticleState != NULL)
-                        {
-                                delete [] mParticleState;
-                        }
-                        if(mDeadArr != NULL)
-                        {
-                                delete [] mDeadArr;
-                        }
-
-                        mParticleState = NULL;
-                        mDeadArr = NULL;
-                        mNumPart = 0;
-                }
-                mNumPart = n;
-                //state_arr = new F32[n*FLOATS_PER_PARTICLE];
-                mParticleState = new OneParticleData[n];
-                mDeadArr = new U8[n];
-                memset(mDeadArr,1,n);           // initialize these to 1;
-        } 
-        else
-        {
-                mNumPart = n;
-        }
-
-        setTETexture(0, image_uuid);
-
-        for(U32 i = 0; i< PART_SYS_BYTES_OF_FLAGS; i++)
-        {
-                mFlags[i] = flags[i];
-        }
-
-        return '\0'; // success 
-}
-
-
-void LLVOPart::setParticleCountdownStateWaitingDead(const U32 particleNumber)
-{
-        F32     frequency;
-
-        frequency = mSpawnFrequency;
-        // **** Hack!  remainingLifetime counts up from negative, to avoid subtracts! - djs
-        mParticleState[particleNumber].remainingLifetime = -(((mSpawnFrequencyRange * 2.0f)*ll_frand()) + frequency - mSpawnFrequencyRange);
-}
-
-//Can override later
-void LLVOPart::spawnParticle(const U32 particleNumber)
-{
-        F32     randomUnitValue;
-        LLVector3       direction;
-
-        if (particleNumber >= mNumPart)
-        {
-                llinfos << "Trying to spawn particle beyond initialized particles! " << particleNumber << " : " << mNumPart << llendl;
-                return;
-        }
-
-        mDeadArr[particleNumber] = 0; // not dead yet!
-
-        //j = pos_offset_i(particleNumber);
-        mParticleState[particleNumber].position[0] = 2.f*mSpawnRange*(ll_frand()) - mSpawnRange;
-        mParticleState[particleNumber].position[1] = 2.f*mSpawnRange*(ll_frand()) - mSpawnRange;
-        mParticleState[particleNumber].position[2] = 2.f*mSpawnRange*(ll_frand()) - mSpawnRange;
-        
-        //mParticleStateArray[j] = (pos_ranges[1] - pos_ranges[0])*(F32)rand()/((F32)RAND_MAX) + pos_ranges[0];
-        //j++;
-        
-        //mParticleStateArray[j] = (pos_ranges[3] - pos_ranges[2])*(F32)rand()/((F32)RAND_MAX) + pos_ranges[2];
-        //j++;
-        
-        //mParticleStateArray[j] = (pos_ranges[5] - pos_ranges[4])*(F32)rand()/((F32)RAND_MAX) + pos_ranges[4];
-
-        //Create the ranged direction vector first - then rotate by the actual direction and then scale
-        //Creating a random value about 1,0,0
-        //1. pick a random angle YZ orientation through full circle.
-        randomUnitValue = (ll_frand());
-        direction.mV[VY] = sinf(randomUnitValue * 2.0 * F_PI);
-        direction.mV[VZ] = cosf(randomUnitValue * 2.0 * F_PI);
-
-        //2. pick a rotation to this angle to project into z which is scaled by mSpawnDirectionRange
-        randomUnitValue = (ll_frand());
-        randomUnitValue *= mSpawnDirectionRange;
-        direction.mV[VY] = direction.mV[VY] * sinf(randomUnitValue * F_PI);
-        direction.mV[VZ] = direction.mV[VZ] * sinf(randomUnitValue * F_PI);
-        direction.mV[VX] = cosf(randomUnitValue * F_PI);        //works as still dealing with a unit vector
-
-        //3.To rotate into the spawn direction coord system, derive a yaw and pitch (roll doesnt matter)
-        //from the offset between the unit vector 1,0,0 and random direction.
-        {F32    length;
-
-                //TODO - math behind this may be incorrect
-                //Assume the initial axis is +ve x
-                //derive pitch using the XZ or XY components.
-                //derive yaw using YZ components.
-                length = (mSpawnDirection.mV[VY]*mSpawnDirection.mV[VY]) +
-                                                        (mSpawnDirection.mV[VZ]*mSpawnDirection.mV[VZ]);
-                if (length > 0.0f)
-                {//Only happens when spawn a particle, so can afford some heavy math.
-                        F32 xYaw, yYaw, xPitch, yPitch;
-                        LLVector3       tempResult, tempResult2;
-
-                        //Pitch is the XZ component (but if Z is 0 and Y is not, switch)
-                        tempResult.setVec(mSpawnDirection.mV[VX], mSpawnDirection.mV[VY], mSpawnDirection.mV[VZ]);
-                        if (0.0f != mSpawnDirection.mV[VZ])
-                        {
-                                length = sqrtf((mSpawnDirection.mV[VX]*mSpawnDirection.mV[VX]) +
-                                                                (mSpawnDirection.mV[VZ]*mSpawnDirection.mV[VZ]));
-                                if (length > 0.0f)
-                                {
-                                        xPitch = tempResult.mV[VX] / length;
-                                        yPitch = -tempResult.mV[VZ] / length;
-                                }
-                                else
-                                {//length is 0, so no x component, so pitch must be PI/2
-                                        xPitch = 0.0f;
-                                        yPitch = 1.0f;
-                                }
-
-                                //To obtain yaw, remove pitch from the direction vector by inverse rotation (negate the yPitch)
-                                tempResult2.mV[VX] = (tempResult.mV[VX] * xPitch) + (tempResult.mV[VZ] * (-yPitch));
-                                tempResult2.mV[VY] = tempResult.mV[VY];
-                                tempResult2.mV[VZ] = (tempResult.mV[VZ] * xPitch) - (tempResult.mV[VX] * (-yPitch));
-                        }
-                        else
-                        {//Need XY, because if XZ is zero there is no pitch, and yaw may not pick up the discrepancy.
-                        //This also avoids roll, so less math.
-                                length = sqrtf((mSpawnDirection.mV[VX]*mSpawnDirection.mV[VX]) +
-                                                                (mSpawnDirection.mV[VY]*mSpawnDirection.mV[VY]));
-                                if (length > 0.0f)
-                                {
-                                        xPitch = tempResult.mV[VX] / length;
-                                        yPitch = -tempResult.mV[VY] / length;
-                                }
-                                else
-                                {//length is 0, so no x component, so pitch must be PI/2
-                                        xPitch = 0.0f;
-                                        yPitch = 1.0f;
-                                }
-
-                                //To obtain yaw, remove pitch from the direction vector by inverse rotation (negate the yPitch)
-                                tempResult2.mV[VX] = (tempResult.mV[VX] * xPitch) + (tempResult.mV[VY] * (-yPitch));
-                                tempResult2.mV[VY] = (tempResult.mV[VY] * xPitch) - (tempResult.mV[VX] * (-yPitch));
-                                tempResult2.mV[VZ] = tempResult.mV[VZ];
-                        }
-
-                        //Yaw is the YZ component
-                        length = sqrtf((tempResult2.mV[VZ]*tempResult2.mV[VZ]) +
-                                                        (tempResult2.mV[VY]*tempResult2.mV[VY]));
-                        if (length > 0.0f)
-                        {
-                                xYaw = tempResult2.mV[VZ] / length;
-                                yYaw = tempResult2.mV[VY] / length;
-                        }
-                        else
-                        {
-                                xYaw = 1.0f;
-                                yYaw = 0.0f;
-                        }
-
-                        //Now apply the rotations to the actual data in the same order as derived above (pitch first)
-                        tempResult.setVec(direction.mV[VX], direction.mV[VY], direction.mV[VZ]);
-                        //Remember which axis pitch was on, as need to apply in the same manner here for consistency.
-                        if (0.0f != mSpawnDirection.mV[VZ])
-                        {
-                                tempResult2.mV[VX] = (tempResult.mV[VX] * xPitch) + (tempResult.mV[VZ] * yPitch);
-                                tempResult2.mV[VY] = tempResult.mV[VY];
-                                tempResult2.mV[VZ] = (tempResult.mV[VZ] * xPitch) - (tempResult.mV[VX] * yPitch);
-                        }
-                        else
-                        {
-                                tempResult2.mV[VX] = (tempResult.mV[VX] * xPitch) + (tempResult.mV[VY] * yPitch);
-                                tempResult2.mV[VY] = (tempResult.mV[VY] * xPitch) - (tempResult.mV[VX] * yPitch);
-                                tempResult2.mV[VZ] = tempResult.mV[VZ];
-                        }
-                        direction.mV[VX] = tempResult2.mV[VX];
-                        direction.mV[VY] = (tempResult2.mV[VY] * xYaw) + (tempResult2.mV[VZ] * yYaw);
-                        direction.mV[VZ] = (tempResult2.mV[VZ] * xYaw) - (tempResult2.mV[VY] * yYaw);
-                }
-                else
-                {//The is no YZ component, so we a pointing straight along X axis (default) & therefore no rotation
-                        //However, direction may be reversed
-                        if (mSpawnDirection.mV[VX] < 0.0f)
-                        {
-                                direction.mV[VX] = -direction.mV[VX];
-                                direction.mV[VZ] = -direction.mV[VZ];
-                        }
-
-                }
-        }
-
-
-        //4. scale the vector by a random scale by mSpawnVelocityRange and offset by mSpawnVelocity
-        randomUnitValue = (ll_frand());
-        randomUnitValue = (randomUnitValue * mSpawnVelocityRange) + mSpawnVelocity;
-
-        mParticleState[particleNumber].velocity[0] = direction.mV[VX] * randomUnitValue;
-        mParticleState[particleNumber].velocity[1] = direction.mV[VY] * randomUnitValue;
-        mParticleState[particleNumber].velocity[2] = direction.mV[VZ] * randomUnitValue;
-        
-        //add in velocity offset to match what spawned these particles
-        mParticleState[particleNumber].velocity[0] += mVelocityOffset.mV[VX];
-        mParticleState[particleNumber].velocity[1] += mVelocityOffset.mV[VY];
-        mParticleState[particleNumber].velocity[2] += mVelocityOffset.mV[VZ];
-        
-        mParticleState[particleNumber].acceleration[0] = 0.0f; 
-        
-        mParticleState[particleNumber].acceleration[1] = 0.0f; 
-        
-        mParticleState[particleNumber].acceleration[2] = 0.0f;
-
-        mParticleState[particleNumber].scale[0] = (mScale_range[1] - mScale_range[0])*ll_frand() + mScale_range[0];
-        mParticleState[particleNumber].scale[1] = (mScale_range[3] - mScale_range[2])*ll_frand() + mScale_range[2];
-        mParticleState[particleNumber].scale[2] = 0.0f;
-
-        mParticleState[particleNumber].alpha[0] = (mAlpha_range[1] - mAlpha_range[0])*ll_frand() + mAlpha_range[0];
-        mParticleState[particleNumber].alpha[1] = (mAlpha_range[3] - mAlpha_range[2])*ll_frand() + mAlpha_range[2];
-        mParticleState[particleNumber].alpha[2] = 0.0f;
-
-        // **** Hack!  remainingLifetime counts up from negative, to avoid subtracts! - djs
-        mParticleState[particleNumber].remainingLifetime = -((mIndividualLifetimeRange*2.0f)*ll_frand() + mIndividualLifetime - mIndividualLifetimeRange);
-
-        //rest of the state - 0 for now
-        mParticleState[particleNumber].deathOffset = 0.0f; 
-        mParticleState[particleNumber].localWind[0] = 0.0f; 
-        mParticleState[particleNumber].localWind[1] = 0.0f; 
-        mParticleState[particleNumber].localWind[2] = 0.0f; 
-}
-
-//Can override later
-void LLVOPart::onParticleBounce(const U32 particleNumber)
-{
-        mParticleState[particleNumber].velocity[0] +=  - (1.0f + mBounceBehavior) * mBouncePlaneNormal.mV[0] * mParticleState[particleNumber].velocity[0];
-        mParticleState[particleNumber].velocity[1] +=  - (1.0f + mBounceBehavior) * mBouncePlaneNormal.mV[1] * mParticleState[particleNumber].velocity[1];
-        mParticleState[particleNumber].velocity[2] +=  - (1.0f + mBounceBehavior) * mBouncePlaneNormal.mV[2] * mParticleState[particleNumber].velocity[2];
-
-
-        //Need to offset particle so above the plane, so it doesn't oscillate!
-        if (mParticleState[particleNumber].position[2] < mBouncePlaneZ)
-        {
-                mParticleState[particleNumber].position[2] = mBouncePlaneZ;
-        }
-}
-
-
-unsigned char LLVOPart::initializeParticlesAndConstraints(U32 initialParticles,
-                                                                                                                                F32 diffEqAlpha[3],
-                                                                                                                                F32 diffEqScale[3],
-                                                                                                                                F32 scale_ranges[4],
-                                                                                                                                F32 alpha_ranges[4],
-                                                                                                                                F32 velocityOffset[3],
-                                                                                                                                F32     killPlaneZ,
-                                                                                                                                F32     killPlaneNormal[3],
-                                                                                                                                F32     bouncePlaneZ,
-                                                                                                                                F32     bouncePlaneNormal[3],
-                                                                                                                                F32     spawnRange,
-                                                                                                                                F32     spawnFrequency,
-                                                                                                                                F32     spawnFrequencyRange,
-                                                                                                                                F32     spawnDirection[3],
-                                                                                                                                F32     spawnDirectionRange,
-                                                                                                                                F32     spawnVelocity,
-                                                                                                                                F32     spawnVelocityRange,
-                                                                                                                                F32     speedLimit,
-                                                                                                                                F32     windWeight,
-                                                                                                                                F32     currentGravity[3],
-                                                                                                                                F32     gravityWeight,
-                                                                                                                                F32     globalLifetime,
-                                                                                                                                F32     individualLifetime,
-                                                                                                                                F32     individualLifetimeRange,
-                                                                                                                                F32     alphaDecay,
-                                                                                                                                F32     scaleDecay,
-                                                                                                                                F32     distanceDeath,
-                                                                                                                                F32     dampMotionFactor,
-                                                                                                                                F32 windDiffusionFactor[3])
-{
-        // initializes particles randomly within these ranges
-        // scale ranges and alpha ranges contain initial conditions plus rates of change
-        // of initial conditions  My naming is incosistent (passing alpha derivatives with alpha 
-        // values), but this class is wrapped by another one, and this function is called only once
-        U32 i;
-
-
-        for (i = 0; i < 3; i++)
-        {
-                mDiffEqAlpha[i] = diffEqAlpha[i];
-                mDiffEqScale[i] = diffEqScale[i];
-        }
-
-        //First - store the initial conditions
-        for (i = 0; i < 4; i++)
-        {
-                mScale_range[i] = scale_ranges[i];
-                mAlpha_range[i] = alpha_ranges[i];
-        }
-
-        mVelocityOffset.setVec(velocityOffset[0], velocityOffset[1], velocityOffset[2]);
-
-        mKillPlaneZ = killPlaneZ;
-        mKillPlaneNormal.setVec(killPlaneNormal[0], killPlaneNormal[1], killPlaneNormal[2]);
-        mKillPlaneNormal.normVec();
-        mBouncePlaneZ = bouncePlaneZ;
-        mBouncePlaneNormal.setVec(bouncePlaneNormal[0], bouncePlaneNormal[1], bouncePlaneNormal[2]);
-        mBouncePlaneNormal.normVec();
-
-        mSpawnRange = spawnRange;
-
-        mSpawnFrequency = spawnFrequency;
-        mSpawnFrequencyRange = spawnFrequencyRange;
-
-        mSpawnDirection.setVec(spawnDirection[0], spawnDirection[1], spawnDirection[2]);
-        mSpawnDirection.normVec();
-        mSpawnDirectionRange = spawnDirectionRange;
-
-        mSpawnVelocity = spawnVelocity;
-        mSpawnVelocityRange = spawnVelocityRange;
-        mSpeedLimitSquared = speedLimit * speedLimit;
-        if (mSpeedLimitSquared < 0.0000001f)
-        {
-                mSpeedLimitSquared = 0.0000001f;        //speed must be finite +ve to avoid divide by zero
-        }
-
-        mWindWeight = windWeight;
-        mCurrentGravity.setVec(currentGravity[0], currentGravity[1], currentGravity[2]);
-        mGravityWeight = gravityWeight;
-
-        mGlobalLifetime = globalLifetime;
-        mOriginalGlobalLifetime = mGlobalLifetime;
-        mIndividualLifetime = individualLifetime;
-        if (mIndividualLifetime > 0.0f)
-        {
-                mOneOverIndividualLifetime = 1.0f / mIndividualLifetime;
-        }
-        else
-        {
-                mOneOverIndividualLifetime = 0.0f;
-        }
-        mIndividualLifetimeRange = individualLifetimeRange;
-
-        mAlphaDecay = alphaDecay;
-        mScaleDecay = scaleDecay;
-        mDistanceDeathSquared = distanceDeath * distanceDeath;
-        if (mDistanceDeathSquared > 0.0f)
-        {
-                mOneOverDistanceDeathSquared = 1.0f / mDistanceDeathSquared;
-        }
-        else
-        {
-                mOneOverDistanceDeathSquared = 0.0f;
-        }
-        mDampMotionFactor = dampMotionFactor;
-
-        mWindDiffusionFactor.setVec(windDiffusionFactor[0], windDiffusionFactor[1], windDiffusionFactor[2]);
-        //Scale the values down a lot, as can expand sprites incredibly fast
-        mWindDiffusionFactor *= 0.02f;
-        if (mWindDiffusionFactor.mV[VX] > 0.02f)
-        {
-                mWindDiffusionFactor.mV[VX] = 0.02f;
-        }
-        if (mWindDiffusionFactor.mV[VY] > 0.02f)
-        {
-                mWindDiffusionFactor.mV[VY] = 0.02f;
-        }
-        if (mWindDiffusionFactor.mV[VZ] > 0.02f)
-        {
-                mWindDiffusionFactor.mV[VZ] = 0.02f;
-        }
-        //llinfos << "Made a particle system" << llendl;
-
-        for(i = 0; i < initialParticles; i++)
-        {
-                spawnParticle(i);
-        }
-
-        for(i = initialParticles; i < mNumPart; i++)
-        {
-                //create initial conditions - dead waiting to live timer
-                setParticleCountdownStateWaitingDead(i);
-        }
-        return '\0'; // success 
-}
-
-U8  LLVOPart::iterateParticles(F32 deltaT) 
-{
-        const F32 PART_SYS_UPDATE_PHYSICS_INPUTS_TIME = 0.2f;   //How many seconds between querying wind force on a particle
-
-        U32 i;  //, pos_off, vel_off, scale_off, alpha_off, lifetime_off, death_off, local_wind_off;
-        F32     weightedDeathSum;
-        U8 any_leftQ = 0;
-
-        F32 windWeightDT = mWindWeight*deltaT;
-        F32 gravityWeightDT = mGravityWeight*deltaT;
-
-        mLastTime = mCurrTime;
-        mCurrTime += deltaT; 
-
-        if ((mCurrTime - mUpdatePhysicsInputsTime) > PART_SYS_UPDATE_PHYSICS_INPUTS_TIME)
-        {
-                //  If needed, obtain latest wind for the whole system
-                mCurrentWind = mRegionp->mWind.getVelocity(getPositionRegion());
-                mCurrentWindMagnitude = sqrt((mCurrentWind.mV[VX] * mCurrentWind.mV[VX]) +
-                        (mCurrentWind.mV[VY] * mCurrentWind.mV[VY]) +
-                        (mCurrentWind.mV[VZ] * mCurrentWind.mV[VZ]));
-                //don't know a max, so just make up a reasonably large value for now and cap.
-                mCurrentWindMagnitude = mCurrentWindMagnitude * 0.05f;
-                if (mCurrentWindMagnitude > 1.0f)
-                {
-                        mCurrentWindMagnitude = 1.0f;
-                }
-                mCurrentWindMagnitudeSquareRoot = sqrtf(mCurrentWindMagnitude);
-        }
-
-        //TO DO -       LOD algorithm (as with display??)
-        for(i = 0; i < mNumPart; i++) 
-        {
-                //lifetime_off = remaining_lifetime_offset_i(i);
-                if(0 != mDeadArr[i])
-                {
-                        //test for spawns amongst the dead as follows
-                        if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_SPAWN)
-                        {
-                                // **** Hack!  remainingLifetime counts up from negative, to avoid subtracts! - djs
-                                //if die below and spawn flag set, set mParticleState[i].remainingLifetime to a respawn random time
-                                //based on mSpawnFrequency and mSpawnFrequencyRange
-                                //in this section, if spawn flag set, count down - deltaT. If time is negative, call Spawn method, else continue
-                                mParticleState[i].remainingLifetime += deltaT;
-                                if (mParticleState[i].remainingLifetime > 0.0f)
-                                {
-                                        spawnParticle(i);
-                                }
-                        }
-
-                        if(0 != mDeadArr[i])
-                        {
-                                continue; // stop animating dead particles -- else they might come back alive!
-                                        // since we're not alive, do nothing to "any_leftQ"
-                        }
-                }
-
-
-                //New way - apply external forces to each particle and then update
-                // position at .... 
-                mParticleState[i].position[0] += mParticleState[i].velocity[0]*deltaT;          // x position
-                mParticleState[i].position[1] += mParticleState[i].velocity[1]*deltaT;  // y position
-                mParticleState[i].position[2] += mParticleState[i].velocity[2]*deltaT;  // z position
-
-                //then apply force if required
-                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_AFFECTED_BY_WIND)
-                {
-                        mParticleState[i].velocity[0] += mCurrentWind.mV[0]*windWeightDT;
-                        mParticleState[i].velocity[1] += mCurrentWind.mV[1]*windWeightDT;
-                        mParticleState[i].velocity[2] += mCurrentWind.mV[2]*windWeightDT;
-                }
-                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_AFFECTED_BY_GRAVITY)
-                {
-                        mParticleState[i].velocity[0] += mCurrentGravity.mV[0]*gravityWeightDT;
-                        mParticleState[i].velocity[1] += mCurrentGravity.mV[1]*gravityWeightDT;
-                        mParticleState[i].velocity[2] += mCurrentGravity.mV[2]*gravityWeightDT;
-                }
-                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_EVALUATE_WIND_PER_PARTICLE)
-                {
-                        if ((mCurrTime - mUpdatePhysicsInputsTime) > PART_SYS_UPDATE_PHYSICS_INPUTS_TIME)
-                        {
-                                LLVector3 wind, current_position_region;
-                                //  If needed, obtain latest wind per particle
-                                //Particle positions are relative to the object center.
-                                current_position_region.setVec(getPositionRegion());
-                                current_position_region.mV[VX] += (mParticleState[i].position[0]);
-                                current_position_region.mV[VY] += (mParticleState[i].position[1]);
-                                current_position_region.mV[VZ] += (mParticleState[i].position[2]);
-
-                                wind = mRegionp->mWind.getVelocity(current_position_region);
-                                mParticleState[i].localWind[0] = wind.mV[0];
-                                mParticleState[i].localWind[1] = wind.mV[1];
-                                mParticleState[i].localWind[2] = wind.mV[2];
-                        }
-                        mParticleState[i].velocity[0] += mParticleState[i].localWind[0]*windWeightDT;
-                        mParticleState[i].velocity[1] += mParticleState[i].localWind[1]*windWeightDT;
-                        mParticleState[i].velocity[2] += mParticleState[i].localWind[2]*windWeightDT;
-                }
-
-                //then apply drag if required
-                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_DAMP_MOTION)
-                {
-                        F32     dampAmount;
-
-                        dampAmount = (mParticleState[i].velocity[0] * mParticleState[i].velocity[0]) +
-                                        (mParticleState[i].velocity[1] * mParticleState[i].velocity[1]) +
-                                        (mParticleState[i].velocity[2] * mParticleState[i].velocity[2]);
-                        dampAmount = 1.0f - ((mSpeedLimitSquared - dampAmount) / mSpeedLimitSquared);
-                        if (dampAmount < 0.0f)
-                        {
-                                dampAmount = 0.0f;
-                        }
-                        else if (dampAmount > 1.0f)
-                        {
-                                dampAmount = 1.0f;
-                        }
-                        
-                        //Damp prop to deltaT
-                        dampAmount = -1.f * dampAmount * mDampMotionFactor * deltaT;
-
-                        mParticleState[i].velocity[0] += dampAmount * mParticleState[i].velocity[0];
-                        mParticleState[i].velocity[1] += dampAmount * mParticleState[i].velocity[1];
-                        mParticleState[i].velocity[2] += dampAmount * mParticleState[i].velocity[2];
-                }
-
-                //check for bounces if required
-                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_BOUNCE)
-                {//Is the particle below the bounce plane??
-                        LLVector3       tempBounceTest;
-                        tempBounceTest.setVec(mParticleState[i].position[0], mParticleState[i].position[1], mParticleState[i].position[2]);
-                        tempBounceTest.mV[VZ] -= mBouncePlaneZ;
-
-                        //This is simplistic for now
-                        if ((tempBounceTest.mV[VZ] < 0.0f) && (mParticleState[i].velocity[2] < 0.0f))
-                        {
-                                onParticleBounce(i);
-                        }
-                }
-
-                //maintain the old way of updating scale and alpha
-                // clamp scale and alpha to reasonable values
-                // should this section of code only be called if we're *actually* animating scale and alpha?
-                mParticleState[i].alpha[2] = mDiffEqAlpha[0] +   // constant term
-                        mDiffEqAlpha[1]*mParticleState[i].alpha[0] +  // zeroth derivative term
-                        mDiffEqAlpha[2]*mParticleState[i].alpha[1]; // first derivative term
-
-                mParticleState[i].scale[2] = mDiffEqScale[0] +  // constant term
-                        mDiffEqScale[1]*mParticleState[i].scale[0] +  // zeroth derivative term
-                        mDiffEqScale[2]*mParticleState[i].scale[1]; // first derivative term
-
-                mParticleState[i].scale[0] += mParticleState[i].scale[1]*deltaT;        // scale
-                
-                mParticleState[i].alpha[0] += mParticleState[i].alpha[1]*deltaT;        // alpha
-                if (mParticleState[i].scale[0] < 0.0f)
-                {
-                        mParticleState[i].scale[0] = 0.01f;
-                }
-
-                if (mParticleState[i].alpha[0] < 0.0f)
-                {
-                        mParticleState[i].alpha[0] = 0.0f;
-                }
-                else if (mParticleState[i].alpha[0] > 1.0f)
-                {
-                        mParticleState[i].alpha[0] = 1.0f;
-                }
-                mParticleState[i].scale[1] += mParticleState[i].scale[2]*deltaT;
-                mParticleState[i].alpha[1] += mParticleState[i].alpha[2]*deltaT;
-
-                //Is particle appearance affected by wind?
-                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_WIND_DIFFUSION)
-                {
-                        F32 windMagnitude, windMagnitudeSqrt;
-
-                        if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_EVALUATE_WIND_PER_PARTICLE)
-                        {
-                                windMagnitude = sqrt((mParticleState[i].localWind[0] * mParticleState[i].localWind[0]) +
-                                        (mParticleState[i].localWind[1] * mParticleState[i].localWind[1]) +
-                                        (mParticleState[i].localWind[2] * mParticleState[i].localWind[2]));
-                                //don't know a max, so just make up a reasonably large value for now and cap.
-                                windMagnitude = windMagnitude * 0.05f;
-                                if (windMagnitude > 1.0f)
-                                {
-                                        windMagnitude = 1.0f;
-                                }
-                                windMagnitudeSqrt = sqrt(mCurrentWindMagnitude);
-                        }
-                        else
-                        {
-                                windMagnitude = mCurrentWindMagnitude;
-                                windMagnitudeSqrt = mCurrentWindMagnitudeSquareRoot;
-                        }
-
-                        //ignore alpha for now, as it is reduced by distance death and life expectancy in any case.
-                        //mParticleState[i].alpha[0] *= (1.0 - (windMagnitude * mWindDiffusionFactor.mV[VX]));
-                        //Scaling prop to sqr root. Should really be cube root, as we are dealing with a volume, but
-                        //heavy math, and sqr looks OK.
-                        mParticleState[i].scale[0] *= (1.f + (windMagnitudeSqrt * mWindDiffusionFactor.mV[VX]));                        
-                }
-
-                // we have to store the death of the particle somewhere
-
-                //now test for death if life expires or hits edge of death radius (given flags enabled)
-                //aapply alpha and scale fade proportional to proximity to death - test for death flags and produce a weighted sum
-                //taking into account time to live and distance to death.
-                weightedDeathSum = 1.0f;
-                
-                if (mFlags[PART_SYS_KILL_BYTE] & PART_SYS_TIME_DEATH)
-                {
-                        // **** Hack!  remainingLifetime counts up from negative, to avoid subtracts! - djs
-                        mParticleState[i].remainingLifetime += deltaT;
-                        weightedDeathSum *= -1.f * (mParticleState[i].remainingLifetime * mOneOverIndividualLifetime);
-                        if (mParticleState[i].remainingLifetime > 0.0f)
-                        {
-                                mDeadArr[i] = 1;
-                                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_SPAWN)
-                                {
-                                        setParticleCountdownStateWaitingDead(i);
-                                }
-                                weightedDeathSum = 0.0f;
-                        }
-                        else if (weightedDeathSum > 1.0f)
-                        {
-                                weightedDeathSum = 1.0f;        
-                        }
-                }
-                if (mFlags[PART_SYS_KILL_BYTE] & PART_SYS_DISTANCE_DEATH)
-                {
-                        F32     radius;
-                        radius = (mParticleState[i].position[0]*mParticleState[i].position[0] + 
-                                mParticleState[i].position[1]*mParticleState[i].position[1] + 
-                                mParticleState[i].position[2]*mParticleState[i].position[2]);
-                        radius = (mDistanceDeathSquared - radius) * mOneOverDistanceDeathSquared;
-                        weightedDeathSum = weightedDeathSum * radius;
-                        if (radius <= 0.0f)
-                        {
-                                mDeadArr[i] = 1;
-                                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_SPAWN)
-                                {
-                                        setParticleCountdownStateWaitingDead(i);
-                                }
-                                weightedDeathSum = 0.0f;
-                        }
-                        else if (weightedDeathSum > 1.0f)
-                        {
-                                weightedDeathSum = 1.0f;        
-                        }
-                }
-                if (mFlags[PART_SYS_KILL_BYTE] & PART_SYS_KILL_PLANE)
-                {
-                        if (mParticleState[i].position[2] <= mKillPlaneZ)
-                        {
-                                llinfos << "kill plane" << llendl;
-                                mDeadArr[i] = 1;
-                                if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_SPAWN)
-                                {
-                                        setParticleCountdownStateWaitingDead(i);
-                                }
-                                weightedDeathSum = 0.0f;
-                        }
-                }
-                if (mFlags[PART_SYS_KILL_BYTE] & PART_SYS_GLOBAL_DIE)
-                {
-                        weightedDeathSum = weightedDeathSum * (mGlobalLifetime / mOriginalGlobalLifetime);
-                }
-
-
-                mParticleState[i].deathOffset = weightedDeathSum;
-
-                any_leftQ |= (1 - mDeadArr[i]);
-        }
-
-        if (mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_SPAWN)
-        {//May be just waiting for new particles to be born, with none around currently
-                any_leftQ = TRUE;
-        }
-
-
-        if (mFlags[PART_SYS_KILL_BYTE] & PART_SYS_GLOBAL_DIE)
-        {
-                mGlobalLifetime -= deltaT;
-                if (mGlobalLifetime < 0.0f)
-                {
-                        any_leftQ = FALSE;
-                }
-        }
-
-
-        if ((mCurrTime - mUpdatePhysicsInputsTime) > PART_SYS_UPDATE_PHYSICS_INPUTS_TIME)
-        {//Have to execute this at end of itterate, as several independent processes rely on the test being true.
-                mUpdatePhysicsInputsTime = mCurrTime;
-        }
-
-        mNumLiveParticles = 0;
-        for ( i = 0; i < mNumPart; i++)
-        {
-                if (!mDeadArr[i])
-                {
-                        mNumLiveParticles++;
-                }
-        }
-        return any_leftQ;
-}
-
-void LLVOPart::reverseTranslateParticlesAndPotentiallyKill(const LLVector3 &moveBy) 
-{
-        U32     i;//pos_off;
-
-        for(i = 0; i < mNumPart; i++) 
-        {
-                if(0 == mDeadArr[i])
-                {
-                        //pos_off = pos_offset_i(i);
-                        mParticleState[i].position[0] += moveBy.mV[VX];
-                        mParticleState[i].position[1] += moveBy.mV[VY];
-                        mParticleState[i].position[2] += moveBy.mV[VZ];
-                        
-                }
-        }
-}
-
-void LLVOPart::translateParticlesBy(const LLVector3 &moveBy) 
-{
-        if (!(mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_BOUNCE))
-        {//Do not translate if bouncing is on, as the whole system shifts adding or subtractiong potential energy
-
-                //If the object moves, the particles should not, otherwise will look like a rigid structure
-                reverseTranslateParticlesAndPotentiallyKill(moveBy);
-
-                mSpawnPoint.mV[VX] += moveBy.mV[VX];
-                mSpawnPoint.mV[VY] += moveBy.mV[VY];
-                mSpawnPoint.mV[VZ] += moveBy.mV[VZ];
-        }
-}
-
-
-void LLVOPart::translateParticlesTo(const LLVector3 &moveTo) 
-{
-        LLVector3 moveBy;
-
-        if (!(mFlags[PART_SYS_ACTION_BYTE] & PART_SYS_BOUNCE))
-        {//Do not translate if bouncing is on, as the whole system shifts adding or subtractiong potential energy
-
-                //If the object moves, the particles should not, otherwise will look like a rigid structure
-                moveBy.setVec(moveTo.mV[VX] - mSpawnPoint.mV[VX], moveTo.mV[VY] - mSpawnPoint.mV[VY], moveTo.mV[VZ] - mSpawnPoint.mV[VZ]);
-                reverseTranslateParticlesAndPotentiallyKill(moveBy);
-
-                mSpawnPoint.mV[VX] = moveTo.mV[VX];
-                mSpawnPoint.mV[VY] = moveTo.mV[VY];
-                mSpawnPoint.mV[VZ] = moveTo.mV[VZ];
-        }
-}
-
-
-void LLVOPart::rotateParticlesBy(const LLQuaternion &q) 
-{
-        mOriginOrientation *= q;
-}
-
-
-void LLVOPart::rotateParticlesTo(const LLQuaternion &q) 
-{
-        mOriginOrientation.setQuatInit(q.mQ[VX], q.mQ[VY], q.mQ[VZ], q.mQ[VW]);
-}
diff --git a/linden/indra/newview/llvopart.h b/linden/indra/newview/llvopart.h
deleted file mode 100644
index 3f31de6..0000000
--- a/linden/indra/newview/llvopart.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/** 
- * @file llvopart.h
- * @brief Description of LLVOPart class
- *
- * Copyright (c) 2001-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#ifndef LL_LLVOPART_H
-#define LL_LLVOPART_H
-
-#include "llviewerobject.h"
-#include "v3math.h"
-#include "llframetimer.h"
-#include "partsyspacket.h" // for compressing / decompressing particle system data
-
-//28 September 2001 - try and make the internal structs more meaningful than a huge array of floats!
-typedef struct  OneParticleData
-{
-        F32 position[3];
-        F32 velocity[3];
-        F32 acceleration[3];
-        F32 scale[3];
-        F32 alpha[3];
-        F32 remainingLifetime;
-        F32 deathOffset;
-        F32 localWind[3];
-}OneParticleData;
-
-
-
-
-
-/* viewer object for a particle system */
-const U32 PART_SYS_BYTES_OF_FLAGS               = 8;
-
-class LLVOPart : public LLViewerObject
-{
-public:
-        LLVOPart(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-
-        ~LLVOPart();
-
-        // Initialize data that's only inited once per class.
-        static void initClass();
-
-        /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
-        BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
-
-
-        /*virtual*/ U32 processUpdateMessage(LLMessageSystem *mesgsys,
-                                                                                        void **user_data,
-                                                                                        U32 block_num,
-                                                                                        const EObjectUpdateType update_type,
-                                                                                        LLDataPacker *dp);
-
-        /*virtual*/ void updateTextures(LLAgent &agent);
-
-        /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
-        /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
-
-protected:
-        void setParticleCountdownStateWaitingDead(U32 particleNumber);
-
-                //Override these methods for new particle classes
-        void spawnParticle(const U32 particleNumber);
-        void onParticleBounce(const U32 particleNumber);
-
-        void setDefaultValues();
-
-        U8 setParticleParams(F32 bounce_b, 
-                const F32 o_pos[3], const F32 o_or[3], U32 n, LLUUID image_uuid, U8 flags[PART_SYS_BYTES_OF_FLAGS]);
-
-        U8 initializeParticlesAndConstraints(U32 initialNumberOfParticles,
-                                                                                F32 diffEqAlpha[3],
-                                                                                F32 diffEqScale[3],
-                                                                                F32 scale_ranges[4],
-                                                                                F32 alpha_ranges[4],
-                                                                                F32 velocityOffset[3],
-                                                                                F32     killPlaneZ,
-                                                                                F32     killPlaneNormal[3],
-                                                                                F32     bouncePlaneZ,
-                                                                                F32     bouncePlaneNormal[3],
-                                                                                F32     spawnRange,
-                                                                                F32     spawnFrequency,
-                                                                                F32     spawnFreqencyRange,
-                                                                                F32     spawnDirection[3],
-                                                                                F32     spawnDirectionRange,
-                                                                                F32     spawnVelocity,
-                                                                                F32     spawnVelocityRange,
-                                                                                F32     speedLimit,
-                                                                                F32     windWeight,
-                                                                                F32     currentGravity[3],
-                                                                                F32     gravityWeight,
-                                                                                F32     globalLifetime,
-                                                                                F32     individualLifetime,
-                                                                                F32     individualLifetimeRange,
-                                                                                F32     alphaDecay,
-                                                                                F32     scaleDecay,
-                                                                                F32     distanceDeath,
-                                                                                F32     dampMotionFactor,
-                                                                                F32 windDiffusionFactor[3]);
-        // initializes particles randomly within these ranges
-        // scale ranges and alpha ranges contain initial conditions plus rates of change
-        // of initial conditions  My naming is inconsistent (passing alpha derivatives with alpha 
-        // values), but this class is wrapped by another one, and this function is called only once
-
-        U8 iterateParticles(F32 deltaT); // step by one deltaT, check for bounces and particle deaths 
-
-        void reverseTranslateParticlesAndPotentiallyKill(const LLVector3 &moveBy);
-
-        void translateParticlesBy(const LLVector3 &moveBy);
-        void translateParticlesTo(const LLVector3 &moveTo);
-        void rotateParticlesBy(const LLQuaternion &q);
-        void rotateParticlesTo(const LLQuaternion &q);
-
-        ///////////////////////
-        //
-        // Legacy, "dead" methods
-        U8 setParticlesDistFadeout(F32 beginFadeout, F32 endFadeout);
-
-protected:
-        LLFrameTimer mDeathTimer;
-        U32 mNumPart;   // number of particles 
-        U32 mNumLiveParticles;
-        BOOL mParticlesDead; // am I dead yet? (i.e. should I keep rendering?)
-        LLPartInitData mInitSysData; // data for initializing the particle system.
-
-        U64 mTimeLastFrame;
-        
-        //27 September 2001 - LLParticleSystem no longer a seperate class, as does not allow access to all object facilities
-        //the following private data and methods used to be in LLParticleSystem
-
-        F32 mCurrTime; // time value in simulator for particle system -- note: may be independent of simulator time 
-        F32 mLastTime; // time last frame
-
-        //26 September - these are replaced by alpha and scale parameters below
-        //F32 mDiffEq[18]; // constants for second-order differential equation describing particle motion 
-        //                  MDS -- july, doubled the number of constants to handle scale, alpha and rotation
-        //26 September - just use mKillPlaneZ, as the rest really confusing to set sometimes
-        //F32 mKillParameters[6]; // take a dot-product of a particle's <x,y,z,t, 1, mag^2> values
-                                                        // with this and compare to zero to determine if its killed 
-                                                        // computational trick, only call it a "kill" when the dot product of
-                                                        // the velocity with the first three values of this is below zero 
-
-        //26 September - use mBouncePlaneZ as the parameters are interesting but hard to manipulate predictably
-        //F32 mBounceParams[5]; // same as "mKillParameters" only they determine when an object bounces 
-        // this is actually for generalized bouncing, might indicate decayed bouncing, or sliding behavior 
-
-        F32 mBounceBehavior; // first three are multiplied pointwise with x,y and z velocities,
-                                                          // next three are added pointwise to x, y and z positions 
-
-        F32 mAlpha;                                     // so I can fade out the whole system
-
-        LLQuaternion mOriginOrientation; // quaternion for origin orientation 
-        
-        // geometry / image data for particles visual representation 
-        
-        //F32 *state_arr; // big array of velocity and position and acceleration 
-        OneParticleData *mParticleState; // big array of velocity and position and acceleration 
-        U8 *mDeadArr; // mDeadArr[i] == true if particle i is dead
-
-        U8 mFlags[PART_SYS_BYTES_OF_FLAGS];    // just copy the flags from the initialization data
-
-
-        //New structures added as of 26 September 2001
-
-        //Have to remember the states if are to spawn new particles.
-        //These are from the original implementation, but now remembered!
-        F32 mDiffEqAlpha[3];
-        F32 mDiffEqScale[3];
-        F32 mScale_range[4];
-        F32 mAlpha_range[4];
-        LLVector3       mVelocityOffset;
-
-
-        //Incorporated in mFlags[PART_SYS_ACTION_BYTE]
-                //What actions will this system perform - bit mask of flags so can perform multiple operations.
-                //PART_SYS_SPAWN,
-                //PART_SYS_BOUNCE,
-                //PART_SYS_AFFECTED_BY_WIND,
-                //PART_SYS_AFFECTED_BY_GRAVITY,
-                //PART_SYS_EVALUATE_WIND_PER_PARTICLE,
-                //PART_SYS_APPLY_FORCE
-                //PART_SYS_DAMP_MOTION
-                //are valid flags.
-
-        //Incorporated in mFlags[PART_SYS_KILL_BYTE]
-                //What actions will this system perform - bit mask of flags so can perform multiple operations.
-                //PART_SYS_KILL_PLANE,
-                //PART_SYS_GLOBAL_DIE,
-                //PART_SYS_DISTANCE_DEATH
-                //are valid flags.
-
-        F32     mKillPlaneZ;
-                //For simplicity assume the XY plane, so this sets an altitude at which to die
-        LLVector3       mKillPlaneNormal;
-                //Normal direction to the kill plane - UNIT vector
-        F32     mBouncePlaneZ;
-                //For simplicity assume the XY plane, so this sets an altitude at which to bounce
-        LLVector3       mBouncePlaneNormal;
-                //Normal direction to the bounce plane - UNIT vector
-        LLVector3       mSpawnPoint;
-                //If new particles are created, this is where they come from
-        F32     mSpawnRange;
-                //Range of emission points about the mSpawnPoint
-        F32     mSpawnFrequency;
-                //Required if the system is to spawn new particles.
-                //This variable determines the time after a particle dies when it is respawned.
-        F32     mSpawnFrequencyRange;
-                //Determines the random range of time until a new particle is spawned.
-        LLVector3       mSpawnDirection;
-                //Direction vector giving the mean direction in which particles are spawned
-        F32     mSpawnDirectionRange;
-                //Direction limiting the angular range of emissions about the mean direction. 1.0f means everywhere, 0.0f means uni-directional
-        F32     mSpawnVelocity;
-                //The mean speed at which particles are emitted
-        F32     mSpawnVelocityRange;
-                //The range of speeds about the mean at which particles are emitted.
-        F32     mSpeedLimitSquared;
-                //Used to constrain particle maximum velocity (squared to minimize calcs)
-        LLVector3       mCurrentWind;
-                //Wind direction used in update calculations
-        F32     mCurrentWindMagnitude, mCurrentWindMagnitudeSquareRoot;
-                //Velocity of current wind and square root of it to save calculations
-        F32     mWindWeight;
-                //How much of an effect does wind have
-        LLVector3       mCurrentGravity;
-                //Gravity direction used in update calculations
-        F32     mGravityWeight;
-                //How much of an effect does gravity have
-        F32     mGlobalLifetime, mOriginalGlobalLifetime;
-                //If particles re-spawn, a system can exist forever.
-                //If (ActionFlags & PART_SYS_GLOBAL_DIE) is TRUE this variable is used to determine how long the system lasts.
-        F32     mIndividualLifetime;
-                //How long does each particle last if nothing else happens to it
-        F32     mOneOverIndividualLifetime;
-                //For fast reciprocals
-        F32     mIndividualLifetimeRange;
-                //Range of variation in individual lifetimes
-        F32     mAlphaDecay;
-                //By what factor does alpha decrease as the lifetime of a particle is approached.
-        F32     mScaleDecay;
-                //By what factor does scale decrease as the lifetime of a particle is approached.
-        F32     mDistanceDeathSquared;
-                //With the increased functionality, particle systems can expand to indefinite size
-                //(e.g. wind can chaotically move particles into a wide spread).
-                //To avoid particles exceeding normal object size constraints,
-                //set the PART_SYS_DISTANCE_DEATH flag, and set a distance value here, representing a radius around the spawn point.
-                //Square to reduce computation.
-        F32     mOneOverDistanceDeathSquared;
-                //For fast reciprocals
-        F32     mDampMotionFactor;
-                //How much to damp motion
-        LLVector3       mWindDiffusionFactor;
-                //How does wind affect the apearance of sprites
-
-        F32     mUpdatePhysicsInputsTime;
-                //Internal value to determine whether the time is right to update physical environmental effects
-};
-
-#endif // LL_VO_PART_H
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 150f5cd..a51ae9c 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -29,6 +29,8 @@
 
 #include "llvopartgroup.h"
 
+#include "lldrawpoolalpha.h"
+
 #include "llfasttimer.h"
 #include "message.h"
 #include "v2math.h"
@@ -47,7 +49,7 @@ const F32 MAX_PART_LIFETIME = 120.f;
 extern U64 gFrameTime;
 
 LLVOPartGroup::LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-        :       LLViewerObject(id, pcode, regionp),
+        :       LLAlphaObject(id, pcode, regionp),
                 mViewerPartGroupp(NULL)
 {
         setNumTEs(1);
@@ -61,37 +63,37 @@ LLVOPartGroup::~LLVOPartGroup()
 {
 }
 
+
 BOOL LLVOPartGroup::isActive() const
 {
         return TRUE;
 }
 
+F32 LLVOPartGroup::getBinRadius()
+{ 
+        return mScale.mV[0]*2.f;
+}
+
+void LLVOPartGroup::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
+{               
+        LLVector3 pos_agent = getPositionAgent();
+        mExtents[0] = pos_agent - mScale;
+        mExtents[1] = pos_agent + mScale;
+        newMin = mExtents[0];
+        newMax = mExtents[1];
+        mDrawable->setPositionGroup(pos_agent);
+}
+
 BOOL LLVOPartGroup::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
-        if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_PARTICLES))
-        {
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-        }
-
-        // Particle groups don't need any of default idleUpdate velocity interpolation stuff.
-        //LLViewerObject::idleUpdate(agent, world, time);
         return TRUE;
 }
 
-
 void LLVOPartGroup::setPixelAreaAndAngle(LLAgent &agent)
 {
         // mPixelArea is calculated during render
-
-        LLVector3 viewer_pos_agent = agent.getCameraPositionAgent();
-        LLVector3 pos_agent = getRenderPosition();
-
-        F32 dx = viewer_pos_agent.mV[VX] - pos_agent.mV[VX];
-        F32 dy = viewer_pos_agent.mV[VY] - pos_agent.mV[VY];
-        F32 dz = viewer_pos_agent.mV[VZ] - pos_agent.mV[VZ];
-
         F32 mid_scale = getMidScale();
-        F32 range = sqrt(dx*dx + dy*dy + dz*dz);
+        F32 range = (getRenderPosition()-gCamera->getOrigin()).magVec();
 
         if (range < 0.001f || isHUDAttachment())                // range == zero
         {
@@ -105,7 +107,7 @@ void LLVOPartGroup::setPixelAreaAndAngle(LLAgent &agent)
 
 void LLVOPartGroup::updateTextures(LLAgent &agent)
 {
-        // Texture stats for particles will need to be updated in a different way...
+        // Texture stats for particles need to be updated in a different way...
 }
 
 
@@ -114,37 +116,45 @@ LLDrawable* LLVOPartGroup::createDrawable(LLPipeline *pipeline)
         pipeline->allocDrawable(this);
         mDrawable->setLit(FALSE);
         mDrawable->setRenderType(LLPipeline::RENDER_TYPE_PARTICLES);
-
-        LLDrawPool *pool = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-        mDrawable->setNumFaces(mViewerPartGroupp->getCount(), pool, getTEImage(0));
         return mDrawable;
 }
 
  const F32 MAX_PARTICLE_AREA_SCALE = 0.02f; // some tuned constant, limits on how much particle area to draw
 
-BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
+F32 LLVOPartGroup::getPartSize(S32 idx)
 {
-        LLFastTimer t(LLFastTimer::FTM_UPDATE_PARTICLES);
-        
-        LLVector3 at;
-        LLVector3 up;
-        LLVector3 right;
-        LLVector3 position_agent;
-        LLVector3 camera_agent = gAgent.getCameraPositionAgent();
-        LLVector2 uvs[4];
+        if (idx < (S32) mViewerPartGroupp->mParticles.size())
+        {
+                return mViewerPartGroupp->mParticles[idx]->mScale.mV[0];
+        }
+
+        return 0.f;
+}
 
-        uvs[0].setVec(0.f, 1.f);
-        uvs[1].setVec(0.f, 0.f);
-        uvs[2].setVec(1.f, 1.f);
-        uvs[3].setVec(1.f, 0.f);
+BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
+{
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_PARTICLES);
 
-        LLDrawPool *drawpool = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
+        LLVector3 at;
+        LLVector3 position_agent;
+        LLVector3 camera_agent = gCamera->getOrigin();
+        
         S32 num_parts = mViewerPartGroupp->getCount();
         LLFace *facep;
-        
+        LLSpatialGroup* group = drawable->getSpatialGroup();
+        if (!group && num_parts)
+        {
+                drawable->movePartition();
+                group = drawable->getSpatialGroup();
+        }
+
         if (!num_parts)
         {
-                drawable->setNumFaces(0, drawpool, getTEImage(0));
+                if (drawable->getNumFaces())
+                {
+                        group->dirtyGeom();
+                }
+                drawable->setNumFaces(0, NULL, getTEImage(0));
                 LLPipeline::sCompiles++;
                 return TRUE;
         }
@@ -154,30 +164,30 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                 return TRUE;
         }
 
-//      drawable->setNumFaces(num_parts, drawpool, getTEImage(0));
-        drawable->setNumFacesFast(num_parts, drawpool, getTEImage(0));
-        
-        LLVector3 normal(-gCamera->getXAxis()); // make point agent face camera
-        
-        LLStrider<LLVector3> verticesp;
-        LLStrider<LLVector3> normalsp;
-        LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp = 0;
+        if (num_parts > drawable->getNumFaces())
+        {
+                drawable->setNumFacesFast(num_parts+num_parts/4, NULL, getTEImage(0));
+        }
 
-        S32 vert_offset;
         F32 tot_area = 0;
+        BOOL is_particle = isParticle();
+
         F32 max_area = LLViewerPartSim::getMaxPartCount() * MAX_PARTICLE_AREA_SCALE; 
-        
+        F32 pixel_meter_ratio = gCamera->getPixelMeterRatio();
+        pixel_meter_ratio *= pixel_meter_ratio;
+
         S32 count=0;
-        for (S32 i = 0; i < num_parts; i++)
+        S32 i;
+        F32 max_width = 0.f;
+        mDepth = 0.f;
+
+        for (i = 0; i < num_parts; i++)
         {
-                const LLViewerPart &part = mViewerPartGroupp->mParticles[i];
+                const LLViewerPart &part = *((LLViewerPart*) mViewerPartGroupp->mParticles[i]);
 
                 LLVector3 part_pos_agent(part.mPosAgent);
                 at = part_pos_agent - camera_agent;
 
-                //F32 invcamdist = 1.0f / at.magVec();
-                //area += (part.mScale.mV[0]*invcamdist)*(part.mScale.mV[1]*invcamdist);
                 F32 camera_dist_squared = at.magVecSquared();
                 F32 inv_camera_dist_squared;
                 if (camera_dist_squared > 1.f)
@@ -186,29 +196,124 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                         inv_camera_dist_squared = 1.f;
                 F32 area = part.mScale.mV[0] * part.mScale.mV[1] * inv_camera_dist_squared;
                 tot_area += area;
-                if (tot_area > max_area)
+                
+                if (!is_particle && tot_area > max_area)
                 {
                         break;
                 }
-                
+        
                 count++;
 
                 facep = drawable->getFace(i);
+                facep->setTEOffset(i);
                 const F32 NEAR_PART_DIST_SQ = 5.f*5.f;  // Only discard particles > 5 m from the camera
                 const F32 MIN_PART_AREA = .005f*.005f;  // only less than 5 mm x 5 mm at 1 m from camera
-                if (camera_dist_squared > NEAR_PART_DIST_SQ && area < MIN_PART_AREA)
+                
+                if (!is_particle)
                 {
-                        facep->setSize(0, 0);
-                        continue;
+                        if (camera_dist_squared > NEAR_PART_DIST_SQ && area < MIN_PART_AREA)
+                        {
+                                facep->setSize(0, 0);
+                                continue;
+                        }
+
+                        facep->setSize(4, 6);
+                }
+                else
+                {               
+                        facep->setSize(1,1);
+                }
+
+                facep->setViewerObject(this);
+
+                if (part.mFlags & LLPartData::LL_PART_EMISSIVE_MASK)
+                {
+                        facep->setState(LLFace::FULLBRIGHT);
                 }
-                facep->setSize(4, 6);
-                facep->mCenterAgent = part_pos_agent;
-                vert_offset = facep->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
-                if (-1 == vert_offset)
+                else
                 {
-                        return TRUE;
+                        facep->clearState(LLFace::FULLBRIGHT);
                 }
+
+                facep->mCenterLocal = part.mPosAgent;
+                facep->setFaceColor(part.mColor);
+                facep->setTexture(part.mImagep);
                 
+                if (i == 0)
+                {
+                        mExtents[0] = mExtents[1] = part.mPosAgent;
+                }
+                else
+                {
+                        update_min_max(mExtents[0], mExtents[1], part.mPosAgent);
+                }
+
+                max_width = llmax(max_width, part.mScale.mV[0]);
+                max_width = llmax(max_width, part.mScale.mV[1]);
+
+                mPixelArea = tot_area * pixel_meter_ratio;
+                const F32 area_scale = 10.f; // scale area to increase priority a bit
+                facep->setVirtualSize(mPixelArea*area_scale);
+        }
+        for (i = count; i < drawable->getNumFaces(); i++)
+        {
+                LLFace* facep = drawable->getFace(i);
+                facep->setTEOffset(i);
+                facep->setSize(0,0);
+        }
+        
+        LLVector3 y = gCamera->mYAxis;
+        LLVector3 z = gCamera->mZAxis;
+
+        LLVector3 pad;
+        for (i = 0; i < 3; i++)
+        {
+                pad.mV[i] = llmax(max_width, max_width * (fabsf(y.mV[i]) + fabsf(z.mV[i])));
+        }
+        
+        mExtents[0] -= pad;
+        mExtents[1] += pad;
+        
+        mDrawable->movePartition();
+        LLPipeline::sCompiles++;
+        return TRUE;
+}
+
+void LLVOPartGroup::getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp)
+{
+        if (idx >= (S32) mViewerPartGroupp->mParticles.size())
+        {
+                return;
+        }
+
+        const LLViewerPart &part = *((LLViewerPart*) (mViewerPartGroupp->mParticles[idx]));
+
+        U32 vert_offset = mDrawable->getFace(idx)->getGeomIndex();
+
+        if (isParticle())
+        {
+                LLVector3 part_pos_agent(part.mPosAgent);
+
+                const LLVector3& normal = -gCamera->getXAxis();
+
+                *verticesp++ = part_pos_agent;
+                *normalsp++ = normal;
+                *colorsp++ = part.mColor;
+                *texcoordsp++ = LLVector2(0.5f, 0.5f);
+                *indicesp++ = vert_offset;
+        }
+        else
+        {
+                LLVector3 part_pos_agent(part.mPosAgent);
+                LLVector3 camera_agent = gAgent.getCameraPositionAgent();
+                LLVector3 at = part_pos_agent - camera_agent;
+                LLVector3 up, right;
+
                 right = at % LLVector3(0.f, 0.f, 1.f);
                 right.normVec();
                 up = right % at;
@@ -236,31 +341,28 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                 right *= 0.5f*part.mScale.mV[0];
                 up *= 0.5f*part.mScale.mV[1];
 
+                const LLVector3& normal = -gCamera->getXAxis();
+                
                 *verticesp++ = part_pos_agent + up - right;
                 *verticesp++ = part_pos_agent - up - right;
                 *verticesp++ = part_pos_agent + up + right;
                 *verticesp++ = part_pos_agent - up + right;
 
-                *texCoordsp++ = uvs[0];
-                *texCoordsp++ = uvs[1];
-                *texCoordsp++ = uvs[2];
-                *texCoordsp++ = uvs[3];
+                *colorsp++ = part.mColor;
+                *colorsp++ = part.mColor;
+                *colorsp++ = part.mColor;
+                *colorsp++ = part.mColor;
+
+                *texcoordsp++ = LLVector2(0.f, 1.f);
+                *texcoordsp++ = LLVector2(0.f, 0.f);
+                *texcoordsp++ = LLVector2(1.f, 1.f);
+                *texcoordsp++ = LLVector2(1.f, 0.f);
 
                 *normalsp++   = normal;
                 *normalsp++   = normal;
                 *normalsp++   = normal;
                 *normalsp++   = normal;
 
-                if (part.mFlags & LLPartData::LL_PART_EMISSIVE_MASK)
-                {
-                        facep->setState(LLFace::FULLBRIGHT);
-                }
-                else
-                {
-                        facep->clearState(LLFace::FULLBRIGHT);
-                }
-                facep->setFaceColor(part.mColor);
-                
                 *indicesp++ = vert_offset + 0;
                 *indicesp++ = vert_offset + 1;
                 *indicesp++ = vert_offset + 2;
@@ -269,17 +371,149 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                 *indicesp++ = vert_offset + 3;
                 *indicesp++ = vert_offset + 2;
         }
-        for (S32 j = count; j < drawable->getNumFaces(); j++) 
+}
+
+BOOL LLVOPartGroup::isParticle()
+{
+        return FALSE; //gGLManager.mHasPointParameters && mViewerPartGroupp->mUniformParticles;
+}
+
+U32 LLVOPartGroup::getPartitionType() const
+{ 
+        return LLPipeline::PARTITION_PARTICLE; 
+}
+
+LLParticlePartition::LLParticlePartition()
+: LLSpatialPartition(LLDrawPoolAlpha::VERTEX_DATA_MASK)
+{
+        mRenderPass = LLRenderPass::PASS_ALPHA;
+        mDrawableType = LLPipeline::RENDER_TYPE_PARTICLES;
+        mPartitionType = LLPipeline::PARTITION_PARTICLE;
+        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
+        mSlopRatio = 0.f;
+        mLODPeriod = 1;
+}
+
+void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count, U32& index_count)
+{
+        group->mBufferUsage = mBufferUsage;
+
+        mFaceList.clear();
+
+        for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
         {
-                drawable->getFace(j)->setSize(0,0);
+                LLDrawable* drawablep = *i;
+                
+                if (drawablep->isDead())
+                {
+                        continue;
+                }
+
+                LLAlphaObject* obj = (LLAlphaObject*) drawablep->getVObj();
+                obj->mDepth = 0.f;
+                
+                if (drawablep->isAnimating())
+                {
+                        group->mBufferUsage = GL_STREAM_DRAW_ARB;
+                }
+
+                U32 count = 0;
+                for (S32 j = 0; j < drawablep->getNumFaces(); ++j)
+                {
+                        drawablep->updateFaceSize(j);
+
+                        LLFace* facep = drawablep->getFace(j);
+                        if (!facep->hasGeometry())
+                        {
+                                continue;
+                        }
+                        
+                        count++;
+                        facep->mDistance = (facep->mCenterLocal - gCamera->getOrigin()) * gCamera->getAtAxis();
+                        obj->mDepth += facep->mDistance;
+                        
+                        mFaceList.push_back(facep);
+                        vertex_count += facep->getGeomCount();
+                        index_count += facep->getIndicesCount();
+                }
+                
+                obj->mDepth /= count;
         }
-        
-        mPixelArea = tot_area * gCamera->getPixelMeterRatio() * gCamera->getPixelMeterRatio();
-        const F32 area_scale = 10.f; // scale area to increase priority a bit
-        getTEImage(0)->addTextureStats(mPixelArea * area_scale);
+}
 
-        LLPipeline::sCompiles++;
+void LLParticlePartition::getGeometry(LLSpatialGroup* group)
+{
+        LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 
-        return TRUE;
+        std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater());
+
+        U32 index_count = 0;
+        U32 vertex_count = 0;
+
+        group->clearDrawMap();
+
+        LLVertexBuffer* buffer = group->mVertexBuffer;
+
+        LLStrider<U32> indicesp;
+        LLStrider<LLVector3> verticesp;
+        LLStrider<LLVector3> normalsp;
+        LLStrider<LLVector2> texcoordsp;
+        LLStrider<LLColor4U> colorsp;
+
+        buffer->getVertexStrider(verticesp);
+        buffer->getNormalStrider(normalsp);
+        buffer->getColorStrider(colorsp);
+        buffer->getTexCoordStrider(texcoordsp);
+        buffer->getIndexStrider(indicesp);
+
+        std::vector<LLDrawInfo*>& draw_vec = group->mDrawMap[mRenderPass];
+
+        for (std::vector<LLFace*>::iterator i = mFaceList.begin(); i != mFaceList.end(); ++i)
+        {
+                LLFace* facep = *i;
+                LLAlphaObject* object = (LLAlphaObject*) facep->getViewerObject();
+                facep->setGeomIndex(vertex_count);
+                facep->setIndicesIndex(index_count);
+                facep->mVertexBuffer = buffer;
+                facep->setPoolType(LLDrawPool::POOL_ALPHA);
+                object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, indicesp);
+                
+                vertex_count += facep->getGeomCount();
+                index_count += facep->getIndicesCount();
+
+                S32 idx = draw_vec.size()-1;
+
+                BOOL fullbright = facep->isState(LLFace::FULLBRIGHT);
+                F32 vsize = facep->getVirtualSize();
+
+                if (idx >= 0 && draw_vec[idx]->mEnd == facep->getGeomIndex()-1 &&
+                        draw_vec[idx]->mTexture == facep->getTexture() &&
+                        draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount() <= (U32) gGLManager.mGLMaxVertexRange &&
+                        draw_vec[idx]->mCount + facep->getIndicesCount() <= (U32) gGLManager.mGLMaxIndexRange &&
+                        draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount() < 4096 &&
+                        draw_vec[idx]->mFullbright == fullbright)
+                {
+                        draw_vec[idx]->mCount += facep->getIndicesCount();
+                        draw_vec[idx]->mEnd += facep->getGeomCount();
+                        draw_vec[idx]->mVSize = llmax(draw_vec[idx]->mVSize, vsize);
+                }
+                else
+                {
+                        U32 start = facep->getGeomIndex();
+                        U32 end = start + facep->getGeomCount()-1;
+                        U32 offset = facep->getIndicesStart();
+                        U32 count = facep->getIndicesCount();
+                        LLDrawInfo* info = new LLDrawInfo(start,end,count,offset,facep->getTexture(), buffer, fullbright); 
+                        info->mVSize = vsize;
+                        draw_vec.push_back(info);
+                }
+        }
+
+        mFaceList.clear();
+}
+
+F32 LLParticlePartition::calcPixelArea(LLSpatialGroup* group, LLCamera& camera)
+{
+        return 1024.f;
 }
 
diff --git a/linden/indra/newview/llvopartgroup.h b/linden/indra/newview/llvopartgroup.h
index fc6c1f3..3dc07c0 100644
--- a/linden/indra/newview/llvopartgroup.h
+++ b/linden/indra/newview/llvopartgroup.h
@@ -35,26 +35,50 @@
 
 class LLViewerPartGroup;
 
-class LLVOPartGroup : public LLViewerObject
+class LLVOPartGroup : public LLAlphaObject
 {
 public:
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD) |
+                                                        (1 << LLVertexBuffer::TYPE_COLOR)
+        }
+        eVertexDataMask;
+
         LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
 
         ~LLVOPartGroup();
 
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
         BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+        BOOL isParticle();
 
+        virtual F32 getBinRadius();
+        virtual void updateSpatialExtents(LLVector3& newMin, LLVector3& newMax);
+        virtual U32 getPartitionType() const;
+        
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent);
         /*virtual*/ void updateTextures(LLAgent &agent);
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
+                                void            getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp);
 
+        void updateFaceSize(S32 idx) { }
+        F32 getPartSize(S32 idx);
         void setViewerPartGroup(LLViewerPartGroup *part_groupp)         { mViewerPartGroupp = part_groupp; }
+        LLViewerPartGroup* getViewerPartGroup() { return mViewerPartGroupp; }
+
 protected:
         LLViewerPartGroup *mViewerPartGroupp;
-
+        LLVector3 mExtents[2];
         LLColor4 mDebugColor;
 };
 
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 559e846..4ed5353 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -440,7 +440,7 @@ void LLSkyTex::initEmpty(const S32 tex)
                 }
         }
 
-        createTexture(tex);
+        createGLImage(tex);
 }
 
 
@@ -467,10 +467,10 @@ void LLSkyTex::create(const F32 brightness_scale, const LLColor3& multiscatt)
                         *pix = temp1.mAll;
                 }
         }
-        createTexture(sCurrent);
+        createGLImage(sCurrent);
 }
 
-void LLSkyTex::createTexture(S32 which)
+void LLSkyTex::createGLImage(S32 which)
 {       
         mImageGL[which]->createGLTexture(0, mImageRaw[which]);
         mImageGL[which]->setClamp(TRUE, TRUE);
@@ -494,7 +494,7 @@ S32 LLVOSky::sTileResX = sResolution/NUM_TILES_X;
 S32 LLVOSky::sTileResY = sResolution/NUM_TILES_Y;
 
 LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, pcode, regionp),
+:       LLStaticViewerObject(id, pcode, regionp),
         mSun(SUN_DISK_RADIUS), mMoon(MOON_DISK_RADIUS),
         mBrightnessScale(1.f),
         mBrightnessScaleNew(0.f),
@@ -1054,11 +1054,9 @@ void LLVOSky::calcBrightnessScaleAndColors()
         }
 
         calculateColors(); // MSMSM Moved this down here per Milo Lindens suggestion, to fix orange flashing bug at sunset.
-        generateScatterMap();
 }
 
 
-
 void LLVOSky::calculateColors()
 {
         const F32 h = -0.1f;
@@ -1068,14 +1066,13 @@ void LLVOSky::calculateColors()
         F32 sun_factor = 1;
         
         // Sun Diffuse
-        if (calcHitsEarth(mCameraPosAgent, tosun) < 0)
-        {
-                mSunDiffuse = mBrightnessScaleGuess * mSun.getIntensity() * mTransp.calcTransp(tosun.mV[2], h);
-        }
-        else
-        {
-                mSunDiffuse = mBrightnessScaleGuess * mSun.getIntensity() * mTransp.calcTransp(0, h);
-        }
+        F32 sun_height = tosun.mV[2];
+
+        if (sun_height <= 0.0)
+                sun_height = 0.0;
+        
+        mSunDiffuse = mBrightnessScaleGuess * mSun.getIntensity() * mTransp.calcTransp(sun_height, h);
+
         mSunDiffuse = 1.0f * color_norm(mSunDiffuse);
 
         // Sun Ambient
@@ -1188,8 +1185,6 @@ BOOL LLVOSky::updateSky()
                 return TRUE;
         }
 
-        setPositionAgent(gAgent.getCameraPositionAgent());
-
         static S32 next_frame = 0;
         const S32 total_no_tiles = 6 * NUM_TILES;
         const S32 cycle_frame_no = total_no_tiles + 1;
@@ -1253,21 +1248,27 @@ BOOL LLVOSky::updateSky()
                                                         LLImageRaw* raw1 = mSkyTex[side].getImageRaw(TRUE);
                                                         LLImageRaw* raw2 = mSkyTex[side].getImageRaw(FALSE);
                                                         raw2->copy(raw1);
-                                                        mSkyTex[side].createTexture(mSkyTex[side].getWhich(FALSE));
+                                                        mSkyTex[side].createGLImage(mSkyTex[side].getWhich(FALSE));
                                                 }
                                                 next_frame = 0; 
                                                 //llSkyTex::stepCurrent();
                                         }
 
-                                        std::vector<LLPointer<LLImageRaw> > images;
-                                        for (S32 side = 0; side < 6; side++)
+                                        if (!gSavedSettings.getBOOL("RenderDynamicReflections"))
                                         {
-                                                images.push_back(mSkyTex[side].getImageRaw(FALSE));
+                                                std::vector<LLPointer<LLImageRaw> > images;
+                                                for (S32 side = 0; side < 6; side++)
+                                                {
+                                                        images.push_back(mSkyTex[side].getImageRaw(FALSE));
+                                                }
+                                                mCubeMap->init(images);
                                         }
-                                        mCubeMap->init(images);
                                 }
                         }
 
+                        gPipeline.markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+                        gPipeline.markRebuild(gSky.mVOStarsp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+
                         mForceUpdate = FALSE;
                 }
                 else
@@ -1306,7 +1307,8 @@ LLDrawable *LLVOSky::createDrawable(LLPipeline *pipeline)
         poolp->setSkyTex(mSkyTex);
         poolp->setSun(&mSun);
         poolp->setMoon(&mMoon);
-
+        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_SKY);
+        
         for (S32 i = 0; i < 6; ++i)
         {
                 mFace[FACE_SIDE0 + i] = mDrawable->addFace(poolp, NULL);
@@ -1316,9 +1318,6 @@ LLDrawable *LLVOSky::createDrawable(LLPipeline *pipeline)
         mFace[FACE_MOON] = mDrawable->addFace(poolp, mMoonTexturep);
         mFace[FACE_BLOOM] = mDrawable->addFace(poolp, mBloomTexturep);
 
-        //mDrawable->addFace(poolp, LLViewerImage::sDefaultImagep);
-        gPipeline.markMaterialed(mDrawable);
-
         return mDrawable;
 }
 
@@ -1326,70 +1325,74 @@ BOOL LLVOSky::updateGeometry(LLDrawable *drawable)
 {
         if (mFace[FACE_REFLECTION] == NULL)
         {
-                mFace[FACE_REFLECTION] = drawable->addFace(gPipeline.getPool(LLDrawPool::POOL_WATER), NULL);
+                LLDrawPoolWater *poolp = (LLDrawPoolWater*) gPipeline.getPool(LLDrawPool::POOL_WATER);
+                mFace[FACE_REFLECTION] = drawable->addFace(poolp, NULL);
         }
 
         mCameraPosAgent = drawable->getPositionAgent();
         mEarthCenter.mV[0] = mCameraPosAgent.mV[0];
         mEarthCenter.mV[1] = mCameraPosAgent.mV[1];
 
-
         LLVector3 v_agent[8];
         for (S32 i = 0; i < 8; ++i)
         {
                 F32 x_sgn = (i&1) ? 1.f : -1.f;
                 F32 y_sgn = (i&2) ? 1.f : -1.f;
                 F32 z_sgn = (i&4) ? 1.f : -1.f;
-                v_agent[i] = mCameraPosAgent + HORIZON_DIST * LLVector3(x_sgn, y_sgn, z_sgn);
+                v_agent[i] = HORIZON_DIST*0.25f * LLVector3(x_sgn, y_sgn, z_sgn);
         }
 
         LLStrider<LLVector3> verticesp;
         LLStrider<LLVector3> normalsp;
         LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
         LLFace *face;   
 
         for (S32 side = 0; side < 6; ++side)
         {
                 face = mFace[FACE_SIDE0 + side]; 
-                face->setPrimType(LLTriangles);
-                face->setSize(4, 6);
-                index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
-                if (-1 == index_offset)
+
+                if (face->mVertexBuffer.isNull())
                 {
-                        return TRUE;
+                        face->setSize(4, 6);
+                        face->setGeomIndex(0);
+                        face->setIndicesIndex(0);
+                        face->mVertexBuffer = new LLVertexBuffer(LLDrawPoolSky::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
+                        face->mVertexBuffer->allocateBuffer(4, 6, TRUE);
+                        
+                        index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
+                        
+                        S32 vtx = 0;
+                        S32 curr_bit = side >> 1; // 0/1 = Z axis, 2/3 = Y, 4/5 = X
+                        S32 side_dir = side & 1;  // even - 0, odd - 1
+                        S32 i_bit = (curr_bit + 2) % 3;
+                        S32 j_bit = (i_bit + 2) % 3;
+
+                        LLVector3 axis;
+                        axis.mV[curr_bit] = 1;
+                        face->mCenterAgent = (F32)((side_dir << 1) - 1) * axis * HORIZON_DIST;
+
+                        vtx = side_dir << curr_bit;
+                        *(verticesp++)  = v_agent[vtx];
+                        *(verticesp++)  = v_agent[vtx | 1 << j_bit];
+                        *(verticesp++)  = v_agent[vtx | 1 << i_bit];
+                        *(verticesp++)  = v_agent[vtx | 1 << i_bit | 1 << j_bit];
+
+                        *(texCoordsp++) = TEX00;
+                        *(texCoordsp++) = TEX01;
+                        *(texCoordsp++) = TEX10;
+                        *(texCoordsp++) = TEX11;
+
+                        // Triangles for each side
+                        *indicesp++ = index_offset + 0;
+                        *indicesp++ = index_offset + 1;
+                        *indicesp++ = index_offset + 3;
+
+                        *indicesp++ = index_offset + 0;
+                        *indicesp++ = index_offset + 3;
+                        *indicesp++ = index_offset + 2;
                 }
-
-                S32 vtx = 0;
-                S32 curr_bit = side >> 1; // 0/1 = Z axis, 2/3 = Y, 4/5 = X
-                S32 side_dir = side & 1;  // even - 0, odd - 1
-                S32 i_bit = (curr_bit + 2) % 3;
-                S32 j_bit = (i_bit + 2) % 3;
-
-                LLVector3 axis;
-                axis.mV[curr_bit] = 1;
-                face->mCenterAgent = mCameraPosAgent + (F32)((side_dir << 1) - 1) * axis * HORIZON_DIST;
-
-                vtx = side_dir << curr_bit;
-                *(verticesp++)  = v_agent[vtx];
-                *(verticesp++)  = v_agent[vtx | 1 << j_bit];
-                *(verticesp++)  = v_agent[vtx | 1 << i_bit];
-                *(verticesp++)  = v_agent[vtx | 1 << i_bit | 1 << j_bit];
-
-                *(texCoordsp++) = TEX00;
-                *(texCoordsp++) = TEX01;
-                *(texCoordsp++) = TEX10;
-                *(texCoordsp++) = TEX11;
-
-                // Triangles for each side
-                *indicesp++ = index_offset + 0;
-                *indicesp++ = index_offset + 1;
-                *indicesp++ = index_offset + 3;
-
-                *indicesp++ = index_offset + 0;
-                *indicesp++ = index_offset + 3;
-                *indicesp++ = index_offset + 2;
         }
 
         const LLVector3 &look_at = gCamera->getAtAxis();
@@ -1464,7 +1467,7 @@ BOOL LLVOSky::updateHeavenlyBodyGeometry(LLDrawable *drawable, const S32 f, cons
         LLStrider<LLVector3> verticesp;
         LLStrider<LLVector3> normalsp;
         LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
         LLFace *facep;
 
@@ -1512,8 +1515,16 @@ BOOL LLVOSky::updateHeavenlyBodyGeometry(LLDrawable *drawable, const S32 f, cons
         hb.setVisible(TRUE);
 
         facep = mFace[f]; 
-        facep->setPrimType(LLTriangles);
-        facep->setSize(4, 6);
+
+        if (facep->mVertexBuffer.isNull())
+        {
+                facep->setSize(4, 6);
+                facep->mVertexBuffer = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
+                facep->mVertexBuffer->allocateBuffer(facep->getGeomCount(), facep->getIndicesCount(), TRUE);
+                facep->setGeomIndex(0);
+                facep->setIndicesIndex(0);
+        }
+
         index_offset = facep->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
         if (-1 == index_offset)
         {
@@ -1642,7 +1653,7 @@ void LLVOSky::updateSunHaloGeometry(LLDrawable *drawable )
         LLStrider<LLVector3> verticesp;
         LLStrider<LLVector3> normalsp;
         LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
         LLFace *face;
 
@@ -1661,8 +1672,16 @@ void LLVOSky::updateSunHaloGeometry(LLDrawable *drawable )
         v_glow_corner[3] = draw_pos + right - up;
 
         face = mFace[FACE_BLOOM]; 
-        face->setPrimType(LLTriangles);
-        face->setSize(4, 6);
+
+        if (face->mVertexBuffer.isNull())
+        {
+                face->setSize(4, 6);
+                face->setGeomIndex(0);
+                face->setIndicesIndex(0);
+                face->mVertexBuffer = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
+                face->mVertexBuffer->allocateBuffer(4, 6, TRUE);
+        }
+
         index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
         if (-1 == index_offset)
         {
@@ -1896,15 +1915,23 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
                 dt_clip = -0.1f;
         }
 
+        LLFace *face = mFace[FACE_REFLECTION]; 
+
+        if (face->mVertexBuffer.isNull() || quads*4 != face->getGeomCount())
+        {
+                face->setSize(quads * 4, quads * 6);
+                face->mVertexBuffer = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
+                face->mVertexBuffer->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), TRUE);
+                face->setIndicesIndex(0);
+                face->setGeomIndex(0);
+        }
+        
         LLStrider<LLVector3> verticesp;
         LLStrider<LLVector3> normalsp;
         LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
-        LLFace *face = mFace[FACE_REFLECTION]; 
-
-        face->setPrimType(LLTriangles);
-        face->setSize(quads * 4, quads * 6);
+        
         index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
         if (-1 == index_offset)
         {
@@ -2132,16 +2159,14 @@ void LLVOSky::updateFog(const F32 distance)
 
         color_gamma_correct(sky_fog_color);
 
-        if (!(gPipeline.getVertexShaderLevel(LLPipeline::SHADER_ENVIRONMENT) > LLDrawPool::SHADER_LEVEL_SCATTERING))
-        {
-                render_fog_color = sky_fog_color;
-        }
-
+        render_fog_color = sky_fog_color;
+        
         if (camera_height > water_height)
         {
                 fog_distance = mFogRatio * distance;
                 LLColor4 fog(render_fog_color);
                 glFogfv(GL_FOG_COLOR, fog.mV);
+                mGLFogCol = fog;
         }
         else
         {
@@ -2161,6 +2186,7 @@ void LLVOSky::updateFog(const F32 distance)
                 LLColor4 fogCol = brightness * (color_frac * render_fog_color + (1.f - color_frac) * LLColor4(0.f, 0.2f, 0.3f, 1.f));
                 fogCol.setAlpha(1);
                 glFogfv(GL_FOG_COLOR, (F32 *) &fogCol.mV);
+                mGLFogCol = fogCol;
         }
 
         mFogColor = sky_fog_color;
diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index 1617c2a..0ca56dc 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -197,7 +197,7 @@ protected:
         }
 
         LLImageRaw* getImageRaw(BOOL curr=TRUE)                 { return mImageRaw[getWhich(curr)]; }
-        void createTexture(BOOL curr=TRUE);
+        void createGLImage(BOOL curr=TRUE);
 };
 
 
@@ -511,7 +511,7 @@ public:
 class LLCubeMap;
 
 
-class LLVOSky : public LLViewerObject
+class LLVOSky : public LLStaticViewerObject
 {
 public:
         enum
@@ -593,6 +593,7 @@ public:
         LLColor4 getMoonAmbientColor() const                                    { return mMoonAmbient; }
         const LLColor4& getTotalAmbientColor() const                    { return mTotalAmbient; }
         LLColor4 getFogColor() const                                                    { return mFogColor; }
+        LLColor4 getGLFogColor() const                                                  { return mGLFogCol; }
         
         LLVector3 calcUpVec(const LLVector3 &pos) const
         {
@@ -729,6 +730,8 @@ protected:
         F32                                     sInterpVal;
 
         LLColor4                        mFogColor;
+        LLColor4                        mGLFogCol;
+        
         F32                                     mFogRatio;
         F32                                     mWorldScale;
 
@@ -739,7 +742,7 @@ protected:
         LLColor3                        mMoonDiffuse;
         LLColor4U                       mFadeColor;                                     // Color to fade in from        
 
-        LLCubeMap                       *mCubeMap;                                      // Cube map for the sky
+        LLCubeMap                       *mCubeMap;                                      // Cube map for the environment
         S32                                     mDrawRefl;
 
         LLFrameTimer            mUpdateTimer;
diff --git a/linden/indra/newview/llvostars.cpp b/linden/indra/newview/llvostars.cpp
index 3fd3b91..a4568ce 100644
--- a/linden/indra/newview/llvostars.cpp
+++ b/linden/indra/newview/llvostars.cpp
@@ -37,11 +37,11 @@
 #include "pipeline.h"
 
 const U32 NUMBER_OF_STARS               = 1000;
-const F32 DISTANCE_TO_STARS             = HORIZON_DIST - 10.f;
+const F32 DISTANCE_TO_STARS             = (HORIZON_DIST - 10.f)*0.25f;
 
 
 LLVOStars::LLVOStars(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-        : LLViewerObject(id, pcode, regionp)
+        : LLStaticViewerObject(id, pcode, regionp)
 {
         initStars();
 }
@@ -64,7 +64,7 @@ LLDrawable *LLVOStars::createDrawable(LLPipeline *pipeline)
         LLDrawPoolStars *poolp = (LLDrawPoolStars*) gPipeline.getPool(LLDrawPool::POOL_STARS);
 
         mFace = mDrawable->addFace(poolp, NULL);
-        mFace->setPrimType(GL_POINTS);
+        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_STARS);
         mFace->setSize(NUMBER_OF_STARS, NUMBER_OF_STARS);
 
         return mDrawable;
@@ -90,19 +90,27 @@ BOOL LLVOStars::updateStarGeometry(LLDrawable *drawable)
         LLStrider<LLVector3> normalsp;
         LLStrider<LLVector2> texCoordsp;
         LLStrider<LLColor4U> colorsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
 
+        if (mFace->mVertexBuffer.isNull())
+        {
+                mFace->mVertexBuffer = new LLVertexBuffer(LLDrawPoolStars::VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
+                mFace->mVertexBuffer->allocateBuffer(mFace->getGeomCount(), mFace->getIndicesCount(), TRUE);
+                mFace->setGeomIndex(0);
+                mFace->setIndicesIndex(0);
+        }
+        
         index_offset = mFace->getGeometryColors(verticesp,normalsp,texCoordsp,colorsp, indicesp);
         
         if (-1 == index_offset)
         {
                 return TRUE;
         }
-        LLVector3 cam_pos = gSky.mVOSkyp ? gSky.mVOSkyp->getPositionAgent() : drawable->getPositionAgent();
+        
         for (U32 vtx = 0; vtx < NUMBER_OF_STARS; ++vtx)
         {
-                *(verticesp++)  = mStarVertices[vtx] + cam_pos;
+                *(verticesp++)  = mStarVertices[vtx];
                 *(colorsp++)    = LLColor4U(mStarColors[vtx]);
                 *(indicesp++)   = index_offset + vtx;
         }
@@ -173,7 +181,7 @@ void LLVOStars::updateStarColors()
                         F32 sundir_factor = 1;
                         LLVector3 tostar = *v_p;
                         tostar.normVec();
-                        const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSun();
+                        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;
diff --git a/linden/indra/newview/llvostars.h b/linden/indra/newview/llvostars.h
index 88e792c..10b644e 100644
--- a/linden/indra/newview/llvostars.h
+++ b/linden/indra/newview/llvostars.h
@@ -35,7 +35,7 @@
 
 class LLFace;
 
-class LLVOStars : public LLViewerObject
+class LLVOStars : public LLStaticViewerObject
 {
 public:
         LLVOStars(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index d49d78c..88e610b 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -29,6 +29,8 @@
 
 #include "llvosurfacepatch.h"
 
+#include "lldrawpoolterrain.h"
+
 #include "lldrawable.h"
 #include "llface.h"
 #include "llprimitive.h"
@@ -41,8 +43,52 @@
 #include "llvovolume.h"
 #include "pipeline.h"
 
+//============================================================================
+
+class LLVertexBufferTerrain : public LLVertexBuffer
+{
+public:
+        LLVertexBufferTerrain() :
+                LLVertexBuffer(MAP_VERTEX | MAP_NORMAL | MAP_TEXCOORD | MAP_TEXCOORD2 | MAP_COLOR, GL_DYNAMIC_DRAW_ARB)
+        {
+        };
+
+        // virtual
+        void setupVertexBuffer(U32 data_mask) const
+        {               
+                if (LLDrawPoolTerrain::getDetailMode() == 0)
+                {
+                        LLVertexBuffer::setupVertexBuffer(data_mask);
+                }
+                else if (data_mask & LLVertexBuffer::MAP_TEXCOORD2)
+                {
+                        U8* base = useVBOs() ? NULL : mMappedData;
+        
+                        glVertexPointer(3,GL_FLOAT, mStride, (void*)(base + 0));
+                        glNormalPointer(GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_NORMAL]));
+                        glColorPointer(4, GL_UNSIGNED_BYTE, mStride, (void*)(base + mOffsets[TYPE_COLOR]));
+                
+                        glClientActiveTextureARB(GL_TEXTURE3_ARB);
+                        glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD2]));
+                        glClientActiveTextureARB(GL_TEXTURE2_ARB);
+                        glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD2]));
+                        glClientActiveTextureARB(GL_TEXTURE1_ARB);
+                        glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD2]));
+                        glClientActiveTextureARB(GL_TEXTURE0_ARB);
+                        glTexCoordPointer(2,GL_FLOAT, mStride, (void*)(base + mOffsets[TYPE_TEXCOORD2]));
+                }
+                else
+                {
+                        LLVertexBuffer::setupVertexBuffer(data_mask);
+                }
+                llglassertok();         
+        }
+};
+
+//============================================================================
+
 LLVOSurfacePatch::LLVOSurfacePatch(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, LL_VO_SURFACE_PATCH, regionp)
+:       LLStaticViewerObject(id, LL_VO_SURFACE_PATCH, regionp)
 {
         // Terrain must draw during selection passes so it can block objects behind it.
         mbCanSelect = TRUE;
@@ -95,9 +141,9 @@ void LLVOSurfacePatch::updateTextures(LLAgent &agent)
 }
 
 
-LLDrawPool *LLVOSurfacePatch::getPool()
+LLFacePool *LLVOSurfacePatch::getPool()
 {
-        mPool = gPipeline.getPool(LLDrawPool::POOL_TERRAIN, mPatchp->getSurface()->getSTexture());
+        mPool = (LLDrawPoolTerrain*) gPipeline.getPool(LLDrawPool::POOL_TERRAIN, mPatchp->getSurface()->getSTexture());
 
         return mPool;
 }
@@ -125,15 +171,18 @@ LLDrawable *LLVOSurfacePatch::createDrawable(LLPipeline *pipeline)
                 range = 3;
         }
 
-        LLDrawPool *poolp = getPool();
+        LLFacePool *poolp = getPool();
 
         mDrawable->addFace(poolp, NULL);
+
         return mDrawable;
 }
 
 
 BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable)
 {
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TERRAIN);
+
         S32 min_comp, max_comp, range;
         min_comp = lltrunc(mPatchp->getMinComposition());
         max_comp = lltrunc(ceil(mPatchp->getMaxComposition()));
@@ -185,57 +234,63 @@ BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable)
                 east_stride = render_stride;
         }
 
+        mLastLength = length;
+        mLastStride = render_stride;
+        mLastNorthStride = north_stride;
+        mLastEastStride = east_stride;
+
+        return TRUE;
+}
+
+void LLVOSurfacePatch::updateFaceSize(S32 idx)
+{
+        if (idx != 0)
+        {
+                llwarns << "Terrain partition requested invalid face!!!" << llendl;
+                return;
+        }
+
+        LLFace* facep = mDrawable->getFace(idx);
+
         S32 num_vertices = 0;
         S32 num_indices = 0;
-        S32 new_north_offset = 0;
-        S32 new_east_offset = 0;
-
-        getGeomSizesMain(render_stride, num_vertices, num_indices);
-        new_north_offset = num_vertices;
-        getGeomSizesNorth(render_stride, north_stride, num_vertices, num_indices);
-        new_east_offset = num_vertices;
-        getGeomSizesEast(render_stride, east_stride, num_vertices, num_indices);
-        S32 new_num_vertices = num_vertices;
-        S32 new_num_indices = num_indices;
-
-        LLFace *facep = NULL;
-
-        // Update the allocated face
-        LLStrider<LLVector3> verticesp;
-        LLStrider<LLVector3> normalsp;
-        LLStrider<LLVector2> texCoords0p;
-        LLStrider<LLVector2> texCoords1p;
-        LLStrider<LLColor4U> colorsp;
-        U32*       indicesp = NULL;
-        S32 index_offset;
-
-        facep = mDrawable->getFace(0);
-
-        facep->setSize(new_num_vertices, new_num_indices);
-        facep->setPrimType(LLTriangles);
-
-        index_offset = facep->getGeometryTerrain(
-                                                             verticesp,
-                                                                 normalsp,
-                                                                 colorsp,
-                                                                 texCoords0p,
-                                                                 texCoords1p,
-                                                                 indicesp);
-        if (-1 == index_offset)
+        
+        if (mLastStride)
         {
-                return TRUE;
+                getGeomSizesMain(mLastStride, num_vertices, num_indices);
+                getGeomSizesNorth(mLastStride, mLastNorthStride, num_vertices, num_indices);
+                getGeomSizesEast(mLastStride, mLastEastStride, num_vertices, num_indices);
         }
 
-        mDrawable->updateLightSet();
+        facep->setSize(num_vertices, num_indices);      
+}
+
+BOOL LLVOSurfacePatch::updateLOD()
+{
+        //mDrawable->updateLightSet();
+        mDrawable->setState(LLDrawable::LIGHTING_BUILT);
+        return TRUE;
+}
+
+void LLVOSurfacePatch::getGeometry(LLStrider<LLVector3> &verticesp,
+                                                                LLStrider<LLVector3> &normalsp,
+                                                                LLStrider<LLColor4U> &colorsp,
+                                                                LLStrider<LLVector2> &texCoords0p,
+                                                                LLStrider<LLVector2> &texCoords1p,
+                                                                LLStrider<U32> &indicesp)
+{
+        LLFace* facep = mDrawable->getFace(0);
+
+        U32 index_offset = facep->getGeomIndex();
 
         updateMainGeometry(facep, 
-                                           verticesp,
-                                           normalsp,
-                                           colorsp,
-                                           texCoords0p,
-                                           texCoords1p,
-                                           indicesp,
-                                           index_offset);
+                                        verticesp,
+                                        normalsp,
+                                        colorsp,
+                                        texCoords0p,
+                                        texCoords1p,
+                                        indicesp,
+                                        index_offset);
         updateNorthGeometry(facep, 
                                                 verticesp,
                                                 normalsp,
@@ -252,24 +307,6 @@ BOOL LLVOSurfacePatch::updateGeometry(LLDrawable *drawable)
                                                 texCoords1p,
                                                 indicesp,
                                                 index_offset);
-
-        if (mLastLength != 0)
-        {
-                // lazy, should cache the geom sizes so we know the offsets.
-                num_vertices = 0;
-                num_indices = 0;
-
-        }
-
-        mLastLength = length;
-        mLastStride = render_stride;
-        mLastNorthStride = north_stride;
-        mLastEastStride = east_stride;
-
-        mDrawable->setState(LLDrawable::LIGHTING_BUILT);
-        
-        LLPipeline::sCompiles++;
-        return TRUE;
 }
 
 void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
@@ -278,8 +315,8 @@ void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
                                                                                 LLStrider<LLColor4U> &colorsp,
                                                                                 LLStrider<LLVector2> &texCoords0p,
                                                                                 LLStrider<LLVector2> &texCoords1p,
-                                                                                U32* &indicesp,
-                                                                                S32 &index_offset)
+                                                                                LLStrider<U32> &indicesp,
+                                                                                U32 &index_offset)
 {
         S32 i, j, x, y;
 
@@ -287,7 +324,7 @@ void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
         S32 num_vertices, num_indices;
         U32 index;
 
-        render_stride = mPatchp->getRenderStride();
+        render_stride = mLastStride;
         patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
         S32 vert_size = patch_size / render_stride;
 
@@ -383,29 +420,20 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
                                                                                 LLStrider<LLColor4U> &colorsp,
                                                                                 LLStrider<LLVector2> &texCoords0p,
                                                                                 LLStrider<LLVector2> &texCoords1p,
-                                                                                U32* &indicesp,
-                                                                                S32 &index_offset)
+                                                                                LLStrider<U32> &indicesp,
+                                                                                U32 &index_offset)
 {
         S32 vertex_count = 0;
         S32 i, x, y;
 
         S32 num_vertices, num_indices;
 
-        U32 render_stride = mPatchp->getRenderStride();
+        U32 render_stride = mLastStride;
         S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
         S32 length = patch_size / render_stride;
         S32 half_length = length / 2;
-
-        U32 north_stride;
-        if (mPatchp->getNeighborPatch(NORTH))
-        {
-                north_stride = mPatchp->getNeighborPatch(NORTH)->getRenderStride();
-        }
-        else
-        {
-                north_stride = render_stride;
-        }
-
+        U32 north_stride = mLastNorthStride;
+        
         ///////////////////////////
         //
         // Render the north strip
@@ -605,27 +633,19 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
                                                                                   LLStrider<LLColor4U> &colorsp,
                                                                                   LLStrider<LLVector2> &texCoords0p,
                                                                                   LLStrider<LLVector2> &texCoords1p,
-                                                                                  U32* &indicesp,
-                                                                                  S32 &index_offset)
+                                                                                  LLStrider<U32> &indicesp,
+                                                                                  U32 &index_offset)
 {
         S32 i, x, y;
 
         S32 num_vertices, num_indices;
 
-        U32 render_stride = mPatchp->getRenderStride();
+        U32 render_stride = mLastStride;
         S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
         S32 length = patch_size / render_stride;
         S32 half_length = length / 2;
 
-        U32 east_stride;
-        if (mPatchp->getNeighborPatch(EAST))
-        {
-                east_stride = mPatchp->getNeighborPatch(EAST)->getRenderStride();
-        }
-        else
-        {
-                east_stride = render_stride;
-        }
+        U32 east_stride = mLastEastStride;
 
         // Stride lengths are the same
         if (east_stride == render_stride)
@@ -844,10 +864,6 @@ void LLVOSurfacePatch::setPatch(LLSurfacePatch *patchp)
 
 void LLVOSurfacePatch::dirtyPatch()
 {
-        if (mDrawable)
-        {
-                gPipeline.markMoved(mDrawable);
-        }
         mDirtiedPatch = TRUE;
         dirtyGeom();
         mDirtyTerrain = TRUE;
@@ -865,6 +881,8 @@ void LLVOSurfacePatch::dirtyGeom()
         if (mDrawable)
         {
                 gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+                mDrawable->getFace(0)->mVertexBuffer = NULL;
+                mDrawable->movePartition();
         }
 }
 
@@ -937,7 +955,67 @@ void LLVOSurfacePatch::updateSpatialExtents(LLVector3& newMin, LLVector3 &newMax
 {
         LLVector3 posAgent = getPositionAgent();
         LLVector3 scale = getScale();
-        newMin = posAgent-scale;
-        newMax = posAgent+scale;
+        newMin = posAgent-scale*0.5f;
+        newMax = posAgent+scale*0.5f;
         mDrawable->setPositionGroup((newMin+newMax)*0.5f);
 }
+
+U32 LLVOSurfacePatch::getPartitionType() const
+{ 
+        return LLPipeline::PARTITION_TERRAIN; 
+}
+
+LLTerrainPartition::LLTerrainPartition()
+: LLSpatialPartition(LLDrawPoolTerrain::VERTEX_DATA_MASK)
+{
+        mRenderByGroup = FALSE;
+        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
+        mDrawableType = LLPipeline::RENDER_TYPE_TERRAIN;
+        mPartitionType = LLPipeline::PARTITION_TERRAIN;
+}
+
+LLVertexBuffer* LLTerrainPartition::createVertexBuffer(U32 type_mask, U32 usage)
+{
+        return new LLVertexBufferTerrain();
+}
+
+void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
+{
+        LLVertexBuffer* buffer = group->mVertexBuffer;
+
+        //get vertex buffer striders
+        LLStrider<LLVector3> vertices;
+        LLStrider<LLVector3> normals;
+        LLStrider<LLVector2> texcoords2;
+        LLStrider<LLVector2> texcoords;
+        LLStrider<LLColor4U> colors;
+        LLStrider<U32> indices;
+
+        buffer->getVertexStrider(vertices);
+        buffer->getNormalStrider(normals);
+        buffer->getTexCoordStrider(texcoords);
+        buffer->getTexCoord2Strider(texcoords2);
+        buffer->getColorStrider(colors);
+        buffer->getIndexStrider(indices);
+
+        U32 indices_index = 0;
+        U32 index_offset = 0;
+
+        for (std::vector<LLFace*>::iterator i = mFaceList.begin(); i != mFaceList.end(); ++i)
+        {
+                LLFace* facep = *i;
+
+                facep->setIndicesIndex(indices_index);
+                facep->setGeomIndex(index_offset);
+                facep->mVertexBuffer = buffer;
+
+                LLVOSurfacePatch* patchp = (LLVOSurfacePatch*) facep->getViewerObject();
+                patchp->getGeometry(vertices, normals, colors, texcoords, texcoords2, indices);
+
+                indices_index += facep->getIndicesCount();
+                index_offset += facep->getGeomCount();
+        }
+
+        mFaceList.clear();
+}
+
diff --git a/linden/indra/newview/llvosurfacepatch.h b/linden/indra/newview/llvosurfacepatch.h
index 3549571..75d57cb 100644
--- a/linden/indra/newview/llvosurfacepatch.h
+++ b/linden/indra/newview/llvosurfacepatch.h
@@ -35,9 +35,19 @@ class LLSurfacePatch;
 class LLDrawPool;
 class LLVector2;
 
-class LLVOSurfacePatch : public LLViewerObject
+class LLVOSurfacePatch : public LLStaticViewerObject
 {
 public:
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD2) |
+                                                        (1 << LLVertexBuffer::TYPE_COLOR) 
+        }
+        eVertexDataMask;
+
         LLVOSurfacePatch(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
         virtual ~LLVOSurfacePatch();
 
@@ -46,8 +56,18 @@ public:
         // Initialize data that's only inited once per class.
         static void initClass();
 
+        virtual U32 getPartitionType() const;
+
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
+        /*virtual*/ BOOL                updateLOD();
+        /*virtual*/ void                updateFaceSize(S32 idx);
+        void getGeometry(LLStrider<LLVector3> &verticesp,
+                                                                LLStrider<LLVector3> &normalsp,
+                                                                LLStrider<LLColor4U> &colorsp,
+                                                                LLStrider<LLVector2> &texCoords0p,
+                                                                LLStrider<LLVector2> &texCoords1p,
+                                                                LLStrider<U32> &indicesp);
 
         /*virtual*/ void updateTextures(LLAgent &agent);
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
@@ -63,8 +83,8 @@ public:
 
         BOOL                    mDirtiedPatch;
 protected:
-        LLDrawPool              *mPool;
-        LLDrawPool              *getPool();
+        LLFacePool              *mPool;
+        LLFacePool              *getPool();
         S32                             mBaseComp;
         LLSurfacePatch  *mPatchp;
         BOOL                    mDirtyTexture;
@@ -89,24 +109,24 @@ protected:
                                            LLStrider<LLColor4U> &colorsp,
                                            LLStrider<LLVector2> &texCoords0p,
                                            LLStrider<LLVector2> &texCoords1p,
-                                           U32* &indicesp,
-                                           S32 &index_offset);
+                                           LLStrider<U32> &indicesp,
+                                           U32 &index_offset);
         void updateNorthGeometry(LLFace *facep,
                                            LLStrider<LLVector3> &verticesp,
                                            LLStrider<LLVector3> &normalsp,
                                            LLStrider<LLColor4U> &colorsp,
                                            LLStrider<LLVector2> &texCoords0p,
                                            LLStrider<LLVector2> &texCoords1p,
-                                           U32* &indicesp,
-                                           S32 &index_offset);
+                                           LLStrider<U32> &indicesp,
+                                           U32 &index_offset);
         void updateEastGeometry(LLFace *facep,
                                            LLStrider<LLVector3> &verticesp,
                                            LLStrider<LLVector3> &normalsp,
                                            LLStrider<LLColor4U> &colorsp,
                                            LLStrider<LLVector2> &texCoords0p,
                                            LLStrider<LLVector2> &texCoords1p,
-                                           U32* &indicesp,
-                                           S32 &index_offset);
+                                           LLStrider<U32> &indicesp,
+                                           U32 &index_offset);
 };
 
 #endif // LL_VOSURFACEPATCH_H
diff --git a/linden/indra/newview/llvotextbubble.cpp b/linden/indra/newview/llvotextbubble.cpp
index 96ffe6b..ee0359b 100644
--- a/linden/indra/newview/llvotextbubble.cpp
+++ b/linden/indra/newview/llvotextbubble.cpp
@@ -43,7 +43,7 @@
 #include "pipeline.h"
 
 LLVOTextBubble::LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, pcode, regionp)
+:       LLAlphaObject(id, pcode, regionp)
 {
         setScale(LLVector3(1.5f, 1.5f, 0.25f));
         mbCanSelect = FALSE;
@@ -102,8 +102,10 @@ BOOL LLVOTextBubble::idleUpdate(LLAgent &agent, LLWorld	&world, const F64 &time)
         for (i = 0; i < getNumTEs(); i++)
         {
                 setTEColor(i, color);
+                setTEFullbright(i, TRUE);
         }
 
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
         return TRUE;
 }
 
@@ -145,15 +147,14 @@ LLDrawable *LLVOTextBubble::createDrawable(LLPipeline *pipeline)
         pipeline->allocDrawable(this);
         mDrawable->setLit(FALSE);
         mDrawable->setRenderType(LLPipeline::RENDER_TYPE_VOLUME);
-        LLDrawPool *poolp;
+        
         for (U32 i = 0; i < getNumTEs(); i++)
         {
                 LLViewerImage *imagep;
                 const LLTextureEntry *texture_entry = getTE(i);
                 imagep = gImageList.getImage(texture_entry->getID());
 
-                poolp = gPipeline.getPool(LLDrawPool::POOL_ALPHA);
-                mDrawable->addFace(poolp, imagep);
+                mDrawable->addFace((LLFacePool*) NULL, imagep);
         }
 
         return mDrawable;
@@ -200,24 +201,65 @@ BOOL LLVOTextBubble::updateGeometry(LLDrawable *drawable)
         for (S32 i = 0; i < drawable->getNumFaces(); i++)
         {
                 LLFace *face = drawable->getFace(i);
-
-                if (i == 0)
-                {
-                        face->setSize(0);
-                        continue;
-                }
-                if (i == 2)
-                {
-                        face->setSize(0);
-                        continue;
-                }
-
-                // Need to figure out how to readd logic to determine face dirty vs. entire object dirty.
                 face->setTEOffset(i);
-                face->clearState(LLFace::GLOBAL);
-                face->genVolumeTriangles(*getVolume(), i, identity4, identity3);
+                face->setTexture(LLViewerImage::sSmokeImagep);
+                face->setState(LLFace::FULLBRIGHT);
         }
+
         mVolumeChanged = FALSE;
 
+        mDrawable->movePartition();
         return TRUE;
 }
+
+void LLVOTextBubble::updateFaceSize(S32 idx)
+{
+        LLFace* face = mDrawable->getFace(idx);
+        
+        if (idx == 0 || idx == 2)
+        {
+                face->setSize(0,0);
+        }
+        else
+        {
+                const LLVolumeFace& vol_face = getVolume()->getVolumeFace(idx);
+                face->setSize(vol_face.mVertices.size(), vol_face.mIndices.size());
+        }
+}
+
+void LLVOTextBubble::getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp) 
+{
+        if (idx == 0 || idx == 2)
+        {
+                return;
+        }
+
+        const LLVolumeFace& face = getVolume()->getVolumeFace(idx);
+        
+        LLVector3 pos = getPositionAgent();
+        LLColor4U color = LLColor4U(getTE(idx)->getColor());
+        U32 offset = mDrawable->getFace(idx)->getGeomIndex();
+        
+        for (U32 i = 0; i < face.mVertices.size(); i++)
+        {
+                *verticesp++ = face.mVertices[i].mPosition.scaledVec(getScale()) + pos;
+                *normalsp++ = face.mVertices[i].mNormal;
+                *texcoordsp++ = face.mVertices[i].mTexCoord;
+                *colorsp++ = color;
+        }
+        
+        for (U32 i = 0; i < face.mIndices.size(); i++)
+        {
+                *indicesp++ = face.mIndices[i] + offset;
+        }
+}
+
+U32 LLVOTextBubble::getPartitionType() const
+{ 
+        return LLPipeline::PARTITION_PARTICLE; 
+}
diff --git a/linden/indra/newview/llvotextbubble.h b/linden/indra/newview/llvotextbubble.h
index b77ed1a..bd1d241 100644
--- a/linden/indra/newview/llvotextbubble.h
+++ b/linden/indra/newview/llvotextbubble.h
@@ -31,7 +31,7 @@
 #include "llviewerobject.h"
 #include "llframetimer.h"
 
-class LLVOTextBubble : public LLViewerObject
+class LLVOTextBubble : public LLAlphaObject
 {
 public:
         LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
@@ -44,6 +44,16 @@ public:
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL                updateGeometry(LLDrawable *drawable);
         /*virtual*/ BOOL                updateLOD();
+        /*virtual*/ void                updateFaceSize(S32 idx);
+        
+        /*virtual*/ void                getGeometry(S32 idx,
+                                                                LLStrider<LLVector3>& verticesp,
+                                                                LLStrider<LLVector3>& normalsp, 
+                                                                LLStrider<LLVector2>& texcoordsp,
+                                                                LLStrider<LLColor4U>& colorsp, 
+                                                                LLStrider<U32>& indicesp);
+
+        virtual U32 getPartitionType() const;
 
         LLColor4 mColor;
         S32 mLOD;
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 9808a02..382f9a6 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -29,6 +29,8 @@
 
 #include "llvotree.h"
 
+#include "lldrawpooltree.h"
+
 #include "llviewercontrol.h"
 #include "lldir.h"
 #include "llprimitive.h"
@@ -38,7 +40,6 @@
 #include "object_flags.h"
 
 #include "llagent.h"
-#include "llagparray.h"
 #include "llcylinder.h"
 #include "lldrawable.h"
 #include "llface.h"
@@ -231,13 +232,13 @@ void LLVOTree::initClass()
                 
                 BOOL have_all_trees = TRUE;
                 LLString err;
-                char buffer[10];
+                char buffer[10];                /* Flawfinder: ignore */
 
                 for (S32 i=0;i<sMaxTreeSpecies;++i)
                 {
                         if (!sSpeciesTable.count(i))
                         {
-                                snprintf(buffer,10," %d",i);
+                                snprintf(buffer,10," %d",i);            /* Flawfinder: ignore */
                                 err.append(buffer);
                                 have_all_trees = FALSE;
                         }
@@ -408,6 +409,10 @@ void LLVOTree::updateTextures(LLAgent &agent)
         F32 cos_angle = 1.f;
         if (mTreeImagep)
         {
+                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA))
+                {
+                        setDebugText(llformat("%4.0f", fsqrtf(mPixelArea)));
+                }
                 mTreeImagep->addTextureStats(mPixelArea, texel_area_ratio, cos_angle);
         }
 
@@ -421,14 +426,12 @@ LLDrawable* LLVOTree::createDrawable(LLPipeline *pipeline)
 
         mDrawable->setRenderType(LLPipeline::RENDER_TYPE_TREE);
 
-        LLDrawPool *poolp = gPipeline.getPool(LLDrawPool::POOL_TREE, mTreeImagep);
+        LLDrawPoolTree *poolp = (LLDrawPoolTree*) gPipeline.getPool(LLDrawPool::POOL_TREE, mTreeImagep);
 
         // Just a placeholder for an actual object...
-        LLFace *facep = mDrawable->addFace(poolp, mTreeImagep, TRUE);
+        LLFace *facep = mDrawable->addFace(poolp, mTreeImagep);
         facep->setSize(1, 3);
 
-        gPipeline.markMaterialed(mDrawable);
-
         updateRadius();
 
         return mDrawable;
@@ -441,6 +444,7 @@ const S32 LEAF_VERTICES = 16;
 
 BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
 {
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_TREE);
         U32 i, j;
         const S32 MAX_SLICES = 32;
 
@@ -463,20 +467,6 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
         face->mCenterAgent = getPositionAgent();
         face->mCenterLocal = face->mCenterAgent;
 
-        LLDrawPool *poolp = face->getPool();
-        
-        if (poolp->getVertexCount())
-        {
-                return TRUE;
-        }
-
-        if (!face->getDirty())
-        {
-                return FALSE;
-        }
-
-        poolp->setDirty();
-
         for (lod = 0; lod < 4; lod++)
         {
                 slices = sLODSlices[lod];
@@ -491,10 +481,17 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
         LLStrider<LLVector3> vertices;
         LLStrider<LLVector3> normals;
         LLStrider<LLVector2> tex_coords;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
 
         face->setSize(max_vertices, max_indices);
+
+        face->mVertexBuffer = new LLVertexBuffer(LLDrawPoolTree::VERTEX_DATA_MASK, GL_STATIC_DRAW_ARB);
+        face->mVertexBuffer->allocateBuffer(max_vertices, max_indices, TRUE);
+        face->setGeomIndex(0);
+        face->setIndicesIndex(0);
+
         face->getGeometry(vertices, normals, tex_coords, indicesp);
+        
 
         S32 vertex_count = 0;
         S32 index_count = 0;
@@ -793,17 +790,13 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
         return TRUE;
 }
 
-void LLVOTree::drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha)
+U32 LLVOTree::drawBranchPipeline(U32* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha)
 {
+        U32 ret = 0;
         //
         //  Draws a tree by recursing, drawing branches and then a 'leaf' texture.
         //  If stop_level = -1, simply draws the whole tree as a billboarded texture
         //
-
-        if (!draw_pool->getIndexCount())
-        {
-                return; // safety net
-        }
         
         static F32 constant_twist;
         static F32 width = 0;
@@ -827,15 +820,15 @@ void LLVOTree::drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop
                                 width = scale * length * aspect;
                                 glPushMatrix();
                                 glScalef(width,width,scale * length);
-                                //glDrawElements(GL_TRIANGLES, sLODIndexCount[trunk_LOD], GL_UNSIGNED_INT, draw_pool.getRawIndices() + sLODIndexOffset[trunk_LOD]);
-                                glDrawRangeElements(GL_TRIANGLES,
+                                glDrawElements(GL_TRIANGLES, sLODIndexCount[trunk_LOD], GL_UNSIGNED_INT, indicesp + sLODIndexOffset[trunk_LOD]);
+                                /*glDrawRangeElements(GL_TRIANGLES,
                                                                         sLODVertexOffset[trunk_LOD],
                                                                         sLODVertexOffset[trunk_LOD] + sLODVertexCount[trunk_LOD]-1,
                                                                         sLODIndexCount[trunk_LOD],
                                                                         GL_UNSIGNED_INT,
-                                                                        draw_pool->getRawIndices() + sLODIndexOffset[trunk_LOD]);
+                                                                        indicesp + sLODIndexOffset[trunk_LOD]);*/
                                 stop_glerror();
-                                draw_pool->addIndicesDrawn(sLODIndexCount[trunk_LOD]);
+                                ret += sLODIndexCount[trunk_LOD];
                                 glPopMatrix();
                         }
                         
@@ -847,7 +840,7 @@ void LLVOTree::drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop
                                 glRotatef((constant_twist + ((i%2==0)?twist:-twist))*i, 0.f, 0.f, 1.f);
                                 glRotatef(droop, 0.f, 1.f, 0.f);
                                 glRotatef(20.f, 0.f, 0.f, 1.f);                         // rotate 20deg about axis of new branch to add some random variation
-                                drawBranchPipeline(draw_pool, trunk_LOD, stop_level, depth - 1, 0, scale*mScaleStep, twist, droop, branches, alpha);
+                                ret += drawBranchPipeline(indicesp, trunk_LOD, stop_level, depth - 1, 0, scale*mScaleStep, twist, droop, branches, alpha);
                                 glPopMatrix();
                         }
                         //  Recurse to continue trunk
@@ -856,7 +849,7 @@ void LLVOTree::drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop
                                 glPushMatrix();
                                 glTranslatef(0.f, 0.f, scale * length);
                                 glRotatef(70.5f, 0.f, 0.f, 1.f);                                        // rotate a bit around Z when ascending 
-                                drawBranchPipeline(draw_pool, trunk_LOD, stop_level, depth, trunk_depth-1, scale*mScaleStep, twist, droop, branches, alpha);
+                                ret += drawBranchPipeline(indicesp, trunk_LOD, stop_level, depth, trunk_depth-1, scale*mScaleStep, twist, droop, branches, alpha);
                                 glPopMatrix();
                         }
                 }
@@ -871,15 +864,15 @@ void LLVOTree::drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop
                                 //width = scale * (TREE_BRANCH_ASPECT + TREE_LEAF_ASPECT);
                                 glScalef(scale*mLeafScale, scale*mLeafScale, scale*mLeafScale);
                                 //glScalef(1.5f*width*mLeafScale,1,1.5f*scale*mLeafScale);
-//                              glDrawElements(GL_TRIANGLES, LEAF_INDICES, GL_UNSIGNED_INT, draw_pool.getRawIndices());
-                                glDrawRangeElements(GL_TRIANGLES,
+                                glDrawElements(GL_TRIANGLES, LEAF_INDICES, GL_UNSIGNED_INT, indicesp);
+                                /*glDrawRangeElements(GL_TRIANGLES,
                                                                         0,
                                                                         LEAF_VERTICES-1,
                                                                         LEAF_INDICES,
                                                                         GL_UNSIGNED_INT,
-                                                                        draw_pool->getRawIndices());
+                                                                        indicesp);*/
                                 stop_glerror();
-                                draw_pool->addIndicesDrawn(LEAF_INDICES);
+                                ret += LEAF_INDICES;
                                 glPopMatrix();
                         }
                 }
@@ -897,21 +890,23 @@ void LLVOTree::drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop
                 {
                         glPushMatrix();
                         glScalef(mBillboardScale*mBillboardRatio, mBillboardScale*mBillboardRatio, mBillboardScale);
-//                      glDrawElements(GL_TRIANGLES, LEAF_INDICES, GL_UNSIGNED_INT, draw_pool.getRawIndices());
-                        glDrawRangeElements(GL_TRIANGLES,
+                        glDrawElements(GL_TRIANGLES, LEAF_INDICES, GL_UNSIGNED_INT, indicesp);
+/*                      glDrawRangeElements(GL_TRIANGLES,
                                                                 0,
                                                                 LEAF_VERTICES-1,
                                                                 LEAF_INDICES,
                                                                 GL_UNSIGNED_INT,
-                                                                draw_pool->getRawIndices());
+                                                                indicesp);*/
                         stop_glerror();
-                        draw_pool->addIndicesDrawn(LEAF_INDICES);
+                        ret += LEAF_INDICES;
                         glPopMatrix();
                 }
                 glMatrixMode(GL_TEXTURE);
                 glPopMatrix();
                 glMatrixMode(GL_MODELVIEW);
         }
+
+        return ret;
 }
 
 void LLVOTree::updateRadius()
@@ -923,3 +918,30 @@ void LLVOTree::updateRadius()
                 
         mDrawable->setRadius(32.0f);
 }
+
+void LLVOTree::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
+{
+        LLVector3 center = getRenderPosition();
+        LLVector3 size = getScale();
+        center.mV[2] += size.mV[2];
+
+        newMin.setVec(center-size);
+        newMax.setVec(center+size);
+        mDrawable->setPositionGroup((newMin + newMax) * 0.5f);
+}
+
+U32 LLVOTree::getPartitionType() const
+{ 
+        return LLPipeline::PARTITION_TREE; 
+}
+
+LLTreePartition::LLTreePartition()
+: LLSpatialPartition(0)
+{
+        mRenderByGroup = FALSE;
+        mDrawableType = LLPipeline::RENDER_TYPE_TREE;
+        mPartitionType = LLPipeline::PARTITION_TREE;
+        mSlopRatio = 0.f;
+        mLODPeriod = 1;
+}
+
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 4d11d20..fb35dd9 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,6 +39,14 @@ class LLDrawPool;
 class LLVOTree : public LLViewerObject
 {
 public:
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD)
+        }
+        eVertexDataMask;
+
         LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
         virtual ~LLVOTree();
 
@@ -59,10 +67,13 @@ public:
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL                updateGeometry(LLDrawable *drawable);
+        /*virtual*/ void                updateSpatialExtents(LLVector3 &min, LLVector3 &max);
+
+        virtual U32 getPartitionType() const;
 
         void updateRadius();
 
-        void drawBranchPipeline(LLDrawPool *draw_pool, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha);
+        U32 drawBranchPipeline(U32* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha);
  
         void drawBranch(S32 stop_level, U16 depth, U16 trunk_depth, F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha, BOOL draw_leaves);
 
diff --git a/linden/indra/newview/llvotreenew.cpp b/linden/indra/newview/llvotreenew.cpp
deleted file mode 100644
index d7fc635..0000000
--- a/linden/indra/newview/llvotreenew.cpp
+++ /dev/null
@@ -1,1470 +0,0 @@
-/** 
- * @file llvotreenew.cpp
- * @brief LLVOTreeNew class implementation
- *
- * Copyright (c) 2003-2007, Linden Research, Inc.
- * 
- * 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.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llvotreenew.h"
-
-#include "llgl.h"
-#include "llglheaders.h"
-#include "lltree_common.h"
-#include "lltreeparams.h"
-#include "material_codes.h"
-#include "object_flags.h"
-
-#include "llagent.h"
-#include "llagparray.h"
-#include "llviewercontrol.h"
-#include "llcylinder.h"
-#include "lldrawable.h"
-#include "llface.h"
-#include "llprimitive.h"
-#include "llviewerimagelist.h"
-#include "llviewerobjectlist.h"
-#include "llviewerregion.h"
-#include "llworld.h"
-#include "noise.h"
-#include "pipeline.h"
-
-U32 LLVOTreeNew::sNextVertexIndex[MAX_SPECIES];
-U32 LLVOTreeNew::sNextIndiceIndex[MAX_SPECIES];
-U32 LLVOTreeNew::sNextPartIndex[MAX_PARTS];
-LLVOTreeNew::TreePart LLVOTreeNew::sTreeParts[MAX_SPECIES][MAX_PARTS];
-LLUUID LLVOTreeNew::sTreeImageIDs[MAX_SPECIES];
-U32 LLVOTreeNew::sTreePartsUsed[MAX_SPECIES][MAX_PARTS][MAX_VARS];
-LLTreeParams LLVOTreeNew::sParameters;
-F32 LLVOTreeNew::sRandNums[MAX_RAND_NUMS];
-
-extern LLPipeline gPipeline;
-
-// Tree variables and functions
-
-LLVOTreeNew::LLVOTreeNew(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp):
-                                                LLViewerObject(id, pcode, regionp)
-{
-        mTotalIndices = 0;
-        mTotalVerts = 0;
-        mSpecies = 0;
-}
-
-
-LLVOTreeNew::~LLVOTreeNew()
-{
-        if (mData)
-        {
-                delete[] mData;
-                mData = NULL;
-        }
-}
-
-
-void LLVOTreeNew::initClass()
-{
-        U8 i;
-
-        // for now just load the same texture in for every tree...
-        
-        for (i = 0; i < MAX_SPECIES; i++) 
-        {
-                switch (i) {
-                case (0):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_pine_1.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_pine_1.tga") ));
-                        break;
-                case (1):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_oak.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_oak.tga") ));
-                        break;
-                case (2):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_tropical_1.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_tropical_1.tga") ));
-                        break;
-                case (3):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_palm_1.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_palm_1.tga") ));
-                        break;
-                case (4):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_dogwood.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_dogwood.tga") ));
-                        break;  
-                case (5):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_tropical_2.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_tropical_2.tga") ));
-                        break;  
-                case (6):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_palm_2.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_palm_2.tga") ));
-                        break;                  
-                case (7):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_cypress_1.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_cypress_1.tga") ));
-                        break;  
-                case (8):
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_cypress_2.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_cypress_2.tga") ));
-                        break;  
-                default:
-                        sTreeImageIDs[i] = LLUUID( gViewerArt.getString("tree_pine_2.tga") );
-                        //LLVOTreeNew::sTreeImagep[i] = gImageList.getImage(LLUUID( gViewerArt.getString("tree_pine_2.tga") ));
-                        break;                  
-                }
-        }
-
-        
-        //LLVOTreeNew::sParameters = LLTreeParams();
-
-        // initialize an array of random numbers that we'll be using
-        LLRandLagFib607 tree_rand;
-        for (i = 0; i < MAX_RAND_NUMS; i++)
-                sRandNums[i] = (F32)tree_rand();
-}
-
-/*
-void LLVOTreeNew::cleanupTextures()
-{
-        S32 i;
-        for (i = 0; i < MAX_SPECIES; i++)
-        {
-                mTreeImagep = NULL;
-        }
-}
-*/
-
-U32 LLVOTreeNew::processUpdateMessage(LLMessageSystem *mesgsys,
-                                                                                  void **user_data,
-                                                                                  U32 block_num, EObjectUpdateType update_type,
-                                                                                  LLDataPacker *dp)
-{
-        // Do base class updates...
-        U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
-
-        if (  (getVelocity().magVecSquared() > 0.f)
-                ||(getAcceleration().magVecSquared() > 0.f)
-                ||(getAngularVelocity().magVecSquared() > 0.f))
-        {
-                llinfos << "ACK! Moving tree!" << llendl;
-                setVelocity(LLVector3::zero);
-                setAcceleration(LLVector3::zero);
-                setAngularVelocity(LLVector3::zero);
-        }
-
-        mSpecies = ((U8 *)mData)[0];
-        mSpecies = 1;
-
-        if (mSpecies >= MAX_SPECIES)
-        {
-                mSpecies = 0;
-        }
-
-
-        mTreeImagep = gImageList.getImage(sTreeImageIDs[mSpecies]);
-        if (mTreeImagep)
-        {
-                mTreeImagep->bindTexture(0);
-                mTreeImagep->setClamp(TRUE, TRUE);
-        }
-
-        return retval;
-}
-
-
-BOOL LLVOTreeNew::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
-{
-        return TRUE;
-}
-
-
-void LLVOTreeNew::render(LLAgent &agent)
-{
-        // nothing
-}
-
-
-void LLVOTreeNew::updateTextures(LLAgent &agent)
-{
-        LLVector3 position_local = getPositionAgent() - agent.getCameraPositionAgent();
-        F32 dot_product = position_local * agent.getFrameAgent().getAtAxis();
-        F32 cos_angle = dot_product / position_local.magVec();
-
-        if (cos_angle > 1.f)
-        {
-                cos_angle = 1.f;
-        }
-
-        // temporary aggregate texture scale calculation
-        // this is less correct than the code above!
-        F32 texel_area_ratio = 0.5f; // When we're billboarded, we use less than the whole texture (about half?)
-        if (mTreeImagep)
-        {
-                mTreeImagep->addTextureStats(mPixelArea, texel_area_ratio, cos_angle);
-        }
-
-}
-
-
-LLDrawable* LLVOTreeNew::createDrawable(LLPipeline *pipeline)
-{
-        
-        pipeline->allocDrawable(this);
-        mDrawable->setLit(FALSE);
-
-        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_TREE);
-        //llinfos << "tree type: " << LLPipeline::RENDER_TYPE_TREE << llendl;
-
-        //!! add the leaf texture to this
-        LLDrawPool *poolp = gPipeline.getPool(LLDrawPool::POOL_TREE_NEW, mTreeImagep);
-
-
-        //!! add a face for the bark texture...
-        //LLFace *facep = mDrawable->addFace(poolp, mTreeImagep, TRUE);
-        mDrawable->addFace(poolp, mTreeImagep, TRUE);
-        //facep->setSize(1, 3);
-
-        //!! add a face for the leaf texture ??
-        //
-
-        gPipeline.markMaterialed(mDrawable);
-
-        return mDrawable;
-}
-
-
-
-BOOL LLVOTreeNew::updateGeometry(LLDrawable *drawable)
-{
-
-        llinfos << "TREE SPECIES " << U32(mSpecies) << llendl;
-
-        // create the basic geometry of the trunk and branch
-
-        // get the face for the branches...
-        LLFace *face = drawable->getFace(0);
-        LLDrawPool *poolp = face->getPool();
-
-        if (!face->getDirty())
-        {
-                return TRUE;
-        }
-
-        poolp->setDirty();
-
-        U32 curVertexIndex, curTexCoordIndex, curNormalIndex;
-        U32 curIndiceIndex;
-//      U32 numVertsCreated = LLVOTreeNew::sNextVertexIndex[mSpecies];
-
-        //U32 vertexCount = poolp->getVertexCount();
-        //llinfos << "TREE vertexCount = " << vertexCount << ", nextVertexIndex = " << mNextVertexIndex[mSpecies] << llendl;
-        //U32 indiceCount = poolp->getIndexCount();
-        //llinfos << "TREE indiceCount = " << indiceCount << ", nextIndiceIndex = " << mNextIndiceIndex[mSpecies] << llendl;
-
-
-        if (poolp->getVertexCount() > 0)
-        {       
-                //llinfos << "TREE not creating the arrays..." << llendl;       
-        }
-        else
-        {
-                // create the drawpool arrays
-                // using some rough estimates
-                U32 numVerts = NUM_INIT_VERTS;
-                U32 numIndices = NUM_INIT_INDICES;
-
-                face->setPrimType(LLTriangles);
-                face->setSize(numVerts, numIndices);
-
-                // reset the next's since they may have been previously initialized...
-                LLVOTreeNew::sNextIndiceIndex[mSpecies] = 0;
-                LLVOTreeNew::sNextVertexIndex[mSpecies] = 0;
-                LLVOTreeNew::sNextPartIndex[mSpecies] = 0;
-
-                //llinfos << "TREE creating the arrays..." << llendl;
-        }
-
-        curVertexIndex = LLVOTreeNew::sNextVertexIndex[mSpecies];
-        curTexCoordIndex = curVertexIndex;
-        curNormalIndex = curVertexIndex;
-        curIndiceIndex = LLVOTreeNew::sNextIndiceIndex[mSpecies];
-
-        //vertexCount = poolp->getVertexCount();
-        //llinfos << "TREE vertexCount = " << vertexCount << ", nextVertexIndex = " << mNextVertexIndex[mSpecies] << llendl;
-        //indiceCount = poolp->getIndexCount();
-        //llinfos << "TREE indiceCount = " << indiceCount << ", nextIndiceIndex = " << mNextIndiceIndex[mSpecies] << llendl;
-
-        //llinfos << "TREE \t" << "\t curVertexIndex: \t" << curVertexIndex << llendl;
-        //llinfos << "TREE \t" << "\t curIndiceIndex: \t" << curIndiceIndex << llendl;
-
-        LLStrider<LLVector3> vertices;
-        LLStrider<LLVector3> normals;
-        LLStrider<LLVector2> tex_coords;
-        U32 *indices;
-
-        face->getGeometry(vertices, normals, tex_coords, indices);
-        
-        // create different parts for the levels...
-
-        // create the trunk...
-        F32 length, curve, radius, parentLength, parentRadius;
-        
-        length = parentLength = sParameters.mLength[0] * sParameters.mScale;
-        radius = parentRadius = length * sParameters.mRatio * sParameters.mScale0;
-        curve = sParameters.mCurve[0];
-        createPart(0, length, radius, vertices, normals, tex_coords, indices, curVertexIndex, curTexCoordIndex,
-                        curNormalIndex, curIndiceIndex);
-
-        // create collection of curved branches...
-        //*
-        for (U8 i = 1; i <= sParameters.mLevels; i++)
-        {
-                length = sParameters.mLength[i] * parentLength;
-                radius = parentRadius * pow((length / parentLength), sParameters.mRatioPower);
-
-                llinfos << "TREE creating (?) part with radius: " << radius << " and length: " << length << llendl;
-
-                createPart(i, length, radius, vertices, normals, tex_coords, indices, curVertexIndex, curTexCoordIndex,
-                                curNormalIndex, curIndiceIndex);
-                
-                parentRadius = radius;
-                parentLength = length;
-                
-        }
-        //*/
-        
-        LLVOTreeNew::sNextVertexIndex[mSpecies] = curVertexIndex;
-        LLVOTreeNew::sNextIndiceIndex[mSpecies] = curIndiceIndex;
-
-        // create a leaf...?
-
-        return TRUE;    
-}
-
-F32 LLVOTreeNew::CalcZStep(TreePart *part, U8 section)
-{
-        F32 zStep;
-
-        if (part->mLevel == 0 && section < sParameters.mFlareRes)
-                zStep = (sParameters.mFlarePercentage * part->mLength)/sParameters.mFlareRes;
-        else
-                zStep = ((1.f - sParameters.mFlarePercentage)*part->mLength) / (part->mCurveRes);
-
-        return zStep;
-}
-
-S32 LLVOTreeNew::findSimilarPart(U8 level)
-{
-        // see if there's a tree part that's similar...
-        for (U8 i = 0; i < sNextPartIndex[mSpecies]; i++)
-        {
-                TreePart *curPart = &(sTreeParts[mSpecies][i]);
-                // make sure older branch is at same 'level' and has
-                // similar lobe parameters (if at the trunk level)
-                if (curPart->mLevel == level && 
-                        (level != 0 || (llabs(curPart->mLobes - sParameters.mLobes) < MAX_LOBES_DIFF && llabs(curPart->mLobeDepth - sParameters.mLobeDepth) < MAX_LOBEDEPTH_DIFF)))
-                {
-                        // check to see if older branch's curve, curveBack, and curveV
-                        // are all close to the desired branch...
-                        F32 curveDiff = llabs(curPart->mCurve - sParameters.mCurve[level]);
-                        F32 curveBackDiff = llabs(curPart->mCurveBack - sParameters.mCurveBack[level]);
-                        F32 curveVDiff = llabs(curPart->mCurveV - sParameters.mCurveV[level]);
-                        if (curveDiff < MAX_CURVE_DIFF 
-                                && curveVDiff < MAX_CURVE_V_DIFF
-                                && (curveBackDiff == 0 || curveBackDiff < MAX_CURVEBACK_DIFF)
-                                )
-                        {
-                                // already have a branch that's close enough
-                                return i;
-                        }
-                }
-        }
-
-        return -1;
-}
-
-
-void LLVOTreeNew::createPart(U8 level, F32 length, F32 radius, LLStrider<LLVector3> &vertices, LLStrider<LLVector3> &normals, 
-                                                        LLStrider<LLVector2> &tex_coords, U32 *indices, 
-                                                        U32 &curVertexIndex, U32 &curTexCoordIndex,
-                                                        U32 &curNormalIndex, U32 &curIndiceIndex)
-{
-        U8 i, j, k;
-
-        // check for a similar branch...
-        S32 selectedPart = findSimilarPart(level);
-        if (selectedPart > -1) return;
-
-        // if we didn't find the branch, make different versions of it
-        // depending on how large curveV (curveVariance), make more branches...
-        S32 numVariants = 1;
-        numVariants += (S32)(sParameters.mCurveV[level]/CURVEV_DIVIDER);
-
-        if (numVariants > MAX_VARS) numVariants = MAX_VARS;
-        if (level == 0) numVariants = 1;        // just make one trunk
-
-        llinfos << "TREE generating " << numVariants << " variants for curveV of " << sParameters.mCurveV[level] << " on level " << U32(level) << llendl;
-
-
-        // if we've hit the max part limit, just quit...
-        if (sNextPartIndex[mSpecies] == MAX_PARTS)
-        {
-                llinfos << "TREE SPECIES RAN OUT OF DRAWPOOL PART SPACE..." << llendl;
-                return;
-        }
-        
-        // put the first variant in its own mTreePart
-        TreePart *part = &(LLVOTreeNew::sTreeParts[mSpecies][LLVOTreeNew::sNextPartIndex[mSpecies]++]);
-        
-        // set the tree part params from the basic tree params...
-        part->mCurve = sParameters.mCurve[level];;
-        part->mCurveRes = sParameters.mCurveRes[level];
-        part->mCurveBack = sParameters.mCurveBack[level];
-        part->mCurveV = sParameters.mCurveV[level];
-        part->mLobeDepth = sParameters.mLobeDepth;
-        part->mLobes = sParameters.mLobes;
-        part->mLength = length;
-        part->mRadius = radius;
-        part->mLevel = level;
-        part->mVertsPerSection = sParameters.mVertices[level];
-        part->mNumVariants = 0;
-        
-        // enforce constraints on # of resolutions
-        if (sParameters.mFlareRes > MAX_FLARE) sParameters.mFlareRes = MAX_FLARE;
-        if (part->mCurveRes > MAX_RES) part->mCurveRes = MAX_RES;
-
-        for (k = 0; k < numVariants; k++)
-        {
-                part->mNumVariants++;
-
-                // set the part's vertices to the first vertex and first index of its parts
-                part->mIndiceIndex[k] = curIndiceIndex;
-                
-                // how many total sections in the branch
-                U8 numSections = (U8)(part->mCurveRes) + (level == 0 ? sParameters.mFlareRes : 0);
-                
-                U8 framesUsed = 0;
-                U8 flareFramesUsed = 0;
-                F32 stemZ;
-                F32 startingZ = 0;
-                
-                // create curveRes different versions of the branch, with each
-                // one having its origin base be a different flareRes or curveRes base
-                
-                U32 oldOffset = mRandOffset[level];
-                
-                for (j = 0; j < numSections; j++) 
-                {
-                        mRandOffset[level] = oldOffset;
-                        if (j != 0) part->mOffsets[k][j - (level == 0 ? sParameters.mFlareRes : 0)] = curIndiceIndex;
-                        
-                        F32 sectionRadius;
-                        LLMatrix4 curFrame;
-                        U8 curSection = 0;
-                        
-                        // our position in the branch
-                        stemZ = startingZ;
-                        
-                        // Make branches from 
-                        // From 0th section...numSections
-                        //              1st section...numSections
-                        //              2nd section...numSections
-                        
-                        sectionRadius = CalculateSectionRadius(level, stemZ / part->mLength, part->mLength, part->mRadius);
-                        
-                        // create points that make up the bottom of the section...
-                        createSection(curFrame, part, sectionRadius, stemZ,
-                                vertices, tex_coords, indices, 
-                                curVertexIndex, curTexCoordIndex, curIndiceIndex, curSection++, j == 0 ? TRUE : FALSE);
-                        
-                        for (i = j; i < numSections; i++)
-                        {
-                                // do the curving...
-                                F32 angle;
-                                if (part->mCurveBack != 0)
-                                {               
-                                        if (part->mCurveRes / (i + 1.0) < 2) 
-                                                angle = part->mCurve / part->mCurveRes / 2.f;
-                                        else
-                                                angle = part->mCurveBack / part->mCurveRes / 2.f;
-                                }
-                                else
-                                {
-                                        if (part->mLevel == 0)
-                                        {
-                                                if (i <= sParameters.mFlareRes) angle = (sParameters.mFlarePercentage*part->mCurve)/sParameters.mFlareRes;
-                                                else angle = ((1.f - sParameters.mFlarePercentage)*part->mCurve)/part->mCurveRes;
-                                        }
-                                        else
-                                                angle = part->mCurve / part->mCurveRes;
-                                        
-                                }
-                                
-                                // add in variance just for kicks...
-                                angle += llfrand_signed(part->mCurveV/part->mCurveRes, mRandOffset[level + i]++);
-                                
-                                /* vertical attraction is based on height of branch which is unavailable information
-                                if (level > 1)
-                                angle += CalculateVerticalAttraction(level, curFrame);
-                                //*/
-                                
-                                angle *= DEG_TO_RAD;
-                                
-                                // translation...
-                                F32 zStep;
-                                zStep = CalcZStep(part, i);
-                                stemZ += zStep;
-                                
-                                // set the next startingZ as current stemZ if at first level
-                                if (i == j || (level == 0 && j == 0 && i == sParameters.mFlareRes - 1))
-                                        startingZ = stemZ;
-                                
-                                LLQuaternion rotateQuat, oldRotateQuat, newRotateQuat;
-                                LLMatrix4 localFrame, transFrame;
-                                
-                                rotateQuat.setQuat(angle, 1.0f, 0.0f, 0.0f);
-                                oldRotateQuat.setQuat(curFrame);
-                                newRotateQuat = oldRotateQuat * rotateQuat;
-                                
-                                transFrame.translate(LLVector3(0, 0, zStep));
-                                transFrame.rotate(newRotateQuat);
-                                
-                                localFrame.rotate(newRotateQuat);
-                                localFrame.translate(curFrame.getTranslation());
-                                localFrame.translate(transFrame.getTranslation());
-                                
-                                curFrame = localFrame;
-                                
-                                // store flare frames seperately
-                                if (part->mLevel == 0 && i < sParameters.mFlareRes)
-                                        mTrunkFlareFrames[flareFramesUsed++] = curFrame;
-                                else                    
-                                        part->mFrames[k][framesUsed++] = curFrame;
-                                
-                                // calc radius of section
-                                if (part->mLength == 0)
-                                        sectionRadius = 0;
-                                else
-                                        sectionRadius = CalculateSectionRadius(level, stemZ / part->mLength, part->mLength, part->mRadius);
-                                
-                                // create points that make up the section
-                                createSection(curFrame, part, sectionRadius, stemZ,
-                                        vertices, tex_coords, indices,
-                                        curVertexIndex, curTexCoordIndex, curIndiceIndex, curSection++, j == 0 ? TRUE : FALSE);
-                        }
-                        
-                        // only do one trunk w/ flaring.
-                        if (level == 0 && j == 0) j = sParameters.mFlareRes - 1;
-                }
-                
-                // gen vertex normals now that we've created face normals for the first section...
-                genVertexNormals(part, normals, numSections, curNormalIndex);
-        }
-
-}
-
-
-
-
-void LLVOTreeNew::createSection(LLMatrix4 &frame, TreePart *part, F32 sectionRadius, F32 stemZ, 
-                                                          LLStrider<LLVector3> &vertices, LLStrider<LLVector2> &tex_coords, U32 *indices, 
-                                                          U32 &curVertexIndex, U32 &curTexCoordIndex, U32 &curIndiceIndex, U8 curSection, BOOL firstBranch)
-{
-
-    F32 angle;                                                  // Angle holds the angle in radians
-                                        // between two points in the section.
-
-    LLVector3 localPoint;               // LocalPoint is used to hold the points
-                                        // that are being created and added to
-                                        // the points list of the section (in
-                                        // local coordinates)
-
-    LLVector3 globalPoint;              // GlobalPoint is used to hold the points
-                                        // that are being created and added to
-                                        // the points list of the section (in
-                                        // global coordinates)
-
-    F32 lobedSectionRadius;                             // The sectionradius rescaled using
-                                                        // the lobing parameters
-
-        F32 percentX, percentY;                         // The texture coords
-
-
-
-        U8 numVerts = part->mVertsPerSection;
-
-        // prevent empty triangles
-        if (sectionRadius < 0.0001) {
-                sectionRadius = 0.0001f;
-        }
-
-        // Y texture coordinate
-        // stemZ is current position within mLength...
-        percentY = stemZ;
-        //percentY = stemZ/part->mLength;
-
-        angle = (2 * F_PI) / numVerts;
-        for (U8 i = 0; i <= numVerts; i++)
-        {
-                // last vertex is same as first one...
-                if (i == numVerts)
-                {
-                        // make first vertice the last vertice (wrap around so that our texture coords will be ok...
-                        globalPoint = vertices[curVertexIndex - numVerts]; 
-                }
-                else
-                {
-                        // lobed = 1.0 + lobeDepth * sin(lobes * angle)
-                        lobedSectionRadius = sectionRadius * (1.f + sParameters.mLobeDepth * sin(sParameters.mLobes * (i + 1) * angle));
-
-                        localPoint.mV[0] = cos((i + 1.f) * angle) * lobedSectionRadius;
-                        localPoint.mV[1] = sin((i + 1.f) * angle) * lobedSectionRadius;
-                        localPoint.mV[2] = 0;
-
-                        globalPoint = localPoint * frame;
-                }
-
-                if (curVertexIndex > NUM_INIT_VERTS) {
-                        llinfos << "TREE ERROR NO MORE VERTS" << llendl;
-                        return;
-                }
-
-                // add to instanced data...
-                vertices[curVertexIndex++] = globalPoint;
-                mTotalVerts++;
-
-                /*
-                // update the max x, y, and z of tree 
-                if (globalPoint->mV[0] > mTree->mMaxX) { mTree->mMaxX = globalPoint->mV[0]; }
-                if (globalPoint->mV[1] > mTree->mMaxY) { mTree->mMaxY = globalPoint->mV[1]; }
-                if (globalPoint->mV[2] > mTree->mMaxZ) { mTree->mMaxZ = globalPoint->mV[2]; }
-                */
-
-                // TEXTURE COORDS
-                percentX = WIDTH_OF_BARK * (i/F32(numVerts));// * (2.0*F_PI*sectionRadius);
-                //percentX =  * (i/F32(numVerts));
-                tex_coords[curTexCoordIndex++] = LLVector2(percentX, percentY);
-        }
-
-        // gen face normals and do texcoords...
-        if (curSection != 0)
-                genIndicesAndFaceNormalsForLastSection(part, numVerts, vertices, curVertexIndex, indices, curIndiceIndex, firstBranch);
-}
-
-
-// generate face normals for the last two cross sections in sectionlist
-void LLVOTreeNew::genIndicesAndFaceNormalsForLastSection(TreePart *part, U8 numVerts, LLStrider<LLVector3> &vertices, U32 curVertexIndex, U32 *indices, U32 &curIndiceIndex, BOOL firstBranch)
-{
-
-        LLVector3 v1, v2;
-        LLVector3 vCross;
-        LLVector3 a, b, c, d;
-
-        // offsets into the vertex array
-        U32 upperOffset = curVertexIndex - (numVerts + 1);
-        U32 lowerOffset = upperOffset - (numVerts + 1);
-
-        // generate the normals for the triangles from the quads
-                // quad is defined by:
-                // upper[i].....upper[i+1]
-                //    .             .
-                //    .             .
-                //    .             .
-                // lower[i].....lower[i+1]
-
-                // 10.......11
-                // .  .     .
-                // .    .   .
-                // .      . .
-                // 00 . . . 01
-
-                // b . . . d
-                // . .     .
-                // .   .   .
-                // .     . .
-                // a . . . c
-
-        for (U8 j = 0; j < numVerts; j++ ) {
-
-                U8 nextVert = j + 1;
-
-                // do face normals for first version only
-                if (firstBranch)
-                {
-                        // the points of the quad
-                        a = vertices[lowerOffset];                              // 00
-                        b = vertices[upperOffset];                              // 10
-                        c = vertices[lowerOffset + nextVert];   // 01
-                        d = vertices[upperOffset + nextVert];   // 11
-
-                        // 1st triangle
-                        v1 = c - b;
-                        v2 = a - b;
-                        vCross = v1 % v2;
-                        vCross.normVec();
-                        part->mFaceNormals.put(vCross);
-
-                        // 2nd triangle
-                        v1 = c - b;
-                        v2 = d - b;
-                        vCross = v1 % v2;
-                        vCross.normVec();
-                        part->mFaceNormals.put(vCross);
-                }
-
-                if (curIndiceIndex + 6 > NUM_INIT_INDICES)
-                {
-                        llinfos << "TREE ERROR NO MORE INDICES" << llendl;
-                        return;
-                }
-
-                indices[curIndiceIndex++] = lowerOffset + j;                    // 00
-                indices[curIndiceIndex++] = lowerOffset + nextVert;             // 01
-                indices[curIndiceIndex++] = upperOffset + j;                    // 10
-                if (firstBranch) { part->mNumTris++; }
-
-                indices[curIndiceIndex++] = lowerOffset + nextVert;             // 01
-                indices[curIndiceIndex++] = upperOffset + nextVert;             // 11
-                indices[curIndiceIndex++] = upperOffset + j;                    // 10                                                                                                                                                                                                                                                                                                                                                                                                       
-                if (firstBranch) { part->mNumTris++; }
-
-                mTotalIndices += 6;
-        //*/
-        }
-}
-
-
-
-
-void LLVOTreeNew::genVertexNormals(TreePart *part, LLStrider<LLVector3> &normals, U8 numSections, U32 curNormalIndex)
-{
-        LLVector3 vNormal;
-
-        U8 numVerts = part->mVertsPerSection;
-        U16 numFaces = numVerts * 2;
-
-        U32 curSectionFaceOffset, lowerSectionFaceOffset;
-                                
-        U8 i;
-        U8 j;
-
-        // for each section...
-        for (i = 0; i < numSections; i++) {
-
-                U32 numFacesStored = part->mFaceNormals.count();
-                // index into face normals for 0-ith face of section i...
-                curSectionFaceOffset = numFacesStored - (numSections - 1 - i)*numFaces;
-                lowerSectionFaceOffset = curSectionFaceOffset - numFaces;
-
-                // for each vertex...
-                for (j = 0; j < numVerts; j++) {
-
-                        // if lowest level or highest level...
-                        if (i == 0) {
-                                // bottom 3 adjacent tris
-                                vNormal += part->mFaceNormals[curSectionFaceOffset + (numFaces - j*2 - 2) % numFaces];
-                                vNormal += part->mFaceNormals[curSectionFaceOffset + (numFaces - j*2 - 1) % numFaces];
-                                vNormal += part->mFaceNormals[curSectionFaceOffset + (numFaces - j*2) % numFaces];
-                                vNormal /= 3.0;
-                        } else if (i == numSections - 1) {
-                                // top 3 adj tris
-                                vNormal += part->mFaceNormals[lowerSectionFaceOffset + (numFaces - j*2 - 1) % numFaces];
-                                vNormal += part->mFaceNormals[lowerSectionFaceOffset + (numFaces - j*2) % numFaces];
-                                vNormal += part->mFaceNormals[lowerSectionFaceOffset + (numFaces - j*2 + 1) % numFaces];
-                                vNormal /= 3.0;
-                        }
-                        else
-                        {
-                                // otherwise avg the normals from the 6 adjacent tris
-                                // avg the 6 normal vectors that are adjacent to it...
-                                // vertex 0 is surrounded by...
-                                //              lower: 0, 1  .... n
-                                //              upper: n-1, n .... 0
-
-                                vNormal += part->mFaceNormals[curSectionFaceOffset + (numFaces - j*2 - 2) % numFaces];
-                                vNormal += part->mFaceNormals[curSectionFaceOffset + (numFaces - j*2 - 1) % numFaces];
-                                vNormal += part->mFaceNormals[curSectionFaceOffset + (numFaces - j*2) % numFaces];
-
-                                vNormal += part->mFaceNormals[lowerSectionFaceOffset + (numFaces - j*2 - 1) % numFaces];
-                                vNormal += part->mFaceNormals[lowerSectionFaceOffset + (numFaces - j*2) % numFaces];
-                                vNormal += part->mFaceNormals[lowerSectionFaceOffset + (numFaces - j*2 + 1) % numFaces];
-
-                                vNormal /= 6.0;
-                        }
-                        normals[curNormalIndex] = vNormal;
-                        curNormalIndex++;
-                }
-                // get first normal and use for the repeated last vertex...
-                normals[curNormalIndex] = normals[curNormalIndex - numVerts];
-                curNormalIndex++;
-        }
-
-
-        // there are mCurveRes - 1 different starting points...
-        U8 offset = 0;
-        U8 curveres8 = (U8)part->mCurveRes;
-        for (i = 0; i < curveres8 - 1; i++)
-        {
-                U8 numSectionsInBranch = curveres8 - i;
-                U8 origOffset = i * numVerts;
-
-                for (j = 0; j <= numSectionsInBranch * numVerts; j++)
-                        normals[curNormalIndex + offset + j] = normals[curNormalIndex + origOffset + j];
-
-                offset += numSectionsInBranch * numVerts;
-        }
-
-        
-}
-
-
-
-//{ Pre: 0 <= y <= 1
-//  Ret: The radius of the stem at the (normalized) y position along the stem.
-//       See for the exact calculations the paper "Creation and Rendering of
-//       Realistic Trees", by Jason Weber and Joseph Penn. }
-           
-
-F32 LLVOTreeNew::CalculateSectionRadius(U8 level, F32 y, F32 stemLength, F32 stemRadius)
-{
-        F32 y2, y3;
-
-        F32 depth;              // Scaling factor used for periodic tapering
-        F32 taperY;             // Tapered radius along at the (normalized) y
-                    // position along the stem
-        F32 unitTaper;  // UnitTaper is used to determine the radius of
-                    // the stem along a specified (normalized)
-                    // position along the stem.
-
-        F32 radius;             // radius returned      
-
-        //    { Calculate UnitTaper, a variable used to determine the radius of the
-    //  stem along a specified (normalized) position Z along the stem }
-
-        unitTaper = 0;
-
-        F32 curTaper = sParameters.mTaper[level];       // cur taper for this level
-
-        // 0 <= nTaper < 1
-        //      unitTaper = nTaper
-        // 1 <= nTaper < 2
-        //      unitTaper = 2 - nTaper
-        // 2 <= nTaper < 3
-        //      unitTaper = 0
-
-        if ( (curTaper >= 0) && (curTaper < 1) )
-                unitTaper = curTaper;
-        else if ( (curTaper >= 1) && (curTaper < 2) )
-                unitTaper = 2.f - curTaper;
-        else    // should be 2 <= curTaper < 3
-                unitTaper = 0;
-
-
-        // y is ratio of stemY/length...sometimes [something.mumble] / [something.mumble] != 1 when it should...
-        if (y > 1.0)
-                y = 1.0;
-
-        // taperY = radius[stem] * (1 - unitTaper * y)
-        taperY = stemRadius * (1.f - unitTaper * y);
-
-        // 0 <= curTaper <= 1
-        //      radius = taperY;
-
-        if ( (curTaper >= 0) && (curTaper < 1) )
-        {
-                radius = taperY;
-        }
-        else
-        {
-                // { (nTaper[ALevel] >= 1) and (nTaper[ALevel] <= 3) }
-
-                // initialize y2
-                y2 = (1 - y) * stemLength;
-
-                // initialize depth
-                        
-                if ( (curTaper < 2) || (y2 < taperY) )
-                        depth = 1;
-                else
-                        depth = curTaper - 2;
-
-                // initialize y3
-                if ( curTaper < 2) 
-                        y3 = y2;
-                else
-                        y3 = fabs(y2 - 2 * taperY * floor(y2 / (2 * taperY) + 0.5f));
-                
-                // return the radius
-                if ( (curTaper < 2) && (y3 >= taperY) )
-                        radius = taperY;
-                else
-                        radius = (1 - depth) * taperY + depth * sqrt(pow(taperY, 2) - pow(y3 - taperY, 2));
-        }
-
-        // calculate flaring
-        if (level == 0)
-        {
-                y2 = 1 - 8 * y;
-                if (y2 < 0) 
-                        y2 = 0;
-
-                // flare = Flare * (100^y - 1) / 100 + 1
-                radius = radius * (sParameters.mFlare * (pow((F32)100, y2) - 1) / 100 + 1);
-        }
-
-        return radius;
-}
-
-/*
-F32 LLVOTreeNew::CalculateVerticalAttraction(U8 level, LLMatrix4 &sectionFrame)
-{
-        LLVector3 transformY, transformZ;
-        LLVector3 unitY(0.0, 1.0, 0.0);
-        LLVector3 unitZ(0.0, 0.0, 1.0);
-        F32 declination, orientation;
-        
-        transformY = unitY * sectionFrame;
-        transformZ = unitZ * sectionFrame;
-
-        declination = acos(transformZ.mV[1]);
-        orientation = acos(transformY.mV[1]);
-
-        return (sParameters.mAttractionUp * declination * cos(orientation)) / sParameters.mCurveRes[level];
-}
-//*/
-
-
-void LLVOTreeNew::drawTree(LLDrawPool &draw_pool)
-{
-        U8 i, j;
-
-        // seed the drawtree thing with the object's uuid to make it original but predictable...
-        // don't re-seed the process random number generator. bad.
-        //gLindenLabRandomNumber.seed(0);
-
-        // reset the rand offsets
-        for (i = 0; i < MAX_LEVELS; i++) mRandOffset[i] = 0;
-
-        F32 trunkLength = sParameters.mLength[0] * sParameters.mScale;
-        //F32 trunkLength = sParameters.mLength[0] + llfrand_signed(sParameters.mLengthV[0])) * 
-        //      (sParameters.mScale + llfrand_signed(sParameters.mScaleV));
-        F32 trunkRad = trunkLength * sParameters.mRatio * sParameters.mScale0;
-
-//*     reset usage data on which part is grabbed
-        mNumTrisDrawn = 0;
-        for (i = 0; i < MAX_PARTS; i++)
-                for (j = 0; j < MAX_VARS; j++)
-                        sTreePartsUsed[mSpecies][i][j] = 0;
-        
-        // reset segsplit error stuff...
-        for (j = 0; j < 3; j++)
-                mSegSplitsError[j] = 0;
-
-        //llinfos << "\nTREE Starting" << llendl;
-        drawTree(draw_pool, LLMatrix4(), 0, 0, trunkLength, 0, trunkRad, 0, 0, 0, 0);
-        //llinfos << "\nTREE Ending" << llendl;
-        
-        /*
-        // print part usage info:
-        for (i = 0; i < MAX_PARTS; i++)
-        {
-                llinfos << "TREE part: " << U32(i) << ": " << llendl;
-                for (j = 0; j < MAX_VARS; j++)
-                        llinfos << "\t variant " << U32(j) << ": [" << U32(sTreePartsUsed[mSpecies][i][j]) << "], " << llendl;
-                llinfos << "" << llendl;
-        }
-        //*/
-
-/*
-        glTranslatef(0.0, 0.0, 5.0);
-        for (i = 0; i < sNextPartIndex[mSpecies]; i++)
-        {
-                TreePart *selectedPart = &(sTreeParts[mSpecies][i]);
-                glTranslatef(2.0, 0.0, 0.0);
-
-                // draw a variant...
-                for (U8 k = 0; k < selectedPart->mNumVariants; k++)
-                {
-                        // start at the indice index
-                        U32 prevOffset = 0;//selectedPart->mIndiceIndex[k];
-
-                        
-                        if (selectedPart->mLevel == 0 && k == 0)
-                        {
-                                // draw the original one with flare...
-                                glTranslatef(1.0, 0.0, 0.0);
-                                glPushMatrix();
-                                glDrawElements(GL_TRIANGLES, selectedPart->mNumTris*3, GL_UNSIGNED_INT, draw_pool.getRawIndices() + selectedPart->mIndiceIndex[k]);
-                                glPopMatrix();
-                                prevOffset += selectedPart->mNumTris*3;
-                        }
-
-                        // draw each of the curveRes iterations...
-                        for (j = 0; j < selectedPart->mCurveRes; j++)
-                        {
-                                U32 numTris = (selectedPart->mCurveRes - j) * selectedPart->mVertsPerSection * 2;
-                                glTranslatef(0.0, 1.0, 0.0);
-                                glPushMatrix();
-                                glDrawElements(GL_TRIANGLES, numTris*3, GL_UNSIGNED_INT, draw_pool.getRawIndices() + selectedPart->mIndiceIndex[k] + prevOffset);
-                                glPopMatrix();
-                                prevOffset += numTris*3;
-                        }
-                }
-        }
-//*/
-}
-
-void LLVOTreeNew::drawTree(LLDrawPool &draw_pool, const LLMatrix4 &frame, U8 level, F32 offsetChild, 
-                                                   F32 curLength, F32 parentLength, F32 curRadius, F32 parentRadius,
-                                                   U8 part, U8 variant, U8 startSection)
-{
-        U8 i, j, k;
-
-        // if startSection != 0, we're doing a segsplit.
-
-        // find the tree part most similar (if we're not doing a segsplit)
-        if (startSection == 0)
-        {
-                S32 similarNum = findSimilarPart(level);
-                if (similarNum < 0) part = level;
-                else part = similarNum;
-        }
-
-        TreePart *selectedPart;
-        selectedPart = &(sTreeParts[mSpecies][part]);
-        
-        // pick a variant if we're not in a segsplit (and therefore already have one chosen)
-        //if (startSection == 0) variant = llrand_unsigned(selectedPart->mNumVariants + 1, mRandOffset[level]++);
-        //if (variant == selectedPart->mNumVariants) variant--;
-        // manual override
-        variant = 0;
-
-        sTreePartsUsed[mSpecies][part][variant]++;
-
-        //llinfos << "TREE part desired: " << U32(level) << ", " << sParameters.mLobeDepth << ", " << curAngleInt << llendl;
-        //llinfos << "TREE part found: " << U32(selectedPart->mLevel) << ", " << selectedPart->mLobeDepth << ", " << selectedPart->mAngle << llendl;
-
-        // determine the scalers so that we meet the desired length/radius...
-        F32 lengthMultiplier = curLength / selectedPart->mLength;
-        F32 radiusMultiplier = curRadius / selectedPart->mRadius;
-        LLMatrix4 scaleMatrix;
-        scaleMatrix.mMatrix[0][0] = radiusMultiplier;
-        scaleMatrix.mMatrix[1][1] = radiusMultiplier;
-        scaleMatrix.mMatrix[2][2] = lengthMultiplier;
-
-        // the global rotation this branch will take
-        LLQuaternion frameQuat;
-        frameQuat.setQuat(frame);
-        LLMatrix4 scaledFrame = frame;
-        scaledFrame *= scaleMatrix;
-        
-        // start from the previous startSection of the curveRes...try to go till we're at the end of the branch
-        // i is the current section we're looking at for segment splits
-        
-        F32 otherRotateAngle = llfrand_signed(360.0f, mRandOffset[level]++);
-
-        U8 curSection = startSection;
-        for (i = startSection; i < selectedPart->mCurveRes - 1; i++)
-        {
-                curSection = i + 1;
-
-                S32 segSplitsEffective = 0;
-
-                // seg split code taken from confusing paragraph of Weber + Penn
-                F32 segSplit = llfrand_unsigned(sParameters.mSegSplits[level], mRandOffset[level]++);
-                segSplitsEffective = llround(segSplit + mSegSplitsError[level]);
-                mSegSplitsError[level] += segSplit - lltrunc(segSplit);
-                mSegSplitsError[level] -= (segSplitsEffective - segSplit);
-
-                // if we've got a seg split, figure out the right rotated frames and send them off...
-                if (segSplitsEffective > 0)
-                {
-                        // figure out the declination for this height...
-                        LLVector3 unitZ(0.0f, 0.0f, 1.0f);
-                        LLVector3 transformZ = unitZ * frame;
-                        F32 declination = RAD_TO_DEG*acos(transformZ.mV[1]);
-
-                        F32 splitAngle = (sParameters.mSplitAngle[level] + llfrand_unsigned(sParameters.mSplitAngleV[level], mRandOffset[level]++)) - declination;
-                        if (splitAngle < 0) 
-                                splitAngle = 0;
-                        //splitAngle = sParameters.mDownAngle[2];//45.0f;
-                        
-                        // do each seg split...
-                        for (j = 0; j < segSplitsEffective; j++)
-                        {
-                                otherRotateAngle += llround(20.0f + 0.75f*(30.0f + fabs(declination - 90.0f)) * pow(fabs((F32)llrand_signed(1, mRandOffset[level]++)), 2.0f));
-
-                                //otherRotateAngle += sParameters.mDownAngle[1];//((j + 1) * 360.0)/(segSplitsEffective + 1);
-                                
-                                U32 frameOffset = 0;
-                                if (startSection != 0)
-                                {
-                                        // offset into the branch that begins with that startsection...
-                                        if (level == 0) frameOffset += (U32)selectedPart->mCurveRes - 1;
-                                        // i is our start section ...
-                                        for (k = 0; k < i; k++) 
-                                                frameOffset += ((U32)selectedPart->mCurveRes - k);
-
-                                        frameOffset--;
-                                }
-
-                                LLMatrix4 segFrame;
-                                segFrame = selectedPart->mFrames[variant][frameOffset + curSection - 1];
-                                segFrame *= scaleMatrix;
-
-                                LLVector3 segFrameTrans = segFrame.getTranslation();
-                                segFrameTrans.rotVec(frameQuat);
-
-                                LLQuaternion splitQuat, rotateQuat;
-                                splitQuat.setQuat(splitAngle*DEG_TO_RAD, 1.0f, 0.0f, 0.0f);
-                                rotateQuat.setQuat(otherRotateAngle*DEG_TO_RAD, 0.0f, 0.0f, 1.0f);
-
-                                LLMatrix4 splitFrame;
-                                //splitFrame.rotate(splitQuat * rotateQuat * frameQuat); ??
-                                splitFrame.rotate(frameQuat * splitQuat * rotateQuat);
-                                splitFrame.translate(segFrameTrans);
-                                splitFrame.translate(frame.getTranslation());
-
-                                // recurse from the current endsection as start section and with the new frame as base
-                                drawTree(draw_pool, splitFrame, level, offsetChild, 
-                                   curLength, parentLength, curRadius, parentRadius,
-                                   part, variant, curSection);
-                        }
-                }
-        }
-
-
-        U32 startIndexOffset = 0;
-
-        if (startSection != 0)
-                startIndexOffset = selectedPart->mOffsets[variant][startSection];
-
-        U32 numTris;
-        if (level == 0 && startSection == 0)
-                numTris = selectedPart->mNumTris;
-        else
-                numTris = 2 * selectedPart->mVertsPerSection * ((U8)selectedPart->mCurveRes - startSection);
-
-        glPushMatrix();
-                glMultMatrixf((float *)frame.mMatrix);
-                glScalef(radiusMultiplier, radiusMultiplier, lengthMultiplier);
-        
-                //glDrawElements(GL_TRIANGLES, selectedPart->mNumTris*3, GL_UNSIGNED_INT, draw_pool.getRawIndices() + selectedPart->mIndiceIndex + 0);
-                glDrawElements(GL_TRIANGLES, numTris*3, GL_UNSIGNED_INT, draw_pool.getRawIndices() + selectedPart->mIndiceIndex[variant] + startIndexOffset);
-        glPopMatrix();
-
-        mNumTrisDrawn += numTris;
-
-        // figure out how many in next level of branches || leaves
-        U8 total = 0;
-        F32 baseLength = 0;
-
-        if (level < sParameters.mLevels) 
-        {
-                if (level == 0)
-                {
-                        baseLength = sParameters.mBaseSize * (sParameters.mScale + llfrand_signed(sParameters.mScaleV, mRandOffset[level]++));
-                        total = llround( (1.f - sParameters.mBaseSize) * sParameters.mBranches[level]);
-                }
-                else if (level == 1)
-                {
-                        F32 maxLength = sParameters.mLength[level] + llfrand_signed(sParameters.mLengthV[level], mRandOffset[level]++);
-                        total = llround(sParameters.mBranches[level] * (0.2f + 0.8f * ( (curLength/parentLength)/maxLength ) ) );
-                }
-                else
-                {
-                        total = (llround(sParameters.mBranches[level] * (1.0f - 0.5f * (offsetChild/parentLength) )));
-                }
-        }
-        else if (sParameters.mLevels == level)
-        {
-                // determine leaves
-                // see paper for more on:
-                // leaves_per_branch = Leaves * 
-                //              ShapeRatio ( 4 (tapered), offset[child]/length[parent] * quality)
-                
-                //total = (sParameters.mLeaves * sParameters.ShapeRatio(SR_CONICAL, offsetChild / curLength) * sParameters.mLeafQuality);
-                total = sParameters.mLeaves;
-                
-        }
-
-        F32 fracPos, offsetPos, localPos;
-        F32 downAngle, rotateAngle;
-        U8 currentFrameSegment;         // index of matrix transform of the closest cross section to new branch
-        LLMatrix4 localFrame, curPartFrame, nextPartFrame;
-
-        // init stem rotate angle...
-        rotateAngle = llfrand_unsigned(360.0, mRandOffset[level]++);
-                
-        // grow the leaf or branch...
-        for (i = 0; i < total; i++)
-        {
-                // note: curLength is the 'parentLength' for all of these substems
-                localFrame.identity();
-
-                // find the fractional, offset and then local pos
-                if (level == 0)
-                        fracPos = sParameters.mBaseSize + (i) * (1.0f - sParameters.mBaseSize) / (total);
-                else
-                        fracPos = (i) * (1.0f / (total));
-
-                // offset into branch
-                offsetPos = fracPos*curLength;
-
-                U32 frameOffset = 0;
-                if (startSection != 0) 
-                {
-                        if (level == 0) frameOffset = (U32)selectedPart->mCurveRes;
-
-                        for (k = 0; k < startSection; k++)
-                                frameOffset += ((U32)selectedPart->mCurveRes - k);
-                }
-
-                F32 curSegAt;
-                if (level == 0 && startSection == 0)
-                {
-                        F32 effectiveFlarePercentage = sParameters.mFlarePercentage + (1.0f - sParameters.mFlarePercentage)/selectedPart->mCurveRes;
-
-                        if (fracPos < effectiveFlarePercentage)
-                        {
-                                if (fracPos > sParameters.mFlarePercentage)
-                                        currentFrameSegment = sParameters.mFlareRes - 1;
-                                else
-                                        currentFrameSegment = lltrunc( (fracPos/sParameters.mFlarePercentage) / (1.0/sParameters.mFlareRes) );
-                                
-                                if (currentFrameSegment == 0) 
-                                { 
-                                        curPartFrame.identity(); 
-                                        nextPartFrame = mTrunkFlareFrames[0]; 
-                                }
-                                else 
-                                { 
-                                        curPartFrame = mTrunkFlareFrames[currentFrameSegment - 1]; 
-                                        if (currentFrameSegment == sParameters.mFlareRes - 1) nextPartFrame = selectedPart->mFrames[variant][0]; 
-                                        else nextPartFrame = mTrunkFlareFrames[currentFrameSegment]; 
-                                }
-                                
-                                curSegAt = currentFrameSegment * (curLength * sParameters.mFlarePercentage)/sParameters.mFlareRes;
-                                localPos = offsetPos - curSegAt;
-                        }
-                        else
-                        {
-                                // want to go from frameSegment 0 to (1-CurveRes)...don't want to have frame at tip
-                                currentFrameSegment = lltrunc( ( (fracPos - effectiveFlarePercentage)/(1.0 - effectiveFlarePercentage) ) / (1.0 / (selectedPart->mCurveRes - 1)) );
-                                curSegAt = (sParameters.mFlarePercentage * curLength) + (currentFrameSegment + 1.0f) * (  (curLength*(1.0f - sParameters.mFlarePercentage)/(selectedPart->mCurveRes)) );
-                                localPos = offsetPos - curSegAt;
-                                curPartFrame = selectedPart->mFrames[variant][currentFrameSegment];
-                                nextPartFrame = selectedPart->mFrames[variant][currentFrameSegment + 1];
-                        }
-                        //llinfos << "TREE startsection: " << U32(startSection) << " currentSeg: " << U32(currentFrameSegment) << ", is at: " << curSegAt << ", fracpos: " << fracPos << ", offset: " << offsetPos << ", localpos: " << localPos << ", final: " << curSegAt + localPos << llendl;                       
-                }
-                else if (level == 0 && startSection != 0)
-                {
-                        // if level is zero, don't deal with flared branch positions
-                        if (fracPos < sParameters.mFlarePercentage) continue;
-
-                        // take FlarePercentage out of fracPos 
-                        fracPos = (fracPos - sParameters.mFlarePercentage)/(1 - sParameters.mFlarePercentage);
-
-                        currentFrameSegment = lltrunc(fracPos / (1.0 / selectedPart->mCurveRes));
-                        
-                        // don't do branches below our split starting point
-                        if (currentFrameSegment < startSection) continue;
-
-                        curSegAt = (sParameters.mFlarePercentage * curLength) + currentFrameSegment*((curLength - sParameters.mFlarePercentage*curLength)/(selectedPart->mCurveRes));
-                        localPos = offsetPos - curSegAt;
-                        currentFrameSegment -= startSection;
-
-                        if (currentFrameSegment == 0) 
-                        { 
-                                curPartFrame.identity(); 
-                                nextPartFrame = selectedPart->mFrames[variant][frameOffset]; 
-                        }
-                        else 
-                        {
-                                curPartFrame = selectedPart->mFrames[variant][frameOffset + currentFrameSegment - 1];
-                                nextPartFrame = selectedPart->mFrames[variant][frameOffset + currentFrameSegment];
-                        }
-                }
-                else
-                {
-                        currentFrameSegment = lltrunc(fracPos / (1.0 / selectedPart->mCurveRes));
-
-                        // don't do branches below our split starting point
-                        if (currentFrameSegment < startSection) continue;
-
-                        curSegAt = (currentFrameSegment) * (curLength/(selectedPart->mCurveRes));
-                        localPos = offsetPos - curSegAt;
-                        currentFrameSegment -= startSection;
-
-                        if (currentFrameSegment == 0) 
-                        { 
-                                curPartFrame.identity();
-                                nextPartFrame = selectedPart->mFrames[variant][frameOffset];
-                        }
-                        else 
-                        {
-                                curPartFrame = selectedPart->mFrames[variant][frameOffset + currentFrameSegment - 1];
-                                nextPartFrame = selectedPart->mFrames[variant][frameOffset + currentFrameSegment];
-                        }
-                }
-
-                if (sParameters.mDownAngle[level] >= 0) 
-                        downAngle = sParameters.mDownAngle[level] + llfrand_signed(sParameters.mDownAngleV[level], mRandOffset[level]++);
-                else 
-                        downAngle = sParameters.mDownAngle[level] + sParameters.mDownAngleV[level] *
-                                (1 - 2.0f * sParameters.ShapeRatio(SR_CONICAL, (curLength - offsetPos) / (curLength - baseLength)));
-
-                if (sParameters.mRotate[level] >= 0)
-                        rotateAngle += (sParameters.mRotate[level] + llfrand_signed(sParameters.mRotateV[level], mRandOffset[level]++));
-                else
-                        rotateAngle += (180.0f + sParameters.mRotate[level] + llfrand_signed(sParameters.mRotateV[level], mRandOffset[level]++));
-
-                if (sParameters.mLevels == level)
-                {
-                        downAngle = 0.0; 
-                        rotateAngle = 0.0;
-                }
-
-// manual overrides
-//              rotateAngle = sParameters.mRotate[0];
-//              downAngle = sParameters.mDownAngle[0];
-
-                LLQuaternion downQuat, rotateQuat, nextQuat, curQuat;
-                downQuat.setQuat(DEG_TO_RAD*downAngle, 1.0, 0.0, 0.0);
-                rotateQuat.setQuat(DEG_TO_RAD*rotateAngle, 0.0, 0.0, 1.0);
-                nextQuat.setQuat(nextPartFrame);
-                curQuat.setQuat(curPartFrame);
-
-                localFrame.identity();
-
-                // take the home frame, and rotate by the global frame, translate to the global start
-                curPartFrame.rotate(frameQuat);
-
-                // rotate to the final angle and translate to the bottom of the branch
-
-                localFrame.rotate(frameQuat * nextQuat * downQuat * rotateQuat);
-                // scale our parent frame to put stuff in the right location
-                curPartFrame *= scaleMatrix;
-                localFrame.translate(curPartFrame.getTranslation());
-                //localFrame.translate(scaledFrame.getTranslation());
-                localFrame.translate(frame.getTranslation());
-
-                // offset the branch by a bit and then rotate using current position, add the resulting translation
-                LLVector3 translateUp(0.0, 0.0, localPos);
-                translateUp.rotVec(nextQuat * frameQuat);
-                //translateUp.rotVec(nextQuat);
-                localFrame.translate(translateUp);
-
-                
-                // BRANCHES...
-                if (level < sParameters.mLevels)
-                {
-                        F32 subStemLength, maxChildLength;
-                        F32 localRadius, subStemRadius;
-
-                        // determine a maximum length for this stem's children...
-                        maxChildLength = sParameters.mLength[level+1] + llfrand_signed(sParameters.mLengthV[level+1], mRandOffset[level]++);
-
-                        // length of child branch
-                        if (level == 0)
-                                subStemLength = curLength * maxChildLength * 
-                                        sParameters.ShapeRatio(sParameters.mShape, (curLength - offsetPos) / (curLength - baseLength));
-                        else
-                                subStemLength = maxChildLength * (curLength - 0.6f * offsetPos);
-
-                        // radius of child branch
-                        if (curLength == 0) 
-                                subStemRadius = 0;
-                        else 
-                                subStemRadius = selectedPart->mRadius * pow((subStemLength / curLength), sParameters.mRatioPower);
-
-                        // don't have a radius that is larger than parent's
-                        localRadius = CalculateSectionRadius(level, fracPos, selectedPart->mLength, selectedPart->mRadius);
-                        localRadius *= radiusMultiplier;
-
-                        if ( (subStemRadius > localRadius) || (subStemRadius == 0) )
-                                subStemRadius = localRadius;
-
-                        if (subStemLength != 0)
-                                drawTree(draw_pool, localFrame, level + 1, offsetPos, subStemLength, curLength, subStemRadius, curRadius, 0, 0, 0);
-
-                }
-                // LEAVES
-                else if (sParameters.mLevels == level)
-                {
-                        // for now just draw leaves stupidly...
-
-                        // draw square leaf (two tris) with the texture on it (then do it again for the other side)
-                        mNumTrisDrawn += 4;
-//*
-                        F32 leafXscale = 1.0f;
-                        F32 leafYscale = 1.0f;
-                        
-                        glPushMatrix();
-                        //LLVector3 position = localFrame.getTranslation();
-
-                        //glTranslatef(position.mV[0], position.mV[1], position.mV[2]);
-                        glMultMatrixf((float *)localFrame.mMatrix);
-                        
-                        glBegin(GL_QUADS);
-                        
-                        //*
-                        // 00
-                        glTexCoord2f(0.5f, 0.5f);
-                        glVertex3f(0.0f, 0.0f, 0.0f);
-                        // 10
-                        glTexCoord2f(1.0f, 0.5f);
-                        glVertex3f(0.0f, 0.0f, leafXscale);
-                        // 11
-                        glTexCoord2f(1.0f, 1.0f);
-                        glVertex3f(0.0f, leafYscale, leafXscale);
-                        // 01
-                        glTexCoord2f(0.5f, 1.0f);
-                        glVertex3f(0.0f, leafYscale, 0.0f);
-                        //*/
-                        
-                        // 10
-                        glTexCoord2f(1.0f, 0.5f);
-                        glVertex3f(0.0f, 0.0f, leafXscale);
-                        // 00
-                        glTexCoord2f(0.5f, 0.5f);
-                        glVertex3f(0.0f, 0.0f, 0.0f);
-                        // 01
-                        glTexCoord2f(0.5f, 1.0f);
-                        glVertex3f(0.0f, leafYscale, 0.0f);
-                        // 11
-                        glTexCoord2f(1.0f, 1.0f);
-                        glVertex3f(0.0f, leafYscale, leafXscale);
-
-                        glEnd();
-                        glPopMatrix();
-//*/
-                }
-        }
-
-}
-
-
-
-
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 6791acd..f425687 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -42,7 +42,6 @@
 #include "material_codes.h"
 #include "message.h"
 #include "object_flags.h"
-
 #include "llagent.h"
 #include "lldrawable.h"
 #include "lldrawpoolsimple.h"
@@ -64,14 +63,14 @@
 #include "pipeline.h"
 
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
-
-//#define       LLDEBUG_DISPLAY_LODS 1
+const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
+const F32 FORCE_CULL_AREA = 8.f;
 
 BOOL gAnimateTextures = TRUE;
+extern BOOL gHideSelectedObjects;
 
 F32 LLVOVolume::sLODFactor = 1.f;
 F32     LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
-F32     LLVOVolume::sLODComplexityDistanceBias = 0.0f;//Changing this to zero makes all prims LOD equally regardless of complexity
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
 
@@ -79,17 +78,14 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
         : LLViewerObject(id, pcode, regionp),
           mVolumeImpl(NULL)
 {
+        mTexAnimMode = 0;
         mRelativeXform.identity();
         mRelativeXformInvTrans.identity();
 
         mLOD = MIN_LOD;
         mInited = FALSE;
-        mAllTEsSame = FALSE;
         mTextureAnimp = NULL;
         mGlobalVolume = FALSE;
-
-        mTextureAnimp = NULL;
-        mAllTEsSame = FALSE;
         mVObjRadius = LLVector3(1,1,0.5f).magVec();
         mNumFaces = 0;
 }
@@ -142,12 +138,19 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                                                 mTextureAnimp->reset();
                                         }
                                 }
+                                mTexAnimMode = 0;
                                 mTextureAnimp->unpackTAMessage(mesgsys, block_num);
                         }
                         else
                         {
-                                delete mTextureAnimp;
-                                mTextureAnimp = NULL;
+                                if (mTextureAnimp)
+                                {
+                                        delete mTextureAnimp;
+                                        mTextureAnimp = NULL;
+                                        gPipeline.markTextured(mDrawable);
+                                        mFaceMappingChanged = TRUE;
+                                        mTexAnimMode = 0;
+                                }
                         }
 
                         // Unpack volume data
@@ -193,8 +196,8 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                                 // Well, crap, there's something bogus in the data that we're unpacking.
                                 dp->dumpBufferToLog();
                                 llwarns << "Flushing cache files" << llendl;
-                                char mask[LL_MAX_PATH];
-                                sprintf(mask, "%s*.slc", gDirUtilp->getDirDelimiter().c_str());
+                                char mask[LL_MAX_PATH];         /* Flawfinder: ignore */
+                                snprintf(mask, LL_MAX_PATH, "%s*.slc", gDirUtilp->getDirDelimiter().c_str());           /* Flawfinder: ignore */
                                 gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
 //                              llerrs << "Bogus TE data in " << getID() << ", crashing!" << llendl;
                                 llwarns << "Bogus TE data in " << getID() << llendl;
@@ -219,12 +222,16 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                                                 mTextureAnimp->reset();
                                         }
                                 }
+                                mTexAnimMode = 0;
                                 mTextureAnimp->unpackTAMessage(*dp);
                         }
-                        else
+                        else if (mTextureAnimp)
                         {
                                 delete mTextureAnimp;
                                 mTextureAnimp = NULL;
+                                gPipeline.markTextured(mDrawable);
+                                mFaceMappingChanged = TRUE;
+                                mTexAnimMode = 0;
                         }
                 }
                 else
@@ -247,65 +254,142 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 }
 
 
-BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
+void LLVOVolume::animateTextures()
 {
-        LLViewerObject::idleUpdate(agent, world, time);
-
-        ///////////////////////
-        //
-        // Do texture animation stuff
-        //
-
-        if (mTextureAnimp && gAnimateTextures)
+        F32 off_s = 0.f, off_t = 0.f, scale_s = 1.f, scale_t = 1.f, rot = 0.f;
+        S32 result;
+        
+        if (result = mTextureAnimp->animateTextures(off_s, off_t, scale_s, scale_t, rot))
         {
-                F32 off_s, off_t, scale_s, scale_t, rot;
-                S32 result;
-                if ((result = mTextureAnimp->animateTextures(off_s, off_t, scale_s, scale_t, rot)))
+                if (!mTexAnimMode)
+                {
+                        mFaceMappingChanged = TRUE;
+                        gPipeline.markTextured(mDrawable);
+                }
+                mTexAnimMode = result | mTextureAnimp->mMode;
+                                
+                S32 start=0, end=mDrawable->getNumFaces()-1;
+                if (mTextureAnimp->mFace >= 0 && mTextureAnimp->mFace <= end)
+                {
+                        start = end = mTextureAnimp->mFace;
+                }
+                
+                for (S32 i = start; i <= end; i++)
                 {
-                        U8 has_bump = 0;
-                        if (mTextureAnimp->mFace <= -1)
+                        LLQuaternion quat;
+                        LLVector3 scale(1,1,1);
+                        
+                        LLFace* facep = mDrawable->getFace(i);
+                        const LLTextureEntry* te = facep->getTextureEntry();
+                        LLMatrix4& tex_mat = facep->mTextureMatrix;
+                        
+                        if (!te)
+                        {
+                                continue;
+                        }
+                        if (!(result & LLViewerTextureAnim::ROTATE))
+                        {
+                                te->getRotation(&rot);
+                        }
+
                         {
-                                S32 face;
-                                for (face = 0; face < getNumTEs(); face++)
+                                F32 axis = -1;
+                                F32 s,t;        
+                                te->getScale(&s,&t);
+                                if (s < 0)
                                 {
-                                        if (result & LLViewerTextureAnim::TRANSLATE)
-                                        {
-                                                setTEOffset(face, off_s, off_t);
-                                        }
-                                        if (result & LLViewerTextureAnim::SCALE)
-                                        {
-                                                setTEScale(face, scale_s, scale_t);
-                                        }
-                                        if (result & LLViewerTextureAnim::ROTATE)
-                                        {
-                                                setTERotation(face, rot);
-                                        }
-                                        has_bump |= getTE(face)->getBumpmap();
+                                        axis = -axis;
                                 }
+                                if (t < 0)
+                                {
+                                        axis = -axis;
+                                }
+                                quat.setQuat(rot, 0, 0, axis);
                         }
-                        else if (mTextureAnimp->mFace < getNumTEs())
+                        
+                        if (!(result & LLViewerTextureAnim::TRANSLATE))
                         {
-                                if (result & LLViewerTextureAnim::TRANSLATE)
+                                te->getOffset(&off_s,&off_t);
+                        }                       
+
+                        LLVector3 trans(off_s+0.5f, off_t+0.5f, 0.f);
+
+                        tex_mat.identity();
+                        tex_mat.translate(LLVector3(-0.5f, -0.5f, 0.f));
+                        tex_mat.rotate(quat);                           
+
+                        if (!(result & LLViewerTextureAnim::SCALE))
+                        {
+                                te->getScale(&scale_s, &scale_t);
+                        }
+        
+                        {
+                                scale.setVec(scale_s, scale_t, 1.f);
+                                LLMatrix4 mat;
+                                mat.initAll(scale, LLQuaternion(), LLVector3());
+                                tex_mat *= mat;
+                        }
+
+                        tex_mat.translate(trans);
+                }
+        }
+        else
+        {
+                if (mTexAnimMode && mTextureAnimp->mRate == 0)
+                {
+                        U8 start, count;
+
+                        if (mTextureAnimp->mFace == -1)
+                        {
+                                start = 0;
+                                count = getNumTEs();
+                        }
+                        else
+                        {
+                                start = (U8) mTextureAnimp->mFace;
+                                count = 1;
+                        }
+
+                        for (S32 i = start; i < start + count; i++)
+                        {
+                                if (mTexAnimMode & LLViewerTextureAnim::TRANSLATE)
                                 {
-                                        setTEOffset(mTextureAnimp->mFace, off_s, off_t);
+                                        setTEOffset(i, mTextureAnimp->mOffS, mTextureAnimp->mOffT);                             
                                 }
-                                if (result & LLViewerTextureAnim::SCALE)
+                                if (mTexAnimMode & LLViewerTextureAnim::SCALE)
                                 {
-                                        setTEScale(mTextureAnimp->mFace, scale_s, scale_t);
+                                        setTEScale(i, mTextureAnimp->mScaleS, mTextureAnimp->mScaleT);  
                                 }
-                                if (result & LLViewerTextureAnim::ROTATE)
+                                if (mTexAnimMode & LLViewerTextureAnim::ROTATE)
                                 {
-                                        setTERotation(mTextureAnimp->mFace, rot);
+                                        setTERotation(i, mTextureAnimp->mRot);
                                 }
-                                has_bump |= getTE(mTextureAnimp->mFace)->getBumpmap();
-                        }
-//                      mFaceMappingChanged = TRUE;
-                        if (mDrawable->isVisible())
-                        {
-                                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD, TRUE);
                         }
+
+                        gPipeline.markTextured(mDrawable);
+                        mFaceMappingChanged = TRUE;
+                        mTexAnimMode = 0;
                 }
         }
+}
+BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
+{
+        LLViewerObject::idleUpdate(agent, world, time);
+
+        if (mDead || mDrawable.isNull())
+        {
+                return TRUE;
+        }
+        
+        ///////////////////////
+        //
+        // Do texture animation stuff
+        //
+
+        if (mTextureAnimp && gAnimateTextures)
+        {
+                animateTextures();
+        }
 
         // Dispatch to implementation
         if (mVolumeImpl)
@@ -318,75 +402,45 @@ BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 
 void LLVOVolume::updateTextures(LLAgent &agent)
 {
-
+//      LLFastTimer t(LLFastTimer::FTM_TEMP6);
+        const F32 TEXTURE_AREA_REFRESH_TIME = 5.f; // seconds
+        if (mTextureUpdateTimer.getElapsedTimeF32() > TEXTURE_AREA_REFRESH_TIME)
+        {
+                if (mDrawable->isVisible())
+                {
+                        updateTextures();
+                }
+        }
 }
 
-//static
-F32 LLVOVolume::getTextureVirtualSize(const LLFace* face)
+void LLVOVolume::updateTextures()
 {
-        //LLVector2 tdim = face->mTexExtents[1] - face->mTexExtents[0];
-        //F32 pixel_area = 1.f/llmin(llmax(tdim.mV[0] * tdim.mV[1], 1.f), 10.f);
-        LLVector3 cross_vec = (face->mExtents[1] - face->mExtents[0]);
-        
-
-        LLVector3 lookAt = (face->getPositionAgent()-gCamera->getOrigin());
-        F32 dist = lookAt.normVec();
+        // Update the pixel area of all faces
 
-        F32 face_area;  
-        
-        if (face->isState(LLFace::GLOBAL))
+        if (!gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_SIMPLE))
         {
-                face_area = cross_vec.mV[0]*cross_vec.mV[1]*fabsf(lookAt.mV[2]) +  
-                                        cross_vec.mV[1]*cross_vec.mV[2]*fabsf(lookAt.mV[0]) +
-                                        cross_vec.mV[0]*cross_vec.mV[2]*fabsf(lookAt.mV[1]);
-        }
-        else
-        {
-                face_area = cross_vec.mV[0]*cross_vec.mV[1] + 
-                                        cross_vec.mV[1]*cross_vec.mV[2] +
-                                        cross_vec.mV[0]*cross_vec.mV[2];
+                return;
         }
-
-        if (face_area <= 0)
+        
+        if (LLViewerImage::sDontLoadVolumeTextures || mDrawable.isNull()) // || !mDrawable->isVisible())
         {
-                return 0.f;
+                return;
         }
 
-        F32 view = llmax(lookAt*gCamera->getAtAxis(), 0.5f);
-        F32 dist_ramp = dist * view/face_area;
-        //ramp down distance for things closer than 16 m * lookAt
-        dist /= dist_ramp;
-        dist *= dist;
-        dist *= dist_ramp;
-
-        F32 dist_ratio = face_area / llmax(dist, 0.1f);
-        F32 pixel_area = dist_ratio*gCamera->getScreenPixelArea();
+        mTextureUpdateTimer.reset();
         
-        return view*pixel_area;
-}
-
-void LLVOVolume::updateTextures(S32 lod)
-{
-        // Update the image levels of all textures...
-        // First we do some quick checks.
+        F32 old_area = mPixelArea;
+        mPixelArea = 0.f;
 
-        // This doesn't take into account whether the object is in front
-        // or behind...
-
-        if (LLViewerImage::sDontLoadVolumeTextures || mDrawable.isNull() || !mDrawable->isVisible())
-        {
-                return;
-        }
-                
         const S32 num_faces = mDrawable->getNumFaces();
-        
+        F32 min_vsize=999999999.f, max_vsize=0.f;
         for (S32 i = 0; i < num_faces; i++)
         {
-                const LLFace* face = mDrawable->getFace(i);
+                LLFace* face = mDrawable->getFace(i);
                 const LLTextureEntry *te = face->getTextureEntry();
                 LLViewerImage *imagep = face->getTexture();
-
-                if (!imagep || !te)
+                if (!imagep || !te ||
+                        face->mExtents[0] == face->mExtents[1])
                 {
                         continue;
                 }
@@ -395,25 +449,87 @@ void LLVOVolume::updateTextures(S32 lod)
                 
                 if (isHUDAttachment())
                 {
-                        vsize = (F32) (imagep->getWidth(0) * imagep->getHeight(0));
+                        F32 area = (F32) gCamera->getScreenPixelArea();
+                        vsize = area;
                         imagep->setBoostLevel(LLViewerImage::BOOST_HUD);
+                        face->setPixelArea(area); // treat as full screen
                 }
                 else
                 {
                         vsize = getTextureVirtualSize(face);
                 }
 
+                mPixelArea = llmax(mPixelArea, face->getPixelArea());
+                face->setVirtualSize(vsize);
                 imagep->addTextureStats(vsize);
-
-
-                U8 bump = te->getBumpmap();
-                if( te && bump)
+                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA))
+                {
+                        if (vsize < min_vsize) min_vsize = vsize;
+                        if (vsize > max_vsize) max_vsize = vsize;
+                }
+                else if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
                 {
-                        gBumpImageList.addTextureStats( bump, imagep->getID(), vsize, 1, 1);
+                        F32 pri = imagep->getDecodePriority();
+                        if (pri < min_vsize) min_vsize = pri;
+                        if (pri > max_vsize) max_vsize = pri;
                 }
+                else if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_FACE_AREA))
+                {
+                        F32 pri = mPixelArea;
+                        if (pri < min_vsize) min_vsize = pri;
+                        if (pri > max_vsize) max_vsize = pri;
+                }       
+        }
+
+        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA))
+        {
+                setDebugText(llformat("%.0f:%.0f", fsqrtf(min_vsize),fsqrtf(max_vsize)));
+        }
+        else if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
+        {
+                setDebugText(llformat("%.0f:%.0f", fsqrtf(min_vsize),fsqrtf(max_vsize)));
+        }
+        else if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_FACE_AREA))
+        {
+                setDebugText(llformat("%.0f:%.0f", fsqrtf(min_vsize),fsqrtf(max_vsize)));
+        }
+
+        if (mPixelArea == 0)
+        { //flexi phasing issues make this happen
+                mPixelArea = old_area;
         }
 }
 
+F32 LLVOVolume::getTextureVirtualSize(LLFace* face)
+{
+        //get area of circle around face
+        LLVector3 center = face->getPositionAgent();
+        LLVector3 size = (face->mExtents[1] - face->mExtents[0]) * 0.5f;
+        
+        F32 face_area = LLPipeline::calcPixelArea(center, size, *gCamera);
+
+        face->setPixelArea(face_area);
+
+        if (face_area <= 0)
+        {
+                return 0.f;
+        }
+
+        //get area of circle in texture space
+        LLVector2 tdim = face->mTexExtents[1] - face->mTexExtents[0];
+        F32 texel_area = (tdim * 0.5f).magVecSquared()*3.14159f;
+        if (texel_area <= 0)
+        {
+                // Probably animated, use default
+                texel_area = 1.f;
+        }
+
+        //apply texel area to face area to get accurate ratio
+        face_area /= llclamp(texel_area, 1.f/64.f, 16.f);
+
+        return face_area;
+}
+
 BOOL LLVOVolume::isActive() const
 {
         return !mStatic || mTextureAnimp || isAttachment() || (mVolumeImpl && mVolumeImpl->isActive());
@@ -455,7 +571,7 @@ void LLVOVolume::setScale(const LLVector3 &scale, BOOL damped)
 
                 //since drawable transforms do not include scale, changing volume scale
                 //requires an immediate rebuild of volume verts.
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_POSITION, TRUE);
         }
 }
 
@@ -463,16 +579,7 @@ LLFace* LLVOVolume::addFace(S32 f)
 {
         const LLTextureEntry* te = getTE(f);
         LLViewerImage* imagep = getTEImage(f);
-        LLDrawPool* poolp;
-        if (isHUDAttachment())
-        {
-                poolp = gPipeline.getPool(LLDrawPool::POOL_HUD);
-        }
-        else
-        {
-                poolp = LLPipeline::getPoolFromTE(te, imagep);
-        }
-        return mDrawable->addFace(poolp, imagep);
+        return mDrawable->addFace(te, imagep);
 }
 
 LLDrawable *LLVOVolume::createDrawable(LLPipeline *pipeline)
@@ -480,7 +587,7 @@ LLDrawable *LLVOVolume::createDrawable(LLPipeline *pipeline)
         pipeline->allocDrawable(this);
         mDrawable->setRenderType(LLPipeline::RENDER_TYPE_VOLUME);
 
-        S32 max_tes_to_set = calcAllTEsSame() ? 1 : getNumTEs();
+        S32 max_tes_to_set = getNumTEs();
         for (S32 i = 0; i < max_tes_to_set; i++)
         {
                 LLFace* face = addFace(i);
@@ -537,10 +644,6 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
         }
         mGlobalVolume = (mVolumeImpl && mVolumeImpl->isVolumeGlobal());
         
-        //MSMSM Recompute LOD here in case the object was just created,
-        // its LOD might be incorrectly set to minumum detail...
-        calcLOD();
-
         if (LLPrimitive::setVolume(volume_params, mLOD, (mVolumeImpl && mVolumeImpl->isVolumeUnique())))
         {
                 mFaceMappingChanged = TRUE;
@@ -555,45 +658,12 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
         return FALSE;
 }
 
-
-F32     LLVOVolume::computeLODProfilePathComplexityBias(){
-        //compute a complexity cost from 0 to 1.0 where the 'simplest' prim has a cost of 0.0
-        // and the 'heaviest' prim has a cost of 1.0
-//      LLVolume*       volume = getVolume();
-        F32                     complexity = 0.0f;
-//      const LLVolumeParams&   params = volume->getParams();
-//      U8 type = volume->getPathType();
-//      U8 pcode = this->getPCode();
-//      U8 proftype = volume->getProfileType();
-
-        //if(params.getHollow()>0.0f){// || (proftype == 1) || (proftype == 0)){
-                //If it is hollow, or a cube/pyramid(subdivided), the complexity is roughly doubled
-        //      complexity+=0.5f;
-        //}
-
-        if(this->getVolume()->getProfile().mParams.getCurveType()==LL_PCODE_PROFILE_SQUARE &&
-                this->getVolume()->getPath().mParams.getCurveType()==LL_PCODE_PATH_LINE)
-        {
-                //Object is a cube so bias it heavily since cubes are subdivided alot.
-//              this->setDebugText("CUBE");
-                complexity += 1.0f;
-        }
-
-//      if(params.getTwist() != params.getTwistBegin()){
-                //if there is twist.. the complexity is bumped
-//              complexity+=0.25f;
-//      }
-//      if(type != LL_PCODE_PATH_LINE)//If the path is not a line it is more complex
-//              complexity+=0.2f;
-        return complexity * sLODComplexityDistanceBias;
-}
-
 S32     LLVOVolume::computeLODDetail(F32 distance, F32 radius)
 {
         S32     cur_detail;
         // We've got LOD in the profile, and in the twist.  Use radius.
         F32 tan_angle = (LLVOVolume::sLODFactor*radius)/distance;
-        cur_detail = LLVolumeLODGroup::getDetailFromTan(tan_angle);
+        cur_detail = LLVolumeLODGroup::getDetailFromTan(llround(tan_angle, 0.01f));
         return cur_detail;
 }
 
@@ -603,62 +673,32 @@ BOOL LLVOVolume::calcLOD()
         {
                 return FALSE;
         }
+
         S32 cur_detail = 0;
-        /*if (isHUDAttachment())
+        
+        F32 radius = mVolumep->mLODScaleBias.scaledVec(getScale()).magVec();
+        F32 distance = mDrawable->mDistanceWRTCamera;
+        distance *= sDistanceFactor;
+                        
+        F32 rampDist = LLVOVolume::sLODFactor * 2;
+        
+        if (distance < rampDist)
         {
-                cur_detail = LLVolumeLODGroup::NUM_LODS-1; // max detail
+                // Boost LOD when you're REALLY close
+                distance *= 1.0f/rampDist;
+                distance *= distance;
+                distance *= rampDist;
         }
-        else*/
-        {       
-                F32 radius = (mVolumep->mLODScaleBias.scaledVec(getScale())).magVec();
-                F32 distance = mDrawable->mDistanceWRTCamera;
-                distance *= sDistanceFactor;
-                                
-                F32 rampDist = LLVOVolume::sLODFactor * 2;
-                
-                if (distance < rampDist)
-                {
-                        // Boost LOD when you're REALLY close
-                        distance *= 1.0f/rampDist;
-                        distance *= distance;
-                        distance *= rampDist;
-                }
-                else
-                {
-                        //Now adjust the computed distance by some factor based on the geometric complexity of the primitive
-                        distance += computeLODProfilePathComplexityBias();
-                }
-                // Compensate for field of view changing on FOV zoom.
-                distance *= gCamera->getView();
-
-                cur_detail = computeLODDetail(distance, radius);
+        
+        // DON'T Compensate for field of view changing on FOV zoom.
+        distance *= 3.14159f/3.f;
 
-                //update textures with what the real LOD is
-                updateTextures(cur_detail);
-
-                if(cur_detail != mLOD)
-                {
-                        // Here we test whether the LOD is increasing or decreasing to introduce a slop factor
-                        if(cur_detail < mLOD)
-                        {
-                                // Viewer is moving away from the object
-                                // so bias our LOD by adding a fixed amount to the distance.
-                                // This will reduce the problem of LOD twitching when the 
-                                // user makes slight movements near the LOD transition threshhold.
-                                F32     test_distance = distance - (distance*sLODSlopDistanceFactor/(1.0f+sLODFactor));
-                                if(test_distance < 0.0f) test_distance = 0.0f;
-                                S32     potential_detail = computeLODDetail( test_distance, radius );
-                                if(potential_detail >= mLOD )
-                                {       //The LOD has truly not changed
-                                        cur_detail = mLOD;
-                                }
-                        }
-                }
-        }
+        cur_detail = computeLODDetail(llround(distance, 0.01f), 
+                                                                        llround(radius, 0.01f));
 
         if (cur_detail != mLOD)
         {
-                mAppAngle = (F32) atan2( mDrawable->getRadius(), mDrawable->mDistanceWRTCamera) * RAD_TO_DEG;
+                mAppAngle = llround((F32) atan2( mDrawable->getRadius(), mDrawable->mDistanceWRTCamera) * RAD_TO_DEG, 0.01f);
                 mLOD = cur_detail;              
                 return TRUE;
         }
@@ -676,17 +716,10 @@ BOOL LLVOVolume::updateLOD()
         }
         
         BOOL lod_changed = calcLOD();
-        
-#if LLDEBUG_DISPLAY_LODS
-        //MS Enable this to display LOD numbers on objects
-        std::ostringstream msg;
-        msg << cur_detail;//((cur_detail<mLOD)?"-":cur_detail==mLOD?"=":"+") << (int)cur_detail << " , " << mDrawable->mDistanceWRTCamera << " , " << ((LLVOVolume::sLODFactor*mVObjRadius)/mDrawable->mDistanceWRTCamera);
-        this->setDebugText(msg.str());
-#endif
-        
+
         if (lod_changed)
         {
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE);
                 mLODChanged = TRUE;
         }
 
@@ -703,8 +736,8 @@ BOOL LLVOVolume::setDrawableParent(LLDrawable* parentp)
 
         if (!mDrawable->isRoot())
         {
-                // parent is dynamic, so I'll need to share its drawable, must rebuild to share drawables
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
+                // rebuild vertices in parent relative space
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
 
                 if (mDrawable->isActive() && !parentp->isActive())
                 {
@@ -723,7 +756,7 @@ void LLVOVolume::updateFaceFlags()
 {
         for (S32 i = 0; i < getVolume()->getNumFaces(); i++)
         {
-                LLFace *face = mDrawable->getFace(i + mFaceIndexOffset);
+                LLFace *face = mDrawable->getFace(i);
                 BOOL fullbright = getTE(i)->getFullbright();
                 face->clearState(LLFace::FULLBRIGHT | LLFace::HUD_RENDER | LLFace::LIGHT);
 
@@ -739,10 +772,17 @@ void LLVOVolume::updateFaceFlags()
                 {
                         face->setState(LLFace::HUD_RENDER);
                 }
-                if (getAllTEsSame())
-                {
-                        break; // only 1 face
-                }
+        }
+}
+
+void LLVOVolume::setParent(LLViewerObject* parent)
+{
+        LLViewerObject::setParent(parent);
+        if (mDrawable)
+        {
+                gPipeline.markMoved(mDrawable);
+                mVolumeChanged = TRUE;
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
         }
 }
 
@@ -750,104 +790,87 @@ void LLVOVolume::updateFaceFlags()
 void LLVOVolume::regenFaces()
 {
         // remove existing faces
-        // use mDrawable->getVOVolume() in case of shared drawables
-        mDrawable->getVOVolume()->deleteFaces(this);
-        mFaceIndexOffset = mDrawable->getNumFaces();
-        // add new faces
-        mNumFaces = getAllTEsSame() ? 1 : getNumTEs();
+        BOOL count_changed = mNumFaces != getNumTEs();
+        
+        if (count_changed)
+        {
+                deleteFaces();          
+                // add new faces
+                mNumFaces = getNumTEs();
+        }
+                
         for (S32 i = 0; i < mNumFaces; i++)
         {
-                LLFace* facep = addFace(i);
-                facep->setViewerObject(this);
+                LLFace* facep = count_changed ? addFace(i) : mDrawable->getFace(i);
                 facep->setTEOffset(i);
+                facep->setTexture(getTEImage(i));
+                facep->setViewerObject(this);
+        }
+        
+        if (!count_changed)
+        {
+                updateFaceFlags();
         }
-        // Need to do this as texture entries may not correspond to faces any more!
-        mDrawable->updateTexture();
-        gPipeline.markMaterialed(mDrawable);
 }
 
-BOOL LLVOVolume::genTriangles(BOOL force_global)
+BOOL LLVOVolume::genBBoxes(BOOL force_global)
 {
         BOOL res = TRUE;
 
         LLVector3 min,max;
 
-        if (getAllTEsSame())
+        BOOL rebuild = mDrawable->isState(LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION);
+
+        for (S32 i = 0; i < getVolume()->getNumFaces(); i++)
         {
-                setupSingleFace(mFaceIndexOffset);
-                LLFace *face = mDrawable->getFace(mFaceIndexOffset);
-                S32 num_faces = getVolume()->getNumFaces();
-                res = face->genVolumeTriangles(*getVolume(), 0, num_faces-1,
-                                                                           mRelativeXform, mRelativeXformInvTrans,
-                                                                           mGlobalVolume | force_global);
+                LLFace *face = mDrawable->getFace(i);
+                res &= face->genVolumeBBoxes(*getVolume(), i,
+                                                                                mRelativeXform, mRelativeXformInvTrans,
+                                                                                mGlobalVolume | force_global);
                 
-                if (mDrawable->isState(LLDrawable::REBUILD_VOLUME))
-                {
-                        min = face->mExtents[0];
-                        max = face->mExtents[1];
-                }
-                mWereAllTEsSame = TRUE;
-        }
-        else
-        {
-                for (S32 i = 0; i < getVolume()->getNumFaces(); i++)
+                if (rebuild)
                 {
-                        LLFace *face = mDrawable->getFace(i + mFaceIndexOffset);
-                        res &= face->genVolumeTriangles(*getVolume(), i,
-                                                                                        mRelativeXform, mRelativeXformInvTrans,
-                                                                                        mGlobalVolume | force_global);
-                        
-                        if (mDrawable->isState(LLDrawable::REBUILD_VOLUME))
+                        if (i == 0)
                         {
-                                if (i == 0)
-                                {
-                                        min = face->mExtents[0];
-                                        max = face->mExtents[1];
-                                }
-                                else
+                                min = face->mExtents[0];
+                                max = face->mExtents[1];
+                        }
+                        else
+                        {
+                                for (U32 i = 0; i < 3; i++)
                                 {
-                                        for (U32 i = 0; i < 3; i++)
+                                        if (face->mExtents[0].mV[i] < min.mV[i])
                                         {
-                                                if (face->mExtents[0].mV[i] < min.mV[i])
-                                                {
-                                                        min.mV[i] = face->mExtents[0].mV[i];
-                                                }
-                                                if (face->mExtents[1].mV[i] > max.mV[i])
-                                                {
-                                                        max.mV[i] = face->mExtents[1].mV[i];
-                                                }
+                                                min.mV[i] = face->mExtents[0].mV[i];
+                                        }
+                                        if (face->mExtents[1].mV[i] > max.mV[i])
+                                        {
+                                                max.mV[i] = face->mExtents[1].mV[i];
                                         }
                                 }
                         }
                 }
-                mWereAllTEsSame = FALSE;
         }
-
-        if (mDrawable->isState(LLDrawable::REBUILD_VOLUME))
+        
+        if (rebuild)
         {
                 mDrawable->setSpatialExtents(min,max);
-                if (!isVolumeGlobal())
-                {
-                        mDrawable->setPositionGroup((min+max)*0.5f);    
-                }
-                else
-                {
-                        mDrawable->setPositionGroup(getPosition());
-                }
-
-                updateRadius();
-                mDrawable->updateBinRadius();
-                mDrawable->movePartition();
+                mDrawable->setPositionGroup((min+max)*0.5f);    
+                //bounding boxes changed, update texture priorities
+                updateTextures();
         }
-        
+
+        updateRadius();
+        mDrawable->movePartition();
+                        
         return res;
 }
 
-void LLVOVolume::updateRelativeXform(BOOL global_volume)
+void LLVOVolume::updateRelativeXform()
 {
         if (mVolumeImpl)
         {
-                mVolumeImpl->updateRelativeXform(global_volume);
+                mVolumeImpl->updateRelativeXform();
                 return;
         }
         
@@ -873,12 +896,25 @@ void LLVOVolume::updateRelativeXform(BOOL global_volume)
                                                                 LLVector4(y_axis, 0.f),
                                                                 LLVector4(z_axis, 0.f),
                                                                 LLVector4(delta_pos, 1.f));
-                                
-                x_axis.normVec();
-                y_axis.normVec();
-                z_axis.normVec();
+
                 
-                mRelativeXformInvTrans.setRows(x_axis, y_axis, z_axis);
+                // compute inverse transpose for normals
+                // mRelativeXformInvTrans.setRows(x_axis, y_axis, z_axis);
+                // mRelativeXformInvTrans.invert(); 
+                // mRelativeXformInvTrans.setRows(x_axis, y_axis, z_axis);
+                // grumble - invert is NOT a matrix invert, so we do it by hand:
+
+                LLMatrix3 rot_inverse = LLMatrix3(~delta_rot);
+
+                LLMatrix3 scale_inverse;
+                scale_inverse.setRows(LLVector3(1.0, 0.0, 0.0) / delta_scale.mV[VX],
+                                                          LLVector3(0.0, 1.0, 0.0) / delta_scale.mV[VY],
+                                                          LLVector3(0.0, 0.0, 1.0) / delta_scale.mV[VZ]);
+                                                           
+                
+                mRelativeXformInvTrans = rot_inverse * scale_inverse;
+
+                mRelativeXformInvTrans.transpose();
         }
         else
         {
@@ -905,34 +941,35 @@ void LLVOVolume::updateRelativeXform(BOOL global_volume)
                                                                 LLVector4(z_axis, 0.f),
                                                                 LLVector4(pos, 1.f));
 
-                x_axis.normVec();
-                y_axis.normVec();
-                z_axis.normVec();
-                                                                                                                                                                        
-                mRelativeXformInvTrans.setRows(x_axis, y_axis, z_axis);
+                // compute inverse transpose for normals
+                LLMatrix3 rot_inverse = LLMatrix3(~rot);
+
+                LLMatrix3 scale_inverse;
+                scale_inverse.setRows(LLVector3(1.0, 0.0, 0.0) / scale.mV[VX],
+                                                          LLVector3(0.0, 1.0, 0.0) / scale.mV[VY],
+                                                          LLVector3(0.0, 0.0, 1.0) / scale.mV[VZ]);
+                                                           
+                
+                mRelativeXformInvTrans = rot_inverse * scale_inverse;
+
+                mRelativeXformInvTrans.transpose();
         }
 }
 
 BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 {
         LLFastTimer t(LLFastTimer::FTM_UPDATE_PRIMITIVES);
-
+        
         if (mVolumeImpl != NULL)
         {
                 LLFastTimer t(LLFastTimer::FTM_GEN_FLEX);
                 BOOL res = mVolumeImpl->doUpdateGeometry(drawable);
                 updateFaceFlags();
-                if (res)
-                {
-                        drawable->clearState(LLDrawable::REBUILD_GEOMETRY);
-                }
-
                 return res;
         }
         
         BOOL compiled = FALSE;
-        BOOL change_shared = FALSE;
-                
+                        
         updateRelativeXform();
         
         if (mDrawable.isNull()) // Not sure why this is happening, but it is...
@@ -940,28 +977,23 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
                 return TRUE; // No update to complete
         }
 
-        calcAllTEsSame();
-        
-        if (mVolumeChanged || mFaceMappingChanged || change_shared)
+        if (mVolumeChanged || mFaceMappingChanged )
         {
                 compiled = TRUE;
                 mInited = TRUE;
 
+                if (mVolumeChanged)
                 {
                         LLFastTimer ftm(LLFastTimer::FTM_GEN_VOLUME);
                         LLVolumeParams volume_params = getVolume()->getParams();
                         setVolume(volume_params, 0);
-                }
-                drawable->setState(LLDrawable::REBUILD_GEOMETRY);
-                if (mVolumeChanged || change_shared)
-                {
-                        drawable->setState(LLDrawable::REBUILD_LIGHTING);
+                        drawable->setState(LLDrawable::REBUILD_VOLUME);
                 }
 
                 {
                         LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
                         regenFaces();
-                        genTriangles(FALSE);
+                        genBBoxes(FALSE);
                 }
         }
         else if (mLODChanged)
@@ -983,9 +1015,9 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
                 if (new_lod != old_lod)
                 {
                         compiled = TRUE;
-                        sNumLODChanges += (getAllTEsSame() ? 1 : getVolume()->getNumFaces());
+                        sNumLODChanges += getVolume()->getNumFaces();
         
-                        drawable->setState(LLDrawable::REBUILD_ALL); // for face->genVolumeTriangles()
+                        drawable->setState(LLDrawable::REBUILD_VOLUME); // for face->genVolumeTriangles()
 
                         {
                                 LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
@@ -993,7 +1025,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
                                 {
                                         regenFaces();
                                 }
-                                genTriangles(FALSE);
+                                genBBoxes(FALSE);
                         }
                 }
         }
@@ -1003,7 +1035,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
                 compiled = TRUE;
                 // All it did was move or we changed the texture coordinate offset
                 LLFastTimer t(LLFastTimer::FTM_GEN_TRIANGLES);
-                genTriangles(FALSE);
+                genBBoxes(FALSE);
         }
 
         // Update face flags
@@ -1018,11 +1050,16 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
         mLODChanged = FALSE;
         mFaceMappingChanged = FALSE;
 
-        drawable->clearState(LLDrawable::REBUILD_GEOMETRY);
-
         return TRUE;
 }
 
+void LLVOVolume::updateFaceSize(S32 idx)
+{
+        const LLVolumeFace& vol_face = getVolume()->getVolumeFace(idx);
+        LLFace* facep = mDrawable->getFace(idx);
+        facep->setSize(vol_face.mVertices.size(), vol_face.mIndices.size());
+}
+
 BOOL LLVOVolume::isRootEdit() const
 {
         if (mParent && !((LLViewerObject*)mParent)->isAvatar())
@@ -1034,178 +1071,121 @@ BOOL LLVOVolume::isRootEdit() const
 
 void LLVOVolume::setTEImage(const U8 te, LLViewerImage *imagep)
 {
-//      llinfos << "SetTEImage:" << llendl;
         BOOL changed = (mTEImages[te] != imagep);
         LLViewerObject::setTEImage(te, imagep);
-        if (mDrawable.notNull())
+        if (changed)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
 }
 
 S32 LLVOVolume::setTETexture(const U8 te, const LLUUID &uuid)
 {
-        BOOL changed = (uuid != getTE(te)->getID() || (uuid == LLUUID::null));
-
         S32 res = LLViewerObject::setTETexture(te, uuid);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return res;
 }
 
 S32 LLVOVolume::setTEColor(const U8 te, const LLColor4 &color)
 {
-        BOOL changed = (color != getTE(te)->getColor());
         S32 res = LLViewerObject::setTEColor(te, color);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-//                      mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return  res;
 }
 
 S32 LLVOVolume::setTEBumpmap(const U8 te, const U8 bumpmap)
 {
-        BOOL changed = (bumpmap != getTE(te)->getBumpmap());
         S32 res = LLViewerObject::setTEBumpmap(te, bumpmap);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return  res;
 }
 
 S32 LLVOVolume::setTETexGen(const U8 te, const U8 texgen)
 {
-        BOOL changed = (texgen != getTE(te)->getTexGen());
         S32 res = LLViewerObject::setTETexGen(te, texgen);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return  res;
 }
 
 S32 LLVOVolume::setTEShiny(const U8 te, const U8 shiny)
 {
-        BOOL changed = (shiny != getTE(te)->getShiny());
         S32 res = LLViewerObject::setTEShiny(te, shiny);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return  res;
 }
 
 S32 LLVOVolume::setTEFullbright(const U8 te, const U8 fullbright)
 {
-        BOOL changed = (fullbright != getTE(te)->getFullbright());
         S32 res = LLViewerObject::setTEFullbright(te, fullbright);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        if (!mDrawable->isState(LLDrawable::REBUILD_VOLUME))
-                        {
-                                updateFaceFlags();
-                        }
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return  res;
 }
 
 S32 LLVOVolume::setTEMediaFlags(const U8 te, const U8 media_flags)
 {
-        bool changed = (media_flags != getTE(te)->getMediaFlags());
         S32 res = LLViewerObject::setTEMediaFlags(te, media_flags);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return  res;
 }
 
 S32 LLVOVolume::setTEScale(const U8 te, const F32 s, const F32 t)
 {
-        F32 olds,oldt;
-        getTE(te)->getScale(&olds, &oldt);
-        bool changed = (s != olds || t != oldt);
         S32 res = LLViewerObject::setTEScale(te, s, t);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return res;
 }
 
 S32 LLVOVolume::setTEScaleS(const U8 te, const F32 s)
 {
-        F32 olds,oldt;
-        getTE(te)->getScale(&olds, &oldt);
-        bool changed = (s != olds);
         S32 res = LLViewerObject::setTEScaleS(te, s);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return res;
 }
 
 S32 LLVOVolume::setTEScaleT(const U8 te, const F32 t)
 {
-        F32 olds,oldt;
-        getTE(te)->getScale(&olds, &oldt);
-        bool changed = (t != oldt);
         S32 res = LLViewerObject::setTEScaleT(te, t);
-        if (mDrawable.notNull())
+        if (res)
         {
-                if (changed)
-                {
-                        calcAllTEsSame();
-                        mFaceMappingChanged = TRUE;
-                }
+                gPipeline.markTextured(mDrawable);
+                mFaceMappingChanged = TRUE;
         }
         return res;
 }
@@ -1214,137 +1194,11 @@ void LLVOVolume::updateTEData()
 {
         if (mDrawable.notNull())
         {
-                calcAllTEsSame();
                 mFaceMappingChanged = TRUE;
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY, TRUE);
+                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_MATERIAL, TRUE);
         }
 }
 
-BOOL LLVOVolume::calcAllTEsSame()
-{
-        BOOL is_alpha = FALSE;
-        BOOL was_same = mAllTEsSame;
-        BOOL all_same = TRUE;
-        S32 num_tes = getNumTEs();
-
-        LLViewerImage *first_texturep = getTEImage(0);
-        if (!first_texturep)
-        {
-                return FALSE;
-        }
-
-        const LLTextureEntry *tep = getTE(0);
-        if (!tep)
-        {
-                llwarns << "Volume with zero textures!" << llendl;
-                return FALSE;
-        }
-
-        if (tep->getColor().mV[3] != 1.f)
-        {
-                is_alpha = TRUE;
-        }
-        const LLColor4 first_color = tep->getColor();
-        const U8 first_bump = tep->getBumpShinyFullbright();
-        const U8 first_media_flags = tep->getMediaTexGen();
-
-        if (first_texturep->getComponents() == 4)
-        {
-                is_alpha = TRUE;
-        }
-
-        F32 s_scale, t_scale;
-        tep->getScale(&s_scale, &t_scale);
-
-        for (S32 f = 1; f < num_tes; f++)
-        {
-                LLViewerImage *texturep = getTEImage(f);
-                if (texturep != first_texturep)
-                {
-                        all_same = FALSE;
-                        break;
-                }
-
-                tep = getTE(f);
-
-                if( tep->getBumpShinyFullbright() != first_bump )
-                {
-                        all_same = FALSE;
-                        break;
-                }
-
-                if (first_bump)
-                {
-                        F32 cur_s, cur_t;
-                        tep->getScale(&cur_s, &cur_t);
-                        if ((cur_s != s_scale) || (cur_t != t_scale))
-                        {
-                                all_same = FALSE;
-                                break;
-                        }
-                }
-
-                if ((texturep->getComponents() == 4) || (tep->getColor().mV[3] != 1.f))
-                {
-                        if (!is_alpha)
-                        {
-                                all_same = FALSE;
-                                break;
-                        }
-                }
-                else if (is_alpha)
-                {
-                        all_same = FALSE;
-                        break;
-                }
-
-                if (tep->getColor() != first_color)
-                {
-                        all_same = FALSE;
-                        break;
-                }
-
-                if (tep->getMediaTexGen() != first_media_flags)
-                {
-                        all_same = FALSE;
-                        break;
-                }
-        }
-
-        mAllTEsSame = all_same;
-        if (was_same != all_same)
-        {
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE); // rebuild NOW
-                mFaceMappingChanged = TRUE;
-        }
-        return mAllTEsSame;
-}
-
-void LLVOVolume::setupSingleFace(S32 face_offset)
-{
-        S32 num_indices = 0;
-        S32 num_vertices = 0;
-
-        if (mDrawable.isNull())
-        {
-                llerrs << "setupSingleFace called with NULL mDrawable" << llendl;
-        }
-        if (face_offset >= mDrawable->getNumFaces())
-        {
-                llerrs << "setupSingleFace called with invalid face_offset" << llendl;
-        }
-        
-        const S32 num_faces = getVolume()->getNumFaces();
-        for (S32 i = 0; i < num_faces; i++)
-        {
-                const LLVolumeFace &vf = getVolume()->getVolumeFace(i);
-                num_vertices += vf.mVertices.size();
-                num_indices += vf.mIndices.size();
-        }
-        LLFace *facep = mDrawable->getFace(face_offset);
-        facep->setSize(num_vertices, num_indices);
-}
-
 //----------------------------------------------------------------------------
 
 void LLVOVolume::setIsLight(BOOL is_light)
@@ -1388,6 +1242,8 @@ void LLVOVolume::setLightColor(const LLColor3& color)
                 {
                         param_block->setColor(LLColor4(color, param_block->getColor().mV[3]));
                         parameterChanged(LLNetworkData::PARAMS_LIGHT, true);
+                        gPipeline.markTextured(mDrawable);
+                        mFaceMappingChanged = TRUE;
                 }
         }
 }
@@ -1551,7 +1407,7 @@ F32 LLVOVolume::calcLightAtPoint(const LLVector3& pos, const LLVector3& norm, LL
         LLVector3 light_dir = light_pos - pos;
         F32 dist = light_dir.normVec();
         F32 dp = norm * light_dir;
-        if ((gPipeline.getVertexShaderLevel(LLPipeline::SHADER_OBJECT) >= LLDrawPoolSimple::SHADER_LEVEL_LOCAL_LIGHTS))
+        if ((gPipeline.getLightingDetail() > 2))
         {
                 if (dp <= 0)
                 {
@@ -1590,7 +1446,7 @@ F32 LLVOVolume::calcLightAtPoint(const LLVector3& pos, const LLVector3& norm, LL
 BOOL LLVOVolume::updateLighting(BOOL do_lighting)
 {
         LLMemType mt1(LLMemType::MTYPE_DRAWABLE);
-
+#if 0
         if (mDrawable->isStatic())
         {
                 do_lighting = FALSE;
@@ -1600,31 +1456,31 @@ BOOL LLVOVolume::updateLighting(BOOL do_lighting)
         const LLMatrix3& mat_normal = LLMatrix3(mDrawable->getWorldRotation());
         
         LLVolume* volume = getVolume();
-        if (getAllTEsSame())
+
+        for (S32 i = 0; i < volume->getNumFaces(); i++)
         {
-                LLFace *face = mDrawable->getFace(mFaceIndexOffset);
-                S32 num_faces = volume->getNumFaces();
+                LLFace *face = mDrawable->getFace(i);
                 if (face && face->getGeomCount())
                 {
-                        face->genLighting(volume, mDrawable, 0, num_faces-1, mat_vert, mat_normal, do_lighting);
-                }
-        }
-        else
-        {
-                for (S32 i = 0; i < volume->getNumFaces(); i++)
-                {
-                        LLFace *face = mDrawable->getFace(i + mFaceIndexOffset);
-                        if (face && face->getGeomCount())
-                        {
-                                face->genLighting(volume, mDrawable, i, i, mat_vert, mat_normal, do_lighting);
-                        }
+                        face->genLighting(volume, mDrawable, i, i, mat_vert, mat_normal, do_lighting);
                 }
         }               
+#endif
         return TRUE;
 }
 
 //----------------------------------------------------------------------------
 
+U32 LLVOVolume::getVolumeInterfaceID() const
+{
+        if (mVolumeImpl)
+        {
+                return mVolumeImpl->getID();
+        }
+
+        return 0;
+}
+
 BOOL LLVOVolume::isFlexible() const
 {
         if (getParameterEntryInUse(LLNetworkData::PARAMS_FLEXIBLE))
@@ -1715,16 +1571,18 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
                 LLVector3 view_vector;
                 view_vector = view_point; 
 
+                //transform view vector into volume space
+                view_vector -= getRenderPosition();
+                mDrawable->mDistanceWRTCamera = view_vector.magVec();
+                LLQuaternion worldRot = getRenderRotation();
+                view_vector = view_vector * ~worldRot;
                 if (!isVolumeGlobal())
-                {       //transform view vector into volume space
-                        view_vector -= getRenderPosition();
-                        LLQuaternion worldRot = getRenderRotation();
-                        view_vector = view_vector * ~worldRot;
+                {
                         LLVector3 objScale = getScale();
                         LLVector3 invObjScale(1.f / objScale.mV[VX], 1.f / objScale.mV[VY], 1.f / objScale.mV[VZ]);
                         view_vector.scaleVec(invObjScale);
                 }
-
+                
                 updateRelativeXform();
                 volume->generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals, nodep->mSilhouetteSegments, view_vector, mRelativeXform, mRelativeXformInvTrans);
 
@@ -1732,33 +1590,15 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
         }
 }
 
-void LLVOVolume::deleteFaces(LLVOVolume* childp)
+void LLVOVolume::deleteFaces()
 {
-        S32 face_count = childp->mNumFaces;
-        S32 start_index = childp->mFaceIndexOffset;
+        S32 face_count = mNumFaces;
         if (mDrawable.notNull())
         {
-                mDrawable->deleteFaces(start_index, face_count);
-        }
-        if (mFaceIndexOffset > start_index)
-        {
-                mFaceIndexOffset -= face_count;
+                mDrawable->deleteFaces(0, face_count);
         }
 
-        for (U32 i = 0; i < mChildList.size(); i++)
-        {
-                LLViewerObject* siblingp = mChildList[i];
-                if (siblingp != childp)
-                {
-                        if (siblingp->getPCode() == LL_PCODE_VOLUME && 
-                                ((LLVOVolume*)siblingp)->mFaceIndexOffset > start_index)
-                        {
-                                ((LLVOVolume*)siblingp)->mFaceIndexOffset -= face_count;
-                        }
-                }
-        }
-        childp->mFaceIndexOffset = 0;
-        childp->mNumFaces = 0;
+        mNumFaces = 0;
 }
 
 void LLVOVolume::updateRadius()
@@ -1806,7 +1646,8 @@ const LLMatrix4 LLVOVolume::getRenderMatrix() const
 
 void LLVOVolume::writeCAL3D(apr_file_t* fp, std::string& path, std::string& file_base, S32 joint_num, LLVector3& pos, LLQuaternion& rot, S32& material_index, S32& texture_index, std::multimap<LLUUID, LLMaterialExportInfo*>& material_map)
 {
-        LLPointer<LLImageTGA> tga_image = new LLImageTGA;
+#if 0
+        LLImageTGA tga_image;
 
         if (mDrawable.isNull())
         {
@@ -1878,8 +1719,8 @@ void LLVOVolume::writeCAL3D(apr_file_t* fp, std::string& path, std::string& file
                                 my_texture = texture_index++;
 
                                 //...and export texture as image file
-                                char filename[MAX_PATH];
-                                sprintf(filename, "%s\\%s_material_tex_%d.tga", path.c_str(), file_base.c_str(), my_texture);
+                                char filename[MAX_PATH];                /* Flawfinder: ignore */
+                                snprintf(filename, MAX_PATH, "%s\\%s_material_tex_%d.tga", path.c_str(), file_base.c_str(), my_texture);                /* Flawfinder: ignore */
 
                                 LLViewerImage* imagep = facep->getTexture();
                                 if (imagep->getTexName() == 0)
@@ -1887,10 +1728,10 @@ void LLVOVolume::writeCAL3D(apr_file_t* fp, std::string& path, std::string& file
                                         llinfos << "No image data available for " << filename << llendl;
                                         continue;
                                 }
-                                LLPointer<LLImageRaw> raw_image = new LLImageRaw;
+                                LLImageRaw raw_image;
                                 imagep->readBackRaw(-1, raw_image);
-                                BOOL success = tga_image->encode(raw_image);
-                                success = tga_image->save(filename);
+                                BOOL success = tga_image.encode(raw_image);
+                                success = tga_image.save(filename);
                         }
 
                         material_info = new LLMaterialExportInfo(my_material, my_texture, face_color);
@@ -1931,6 +1772,7 @@ void LLVOVolume::writeCAL3D(apr_file_t* fp, std::string& path, std::string& file
         {
                 ((LLVOVolume*)(LLViewerObject*)mChildList[i])->writeCAL3D(fp, path, file_base, joint_num, final_pos, final_rot, material_index, texture_index, material_map);
         }
+#endif
 }
 
 //static
@@ -1961,10 +1803,67 @@ void LLVOVolume::parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_u
         }
 }
 
+void LLVOVolume::setSelected(BOOL sel)
+{
+        LLViewerObject::setSelected(sel);
+        if (mDrawable.notNull())
+        {
+                mDrawable->movePartition();
+        }
+}
+
 void LLVOVolume::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
 {               
 }
 
+F32 LLVOVolume::getBinRadius()
+{
+        F32 radius;
+        
+        const LLVector3* ext = mDrawable->getSpatialExtents();
+        
+        BOOL shrink_wrap = mDrawable->isAnimating();
+        BOOL alpha_wrap = FALSE;
+
+        if (!isHUDAttachment())
+        {
+                for (S32 i = 0; i < mDrawable->getNumFaces(); i++)
+                {
+                        if (mDrawable->getFace(i)->getPoolType() == LLDrawPool::POOL_ALPHA)
+                        {
+                                alpha_wrap = TRUE;
+                                break;
+                        }
+                }
+        }
+        else
+        {
+                shrink_wrap = FALSE;
+        }
+
+        if (alpha_wrap)
+        {
+                LLVector3 bounds = getScale();
+                radius = llmin(bounds.mV[1], bounds.mV[2]);
+                radius = llmin(radius, bounds.mV[0]);
+                radius *= 0.5f;
+        }
+        else if (shrink_wrap)
+        {
+                radius = (ext[1]-ext[0]).magVec()*0.5f;
+        }
+        else if (mDrawable->isStatic())
+        {
+                radius = 32.f;
+        }
+        else
+        {
+                radius = 8.f;
+        }
+
+        return llclamp(radius, 0.5f, 256.f);
+}
+
 const LLVector3 LLVOVolume::getPivotPositionAgent() const
 {
         if (mVolumeImpl)
@@ -1980,6 +1879,8 @@ void LLVOVolume::onShift(const LLVector3 &shift_vector)
         {
                 mVolumeImpl->onShift(shift_vector);
         }
+
+        updateRelativeXform();
 }
 
 const LLMatrix4& LLVOVolume::getWorldMatrix(LLXformMatrix* xform) const
@@ -1993,14 +1894,9 @@ const LLMatrix4& LLVOVolume::getWorldMatrix(LLXformMatrix* xform) const
 
 LLVector3 LLVOVolume::agentPositionToVolume(const LLVector3& pos) const
 {
-        if (isVolumeGlobal())
-        {
-                return pos;
-        }
-        
         LLVector3 ret = pos - getRenderPosition();
         ret = ret * ~getRenderRotation();
-        LLVector3 objScale = getScale();
+        LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
         LLVector3 invObjScale(1.f / objScale.mV[VX], 1.f / objScale.mV[VY], 1.f / objScale.mV[VZ]);
         ret.scaleVec(invObjScale);
         
@@ -2009,7 +1905,7 @@ LLVector3 LLVOVolume::agentPositionToVolume(const LLVector3& pos) const
 
 LLVector3 LLVOVolume::agentDirectionToVolume(const LLVector3& dir) const
 {
-        return isVolumeGlobal() ? dir : (dir * ~getRenderRotation());
+        return dir * ~getRenderRotation();
 }
 
 LLVector3 LLVOVolume::volumePositionToAgent(const LLVector3& dir) const
@@ -2024,6 +1920,9 @@ LLVector3 LLVOVolume::volumePositionToAgent(const LLVector3& dir) const
 
 BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const
 {
+        return FALSE;
+        
+#if 0 // needs to be rewritten to use face extents instead of volume bounds
         LLVolume* volume = getVolume();
         BOOL ret = FALSE;
         if (volume)
@@ -2043,4 +1942,561 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) co
                 }
         }
         return ret;
+#endif
+}
+
+U32 LLVOVolume::getPartitionType() const
+{
+        if (isHUDAttachment())
+        {
+                return LLPipeline::PARTITION_HUD;
+        }
+
+        return LLPipeline::PARTITION_VOLUME;
+}
+
+LLVolumePartition::LLVolumePartition()
+: LLSpatialPartition(LLVOVolume::VERTEX_DATA_MASK, FALSE)
+{
+        mLODPeriod = 16;
+        mDepthMask = FALSE;
+        mDrawableType = LLPipeline::RENDER_TYPE_VOLUME;
+        mPartitionType = LLPipeline::PARTITION_VOLUME;
+        mSlopRatio = 0.25f;
+        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
+        mImageEnabled = TRUE;
+}
+
+LLVolumeBridge::LLVolumeBridge(LLDrawable* drawablep)
+: LLSpatialBridge(drawablep, LLVOVolume::VERTEX_DATA_MASK)
+{
+        mDepthMask = FALSE;
+        mLODPeriod = 16;
+        mDrawableType = LLPipeline::RENDER_TYPE_VOLUME;
+        mPartitionType = LLPipeline::PARTITION_BRIDGE;
+        
+        mBufferUsage = GL_DYNAMIC_DRAW_ARB;
+
+        mSlopRatio = 0.25f;
+}
+
+void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, U32 type)
+{
+        LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
+
+        if (facep->getViewerObject()->isSelected() && gHideSelectedObjects)
+        {
+                return;
+        }
+
+        //add face to drawmap
+        std::vector<LLDrawInfo*>& draw_vec = group->mDrawMap[type];
+
+        S32 idx = draw_vec.size()-1;
+
+
+        BOOL fullbright = (type == LLRenderPass::PASS_FULLBRIGHT ||
+                                          type == LLRenderPass::PASS_ALPHA) ? facep->isState(LLFace::FULLBRIGHT) : FALSE;
+
+        const LLMatrix4* tex_mat = NULL;
+        if (type != LLRenderPass::PASS_SHINY && facep->isState(LLFace::TEXTURE_ANIM))
+        {
+                tex_mat = &(facep->mTextureMatrix);     
+        }
+
+        U8 bump = (type == LLRenderPass::PASS_BUMP ? facep->getTextureEntry()->getBumpmap() : 0);
+        
+        //LLViewerImage* tex = facep->mAppAngle < FORCE_SIMPLE_RENDER_ANGLE ? NULL : facep->getTexture();
+        LLViewerImage* tex = facep->getTexture();
+
+        if (type == LLRenderPass::PASS_GLOW)
+        {
+                U32 start = facep->getGeomIndex();
+                U32 end = start + facep->getGeomCount()-1;
+                U32 offset = facep->getIndicesStart();
+                U32 count = facep->getIndicesCount();
+                LLDrawInfo* draw_info = new LLDrawInfo(start,end,count,offset,tex, 
+                        facep->mVertexBuffer, fullbright, bump); 
+                draw_info->mVSize = facep->getVirtualSize();
+                draw_vec.push_back(draw_info);
+                LLVOVolume* volume = (LLVOVolume*) facep->getViewerObject();
+                BOOL is_light = volume->mDrawable->isLight();
+
+//              U8 alpha = is_light ? 196 : 160;
+                LLColor3 col = is_light ? volume->getLightColor() : LLColor3(0,0,0);
+                LLColor4 col2 = facep->getRenderColor();
+                draw_info->mGlowColor.setVec((U8) (col.mV[0]*col2.mV[0]*255),
+                                                                        (U8) (col.mV[1]*col2.mV[1]*255),
+                                                                        (U8) (col.mV[2]*col2.mV[2]*255),
+                                                                        196);                                   
+                draw_info->mTextureMatrix = tex_mat;
+                validate_draw_info(*draw_info);
+        }
+        else if (idx >= 0 && 
+                draw_vec[idx]->mVertexBuffer == facep->mVertexBuffer &&
+                draw_vec[idx]->mEnd == facep->getGeomIndex()-1 &&
+                draw_vec[idx]->mTexture == tex &&
+#if LL_DARWIN
+                draw_vec[idx]->mEnd - draw_vec[idx]->mStart + facep->getGeomCount() <= (U32) gGLManager.mGLMaxVertexRange &&
+                draw_vec[idx]->mCount + facep->getIndicesCount() <= (U32) gGLManager.mGLMaxIndexRange &&
+#endif
+                draw_vec[idx]->mFullbright == fullbright &&
+                draw_vec[idx]->mBump == bump &&
+                draw_vec[idx]->mTextureMatrix == tex_mat)
+        {
+                draw_vec[idx]->mCount += facep->getIndicesCount();
+                draw_vec[idx]->mEnd += facep->getGeomCount();
+                draw_vec[idx]->mVSize = llmax(draw_vec[idx]->mVSize, facep->getVirtualSize());
+                validate_draw_info(*draw_vec[idx]);
+        }
+        else
+        {
+                U32 start = facep->getGeomIndex();
+                U32 end = start + facep->getGeomCount()-1;
+                U32 offset = facep->getIndicesStart();
+                U32 count = facep->getIndicesCount();
+                LLDrawInfo* draw_info = new LLDrawInfo(start,end,count,offset,tex, 
+                        facep->mVertexBuffer, fullbright, bump); 
+                draw_info->mVSize = facep->getVirtualSize();
+                draw_vec.push_back(draw_info);
+                draw_info->mReflectionMap = group->mReflectionMap;
+                draw_info->mTextureMatrix = tex_mat;
+                validate_draw_info(*draw_info);
+        }
+}
+
+void LLVolumeGeometryManager::getGeometry(LLSpatialGroup* group)
+{
+
+}
+
+void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
+{
+        if (group->changeLOD())
+        {
+                group->mLastUpdateDistance = group->mDistance;
+        }
+
+        group->mLastUpdateViewAngle = group->mViewAngle;
+
+        if (!group->isState(LLSpatialGroup::GEOM_DIRTY |
+                                                LLSpatialGroup::ALPHA_DIRTY))
+        {
+                return;
+        }
+
+        group->mBuilt = 1.f;
+        LLFastTimer ftm(LLFastTimer::FTM_REBUILD_VBO);  
+
+        LLFastTimer ftm2(LLFastTimer::FTM_REBUILD_VOLUME_VB);
+
+        //find reflection map
+        if (group->mSpatialPartition->mImageEnabled)
+        {
+                if (group->mReflectionMap.isNull())
+                {
+                        LLSpatialGroup* parent = group->getParent();
+                        while (parent && group->mReflectionMap.isNull())
+                        {
+                                group->mReflectionMap = parent->mReflectionMap;
+                                parent = parent->getParent();
+                        }
+                }
+        }
+
+        group->clearDrawMap();
+
+        mFaceList.clear();
+
+        std::vector<LLFace*> alpha_faces;
+        U32 vertex_count = 0;
+        U32 index_count = 0;
+        U32 useage = group->mSpatialPartition->mBufferUsage;
+
+        //get all the faces into a list, putting alpha faces in their own list
+        for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+        {
+                LLDrawable* drawablep = *drawable_iter;
+                
+                if (drawablep->isDead())
+                {
+                        continue;
+                }
+        
+                if (drawablep->isAnimating())
+                { //fall back to stream draw for animating verts
+                        useage = GL_STREAM_DRAW_ARB;
+                }
+
+                LLVOVolume* vobj = drawablep->getVOVolume();
+
+                //for each face
+                for (S32 i = 0; i < drawablep->getNumFaces(); i++)
+                {
+                        //sum up face verts and indices
+                        drawablep->updateFaceSize(i);
+                        LLFace* facep = drawablep->getFace(i);
+                        if (facep->hasGeometry() && facep->mPixelArea > FORCE_CULL_AREA)
+                        {
+                                const LLTextureEntry* te = facep->getTextureEntry();
+                                LLViewerImage* tex = facep->getTexture();
+
+                                BOOL force_simple = (facep->mPixelArea < FORCE_SIMPLE_RENDER_AREA);
+                                U32 type = gPipeline.getPoolTypeFromTE(te, tex);
+                                if (type != LLDrawPool::POOL_ALPHA && force_simple)
+                                {
+                                        type = LLDrawPool::POOL_SIMPLE;
+                                }
+                                facep->setPoolType(type);
+
+                                if (vobj->isHUDAttachment())
+                                {
+                                        facep->setState(LLFace::FULLBRIGHT);
+                                }
+
+                                if (vobj->mTextureAnimp && vobj->mTexAnimMode)
+                                {
+                                        if (vobj->mTextureAnimp->mFace <= -1)
+                                        {
+                                                S32 face;
+                                                for (face = 0; face < vobj->getNumTEs(); face++)
+                                                {
+                                                        drawablep->getFace(face)->setState(LLFace::TEXTURE_ANIM);
+                                                }
+                                        }
+                                        else if (vobj->mTextureAnimp->mFace < vobj->getNumTEs())
+                                        {
+                                                drawablep->getFace(vobj->mTextureAnimp->mFace)->setState(LLFace::TEXTURE_ANIM);
+                                        }
+                                }
+
+                                if (type == LLDrawPool::POOL_ALPHA)
+                                {
+                                        vertex_count += facep->getGeomCount();
+                                        index_count += facep->getIndicesCount();
+                                        alpha_faces.push_back(facep);
+                                }
+                                else
+                                {
+                                        if (drawablep->isState(LLDrawable::REBUILD_VOLUME))
+                                        {
+                                                facep->mLastUpdateTime = gFrameTimeSeconds;
+                                        }
+                                        mFaceList.push_back(facep);
+                                }
+                        }
+                        else
+                        {       //face has no renderable geometry
+                                facep->mVertexBuffer = NULL;
+                                facep->mLastVertexBuffer = NULL;
+                                //don't alpha wrap drawables that have only tiny tiny alpha faces
+                                facep->setPoolType(LLDrawPool::POOL_SIMPLE);
+                        }
+
+                        vobj->updateTextures();
+                }
+        }
+
+        group->mVertexCount = vertex_count;
+        group->mIndexCount = index_count;
+        group->mBufferUsage = useage;
+
+        LLStrider<LLVector3> vertices;
+        LLStrider<LLVector3> normals;
+        LLStrider<LLVector2> texcoords2;
+        LLStrider<LLVector2> texcoords;
+        LLStrider<LLColor4U> colors;
+        LLStrider<U32> indices;
+
+        //PROCESS NON-ALPHA FACES
+        {
+                //sort faces by texture
+                std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareTextureAndTime());
+                
+                std::vector<LLFace*>::iterator face_iter = mFaceList.begin();
+                
+                LLSpatialGroup::buffer_map_t buffer_map;
+
+                while (face_iter != mFaceList.end())
+                {
+                        //pull off next face
+                        LLFace* facep = *face_iter;
+                        LLViewerImage* tex = facep->getTexture();
+
+                        U32 index_count = facep->getIndicesCount();
+                        U32 geom_count = facep->getGeomCount();
+
+                        //sum up vertices needed for this texture
+                        std::vector<LLFace*>::iterator i = face_iter;
+                        ++i;
+                        while (i != mFaceList.end() && (*i)->getTexture() == tex)
+                        {
+                                facep = *i;
+                                ++i;
+                                index_count += facep->getIndicesCount();
+                                geom_count += facep->getGeomCount();
+                        }
+                
+                        //create/delete/resize vertex buffer if needed
+                        LLVertexBuffer* buffer = NULL;
+                        LLSpatialGroup::buffer_map_t::iterator found_iter = group->mBufferMap.find(tex);
+                        if (found_iter != group->mBufferMap.end())
+                        {
+                                buffer = found_iter->second;
+                        }
+                                                
+                        if (!buffer)
+                        { //create new buffer if needed
+                                buffer = createVertexBuffer(group->mSpatialPartition->mVertexDataMask, 
+                                                                                                group->mBufferUsage);
+                                buffer->allocateBuffer(geom_count, index_count, TRUE);
+                        }
+                        else 
+                        {
+                                if (LLVertexBuffer::sEnableVBOs && buffer->getUsage() != group->mBufferUsage)
+                                {
+                                        buffer = createVertexBuffer(group->mSpatialPartition->mVertexDataMask, 
+                                                                                                group->mBufferUsage);
+                                        buffer->allocateBuffer(geom_count, index_count, TRUE);
+                                }
+                                else
+                                {
+                                        buffer->resizeBuffer(geom_count, index_count);
+                                }
+                        }
+
+                        BOOL clean = TRUE;
+                        buffer_map[tex] = buffer;
+
+                        //add face geometry
+                
+                        //get vertex buffer striders
+                        buffer->getVertexStrider(vertices);
+                        buffer->getNormalStrider(normals);
+                        buffer->getTexCoordStrider(texcoords);
+                        buffer->getTexCoord2Strider(texcoords2);
+                        buffer->getColorStrider(colors);
+                        buffer->getIndexStrider(indices);
+
+                        U32 indices_index = 0;
+                        U32 index_offset = 0;
+
+                        while (face_iter < i)
+                        {
+                                facep = *face_iter;
+                                LLDrawable* drawablep = facep->getDrawable();
+                                LLVOVolume* vobj = drawablep->getVOVolume();
+                                LLVolume* volume = vobj->getVolume();
+
+                                U32 te_idx = facep->getTEOffset();
+                                facep->mIndicesIndex = indices_index;
+                                facep->mGeomIndex = index_offset;
+                                facep->mVertexBuffer = buffer;
+                                {
+                                        if (facep->getGeometryVolume(*volume, te_idx, vertices, normals, texcoords, texcoords2, colors, indices, 
+                                                vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), index_offset))
+                                        {
+                                                clean = FALSE;
+                                                buffer->markDirty(facep->getGeomIndex(), facep->getGeomCount(), 
+                                                        facep->getIndicesStart(), facep->getIndicesCount());
+                                        }
+                                }
+
+                                indices_index += facep->mIndicesCount;
+
+                                BOOL force_simple = facep->mPixelArea < FORCE_SIMPLE_RENDER_AREA;
+                                BOOL fullbright = facep->isState(LLFace::FULLBRIGHT);
+                                const LLTextureEntry* te = facep->getTextureEntry();
+
+                                if (tex->getPrimaryFormat() == GL_ALPHA)
+                                {
+                                        registerFace(group, facep, LLRenderPass::PASS_INVISIBLE);
+                                }
+                                else if (fullbright)
+                                {
+                                        registerFace(group, facep, LLRenderPass::PASS_FULLBRIGHT);
+                                }
+                                else
+                                {
+                                        registerFace(group, facep, LLRenderPass::PASS_SIMPLE);
+                                }
+
+                                facep->setPoolType(LLDrawPool::POOL_SIMPLE);
+
+                                if (te->getShiny())
+                                {
+                                        registerFace(group, facep, LLRenderPass::PASS_SHINY);
+                                }
+
+                                if (!force_simple && te->getBumpmap())
+                                {
+                                        registerFace(group, facep, LLRenderPass::PASS_BUMP);
+                                }
+
+                                if (vobj->getIsLight())
+                                {
+                                        registerFace(group, facep, LLRenderPass::PASS_GLOW);
+                                }
+                                
+
+                                ++face_iter;
+                        }
+
+                        if (clean)
+                        {
+                                buffer->markClean();
+                        }
+                }
+
+                group->mBufferMap.clear();
+                for (LLSpatialGroup::buffer_map_t::iterator i = buffer_map.begin(); i != buffer_map.end(); ++i)
+                {
+                        group->mBufferMap[i->first] = i->second;
+                }
+        }
+
+        //PROCESS ALPHA FACES
+        if (!alpha_faces.empty())
+        {
+                //sort alpha faces by distance
+                std::sort(alpha_faces.begin(), alpha_faces.end(), LLFace::CompareDistanceGreater());
+
+                //store alpha faces in root vertex buffer
+                if (group->mVertexBuffer.isNull() || (LLVertexBuffer::sEnableVBOs && group->mBufferUsage != group->mVertexBuffer->getUsage()))
+                {
+                        group->mVertexBuffer = createVertexBuffer(group->mSpatialPartition->mVertexDataMask, 
+                                                                                                          group->mBufferUsage);
+                        group->mVertexBuffer->allocateBuffer(group->mVertexCount, group->mIndexCount, true);
+                        stop_glerror();
+                }
+                else
+                {
+                        group->mVertexBuffer->resizeBuffer(group->mVertexCount, group->mIndexCount);
+                        stop_glerror();
+                }
+
+                //get vertex buffer striders
+                LLVertexBuffer* buffer = group->mVertexBuffer;
+
+                BOOL clean = TRUE;
+
+                buffer->getVertexStrider(vertices);
+                buffer->getNormalStrider(normals);
+                buffer->getTexCoordStrider(texcoords);
+                buffer->getTexCoord2Strider(texcoords2);
+                buffer->getColorStrider(colors);
+                buffer->getIndexStrider(indices);
+
+                U32 index_offset = 0;
+                U32 indices_index = 0;
+
+                for (std::vector<LLFace*>::iterator i = alpha_faces.begin(); i != alpha_faces.end(); ++i)
+                {
+                        LLFace* facep = *i;
+                        LLDrawable* drawablep = facep->getDrawable();
+                        LLVOVolume* vobj = drawablep->getVOVolume();
+                        LLVolume* volume = vobj->getVolume();
+
+                        U32 te_idx = facep->getTEOffset();
+                        facep->mIndicesIndex = indices_index;
+                        facep->mGeomIndex = index_offset;
+                        facep->mVertexBuffer = group->mVertexBuffer;
+                        if (facep->getGeometryVolume(*volume, te_idx, vertices, normals, texcoords, texcoords2, colors, indices, 
+                                vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), index_offset))
+                        {
+                                clean = FALSE;
+                                buffer->markDirty(facep->getGeomIndex(), facep->getGeomCount(), 
+                                        facep->getIndicesStart(), facep->getIndicesCount());
+                        }
+
+                        indices_index += facep->mIndicesCount;
+
+                        registerFace(group, facep, LLRenderPass::PASS_ALPHA);
+                }
+
+                if (clean)
+                {
+                        buffer->markClean();
+                }
+        }
+        else
+        {
+                group->mVertexBuffer = NULL;
+        }
+
+        //get all the faces into a list, putting alpha faces in their own list
+        for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+        {
+                LLDrawable* drawablep = *drawable_iter;
+                drawablep->clearState(LLDrawable::REBUILD_ALL);
+        }
+
+        group->mLastUpdateTime = gFrameTimeSeconds;
+        group->clearState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::MATRIX_DIRTY |
+                                                LLSpatialGroup::ALPHA_DIRTY);
+
+        mFaceList.clear();
 }
+
+void LLGeometryManager::addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32 &index_count)
+{       
+        //initialize to default usage for this partition
+        U32 usage = group->mSpatialPartition->mBufferUsage;
+        
+        //clear off any old faces
+        mFaceList.clear();
+
+        //for each drawable
+        for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+        {
+                LLDrawable* drawablep = *drawable_iter;
+                
+                if (drawablep->isDead())
+                {
+                        continue;
+                }
+        
+                if (drawablep->isAnimating())
+                { //fall back to stream draw for animating verts
+                        usage = GL_STREAM_DRAW_ARB;
+                }
+
+                //for each face
+                for (S32 i = 0; i < drawablep->getNumFaces(); i++)
+                {
+                        //sum up face verts and indices
+                        drawablep->updateFaceSize(i);
+                        LLFace* facep = drawablep->getFace(i);
+                        if (facep->hasGeometry() && facep->mPixelArea > FORCE_CULL_AREA)
+                        {
+                                vertex_count += facep->getGeomCount();
+                                index_count += facep->getIndicesCount();
+
+                                //remember face (for sorting)
+                                mFaceList.push_back(facep);
+                        }
+                        else
+                        {
+                                facep->mVertexBuffer = NULL;
+                                facep->mLastVertexBuffer = NULL;
+                        }
+                }
+        }
+        
+        group->mBufferUsage = usage;
+}
+
+LLHUDPartition::LLHUDPartition()
+{
+        mPartitionType = LLPipeline::PARTITION_HUD;
+        mDrawableType = LLPipeline::RENDER_TYPE_HUD;
+        mSlopRatio = 0.f;
+        mLODPeriod = 16;
+}
+
+void LLHUDPartition::shift(const LLVector3 &offset)
+{
+        //HUD objects don't shift with region crossing.  That would be silly.
+}
+
+
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 2c12f12..9fb8ca4 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -29,6 +29,7 @@
 #define LL_LLVOVOLUME_H
 
 #include "llviewerobject.h"
+#include "llspatialpartition.h"
 #include "llviewerimage.h"
 #include "llframetimer.h"
 #include "llapr.h"
@@ -60,7 +61,8 @@ public:
         virtual bool isVolumeGlobal() const = 0; // Are we in global space?
         virtual bool isActive() const = 0; // Is this object currently active?
         virtual const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const = 0;
-        virtual void updateRelativeXform(BOOL global_volume = FALSE) = 0;
+        virtual void updateRelativeXform() = 0;
+        virtual U32 getID() const = 0;
 };
 
 // Class which embodies all Volume objects (with pcode LL_PCODE_VOLUME)
@@ -69,18 +71,26 @@ class LLVOVolume : public LLViewerObject
 public:
         static          void    initClass();
         static          void    preUpdateGeom();
-        static          F32             getTextureVirtualSize(const LLFace* face);
-        
-        BOOL mWereAllTEsSame;
         
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD2) |
+                                                        (1 << LLVertexBuffer::TYPE_COLOR)
+        }
+        eVertexDataMask;
+
 public:
                                                 LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
         virtual                         ~LLVOVolume();
 
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
 
-                                void    deleteFaces(LLVOVolume* childp);
+                                void    deleteFaces();
 
+                                void    animateTextures();
         /*virtual*/ BOOL        idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
 
         /*virtual*/ BOOL        isActive() const;
@@ -89,8 +99,7 @@ public:
         /*virtual*/ BOOL        isHUDAttachment() const;
 
                                 void    generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
-
-                                BOOL    getAllTEsSame() const                                   { return mAllTEsSame; }
+        /*virtual*/     void    setParent(LLViewerObject* parent);
                                 F32             getIndividualRadius()                                   { return mRadius; }
                                 S32             getLOD() const                                                  { return mLOD; }
         const LLVector3         getPivotPositionAgent() const;
@@ -105,6 +114,7 @@ public:
 
                                 
                                 BOOL    getVolumeChanged() const                                { return mVolumeChanged; }
+                                F32             getTextureVirtualSize(LLFace* face);
         /*virtual*/ F32         getRadius() const                                               { return mVObjRadius; };
                                 const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const;
 
@@ -120,6 +130,7 @@ public:
                                                                                         U32 block_num, const EObjectUpdateType update_type,
                                                                                         LLDataPacker *dp);
 
+        /*virtual*/ void        setSelected(BOOL sel);
         /*virtual*/ BOOL        setDrawableParent(LLDrawable* parentp);
 
         /*virtual*/ void        setScale(const LLVector3 &scale, BOOL damped);
@@ -140,17 +151,19 @@ public:
                                 void    setTexture(const S32 face);
 
         /*virtual*/ BOOL        setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false);
-                                void    updateRelativeXform(BOOL global_volume = FALSE);
+                                void    updateRelativeXform();
         /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
+        /*virtual*/ void        updateFaceSize(S32 idx);
         /*virtual*/ BOOL        updateLOD();
                                 void    updateRadius();
         /*virtual*/ void        updateTextures(LLAgent &agent);
-                                void    updateTextures(S32 lod);
+                                void    updateTextures();
 
                                 void    updateFaceFlags();
                                 void    regenFaces();
-                                BOOL    genTriangles(BOOL force_global);
+                                BOOL    genBBoxes(BOOL force_global);
         virtual         void    updateSpatialExtents(LLVector3& min, LLVector3& max);
+        virtual         F32             getBinRadius();
         virtual         void    writeCAL3D(apr_file_t* fp, 
                                                         std::string& path,
                                                         std::string& file_base,
@@ -161,6 +174,9 @@ public:
                                                         S32& texture_index, 
                                                         std::multimap<LLUUID, LLMaterialExportInfo*>& material_map);
 
+
+        virtual U32 getPartitionType() const;
+
         // For Lights
         void setIsLight(BOOL is_light);
         void setLightColor(const LLColor3& color);
@@ -178,6 +194,7 @@ public:
         F32 getLightDistance(const LLVector3& pos) const; // returns < 0 if inside radius
 
         // Flexible Objects
+        U32 getVolumeInterfaceID() const;
         virtual BOOL isFlexible() const;
         BOOL isVolumeGlobal() const;
         BOOL canBeFlexible() const;
@@ -188,24 +205,21 @@ public:
         BOOL updateLighting(BOOL do_lighting);
 
 protected:
-        F32     computeLODProfilePathComplexityBias();
         S32     computeLODDetail(F32    distance, F32 radius);
         BOOL calcLOD();
-        void setupSingleFace(S32 face_offset); // Set up the face for combined volumes.
         LLFace* addFace(S32 face_index);
         void updateTEData();
-        BOOL calcAllTEsSame();
 
 public:
         LLViewerTextureAnim *mTextureAnimp;
-
+        U8 mTexAnimMode;
 protected:
         friend class LLDrawable;
         
-        BOOL            mAllTEsSame; // All TE's have the same pool/texture
         BOOL            mFaceMappingChanged;
         BOOL            mGlobalVolume;
         BOOL            mInited;
+        LLFrameTimer mTextureUpdateTimer;
         S32                     mLOD;
         BOOL            mLODChanged;
         F32                     mRadius;
@@ -218,8 +232,6 @@ protected:
         // statics
 public:
         static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop 
-        static F32 sLODComplexityDistanceBias;    // Changing this to zero makes all prims LOD at the same distance, 
-                                                                                  // regardless of complexity
         static F32 sLODFactor;                          // LOD scale factor
         static F32 sDistanceFactor;                     // LOD distance factor
                 
diff --git a/linden/indra/newview/llvowater.cpp b/linden/indra/newview/llvowater.cpp
index 55a7020..a57aa8b 100644
--- a/linden/indra/newview/llvowater.cpp
+++ b/linden/indra/newview/llvowater.cpp
@@ -64,22 +64,8 @@ const F32 WAVE_STEP_INV	= (1. / WAVE_STEP);
 
 const F32 g                             = 9.81f;          // gravitational constant (m/s^2)
 
-///////////////////////////////////
-
-LLWaterSurface::LLWaterSurface() :
-        mInitialized(FALSE),
-        mWind(9, 0, 0),
-        mA(0.2f),
-        mVisc(0.001f),
-        mShininess(8.0f)
-{}
-
-
-LLWaterGrid *LLVOWater::sGrid = 0;
-
-
 LLVOWater::LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLViewerObject(id, LL_VO_WATER, regionp)
+:       LLStaticViewerObject(id, LL_VO_WATER, regionp)
 {
         // Terrain must draw during selection passes so it can block objects behind it.
         mbCanSelect = FALSE;
@@ -113,18 +99,6 @@ void LLVOWater::updateTextures(LLAgent &agent)
 {
 }
 
-// virtual
-void LLVOWater::updateDrawable(BOOL force_damped)
-{
-        // Force an immediate rebuild on any update
-        if (mDrawable.notNull())
-        {
-                gPipeline.updateMoveNormalAsync(mDrawable);
-                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL, TRUE);
-        }
-        clearChanged(SHIFTED);
-}
-
 // Never gets called
 BOOL LLVOWater::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
@@ -161,17 +135,13 @@ LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline)
 
 BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
 {
-        return updateGeometryFlat(drawable);
-}
-
-
-BOOL LLVOWater::updateGeometryFlat(LLDrawable *drawable)
-{
+        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WATER);
         LLFace *face;
 
         if (drawable->getNumFaces() < 1)
         {
-                drawable->addFace(gPipeline.getPool(LLDrawPool::POOL_WATER), NULL);
+                LLDrawPoolWater *poolp = (LLDrawPoolWater*) gPipeline.getPool(LLDrawPool::POOL_WATER);
+                drawable->addFace(poolp, NULL);
         }
         face = drawable->getFace(0);
 
@@ -180,15 +150,26 @@ BOOL LLVOWater::updateGeometryFlat(LLDrawable *drawable)
 
         LLStrider<LLVector3> verticesp, normalsp;
         LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
+        LLStrider<U32> indicesp;
         S32 index_offset;
 
         S32 size = 16;
 
-        S32 num_quads = size*size;
-
-        face->setPrimType(LLTriangles);
-        face->setSize(4*num_quads, 6*num_quads);
+        if (face->mVertexBuffer.isNull())
+        {
+                S32 num_quads = size*size;      
+                face->setSize(4*num_quads, 6*num_quads);
+                
+                face->mVertexBuffer = new LLVertexBuffer(LLDrawPoolWater::VERTEX_DATA_MASK, GL_DYNAMIC_DRAW_ARB);
+                face->mVertexBuffer->allocateBuffer(4*num_quads, 6*num_quads, TRUE);
+                face->setIndicesIndex(0);
+                face->setGeomIndex(0);
+        }
+        else
+        {
+                face->mVertexBuffer->resizeBuffer(face->getGeomCount(), face->getIndicesCount());
+        }
+                
         index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
         if (-1 == index_offset)
         {
@@ -198,6 +179,7 @@ BOOL LLVOWater::updateGeometryFlat(LLDrawable *drawable)
         LLVector3 position_agent;
         position_agent = getPositionAgent();
         face->mCenterAgent = position_agent;
+        face->mCenterLocal = position_agent;
 
         S32 x, y;
         F32 step_x = getScale().mV[0] / size;
@@ -256,378 +238,20 @@ BOOL LLVOWater::updateGeometryFlat(LLDrawable *drawable)
                         *indicesp++ = toffset + 2;
                 }
         }
-
-
-        mDrawable->movePartition();
-        LLPipeline::sCompiles++;
-        return TRUE;
-}
-
-
-BOOL LLVOWater::updateGeometryHeightFieldRoam(LLDrawable *drawable)
-{
-        LLVector3 position_agent = getPositionAgent();
-        const LLVector3 region_size = getScale();
-        const LLVector3 region_origin = position_agent - region_size * 0.5f;
-
-        S32 patch_origx = llround(region_origin.mV[VX] - sGrid->mRegionOrigin.mV[VX]) / sGrid->mRegionWidth;
-        S32 patch_origy = llround(region_origin.mV[VY] - sGrid->mRegionOrigin.mV[VY]) / sGrid->mRegionWidth;
-        S32 patch_dimx = llround(region_size.mV[VX]) / sGrid->mRegionWidth;
-        S32 patch_dimy = llround(region_size.mV[VY]) / sGrid->mRegionWidth;
-
-        static S32 res = (S32)sGrid->mPatchRes;
-        if (patch_origx < 0)
-        {
-                patch_dimx -= - patch_origx;
-                if (patch_dimx < 1)
-                {
-                        return TRUE;
-                }
-                patch_origx = 0;
-        }
-        if (patch_origy < 0)
-        {
-                patch_dimy -= - patch_origy;
-                if (patch_dimy < 1)
-                {
-                        return TRUE;
-                }
-                patch_origy = 0;
-        }
-        if (patch_origx >= res)
-        {
-                return TRUE;
-        }
-        if (patch_origy >= res)
-        {
-                return TRUE;
-        }
-
-        patch_dimx = llmin<U32>(patch_dimx, res - patch_origx);
-        patch_dimy = llmin<U32>(patch_dimy, res - patch_origy);
-
-        U32 num_of_tris = 0;
-        S32 px, py;
-        for (py = patch_origy; py < patch_origy + patch_dimy; py++)
-        {
-                for (px = patch_origx; px < patch_origx + patch_dimx; px++)
-                {
-                        const U32 ind = py * sGrid->mPatchRes + px;
-                        if (sGrid->mPatches[ind].visible() && sGrid->mTab[px][py] == 0)
-                        {
-                                num_of_tris += sGrid->mPatches[ind].numTris();
-                                sGrid->mTab[px][py] = this;
-                        }
-                }
-        }
-
-        if (num_of_tris == 0)
-        {
-                return TRUE;
-        }
-
-        if (drawable->getNumFaces() < 1)
-        {
-                drawable->addFace((LLDrawPoolWater*) gPipeline.getPool(LLDrawPool::POOL_WATER),
-                                                                gWorldp->getDefaultWaterTexture());
-        }
-
-        LLFace *face;
-
-        face = drawable->getFace(0);
-        face->mCenterAgent = position_agent;
-
-        LLStrider<LLVector3> verticesp, normalsp;
-        LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
-        S32 index_offset;
-
-        const F32 water_height = getRegion()->getWaterHeight();
-
         
-        face->setPrimType(LLTriangles);
-        face->setSize(3 * num_of_tris, 3 * num_of_tris);
-        index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
-        if (-1 == index_offset)
-        {
-                return TRUE;
-        }
-
-        U32 num_of_vtx = 0;
-
-        for (py = patch_origy; py < patch_origy + patch_dimy; py++)
-        {
-                for (px = patch_origx; px < patch_origx + patch_dimx; px++)
-                {
-                        for (U8 h = 0; h < 2; h++)
-                        {
-                                const U32 ind = py * sGrid->mPatchRes + px;
-                                if (!sGrid->mPatches[ind].visible() || sGrid->mTab[px][py] != this)
-                                        continue;
-                                LLWaterTri* half = (LLWaterTri*) sGrid->mPatches[ind].half(h);
-                                for (const LLWaterTri*  tri = (LLWaterTri*) half->getFirstLeaf();
-                                                                                tri != NULL;
-                                                                                tri = (LLWaterTri*) tri->getNextLeaf())
-                                {
-                                        /////// check for coordinates
-                                        *(verticesp++)  = sGrid->vtx(tri->Lvtx(), water_height);
-                                        *(verticesp++)  = sGrid->vtx(tri->Rvtx(), water_height);
-                                        *(verticesp++)  = sGrid->vtx(tri->Tvtx(), water_height);
-                                        
-                                        *(normalsp++)   = sGrid->norm(tri->Lvtx());
-                                        *(normalsp++)   = sGrid->norm(tri->Rvtx());
-                                        *(normalsp++)   = sGrid->norm(tri->Tvtx());
-                                        
-                                        *(indicesp++) = index_offset + num_of_vtx + 0;
-                                        *(indicesp++) = index_offset + num_of_vtx + 1;
-                                        *(indicesp++) = index_offset + num_of_vtx + 2;
-                                        num_of_vtx += 3;
-                                }
-                        }
-                }
-        }
-
-
-        LLPipeline::sCompiles++;
-        return TRUE;
-}
-
-
-
-BOOL LLVOWater::updateGeometryHeightFieldSimple(LLDrawable *drawable)
-{
-        LLVector3 position_agent = getPositionAgent();
-        const LLVector3 region_size = getScale();
-        const LLVector3 region_origin = position_agent - region_size * 0.5f;
-
-        S32 patch_origx = llround(region_origin.mV[VX] - sGrid->mRegionOrigin.mV[VX]) / sGrid->mRegionWidth;
-        S32 patch_origy = llround(region_origin.mV[VY] - sGrid->mRegionOrigin.mV[VY]) / sGrid->mRegionWidth;
-        S32 patch_dimx = llround(region_size.mV[VX]) / sGrid->mRegionWidth;
-        S32 patch_dimy = llround(region_size.mV[VY]) / sGrid->mRegionWidth;
-
-        static S32 res = sGrid->mPatchRes;
-        if (patch_origx < 0)
-        {
-                patch_dimx -= - patch_origx;
-                if (patch_dimx < 1)
-                {
-                        return TRUE;
-                }
-                patch_origx = 0;
-        }
-        if (patch_origy < 0)
-        {
-                patch_dimy -= - patch_origy;
-                if (patch_dimy < 1)
-                {
-                        return TRUE;
-                }
-                patch_origy = 0;
-        }
-        if (patch_origx >= res)
-        {
-                return TRUE;
-        }
-        if (patch_origy >= res)
-        {
-                return TRUE;
-        }
-
-        patch_dimx = llmin<U32>(patch_dimx, res - patch_origx);
-        patch_dimy = llmin<U32>(patch_dimy, res - patch_origy);
-
-
-        U32 num_of_regions = 0;
-        S32 px, py;
-
-        for (py = patch_origy; py < patch_origy + patch_dimy; py++)
-        {
-                for (px = patch_origx; px < patch_origx + patch_dimx; px++)
-                {
-                //      if (sGrid->mTab[px][py] != 0)
-                //              bool stop = true;
-                        if (sGrid->mPatches[py * sGrid->mPatchRes + px].visible() && sGrid->mTab[px][py] == 0)
-                        {
-                                num_of_regions++;
-                                sGrid->mTab[px][py] = this;
-                        }
-                }
-        }
-
-        if (num_of_regions == 0)
-        {
-                return TRUE;
-        }
-
-        if (drawable->getNumFaces() < 1)
-        {
-                drawable->addFace((LLDrawPoolWater*) gPipeline.getPool(LLDrawPool::POOL_WATER),
-                                                                gWorldp->getDefaultWaterTexture());
-        }
-
-        LLFace *face;
-
-        face = drawable->getFace(0);
-        face->mCenterAgent = position_agent;
-
-        LLStrider<LLVector3> verticesp, normalsp;
-        LLStrider<LLVector2> texCoordsp;
-        U32 *indicesp;
-        S32 index_offset;
-
-        const F32 water_height = getRegion()->getWaterHeight();
-
-        const U32 steps_in_region = sGrid->mStepsInRegion / sGrid->mResDecrease;
-        const U32 num_quads = steps_in_region * steps_in_region * num_of_regions;
-
-        face->setPrimType(LLTriangles);
-        face->setSize(4*num_quads, 6*num_quads);
-        index_offset = face->getGeometry(verticesp,normalsp,texCoordsp, indicesp);
-        if (-1 == index_offset)
-        {
-                return TRUE;
-        }
-
-        U32 num_of_vtx = 0;
-
-        for (py = patch_origy; py < patch_origy + patch_dimy; py++)
-        {
-                for (px = patch_origx; px < patch_origx + patch_dimx; px++)
-                {
-                        if (!sGrid->mPatches[py * sGrid->mPatchRes + px].visible() || sGrid->mTab[px][py] != this)
-                        {
-                                continue;
-                        }
-
-                        U32 orig_indx = px * sGrid->mStepsInRegion;
-                        U32 orig_indy = py * sGrid->mStepsInRegion;
-
-                        for (U32 qy = 0; qy < steps_in_region; qy++)
-                        {
-                                for (U32 qx = 0; qx < steps_in_region; qx++)
-                                {
-                                        const S32 x0 = orig_indx + qx * sGrid->mResDecrease;
-                                        const S32 y0 = orig_indy + qy * sGrid->mResDecrease;
-                                        const S32 x1 = x0 + sGrid->mResDecrease;
-                                        const S32 y1 = y0 + sGrid->mResDecrease;
-                                        
-                                        sGrid->setVertex(x0, y1, water_height, *(verticesp));
-                                        verticesp++;
-                                        sGrid->setVertex(x0, y0, water_height, *(verticesp));
-                                        verticesp++;
-                                        sGrid->setVertex(x1, y1, water_height, *(verticesp));
-                                        verticesp++;
-                                        sGrid->setVertex(x1, y0, water_height, *(verticesp));
-                                        verticesp++;
-                                        /*
-                                        *(verticesp++)  = sGrid->vtx(x0, y1, water_height);
-                                        *(verticesp++)  = sGrid->vtx(x0, y0, water_height);
-                                        *(verticesp++)  = sGrid->vtx(x1, y1, water_height);
-                                        *(verticesp++)  = sGrid->vtx(x1, y0, water_height);
-                                        */
-                                        *(normalsp++)   = sGrid->norm(x0, y1);
-                                        *(normalsp++)   = sGrid->norm(x0, y0);
-                                        *(normalsp++)   = sGrid->norm(x1, y1);
-                                        *(normalsp++)   = sGrid->norm(x1, y0);
-                                        
-                                        const S32 curr_index_offset = index_offset + num_of_vtx;
-
-                                        *indicesp++ = curr_index_offset  + 0;
-                                        *indicesp++ = curr_index_offset  + 1;
-                                        *indicesp++ = curr_index_offset  + 2;
-                                        
-                                        *indicesp++ = curr_index_offset  + 1;
-                                        *indicesp++ = curr_index_offset  + 3;
-                                        *indicesp++ = curr_index_offset  + 2;
-                                        num_of_vtx += 4;
-                                }
-                        }
-                }
-        }
-
-
+        mDrawable->movePartition();
         LLPipeline::sCompiles++;
         return TRUE;
 }
 
 void LLVOWater::initClass()
 {
-        sGrid = new LLWaterGrid;
 }
 
 void LLVOWater::cleanupClass()
 {
-        if (sGrid)
-        {
-                sGrid->cleanup();
-                delete sGrid;
-                sGrid = 0;
-        }
-}
-
-
-LLWaterGrid::LLWaterGrid() : mResIncrease(1)//0.5)
-{
-        init();
 }
 
-
-void LLWaterGrid::init()
-{
-        //mRegionOrigin = LLVector3(-2 * mRegionWidth, -2 * mRegionWidth, 0);
-        mRegionWidth = 256;
-        mPatchRes = 5;
-        mMaxGridSize = mPatchRes * mRegionWidth;
-        mMinStep = (U32)(WAVE_STEP * mResIncrease);
-
-        LLWaterTri::sMinStep = mMinStep;
-        LLWaterTri::sQueues = &mRoam;
-
-        setGridDim(mMaxGridSize / mMinStep);
-
-        mVtx = new LLVector3[mGridDim1 * mGridDim1];
-        mNorms = new LLVector3[mGridDim1 * mGridDim1];
-
-        mPatches = new LLWaterPatch[mPatchRes * mPatchRes];
-
-        mStepsInRegion = mRegionWidth / mMinStep;
-        const U32 max_div_level = 2 * (U32)(log((F32)mStepsInRegion) / log(2.0f));
-
-        for (U32 y = 0; y < mPatchRes; y++)
-        {
-                for (U32 x = 0; x < mPatchRes; x++)
-                {
-                        LLVector3 patch_center(mRegionWidth * (x + 0.5f), mRegionWidth * (y + 0.5f), 0);
-
-                        mPatches[y * mPatchRes + x].set(x * mStepsInRegion, y * mStepsInRegion,
-                                                                                        mStepsInRegion, mRegionWidth, patch_center, max_div_level);
-                        if (x > 0)
-                        {
-                                mPatches[y * mPatchRes + x].left()->setRight(mPatches[y * mPatchRes + x - 1].right());
-                                mPatches[y * mPatchRes + x - 1].right()->setRight(mPatches[y * mPatchRes + x].left());
-                        }
-                        if (y > 0)
-                        {
-                                mPatches[y * mPatchRes + x].left()->setLeft(mPatches[(y - 1) * mPatchRes + x].right());
-                                mPatches[(y - 1) * mPatchRes + x].right()->setLeft(mPatches[y * mPatchRes + x].left());
-                        }
-                }
-        }
-}
-
-void LLWaterGrid::cleanup()
-{
-        delete[] mVtx;
-        mVtx = NULL;
-
-        delete[] mNorms;
-        mNorms = NULL;
-
-        delete[] mPatches;
-        mPatches = NULL;
-}
-
-
 void setVecZ(LLVector3& v)
 {
         v.mV[VX] = 0;
@@ -635,413 +259,31 @@ void setVecZ(LLVector3& v)
         v.mV[VZ] = 1;
 }
 
-void LLWaterGrid::update()
-{
-        static LLViewerRegion* prev_region = gAgent.getRegion();
-        LLViewerRegion* region = gAgent.getRegion();
-
-        mRegionOrigin = region->getOriginAgent();
-        mRegionOrigin.mV[VX] -= 2 * mRegionWidth;
-        mRegionOrigin.mV[VY] -= 2 * mRegionWidth;
-        mRegionOrigin.mV[VZ] = 0;
-
-        const F32 clip_far = gCamera->getFar() - 31;
-        const F32 clip_far2 = clip_far * clip_far;
-
-        const LLVector3 camera_pos = gAgent.getCameraPositionAgent();
-        const LLVector3 look_at = gCamera->getAtAxis();
-
-
-        if (camera_pos.mV[VZ] > 200)
-        {
-                mResDecrease = 4;
-        }
-        else if (camera_pos.mV[VZ] > 100)
-        {
-                mResDecrease = 2;
-        }
-        else
-        {
-                mResDecrease = 1;
-        }
-
-
-        //U32 mResDecrease = res_decrease;
-        U32 res_decrease = 1;
-
-        const F32 res_change = mResIncrease;// * res_decrease ;
-
-        F32 height;
-
-        // Set the grid
-
-        //U32 fractions = 1;
-        U32 fractions_res = res_decrease;
-        if (res_change < 1)
-        {
-                //fractions = llround(1. / res_change);
-                fractions_res = llround(1.f / mResIncrease);
-        }
-
-
-        //const U32 fractions_res = fractions * res_decrease;
-
-        LLVector3 cur_pos;
-        U32 x, y;
-        U32 ind = 0;
-        for (y = 0; y < mGridDim1; y += fractions_res)
-        {
-                const F32 dispy = (F32)(y * mMinStep);//step;
-                for (x = 0; x < mGridDim1; x += fractions_res)
-                {
-                        const F32 dispx = (F32)(x * mMinStep);//step;
-                        cur_pos = mRegionOrigin;
-                        cur_pos.mV[VX] += dispx;
-                        cur_pos.mV[VY] += dispy;
-
-                        const F32 x_dist = cur_pos.mV[VX] - camera_pos.mV[VX];
-                        const F32 y_dist = cur_pos.mV[VY] - camera_pos.mV[VY];
-
-                        if (x_dist * look_at.mV[VX] + y_dist * look_at.mV[VY] < 0)
-                        {
-                                mVtx[ind] = cur_pos;
-                                setVecZ(mNorms[ind]);
-                                ind++;
-                                continue;
-                        }
-                                
-                        const F32 dist_to_vtx2 = x_dist * x_dist + y_dist * y_dist;
-                        if (dist_to_vtx2 > .81 * clip_far2)
-                        {
-                                mVtx[ind] = cur_pos;
-                                setVecZ(mNorms[ind]);
-                                ind++;
-                                continue;
-                        }
-
-                        mWater.getIntegerHeightAndNormal(llround(WAVE_STEP_INV * dispx),
-                                        llround(WAVE_STEP_INV * dispy), height, mNorms[ind]);
-
-                        cur_pos.mV[VZ] += height;
-                        mVtx[ind] = cur_pos;
-                        ind++;
-                }
-        }
-
-        if (res_change < 1)
-        {
-                U32 fractions = llround(1.f / mResIncrease);
-                for (y = 0; y < mGridDim1; y += fractions_res)
-                {
-                        for (x = 0; x < mGridDim; x += fractions_res)
-                        {
-                                const U32 ind00 = index(x, y);
-                                const U32 ind01 = ind00 + fractions_res;
-                                for (U32 frx = 1; frx < fractions; frx += res_decrease)
-                                {
-                                        const U32 ind = ind00 + frx;
-                                        mNorms[ind] = LERP(mNorms[ind00], mNorms[ind01], frx * res_change);
-                                        mVtx[ind]   = LERP(  mVtx[ind00],   mVtx[ind01], frx * res_change);
-                                }
-                        }
-                }
-                for (x = 0; x < mGridDim1; x += res_decrease)
-                {
-                        for (y = 0; y < mGridDim; y += fractions_res)
-                        {
-                                const U32 ind00 = index(x, y);
-                                const U32 ind10 = ind00 + fractions_res * mGridDim1;//(y + fractions) * quad_resx1 + x;
-                                for (U32 fry = 1; fry < fractions; fry += res_decrease)
-                                {
-                                        const U32 ind = ind00 + fry * mGridDim1;//(y + fry) * quad_resx1 + x;
-                                        mNorms[ind] = LERP(mNorms[ind00], mNorms[ind10], fry * res_change);
-                                        mVtx[ind]   = LERP(  mVtx[ind00],   mVtx[ind10], fry * res_change);
-                                }
-                        }
-                }
-        }
-
-        if (gUseRoam)
-        {
-                updateTree(camera_pos, look_at, clip_far, prev_region != region);
-        }
-        else
-        {
-                updateVisibility(camera_pos, look_at, clip_far);
-        }
-
-        prev_region = region;
-
-
-        //mTab[0][0] = 0;
-        for (y = 0; y < mPatchRes; y++)
-        {
-                for (x = 0; x < mPatchRes; x++)
-                        mTab[x][y] = 0;
-        }
-
-}
-
-void LLWaterGrid::updateTree(const LLVector3 &camera_pos, const LLVector3 &look_at, F32 clip_far,
-                                                         BOOL restart = FALSE)
-{
-        static S8 recalculate_frame = 0;
-
-        if (restart)
-        {
-                recalculate_frame = 0;
-        }
-
-        if (recalculate_frame == 0)
-        {
-                LLWaterTri::nextRound();
-                setCamPosition(LLWaterTri::sCam, camera_pos);
-                LLWaterTri::sClipFar = clip_far;
-
-
-                const U32 step = (U32)(WAVE_STEP * mResIncrease * mResDecrease);
-                const U32 steps_in_region = mRegionWidth / step;
-                LLWaterTri::sMaxDivLevel = 2 * llround(log((F32)steps_in_region) / log(2.0f));
-
-                for (U32 y = 0; y < mPatchRes; y++)
-                {
-                        for (U32 x = 0; x < mPatchRes; x++)
-                        {
-                                U32 patch_ind = y * mPatchRes + x;                              
-                                mPatches[patch_ind].updateTree(camera_pos, look_at, mRegionOrigin);
-                        }
-                }
-
-                mRoam.process();
-
-                // debug
-                /*
-                for (y = 0; y < mPatchRes; y++)
-                {
-                        for (U32 x = 0; x < mPatchRes; x++)
-                        {
-                                //mPatches[y * mPatchRes + x].checkUpToDate();
-                                //mPatches[y * mPatchRes + x].checkConsistensy();
-                                mPatches[y * mPatchRes + x].checkCount();
-                        }
-                }
-                */
-        }
-        ++recalculate_frame;
-        recalculate_frame = recalculate_frame % 2;
-}
-
-void LLWaterGrid::updateVisibility(const LLVector3 &camera_pos, const LLVector3 &look_at, F32 clip_far)
-{
-        for (U32 y = 0; y < mPatchRes; y++)
-        {
-                for (U32 x = 0; x < mPatchRes; x++)
-                {
-                        mPatches[y * mPatchRes + x].updateVisibility(camera_pos, look_at, mRegionOrigin);
-                }
-        }
-}
-
-
 void LLVOWater::setUseTexture(const BOOL use_texture)
 {
         mUseTexture = use_texture;
 }
 
-F32 LLWaterSurface::agentDepth() const
+void LLVOWater::updateSpatialExtents(LLVector3 &newMin, LLVector3& newMax)
 {
-        const LLViewerRegion* region = gAgent.getRegion();
-        LLVector3 position_agent = region->getOriginAgent();// getPositionAgent();
-        const LLVector3 region_origin = position_agent;
-        const LLVector3 camera_pos = gAgent.getCameraPositionAgent();
+        LLVector3 pos = getPositionAgent();
+        LLVector3 scale = getScale();
 
-        F32 height;
-        LLVector3 normal;
+        newMin = pos - scale * 0.5f;
+        newMax = pos + scale * 0.5f;
 
-        getHeightAndNormal(WAVE_STEP_INV * camera_pos.mV[VX], 
-                                                WAVE_STEP_INV * camera_pos.mV[VY], height, normal);
-        F32 agent_water_height = gAgent.getRegion()->getWaterHeight();
-        return camera_pos.mV[VZ] - (agent_water_height + height);
+        mDrawable->setPositionGroup((newMin + newMax) * 0.5f);
 }
 
-////////////////////////////////////////////////
-
-
-void LLWaterSurface::getHeightAndNormal(F32 i, F32 j, F32& wave_height, LLVector3& normal) const
-{
-        S32 i_ind = llfloor(i);
-        S32 j_ind = llfloor(j);
-        F32 i_fr = i - i_ind;
-        F32 j_fr = j - j_ind;
-
-        i_ind = i_ind % N_RES;
-        j_ind = j_ind % N_RES;
-
-        S32 i_ind_next = i_ind + 1;
-        S32 j_ind_next = j_ind + 1;
-        if (i_ind_next == (S32)N_RES)   i_ind_next = 0;
-        if (j_ind_next == (S32)N_RES)   j_ind_next = 0;
-
-        const F32 i_fr1 = 1 - i_fr;
-        const F32 j_fr1 = 1 - j_fr;
-
-        const F32 hi0   = i_fr1 * height(i_ind, j_ind)          +       i_fr * height(i_ind_next, j_ind);
-        const F32 hi1   = i_fr1 * height(i_ind, j_ind_next)     +       i_fr * height(i_ind_next, j_ind_next);
-        wave_height             = j_fr1 * hi0 + j_fr * hi1;
-
-        normal                  = i_fr1 * mNorms[i_ind][j_ind];
-        normal                  +=                              i_fr * mNorms[i_ind_next][j_ind];
-        LLVector3 vi1   = i_fr1 * mNorms[i_ind][j_ind_next];
-        vi1                             +=                              i_fr * mNorms[i_ind_next][j_ind_next];
-        normal                  *= j_fr1;
-        normal                  +=                              j_fr * vi1;
-
-        //normal.normVec();
-}
-
-void LLWaterSurface::getIntegerHeightAndNormal(S32 i, S32 j, F32& wave_height, LLVector3& normal) const
-{
-        S32 i_ind = i % N_RES;
-        S32 j_ind = j % N_RES;
-
-        wave_height             = height(i_ind, j_ind);
-        normal                  = mNorms[i_ind][j_ind];
+U32 LLVOWater::getPartitionType() const
+{ 
+        return LLPipeline::PARTITION_WATER; 
 }
 
-F32 LLWaterSurface::phillips(const LLVector2& k, const LLVector2& wind_n, F32 L, F32 L_small)
+LLWaterPartition::LLWaterPartition()
+: LLSpatialPartition(0)
 {
-        F32 k2 = k * k;
-        F32 k_dot_wind = k * wind_n;
-        F32 spectrum = mA * (F32) exp(-1 / (L * L * k2)) / (k2 * k2) * (k_dot_wind * k_dot_wind / k2);
-
-        if (k_dot_wind < 0) spectrum *= .25f;  // scale down waves that move opposite to the wind
-
-        F32 damp = (F32) exp(- k2 * L_small * L_small);
-
-        return (spectrum * damp);
+        mRenderByGroup = FALSE;
+        mDrawableType = LLPipeline::RENDER_TYPE_WATER;
+        mPartitionType = LLPipeline::PARTITION_WATER;
 }
-
-
-
-void LLWaterSurface::initAmplitudes()
-{
-        U16 i, j;
-        LLVector2 k;
-        F32 sqrtPhillips;
-
-        const LLVector2 wind(mWind.mV);
-
-        LLVector2 wind_n = wind;
-        const F32 wind_vel = wind_n.normVec();
-
-        const F32 L = wind_vel * wind_vel / g;  // largest wave arising from constant wind of speed wind_vel
-
-        const F32 L_small = L / 70;             // eliminate waves with very small length (L_small << L)
-
-
-        for (i = 0; i <= N_RES; i++)
-        {
-                k.mV[VX] = (- (S32)N_RES_HALF + i) * (F_TWO_PI / WIDTH);
-                for (j = 0; j <= N_RES; j++)
-                {
-                        k.mV[VY] = (- (S32)N_RES_HALF + j) * (F_TWO_PI / WIDTH);
-
-                        const F32 k_mag = k.magVec();
-                        mOmega[i][j] = (F32) sqrt(g * k_mag);
-
-                        if (k_mag < F_APPROXIMATELY_ZERO)
-                                sqrtPhillips = 0;
-                        else
-                                sqrtPhillips = (F32) sqrt(phillips(k, wind_n, L, L_small));
-
-                        //const F32 r1 = rand() / (F32) RAND_MAX;
-                        //const F32 r2 = rand() / (F32) RAND_MAX;
-                        const F32 r1 = randGauss(0, 1);
-                        const F32 r2 = randGauss(0, 1);
-
-                        mHtilda0[i][j].re = sqrtPhillips * r1 * OO_SQRT2;
-                        mHtilda0[i][j].im = sqrtPhillips * r2 * OO_SQRT2;
-
-                }
-        }
-
-        mPlan.init(N_RES, N_RES);
-        mInitialized = 1;  // initialization complete
-}
-
-void LLWaterSurface::generateWaterHeightField(F64 t)
-{
-        S32 i, j;
-        S32 mi, mj;                // -K indices
-        COMPLEX plus, minus;
-        
-        if (!mInitialized) initAmplitudes();
-        
-        for (i = 0; i < (S32)N_RES_HALF; i++)
-        {
-                mi = N_RES - i;
-                for (j = 0; j < (S32)N_RES ; j++)
-                {
-                        mj = N_RES - j;
-
-                        const F32 cos_wt =  cosf(mOmega[i][j] * t); // = cos(-mOmega[i][j] * t)
-                        const F32 sin_wt =  sinf(mOmega[i][j] * t); // = -sin(-mOmega[i][j] * t)
-                        plus.re  =  mHtilda0[i][j].re   * cos_wt - mHtilda0[i][j].im   * sin_wt;
-                        plus.im  =  mHtilda0[i][j].re   * sin_wt + mHtilda0[i][j].im   * cos_wt;
-                        minus.re =  mHtilda0[mi][mj].re * cos_wt - mHtilda0[mi][mj].im * sin_wt;
-                        minus.im = -mHtilda0[mi][mj].re * sin_wt - mHtilda0[mi][mj].im * cos_wt;
-
-                        // now sum the plus and minus waves to get the total wave amplitude h
-                        mHtilda[i * N_RES + j].re = plus.re + minus.re;
-                        mHtilda[i * N_RES + j].im = plus.im + minus.im;
-                        if (mi < (S32)N_RES && mj < (S32)N_RES)
-                        {
-                                mHtilda[mi * N_RES + mj].re = plus.re + minus.re;
-                                mHtilda[mi * N_RES + mj].im = -plus.im - minus.im;
-                        }
-                }
-        }
-
-        inverse_fft(mPlan, mHtilda, N_RES, N_RES);
-
-        calcNormals();
-}
-
-
-/*
- * Computer normals by taking finite differences.  
- */
-
-void LLWaterSurface::calcNormals()
-{
-        LLVector3 n;
-        
-        for (U32 i = 0; i < N_RES; i++)
-        {
-                for (U32 j = 0; j < N_RES; j++)
-                {
-                        F32 px = heightWrapped(i + 1, j);
-                        F32 mx = heightWrapped(i - 1, j);
-                        F32 py = heightWrapped(i, j + 1);
-                        F32 my = heightWrapped(i, j - 1);
-                        F32 pxpy = heightWrapped(i + 1, j + 1);
-                        F32 pxmy = heightWrapped(i + 1, j - 1);
-                        F32 mxpy = heightWrapped(i - 1, j + 1); 
-                        F32 mxmy = heightWrapped(i - 1, j - 1);
-
-                        n.mV[VX] = -((2 * px + pxpy + pxmy) - (2 * mx + mxpy + mxmy));
-                        n.mV[VY] = -((2 * py + pxpy + mxpy) - (2 * my + pxmy + mxmy));
-                        n.mV[VZ] = 8 * WIDTH / (F32) N_RES;
-                        n.normVec();
-                        
-                        mNorms[i][j] = n;
-                }
-        }
-}
-
-void LLVOWater::generateNewWaves(F64 time)
-{
-        getWaterSurface()->generateWaterHeightField(time);
-        sGrid->update();
-}
-
diff --git a/linden/indra/newview/llvowater.h b/linden/indra/newview/llvowater.h
index 11dc0e5..20fda7e 100644
--- a/linden/indra/newview/llvowater.h
+++ b/linden/indra/newview/llvowater.h
@@ -35,195 +35,25 @@
 
 #include "llwaterpatch.h"
 
-
 const U32 N_RES = 16; //32                      // number of subdivisions of wave tile
 const U8  WAVE_STEP             = 8;
 
-/*
-#define N_DET           32                      // number of subdivisions of wave tile for details
-
-class LLWaterDetail
-{
-protected:
-        S32                             mResolution;
-        LLViewerImage   *mTex;
-        U8                              *mTexData;
-
-public:
-        LLWaterDetail() : mResolution(N_DET), mTex(0), mTexData(0) {init();}
-        void init();
-
-        ~LLWaterDetail()
-        {
-                delete[] mTexData;
-                mTexData = NULL;
-        }
-
-
-        //void initEmpty();
-
-        void setPixel(const LLVector3 &norm, const S32 i, const S32 j)
-        {
-                S32 offset = (i * mResolution + j) * 3;
-                mTexData[offset]   = llround(norm.mV[VX] * 255);
-                mTexData[offset+1] = llround(norm.mV[VX] * 255);
-                mTexData[offset+2] = llround(norm.mV[VX] * 255);
-        }
-        void setPixel(F32 x, F32 y, F32 z, const S32 i, const S32 j)
-        {
-                S32 offset = (i * mResolution + j) * 3;
-                mTexData[offset]   = llround(x * 255);
-                mTexData[offset+1] = llround(y * 255);
-                mTexData[offset+2] = llround(z * 255);
-        }
-
-        S32 getResolution()                                             { return mResolution; }
-
-        void createDetailBumpmap(F32* u, F32* v);
-        void createTexture() const                      { mTex->createTexture(); }
-        void bindTexture() const                        { mTex->bindTexture(); }
-        LLViewerImage* getTexture() const       { return mTex; }
-};
-*/
-
-class LLWaterSurface
-{
-protected:
-        BOOL mInitialized;
-        LLVector3 mWind;
-        F32 mA;
-        F32 mVisc; // viscosity of the fluid
-        F32 mShininess;
-
-        //LLWaterDetail* mDetail;
-
-        LLFFTPlan mPlan;
-        F32 mOmega[N_RES+1][N_RES+1];           // wave frequency
-        COMPLEX mHtilda0[N_RES+1][N_RES+1];     // wave amplitudes and phases at time 0.
-        LLVector3 mNorms[N_RES][N_RES];
-        COMPLEX mHtilda[N_RES * N_RES];
-
-public:
-        LLWaterSurface();
-        ~LLWaterSurface() {}
-
-        //void initSpecularLookup();
-
-        F32 phillips(const LLVector2& k, const LLVector2& wind_n, F32 L, F32 L_small);
-
-        void initAmplitudes();
-
-        F32 height(S32 i, S32 j) const { return mHtilda[i * N_RES + j].re; }
-        F32 heightWrapped(S32 i, S32 j) const
-        {
-                return height((i + N_RES) % N_RES, (j + N_RES) % N_RES);
-        }
-
-        void generateWaterHeightField(F64 time);
-        void calcNormals();
-
-        void getHeightAndNormal(F32 i, F32 j, F32& height, LLVector3& normal) const;
-        void getIntegerHeightAndNormal(S32 i, S32 j, F32& height, LLVector3& normal) const;
-        F32 agentDepth() const;
-
-//      const LLWaterHeightField* hField() const { return &mHeightField; }
-
-        //void generateDetail(F64 t);
-        //void fluidSolver(F32* u, F32* v, F32* u0, F32* v0, F64 dt);
-
-        const LLVector3& getWind() const { return mWind; }
-        void setWind(const LLVector3& w) { mWind = w; } // initialized = 0?
-        F32 A() const { return mA; }
-        void setA(F32 a) { mA = a; }
-        F32 getShininess() const { return mShininess; }
-        //LLViewerImage* getSpecularLookup() const { return mSpecularLookup; }
-        //LLViewerImage* getDetail() const { return mDetail->getTexture(); }
-};
-
-class LLVOWater;
-
-class LLWaterGrid
-{
-public:
-        LLWaterGrid();
-
-        void init();
-        void cleanup();
-
-        LLWaterSurface* getWaterSurface() { return &mWater; }
-
-        void update();
-        void updateTree(const LLVector3 &camera_pos, const LLVector3 &look_at, F32 clip_far,
-                BOOL restart);
-        void updateVisibility(const LLVector3 &camera_pos, const LLVector3 &look_at, F32 clip_far);
-
-        LLVector3 mRegionOrigin;
-
-        LLVector3* mVtx;
-        LLVector3* mNorms;
-        U32 mRegionWidth;
-        U32 mMaxGridSize;
-        U32 mPatchRes;
-        U32 mMinStep;
-        U32 mStepsInRegion;
-        LLWaterPatch* mPatches;
-        LLRoam mRoam;
-        F32 mResIncrease;
-        U32 mResDecrease;
-
-        LLVOWater* mTab[5][5];
-
-        U32 gridDim() const                                     { return mGridDim; }
-        U32 rowSize() const                                     { return mGridDim1; }
-        void setGridDim(U32 gd)                         { mGridDim = gd; mGridDim1 = mGridDim + 1; }
-        U32 index(const LL2Coord& c) const      { return c.y() * mGridDim1 + c.x(); }
-        U32 index(U32 x, U32 y) const           { return y * mGridDim1 + x; }
-
-        LLVector3 vtx(const LL2Coord& c, F32 raised) const
-        {
-                LLVector3 v = mVtx[index(c)];
-                v.mV[VZ] += raised;
-                return v;
-        }
-
-        LLVector3 vtx(U32 x, U32 y, F32 raised) const
-        {
-                LLVector3 v = mVtx[index(x, y)];
-                v.mV[VZ] += raised;
-                return v;
-        }
-
-        void setVertex(const U32 x, const U32 y, const F32 raised, LLVector3 &vertex) const
-        {
-                vertex = mVtx[index(x, y)];
-                vertex.mV[VZ] += raised;
-        }
-
-        void setCamPosition(LL2Coord& cam, const LLVector3& cam_pos)
-        {
-                cam.x() = llround((cam_pos.mV[VX] - mRegionOrigin.mV[VX]) / mMinStep);
-                cam.y() = llround((cam_pos.mV[VY] - mRegionOrigin.mV[VY]) / mMinStep);
-        }
-
-        LLVector3 vtx(const LL2Coord& c) const          { return mVtx[index(c)]; }
-        LLVector3 norm(const LL2Coord& c) const         { return mNorms[index(c)]; }
-        LLVector3 vtx(U32 x, U32 y) const                       { return mVtx[index(x, y)]; }
-        LLVector3 norm(U32 x, U32 y) const                      { return mNorms[index(x, y)]; }
-
-protected:
-        LLWaterSurface mWater;
-        U32 mGridDim;
-        U32 mGridDim1;
-};
-
 class LLSurface;
 class LLHeavenBody;
 class LLVOSky;
 class LLFace;
 
-class LLVOWater : public LLViewerObject
+class LLVOWater : public LLStaticViewerObject
 {
 public:
+        enum 
+        {
+                VERTEX_DATA_MASK =      (1 << LLVertexBuffer::TYPE_VERTEX) |
+                                                        (1 << LLVertexBuffer::TYPE_NORMAL) |
+                                                        (1 << LLVertexBuffer::TYPE_TEXCOORD) 
+        }
+        eVertexDataMask;
+
         LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
         virtual ~LLVOWater() {}
 
@@ -236,24 +66,19 @@ public:
         /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
         /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
         /*virtual*/ BOOL        updateGeometry(LLDrawable *drawable);
-                                BOOL            updateGeometryFlat(LLDrawable *drawable);
-                                BOOL            updateGeometryHeightFieldSimple(LLDrawable *drawable);
-                                BOOL            updateGeometryHeightFieldRoam(LLDrawable *drawable);
+        /*virtual*/ void                updateSpatialExtents(LLVector3& newMin, LLVector3& newMax);
 
-        /*virtual*/ void updateDrawable(BOOL force_damped);
         /*virtual*/ void updateTextures(LLAgent &agent);
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
 
+        virtual U32 getPartitionType() const;
+
         /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
 
         void setUseTexture(const BOOL use_texture);
 
-        static void generateNewWaves(F64 time);
-        static LLWaterSurface* getWaterSurface() { return sGrid->getWaterSurface(); }//return &mWater; }
-        static const LLWaterGrid* getGrid() { return sGrid; }
 protected:
         BOOL mUseTexture;
-        static LLWaterGrid *sGrid;
 };
 
 #endif // LL_VOSURFACEPATCH_H
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index 310eae5..3e3f7ab 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -34,11 +34,13 @@
 #include "llquantize.h"
 
 #include "llagent.h"
+#include "llassetuploadresponders.h"
 #include "llviewerwindow.h"
 #include "llfloatercustomize.h"
 #include "llinventorymodel.h"
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
+#include "llviewerregion.h"
 #include "llvoavatar.h"
 #include "llwearable.h"
 
@@ -148,10 +150,10 @@ EWearableType LLWearable::typeNameToType( const LLString& type_name )
 }
 
 
-const char* terse_F32_to_string( F32 f, char s[MAX_STRING] )
+const char* terse_F32_to_string( F32 f, char s[MAX_STRING] )            /* Flawfinder: ignore */
 {
         char* r = s;
-        S32 len = sprintf( s, "%.2f", f );
+        S32 len = snprintf( s, MAX_STRING, "%.2f", f );         /* Flawfinder: ignore */
 
         // "1.20"  -> "1.2"
         // "24.00" -> "24."
@@ -230,7 +232,7 @@ BOOL LLWearable::exportFile( FILE* file )
                 return FALSE;
         }
 
-        char s[ MAX_STRING ];
+        char s[ MAX_STRING ];           /* Flawfinder: ignore */
         for( F32* param_weightp = mVisualParamMap.getFirstData(); param_weightp; param_weightp = mVisualParamMap.getNextData() )
         {
                 S32 param_id = mVisualParamMap.getCurrentKeyWithoutIncrement();
@@ -250,7 +252,7 @@ BOOL LLWearable::exportFile( FILE* file )
         for( LLUUID* image_id = mTEMap.getFirstData(); image_id; image_id = mTEMap.getNextData() )
         {
                 S32 te = mTEMap.getCurrentKeyWithoutIncrement();
-                char image_id_string[UUID_STR_LENGTH];
+                char image_id_string[UUID_STR_LENGTH];          /* Flawfinder: ignore */
                 image_id->toString( image_id_string );
                 if( fprintf( file, "%d %s\n", te, image_id_string) < 0 )
                 {
@@ -268,7 +270,7 @@ BOOL LLWearable::importFile( FILE* file )
         // *NOTE: changing the type or size of this buffer will require
         // changes in the fscanf() code below. You would be better off
         // rewriting this to use streams and not require an open FILE.
-        char text_buffer[2048];
+        char text_buffer[2048];         /* Flawfinder: ignore */
         S32 fields_read = 0;
 
         // read header and version 
@@ -289,7 +291,7 @@ BOOL LLWearable::importFile( FILE* file )
         }
 
         // name
-        char next_char = fgetc( file );
+        char next_char = fgetc( file );         /* Flawfinder: ignore */
         if( '\n' == next_char )
         {
                 // no name
@@ -298,8 +300,11 @@ BOOL LLWearable::importFile( FILE* file )
         else
         {
                 ungetc( next_char, file );
-                fields_read = fscanf( file, "%2047[^\n]", text_buffer );
-                if( (1 != fields_read) || (fgetc( file ) != '\n') )
+                fields_read = fscanf(   /* Flawfinder: ignore */
+                        file,
+                        "%2047[^\n]",
+                        text_buffer);
+                if( (1 != fields_read) || (fgetc( file ) != '\n') )             /* Flawfinder: ignore */
                 {
                         llwarns << "Bad Wearable asset: early end of file" << llendl;
                         return FALSE;
@@ -309,7 +314,7 @@ BOOL LLWearable::importFile( FILE* file )
         }
 
         // description
-        next_char = fgetc( file );
+        next_char = fgetc( file );              /* Flawfinder: ignore */
         if( '\n' == next_char )
         {
                 // no description
@@ -318,8 +323,11 @@ BOOL LLWearable::importFile( FILE* file )
         else
         {
                 ungetc( next_char, file );
-                fields_read = fscanf( file, "%2047[^\n]", text_buffer );
-                if( (1 != fields_read) || (fgetc( file ) != '\n') )
+                fields_read = fscanf(   /* Flawfinder: ignore */
+                        file,
+                        "%2047[^\n]",
+                        text_buffer );
+                if( (1 != fields_read) || (fgetc( file ) != '\n') )             /* Flawfinder: ignore */
                 {
                         llwarns << "Bad Wearable asset: early end of file" << llendl;
                         return FALSE;
@@ -425,7 +433,10 @@ BOOL LLWearable::importFile( FILE* file )
         for( i = 0; i < num_textures; i++ )
         {
                 S32 te = 0;
-                fields_read = fscanf( file, "%d %2047s\n", &te, text_buffer);
+                fields_read = fscanf(   /* Flawfinder: ignore */
+                        file,
+                        "%d %2047s\n",
+                        &te, text_buffer);
                 if( fields_read != 2 )
                 {
                         llwarns << "Bad Wearable asset: bad texture, #" << i << llendl;
@@ -863,11 +874,11 @@ void LLWearable::saveNewAsset()
 //      llinfos << "LLWearable::saveNewAsset() type: " << getTypeName() << llendl;
         //dump();
 
-        char new_asset_id_string[UUID_STR_LENGTH];
+        char new_asset_id_string[UUID_STR_LENGTH];              /* Flawfinder: ignore */
         mAssetID.toString(new_asset_id_string);
-        char filename[LL_MAX_PATH];
-        sprintf(filename, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str());
-        FILE* fp = LLFile::fopen(filename, "wb");
+        char filename[LL_MAX_PATH];             /* Flawfinder: ignore */
+        snprintf(filename, LL_MAX_PATH, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str());           /* Flawfinder: ignore */
+        FILE* fp = LLFile::fopen(filename, "wb");               /* Flawfinder: ignore */
         BOOL successful_save = FALSE;
         if(fp && exportFile(fp))
         {
@@ -880,8 +891,9 @@ void LLWearable::saveNewAsset()
         }
         if(!successful_save)
         {
-                char buffer[2*MAX_STRING];
-                sprintf(buffer,
+                char buffer[2*MAX_STRING];              /* Flawfinder: ignore */
+                snprintf(buffer,                /* Flawfinder: ignore */
+                                sizeof(buffer),
                                 "Unable to save '%s' to wearable file.",
                                 mName.c_str());
                 llwarns << buffer << llendl;
@@ -895,11 +907,28 @@ void LLWearable::saveNewAsset()
         // save it out to database
         if( gAssetStorage )
         {
-                LLWearableSaveData* data = new LLWearableSaveData;
-                data->mType = mType;
-                gAssetStorage->storeAssetData(filename, mTransactionID, getAssetType(),
-                                                                                &LLWearable::onSaveNewAssetComplete,
-                                                                                (void*)data);
+                 /*
+                std::string url = gAgent.getRegion()->getCapability("NewAgentInventory");
+                if (!url.empty())
+                {
+                        llinfos << "Update Agent Inventory via capability" << llendl;
+                        LLSD body;
+                        body["folder_id"] = gInventory.findCategoryUUIDForType(getAssetType());
+                        body["asset_type"] = LLAssetType::lookup(getAssetType());
+                        body["inventory_type"] = LLInventoryType::lookup(LLInventoryType::IT_WEARABLE);
+                        body["name"] = getName();
+                        body["description"] = getDescription();
+                        LLHTTPClient::post(url, body, new LLNewAgentInventoryResponder(body, filename));
+                }
+                else
+                {
+                }
+                 */
+                 LLWearableSaveData* data = new LLWearableSaveData;
+                 data->mType = mType;
+                 gAssetStorage->storeAssetData(filename, mTransactionID, getAssetType(),
+                                     &LLWearable::onSaveNewAssetComplete,
+                                     (void*)data);
         }
 }
 
@@ -915,8 +944,9 @@ void LLWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userda
         }
         else
         {
-                char buffer[2*MAX_STRING];
-                sprintf(buffer,
+                char buffer[2*MAX_STRING];              /* Flawfinder: ignore */
+                snprintf(buffer,                /* Flawfinder: ignore */
+                                sizeof(buffer),
                                 "Unable to save %s to central asset store.",
                                 type_name);
                 llwarns << buffer << " Status: " << status << llendl;
@@ -926,10 +956,10 @@ void LLWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userda
         }
 
         // Delete temp file
-        char new_asset_id_string[UUID_STR_LENGTH];
+        char new_asset_id_string[UUID_STR_LENGTH];              /* Flawfinder: ignore */
         new_asset_id.toString(new_asset_id_string);
-        char src_filename[LL_MAX_PATH];
-        sprintf(src_filename, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str());
+        char src_filename[LL_MAX_PATH];         /* Flawfinder: ignore */
+        snprintf(src_filename, LL_MAX_PATH, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str());               /* Flawfinder: ignore */
         LLFile::remove(src_filename);
 
         // delete the context data
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 28af5eb..10079f8 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -105,7 +105,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
         if( status >= 0 )
         {
                 // read the file
-                FILE* fp = LLFile::fopen(filename, "rb");
+                FILE* fp = LLFile::fopen(filename, "rb");               /*Flawfinder: ignore*/
                 if( !fp )
                 {
                         llinfos << "Bad Wearable Asset: unable to open file: '" << filename << "'" << llendl;
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 6d1ee28..7df2da4 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -45,15 +45,32 @@ const S32 MAX_TEXTURE_DIMENSION = 2048;
 
 LLWebBrowserCtrl::LLWebBrowserCtrl( const std::string& name, const LLRect& rect ) :
         LLUICtrl( name, rect, FALSE, NULL, NULL ),
-        mEmbeddedBrowserWindowId( 0 ),
         mTextureDepthBytes( 4 ),
-        mBorder( 0 ),
+        mEmbeddedBrowserWindowId( 0 ),
+        mBorder(NULL),
         mFrequentUpdates( true ),
         mOpenLinksInExternalBrowser( false ),
-        mHomePageUrl( "" )
+        mHomePageUrl( "" ),
+        mIgnoreUIScale( true )
 {
+        S32 screen_width = mIgnoreUIScale ? llround((F32)mRect.getWidth() * LLUI::sGLScaleFactor.mV[VX]) : mRect.getWidth();
+        S32 screen_height = mIgnoreUIScale ? llround((F32)mRect.getHeight() * LLUI::sGLScaleFactor.mV[VY]) : mRect.getHeight();
+
         // create a new browser window
-        mEmbeddedBrowserWindowId = LLMozLib::getInstance()->createBrowserWindow( gViewerWindow->getPlatformWindow(), mRect.getWidth(), mRect.getHeight() );
+        {
+#if LL_LINUX
+                // Yuck, Mozilla init plays with the locale - push/pop
+                // the locale to protect it, as exotic/non-C locales
+                // causes our code lots of general critical weirdness
+                // and crashness. (SL-35450)
+                char *saved_locale = setlocale(LC_ALL, NULL);
+#endif // LL_LINUX
+                mEmbeddedBrowserWindowId = LLMozLib::getInstance()->createBrowserWindow( gViewerWindow->getPlatformWindow(), screen_width, screen_height );
+#if LL_LINUX
+                if (saved_locale)
+                        setlocale(LC_ALL, saved_locale);
+#endif // LL_LINUX
+        }
 
         // change color to black so transisitons aren't so noticable (this should be in XML eventually)
         LLMozLib::getInstance()->setBackgroundColor( mEmbeddedBrowserWindowId, 0x00, 0x00, 0x00 );
@@ -62,7 +79,7 @@ LLWebBrowserCtrl::LLWebBrowserCtrl( const std::string& name, const LLRect& rect
         LLMozLib::getInstance()->addObserver( mEmbeddedBrowserWindowId, this );
 
         // create a new texture (based on LLDynamic texture) that will be used to display the output
-        mWebBrowserImage = new LLWebBrowserTexture( mRect.getWidth(), mRect.getHeight(), this, mEmbeddedBrowserWindowId );
+        mWebBrowserImage = new LLWebBrowserTexture( screen_width, screen_height, this, mEmbeddedBrowserWindowId );
 
         LLRect border_rect( 0, mRect.getHeight() + 2, mRect.getWidth() + 2, 0 );
         mBorder = new LLViewBorder( "web control border", border_rect, LLViewBorder::BEVEL_IN );
@@ -119,7 +136,8 @@ void LLWebBrowserCtrl::setOpenInExternalBrowser( bool valIn )
 //
 BOOL LLWebBrowserCtrl::handleHover( S32 x, S32 y, MASK mask )
 {
-        LLMozLib::getInstance()->mouseMove( mEmbeddedBrowserWindowId, x, mRect.getHeight() - y );
+        convertInputCoords(x, y);
+        LLMozLib::getInstance()->mouseMove( mEmbeddedBrowserWindowId, x, y );
 
         return TRUE;
 }
@@ -142,7 +160,8 @@ BOOL LLWebBrowserCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
 //
 BOOL LLWebBrowserCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
 {
-        LLMozLib::getInstance()->mouseUp( mEmbeddedBrowserWindowId, x, mRect.getHeight() - y );
+        convertInputCoords(x, y);
+        LLMozLib::getInstance()->mouseUp( mEmbeddedBrowserWindowId, x, y );
 
         gViewerWindow->setMouseCapture( 0, 0 );
 
@@ -153,7 +172,8 @@ BOOL LLWebBrowserCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
 //
 BOOL LLWebBrowserCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
 {
-        LLMozLib::getInstance()->mouseDown( mEmbeddedBrowserWindowId, x, mRect.getHeight() - y );
+        convertInputCoords(x, y);
+        LLMozLib::getInstance()->mouseDown( mEmbeddedBrowserWindowId, x, y );
 
         gViewerWindow->setMouseCapture( this, 0 );
 
@@ -184,9 +204,67 @@ void LLWebBrowserCtrl::onFocusLost()
 //
 BOOL LLWebBrowserCtrl::handleKey( KEY key, MASK mask, BOOL called_from_parent )
 {
-        LLMozLib::getInstance()->keyPress( mEmbeddedBrowserWindowId, key );
+        unsigned long nskey;
+
+        // First, turn SL internal keycode enum into Mozilla keycode enum
+
+        // We don't have to deal with printable characters here - they should
+        // go through handleUnicodeChar().  This table could be more complete
+        // than it is, but I think this covers all of the important
+        // non-printables.
+        switch (key)
+        {
+        case KEY_BACKSPACE:
+                nskey = LL_DOM_VK_BACK_SPACE; break;
+        case KEY_TAB:
+                nskey = LL_DOM_VK_TAB; break;
+        case KEY_RETURN:
+                nskey = LL_DOM_VK_RETURN; break;
+        case KEY_PAD_RETURN:
+                nskey = LL_DOM_VK_ENTER; break;
+        case KEY_ESCAPE:
+                nskey = LL_DOM_VK_ESCAPE; break;
+        case KEY_PAGE_UP:
+                nskey = LL_DOM_VK_PAGE_UP; break;
+        case KEY_PAGE_DOWN:
+                nskey = LL_DOM_VK_PAGE_DOWN; break;
+        case KEY_END:
+                nskey = LL_DOM_VK_END; break;
+        case KEY_HOME:
+                nskey = LL_DOM_VK_HOME; break;
+        case KEY_LEFT:
+                nskey = LL_DOM_VK_LEFT; break;
+        case KEY_UP:
+                nskey = LL_DOM_VK_UP; break;
+        case KEY_RIGHT:
+                nskey = LL_DOM_VK_RIGHT; break;
+        case KEY_DOWN:
+                nskey = LL_DOM_VK_DOWN; break;
+        case KEY_INSERT:
+                nskey = LL_DOM_VK_INSERT; break;
+        case KEY_DELETE:
+                nskey = LL_DOM_VK_DELETE; break;
+        default:
+                llinfos << "Don't know how to map LL keycode " << U32(key)
+                        << " to DOM key.  Ignoring." << llendl;
+                return FALSE; // don't know how to map this key.
+        }
 
-        return FALSE;
+        LLMozLib::getInstance()->keyPress( mEmbeddedBrowserWindowId, nskey );
+
+        return TRUE;
+}
+
+BOOL LLWebBrowserCtrl::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
+{
+        // only accept 'printable' characters, sigh...
+        if (uni_char >= 32 // discard 'control' characters
+            && uni_char != 127) // SDL thinks this is 'delete' - yuck.
+        {
+                LLMozLib::getInstance()->unicodeInput( mEmbeddedBrowserWindowId, uni_char );
+        }
+
+        return TRUE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -208,9 +286,13 @@ void LLWebBrowserCtrl::onVisibilityChange ( BOOL curVisibilityIn )
 //
 void LLWebBrowserCtrl::reshape( S32 width, S32 height, BOOL called_from_parent )
 {
+        S32 screen_width = mIgnoreUIScale ? llround((F32)width * LLUI::sGLScaleFactor.mV[VX]) : width;
+        S32 screen_height = mIgnoreUIScale ? llround((F32)height * LLUI::sGLScaleFactor.mV[VX]) : height;
         // when floater is minimized, these sizes are negative
-        if ( height > 0 && width > 0 )
-                mWebBrowserImage->resize( width, height );
+        if ( screen_height > 0 && screen_width > 0 )
+        {
+                mWebBrowserImage->resize( screen_width, screen_height );
+        }
 
         LLUICtrl::reshape( width, height, called_from_parent );
 }
@@ -310,38 +392,60 @@ void LLWebBrowserCtrl::draw()
         LLGLSUIDefault gls_ui;
         LLGLDisable gls_alphaTest( GL_ALPHA_TEST );
 
-        // scale texture to fit the space using texture coords
-        mWebBrowserImage->bindTexture();
-        glColor4fv( LLColor4::white.mV );
-        F32 max_u = ( F32 )mWebBrowserImage->getBrowserWidth() / ( F32 )mWebBrowserImage->getWidth();
-        F32 max_v = ( F32 )mWebBrowserImage->getBrowserHeight() / ( F32 )mWebBrowserImage->getHeight();
-
-        // draw the browser
-        glBlendFunc( GL_ONE, GL_ZERO );
-        glBegin( GL_QUADS );
+        glPushMatrix();
         {
-                glTexCoord2f( max_u, 0.f );
-                glVertex2i( mRect.getWidth(), mRect.getHeight() );
+                if (mIgnoreUIScale)
+                {
+                        glLoadIdentity();
+                        // font system stores true screen origin, need to scale this by UI scale factor
+                        // to get render origin for this view (with unit scale)
+                        glTranslatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), 
+                                                floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), 
+                                                LLFontGL::sCurOrigin.mZ);
+                }
+
+                // scale texture to fit the space using texture coords
+                mWebBrowserImage->bindTexture();
+                glColor4fv( LLColor4::white.mV );
+                F32 max_u = ( F32 )mWebBrowserImage->getBrowserWidth() / ( F32 )mWebBrowserImage->getWidth();
+                F32 max_v = ( F32 )mWebBrowserImage->getBrowserHeight() / ( F32 )mWebBrowserImage->getHeight();
+
+                // draw the browser
+                glBlendFunc( GL_ONE, GL_ZERO );
+                glBegin( GL_QUADS );
+                {
+                        // render using web browser reported width and height, instead of trying to invert GL scale
+                        glTexCoord2f( max_u, 0.f );
+                        glVertex2i( mWebBrowserImage->getBrowserWidth(), mWebBrowserImage->getBrowserHeight() );
 
-                glTexCoord2f( 0.f, 0.f );
-                glVertex2i( 0, mRect.getHeight() );
+                        glTexCoord2f( 0.f, 0.f );
+                        glVertex2i( 0, mWebBrowserImage->getBrowserHeight() );
 
-                glTexCoord2f( 0.f, max_v );
-                glVertex2i( 0, 0 );
+                        glTexCoord2f( 0.f, max_v );
+                        glVertex2i( 0, 0 );
 
-                glTexCoord2f( max_u, max_v );
-                glVertex2i( mRect.getWidth(), 0 );
+                        glTexCoord2f( max_u, max_v );
+                        glVertex2i( mWebBrowserImage->getBrowserWidth(), 0 );
+                }
+                glEnd();
+                glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA  );
         }
-        glEnd();
-        glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA  );
+        glPopMatrix();
 
         // highlight if keyboard focus here. (TODO: this needs some work)
         if ( mBorder->getVisible() )
                 mBorder->setKeyboardFocusHighlight( gFocusMgr.childHasKeyboardFocus( this ) );
 
+
         LLUICtrl::draw();
 }
 
+void LLWebBrowserCtrl::convertInputCoords(S32& x, S32& y)
+{
+        x = mIgnoreUIScale ? llround((F32)x * LLUI::sGLScaleFactor.mV[VX]) : x;
+        y = mIgnoreUIScale ? llround((F32)(mRect.getHeight() - y) * LLUI::sGLScaleFactor.mV[VY]) : (mRect.getHeight() - y);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // virtual
 void LLWebBrowserCtrl::onNavigateBegin( const EventType& eventIn )
@@ -551,6 +655,8 @@ void LLWebBrowserTexture::resize( S32 new_width, S32 new_height )
         if ( actual_rowspan < 1 || browser_depth < 2 )
                 return;
 
+        releaseGLTexture();
+        
         S32 pagebuffer_width = actual_rowspan / browser_depth;
 
         // calculate the next power of 2 bigger than reqquested size for width and height
@@ -635,6 +741,10 @@ LLView* LLWebBrowserCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 
         LLWebBrowserCtrl* web_browser = new LLWebBrowserCtrl( name, rect );
 
+        BOOL ignore_ui_scale = web_browser->getIgnoreUIScale();
+        node->getAttributeBOOL("ignore_ui_scale", ignore_ui_scale);
+        web_browser->setIgnoreUIScale((bool)ignore_ui_scale);
+
         web_browser->initFromXML(node, parent);
 
         web_browser->setHomePageUrl( start_url );
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index bad6e88..e6f9005 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -192,8 +192,12 @@ class LLWebBrowserCtrl :
                 bool getFrequentUpdates() { return mFrequentUpdates; };
                 void setFrequentUpdates( bool frequentUpdatesIn ) {  mFrequentUpdates = frequentUpdatesIn; };
 
+                void setIgnoreUIScale(bool ignore) { mIgnoreUIScale = ignore; }
+                bool getIgnoreUIScale() { return mIgnoreUIScale; }
+
                 // over-rides
                 virtual BOOL handleKey( KEY key, MASK mask, BOOL called_from_parent );
+                virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
                 virtual void reshape( S32 width, S32 height, BOOL called_from_parent );
                 virtual void draw();
                 virtual void onVisibilityChange ( BOOL curVisibilityIn );
@@ -214,6 +218,9 @@ class LLWebBrowserCtrl :
                 virtual void onLocationChange( const EventType& eventIn );
                 virtual void onClickLinkHref( const EventType& eventIn );
                 virtual void onClickLinkSecondLife( const EventType& eventIn );
+        
+        protected:
+                void convertInputCoords(S32& x, S32& y);
 
         private:
                 LLWebBrowserCtrlEventEmitter< LLWebBrowserCtrlObserver > mEventEmitter;
@@ -224,6 +231,7 @@ class LLWebBrowserCtrl :
                 bool mFrequentUpdates;
                 bool mOpenLinksInExternalBrowser;
                 std::string mHomePageUrl;
+                bool mIgnoreUIScale;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 18d4e48..cf85eab 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -62,7 +62,6 @@ U32			gAgentPauseSerialNum = 0;
 // Constants
 //
 const S32 MAX_NUMBER_OF_CLOUDS  = 750;
-const F32 MIN_IDLE_UPDATE_TIME = 0.025f;
 const S32 WORLD_PATCH_SIZE = 16;
 
 extern LLColor4U MAX_WATER_COLOR;
@@ -82,7 +81,6 @@ LLWorld::LLWorld(const U32 grids_per_region, const F32 meters_per_grid)
         mLastPacketsOut = 0;
         mLastPacketsLost = 0;
         mLandFarClip = DEFAULT_FAR_PLANE;
-        mIdleUpdateTime = MIN_IDLE_UPDATE_TIME;
 
         if (gNoRender)
         {
@@ -635,31 +633,22 @@ void LLWorld::updateVisibilities()
         gCamera->setFar(cur_far_clip);
 }
 
-
-void LLWorld::updateRegions()
+void LLWorld::updateRegions(F32 max_update_time)
 {
         LLViewerRegion *regionp;
         LLTimer update_timer;
-
+        BOOL did_one = FALSE;
+        
         // Perform idle time updates for the regions (and associated surfaces)
         for (regionp = mRegionList.getFirstData();
                  regionp;
                  regionp = mRegionList.getNextData())
         {
-                update_timer.reset();
-                if (!regionp->idleUpdate(update_timer, mIdleUpdateTime))
-                {
-                        // Didn't finish all the updates.  Slightly increase the idle update time.
-                        mIdleUpdateTime *= 1.05f;
-                }
-                else
-                {
-                        mIdleUpdateTime *= 0.9f;
-                        if (mIdleUpdateTime < MIN_IDLE_UPDATE_TIME)
-                        {
-                                mIdleUpdateTime = MIN_IDLE_UPDATE_TIME;
-                        }
-                }
+                F32 max_time = max_update_time - update_timer.getElapsedTimeF32();
+                if (did_one && max_time <= 0.f)
+                        break;
+                max_time = llmin(max_time, max_update_time*.1f);
+                did_one |= regionp->idleUpdate(max_update_time);
         }
 }
 
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 6645b94..b10b287 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -114,7 +114,7 @@ public:
         F32                                             getRegionMinHeight() const              { return -mWidthInMeters; }
         F32                                             getRegionMaxHeight() const              { return 3.f*mWidthInMeters; }
 
-        void                                    updateRegions();
+        void                                    updateRegions(F32 max_update_time);
         void                                    updateVisibilities();
         void                                    updateParticles();
         void                                    updateClouds(const F32 dt);
@@ -159,7 +159,6 @@ private:
         const F32 mWidthInMeters;
 
         F32 mLandFarClip;                                       // Far clip distance for land.
-        F32 mIdleUpdateTime;
         LLPatchVertexArray              mLandPatch;
         S32 mLastPacketsIn;
         S32 mLastPacketsOut;
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 6e010f7..0bdab0d 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -266,7 +266,6 @@ void LLWorldMap::setCurrentLayer(S32 layer, bool request_layer)
         if (!mMapLoaded[layer] || request_layer)
         {
                 sendMapLayerRequest();
-                sendItemRequest(MAP_ITEM_AGENT_COUNT);
         }
 
         if (mTelehubs.size() == 0 ||
@@ -506,8 +505,8 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
         {
                 U16 x_regions;
                 U16 y_regions;
-                char name[MAX_STRING];
-                U8 access;
+                char name[MAX_STRING];          /* Flawfinder: ignore */
+                U8 access;              /* Flawfinder: ignore */
                 U32 region_flags;
                 U8 water_height;
                 U8 agents;
@@ -515,7 +514,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                 msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
                 msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
                 msg->getStringFast(_PREHASH_Data, _PREHASH_Name, MAX_STRING, name, block);
-                msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, access, block);
+                msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, access, block);          /* Flawfinder: ignore */
                 msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
                 msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
                 msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
@@ -564,7 +563,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
 
                         siminfo->mHandle = handle;
                         siminfo->mName.assign( name );
-                        siminfo->mAccess = access;
+                        siminfo->mAccess = access;              /* Flawfinder: ignore */
                         siminfo->mRegionFlags = region_flags;
                         siminfo->mWaterHeight = (F32) water_height;
                         siminfo->mMapImageID[agent_flags] = image_id;
@@ -621,7 +620,7 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
         for (S32 block=0; block<num_blocks; ++block)
         {
                 U32 X, Y;
-                char name[MAX_STRING];
+                char name[MAX_STRING];          /* Flawfinder: ignore */
                 S32 extra, extra2;
                 LLUUID uuid;
                 msg->getU32Fast(_PREHASH_Data, _PREHASH_X, X, block);
@@ -671,7 +670,7 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                         case MAP_ITEM_PG_EVENT: // events
                         case MAP_ITEM_MATURE_EVENT:
                         {
-                                char buffer[32];
+                                char buffer[32];                /* Flawfinder: ignore */
                                 struct tm* timep;
                                 // Convert to Pacific, based on server's opinion of whether
                                 // it's daylight savings time there.
@@ -680,7 +679,7 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                                 S32 display_hour = timep->tm_hour % 12;
                                 if (display_hour == 0) display_hour = 12;
 
-                                sprintf(buffer, "%d:%02d %s",
+                                snprintf(buffer, sizeof(buffer), "%d:%02d %s",          /* Flawfinder: ignore */
                                         display_hour,
                                         timep->tm_min,
                                         (timep->tm_hour < 12 ? "AM" : "PM") );
@@ -717,12 +716,6 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                                 gWorldMap->mClassifieds.push_back(new_item);
                                 break;
                         }
-                        case MAP_ITEM_AGENT_COUNT: // agent counts
-                        {
-                                // We only ever receive one per region, i.e. this update superceeds any others
-                                gWorldMap->mNumAgents[new_item.mRegionHandle] = new_item.mExtra;
-                                break;
-                        }
                         case MAP_ITEM_AGENT_LOCATIONS: // agent locations
                         {
                                 if (!siminfo)
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 83e10d9..65a084d 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -167,8 +167,7 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
         mMouseDownPanY( 0 ),
         mMouseDownX( 0 ),
         mMouseDownY( 0 ),
-        mSelectIDStart(0),
-        mAgentCountsUpdateTime(0)
+        mSelectIDStart(0)
 {
         sPixelsPerMeter = gMapScale / REGION_WIDTH_METERS;
         clearLastClick();
@@ -298,12 +297,6 @@ void LLWorldMapView::draw()
 
         F64 current_time = LLTimer::getElapsedSeconds();
 
-        if (current_time - mAgentCountsUpdateTime > AGENT_COUNTS_UPDATE_TIME)
-        {
-                gWorldMap->sendItemRequest(MAP_ITEM_AGENT_COUNT);
-                mAgentCountsUpdateTime = current_time;
-        }
-
         mVisibleRegions.clear();
         
         // animate pan if necessary
@@ -324,7 +317,6 @@ void LLWorldMapView::draw()
         {
                 LLGLSNoTexture no_texture;
         
-
                 glMatrixMode(GL_MODELVIEW);
 
                 // Clear the background alpha to 0
@@ -388,14 +380,12 @@ void LLWorldMapView::draw()
                 current_image->setBoostLevel(LLViewerImage::BOOST_MAP_LAYER);
                 current_image->setKnownDrawSize(llround(pix_width), llround(pix_height));
                 
-#if 1 || LL_RELEASE_FOR_DOWNLOAD
                 if (!current_image->getHasGLTexture())
                 {
                         continue; // better to draw nothing than the default image
                 }
-#endif
 
-                LLTextureView::addDebugImage(current_image);
+//              LLTextureView::addDebugImage(current_image);
                 
                 // Draw using the texture.  If we don't clamp we get artifact at
                 // the edge.
@@ -548,7 +538,7 @@ void LLWorldMapView::draw()
                         overlayimage->setKnownDrawSize(draw_size, draw_size);
                 }
                         
-                LLTextureView::addDebugImage(simimage);
+//              LLTextureView::addDebugImage(simimage);
 
                 if (sim_visible && info->mAlpha > 0.001f)
                 {
@@ -640,7 +630,7 @@ void LLWorldMapView::draw()
                 // Draw the region name in the lower left corner
                 LLFontGL* font = LLFontGL::sSansSerifSmall;
 
-                char mesg[MAX_STRING];
+                char mesg[MAX_STRING];          /* Flawfinder: ignore */
                 if (gMapScale < sThresholdA)
                 {
                         mesg[0] = '\0';
@@ -658,11 +648,11 @@ void LLWorldMapView::draw()
                         //                      LLViewerRegion::accessToShortString(info->mAccess) );
                         if (info->mAccess == SIM_ACCESS_DOWN)
                         {
-                                sprintf(mesg, "%s (Offline)", info->mName.c_str());
+                                snprintf(mesg, MAX_STRING, "%s (Offline)", info->mName.c_str());                /* Flawfinder: ignore */
                         }
                         else
                         {
-                                sprintf(mesg, "%s", info->mName.c_str());
+                                snprintf(mesg, MAX_STRING, "%s", info->mName.c_str());          /* Flawfinder: ignore */
                         }
                 }
 
@@ -841,6 +831,39 @@ void LLWorldMapView::draw()
         updateVisibleBlocks();
 }
 
+//virtual
+void LLWorldMapView::setVisible(BOOL visible)
+{
+        LLPanel::setVisible(visible);
+        if (!visible && gWorldMap)
+        {
+                for (S32 map = 0; map < MAP_SIM_IMAGE_TYPES; map++)
+                {
+                        for (U32 layer_idx=0; layer_idx<gWorldMap->mMapLayers[map].size(); ++layer_idx)
+                        {
+                                if (gWorldMap->mMapLayers[map][layer_idx].LayerDefined)
+                                {
+                                        LLWorldMapLayer *layer = &gWorldMap->mMapLayers[map][layer_idx];
+                                        layer->LayerImage->setBoostLevel(0);
+                                }
+                        }
+                }
+                for (LLWorldMap::sim_info_map_t::iterator it = gWorldMap->mSimInfoMap.begin();
+                         it != gWorldMap->mSimInfoMap.end(); ++it)
+                {
+                        LLSimInfo* info = (*it).second;
+                        if (info->mCurrentImage.notNull())
+                        {
+                                info->mCurrentImage->setBoostLevel(0);
+                        }
+                        if (info->mOverlayImage.notNull())
+                        {
+                                info->mOverlayImage->setBoostLevel(0);
+                        }
+                }
+        }
+}
+
 void LLWorldMapView::drawGenericItems(const LLWorldMap::item_info_list_t& items, LLPointer<LLViewerImage> image)
 {
         LLWorldMap::item_info_list_t::const_iterator e;
@@ -1912,7 +1935,7 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
                         {
                                 gFloaterWorldMap->close();
                                 // This is an ungainly hack
-                                char uuid_str[38];
+                                char uuid_str[38];              /* Flawfinder: ignore */
                                 S32 event_id;
                                 id.toString(uuid_str);
                                 sscanf(&uuid_str[28], "%X", &event_id);
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 5c18aab..f2912bd 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -52,8 +52,9 @@ class LLTextBox;
 #define SIM_MAP_AGENT_SCALE 20 // width in pixels, where we start drawing agents
 #define SIM_MAP_SCALE 90 // width in pixels, where we start drawing sim tiles
 
+// Updates for agent locations.
 #define AGENTS_UPDATE_TIME 60.0 // in seconds
-#define AGENT_COUNTS_UPDATE_TIME 60.0 // in seconds
+
 
 class LLWorldMapView : public LLPanel
 {
@@ -65,12 +66,13 @@ public:
         virtual ~LLWorldMapView();
 
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE );
+        virtual void    setVisible(BOOL visible);
 
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleMouseUp(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        handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen );
+        virtual BOOL    handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen );
 
         bool                    checkItemHit(S32 x, S32 y, LLItemInfo& item, LLUUID* id, bool track);
         void                    handleClick(S32 x, S32 y, MASK mask, S32* hit_type, LLUUID* id);
@@ -183,7 +185,6 @@ public:
 
         static BOOL             sHandledLastClick;
         S32                             mSelectIDStart;
-        F64                             mAgentCountsUpdateTime;
 
         typedef std::vector<U64> handle_list_t;
         handle_list_t mVisibleRegions; // set every frame
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index 9b8a872..d84f5c6 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -155,7 +155,7 @@ public:
         std::string     mStatusMessage;
         std::string     mStatusURI;
         
-        char                            mCurlErrorBuffer[CURL_ERROR_SIZE];
+        char                            mCurlErrorBuffer[CURL_ERROR_SIZE];              /* Flawfinder: ignore */
 
         std::string                     mURI;
         char*                           mRequestText;
@@ -343,9 +343,9 @@ bool LLXMLRPCTransaction::Impl::process()
                         if (curl_msg->data.result != CURLE_OK)
                         {
                                 setCurlStatus(curl_msg->data.result);
-                                llalerts << "LLXMLRPCTransaction CURL error "
+                                llwarns << "LLXMLRPCTransaction CURL error "
                                         << mCurlCode << ": " << mCurlErrorBuffer << llendl;
-                                llalerts << "LLXMLRPCTransaction request URI: "
+                                llwarns << "LLXMLRPCTransaction request URI: "
                                         << mURI << llendl;
                                         
                                 return true;
@@ -379,11 +379,11 @@ bool LLXMLRPCTransaction::Impl::process()
                         {
                                 setStatus(LLXMLRPCTransaction::StatusXMLRPCError);
                                 
-                                llalerts << "LLXMLRPCTransaction XMLRPC "
+                                llwarns << "LLXMLRPCTransaction XMLRPC "
                                         << (hasError ? "error " : "fault ")
                                         << faultCode << ": "
                                         << faultString << llendl;
-                                llalerts << "LLXMLRPCTransaction request URI: "
+                                llwarns << "LLXMLRPCTransaction request URI: "
                                         << mURI << llendl;
                         }
                         
@@ -427,9 +427,9 @@ void LLXMLRPCTransaction::Impl::setStatus(Status status,
                                 mStatusMessage =
                                         "Despite our best efforts, something unexpected has gone wrong. \n"
                                         " \n"
-                                        "Please check www.secondlife.com/status and the Second Life \n"
-                                        "Announcements forum to see if there is a known problem with \n"
-                                        "the service.";
+                                        "Please check www.secondlife.com/status \n"
+                                        "to see if there is a known problem with the service.";
+
                                 mStatusURI = "http://secondlife.com/status/";
                                 /*
                                 mStatusMessage =
diff --git a/linden/indra/newview/lsl_guide.html b/linden/indra/newview/lsl_guide.html
index e0faf7b..6f3796f 100644
--- a/linden/indra/newview/lsl_guide.html
+++ b/linden/indra/newview/lsl_guide.html
@@ -58,7 +58,7 @@ NAME="AEN16"
 >Donald Kjer</H3
 ><P
 CLASS="copyright"
->Copyright &copy; 2003 Linden Lab</P
+>Copyright &copy; 2007 Linden Lab</P
 ><DIV
 CLASS="legalnotice"
 ><P
@@ -1623,631 +1623,641 @@ HREF="#AEN3894"
 ><DT
 >A.234. <A
 HREF="#AEN3913"
->llSetLocalRot</A
+>llSetLinkPrimitiveParams</A
 ></DT
 ><DT
 >A.235. <A
-HREF="#AEN3922"
->llSetObjectDesc</A
+HREF="#AEN3929"
+>llSetLinkTexture</A
 ></DT
 ><DT
 >A.236. <A
-HREF="#AEN3932"
->llSetObjectName</A
+HREF="#AEN3948"
+>llSetLocalRot</A
 ></DT
 ><DT
 >A.237. <A
-HREF="#AEN3942"
->llSetParcelMusicURL</A
+HREF="#AEN3957"
+>llSetObjectDesc</A
 ></DT
 ><DT
 >A.238. <A
-HREF="#AEN3952"
->llSetPayPrice</A
+HREF="#AEN3967"
+>llSetObjectName</A
 ></DT
 ><DT
 >A.239. <A
-HREF="#AEN3964"
->llSetPos</A
+HREF="#AEN3977"
+>llSetParcelMusicURL</A
 ></DT
 ><DT
 >A.240. <A
-HREF="#AEN3973"
->llSetPrimitiveParams</A
+HREF="#AEN3987"
+>llSetPayPrice</A
 ></DT
 ><DT
 >A.241. <A
-HREF="#AEN3987"
->llSetRemoteScriptAccessPin</A
+HREF="#AEN3999"
+>llSetPos</A
 ></DT
 ><DT
 >A.242. <A
-HREF="#AEN3996"
->llSetRot</A
+HREF="#AEN4008"
+>llSetPrimitiveParams</A
 ></DT
 ><DT
 >A.243. <A
-HREF="#AEN4005"
->llSetScale</A
+HREF="#AEN4022"
+>llSetRemoteScriptAccessPin</A
 ></DT
 ><DT
 >A.244. <A
-HREF="#AEN4014"
->llSetScriptState</A
+HREF="#AEN4031"
+>llSetRot</A
 ></DT
 ><DT
 >A.245. <A
-HREF="#AEN4025"
->llSetSitText</A
+HREF="#AEN4040"
+>llSetScale</A
 ></DT
 ><DT
 >A.246. <A
-HREF="#AEN4035"
->llSetSoundQueueing</A
+HREF="#AEN4049"
+>llSetScriptState</A
 ></DT
 ><DT
 >A.247. <A
-HREF="#AEN4048"
->llSetStatus</A
+HREF="#AEN4060"
+>llSetSitText</A
 ></DT
 ><DT
 >A.248. <A
-HREF="#AEN4063"
->llSetText</A
+HREF="#AEN4070"
+>llSetSoundQueueing</A
 ></DT
 ><DT
 >A.249. <A
-HREF="#AEN4079"
->llSetTexture</A
+HREF="#AEN4083"
+>llSetStatus</A
 ></DT
 ><DT
 >A.250. <A
-HREF="#AEN4093"
->llSetTextureAnim</A
+HREF="#AEN4098"
+>llSetText</A
 ></DT
 ><DT
 >A.251. <A
-HREF="#AEN4141"
->llSetTimerEvent</A
+HREF="#AEN4114"
+>llSetTexture</A
 ></DT
 ><DT
 >A.252. <A
-HREF="#AEN4153"
->llSetTorque</A
+HREF="#AEN4128"
+>llSetTextureAnim</A
 ></DT
 ><DT
 >A.253. <A
-HREF="#AEN4167"
->llSetTouchText</A
+HREF="#AEN4176"
+>llSetTimerEvent</A
 ></DT
 ><DT
 >A.254. <A
-HREF="#AEN4177"
->llSetVehicleFlags</A
+HREF="#AEN4188"
+>llSetTorque</A
 ></DT
 ><DT
 >A.255. <A
-HREF="#AEN4188"
->llSetVehicleFloatParam</A
+HREF="#AEN4202"
+>llSetTouchText</A
 ></DT
 ><DT
 >A.256. <A
-HREF="#AEN4202"
->llSetVehicleType</A
+HREF="#AEN4212"
+>llSetVehicleFlags</A
 ></DT
 ><DT
 >A.257. <A
-HREF="#AEN4213"
->llSetVehicleRotationParam</A
+HREF="#AEN4223"
+>llSetVehicleFloatParam</A
 ></DT
 ><DT
 >A.258. <A
-HREF="#AEN4227"
->llSetVehicleVectorParam</A
+HREF="#AEN4237"
+>llSetVehicleType</A
 ></DT
 ><DT
 >A.259. <A
-HREF="#AEN4241"
->llShout</A
+HREF="#AEN4248"
+>llSetVehicleRotationParam</A
 ></DT
 ><DT
 >A.260. <A
-HREF="#AEN4255"
->llSin</A
+HREF="#AEN4262"
+>llSetVehicleVectorParam</A
 ></DT
 ><DT
 >A.261. <A
-HREF="#AEN4265"
->llSitTarget</A
+HREF="#AEN4276"
+>llShout</A
 ></DT
 ><DT
 >A.262. <A
-HREF="#AEN4278"
->llSleep</A
+HREF="#AEN4290"
+>llSin</A
 ></DT
 ><DT
 >A.263. <A
-HREF="#AEN4288"
->llSqrt</A
+HREF="#AEN4300"
+>llSitTarget</A
 ></DT
 ><DT
 >A.264. <A
-HREF="#AEN4299"
->llStartAnimation</A
+HREF="#AEN4313"
+>llSleep</A
 ></DT
 ><DT
 >A.265. <A
-HREF="#AEN4531"
->llStopAnimation</A
+HREF="#AEN4323"
+>llSqrt</A
 ></DT
 ><DT
 >A.266. <A
-HREF="#AEN4541"
->llStopHover</A
+HREF="#AEN4334"
+>llStartAnimation</A
 ></DT
 ><DT
 >A.267. <A
-HREF="#AEN4549"
->llStopLookAt</A
+HREF="#AEN4566"
+>llStopAnimation</A
 ></DT
 ><DT
 >A.268. <A
-HREF="#AEN4557"
->llStopMoveToTarget</A
+HREF="#AEN4576"
+>llStopHover</A
 ></DT
 ><DT
 >A.269. <A
-HREF="#AEN4565"
->llStopPointAt</A
+HREF="#AEN4584"
+>llStopLookAt</A
 ></DT
 ><DT
 >A.270. <A
-HREF="#AEN4573"
->llStopSound</A
+HREF="#AEN4592"
+>llStopMoveToTarget</A
 ></DT
 ><DT
 >A.271. <A
-HREF="#AEN4584"
->llStringLength</A
+HREF="#AEN4600"
+>llStopPointAt</A
 ></DT
 ><DT
 >A.272. <A
-HREF="#AEN4594"
->llSubStringIndex</A
+HREF="#AEN4608"
+>llStopSound</A
 ></DT
 ><DT
 >A.273. <A
-HREF="#AEN4605"
->llStringToBase64</A
+HREF="#AEN4619"
+>llStringLength</A
 ></DT
 ><DT
 >A.274. <A
-HREF="#AEN4614"
->llTakeControls</A
+HREF="#AEN4629"
+>llSubStringIndex</A
 ></DT
 ><DT
 >A.275. <A
-HREF="#AEN4631"
->llTan</A
+HREF="#AEN4640"
+>llStringToBase64</A
 ></DT
 ><DT
 >A.276. <A
-HREF="#AEN4641"
->llTarget</A
+HREF="#AEN4649"
+>llTakeControls</A
 ></DT
 ><DT
 >A.277. <A
-HREF="#AEN4654"
->llTargetOmega</A
+HREF="#AEN4666"
+>llTan</A
 ></DT
 ><DT
 >A.278. <A
-HREF="#AEN4671"
->llTargetRemove</A
+HREF="#AEN4676"
+>llTarget</A
 ></DT
 ><DT
 >A.279. <A
-HREF="#AEN4681"
->llTeleportAgentHome</A
+HREF="#AEN4689"
+>llTargetOmega</A
 ></DT
 ><DT
 >A.280. <A
-HREF="#AEN4690"
->llToLower</A
+HREF="#AEN4706"
+>llTargetRemove</A
 ></DT
 ><DT
 >A.281. <A
-HREF="#AEN4699"
->llToUpper</A
+HREF="#AEN4716"
+>llTeleportAgentHome</A
 ></DT
 ><DT
 >A.282. <A
-HREF="#AEN4709"
->llTriggerSound</A
+HREF="#AEN4725"
+>llToLower</A
 ></DT
 ><DT
 >A.283. <A
-HREF="#AEN4723"
->llTriggerSoundLimited</A
+HREF="#AEN4734"
+>llToUpper</A
 ></DT
 ><DT
 >A.284. <A
-HREF="#AEN4743"
->llUnescapeURL</A
+HREF="#AEN4744"
+>llTriggerSound</A
 ></DT
 ><DT
 >A.285. <A
-HREF="#AEN4753"
->llUnSit</A
+HREF="#AEN4758"
+>llTriggerSoundLimited</A
 ></DT
 ><DT
 >A.286. <A
-HREF="#AEN4763"
->llVecDist</A
+HREF="#AEN4778"
+>llUnescapeURL</A
 ></DT
 ><DT
 >A.287. <A
-HREF="#AEN4776"
->llVecMag</A
+HREF="#AEN4788"
+>llUnSit</A
 ></DT
 ><DT
 >A.288. <A
-HREF="#AEN4786"
->llVecNorm</A
+HREF="#AEN4798"
+>llVecDist</A
 ></DT
 ><DT
 >A.289. <A
-HREF="#AEN4796"
->llVolumeDetect</A
+HREF="#AEN4811"
+>llVecMag</A
 ></DT
 ><DT
 >A.290. <A
-HREF="#AEN4805"
->llWater</A
+HREF="#AEN4821"
+>llVecNorm</A
 ></DT
 ><DT
 >A.291. <A
-HREF="#AEN4815"
->llWhisper</A
+HREF="#AEN4831"
+>llVolumeDetect</A
 ></DT
 ><DT
 >A.292. <A
-HREF="#AEN4829"
->llWind</A
+HREF="#AEN4840"
+>llWater</A
 ></DT
 ><DT
 >A.293. <A
-HREF="#AEN4839"
+HREF="#AEN4850"
+>llWhisper</A
+></DT
+><DT
+>A.294. <A
+HREF="#AEN4864"
+>llWind</A
+></DT
+><DT
+>A.295. <A
+HREF="#AEN4874"
 >llXorBase64Strings</A
 ></DT
 ></DL
 ></DD
 ><DT
 >B. <A
-HREF="#AEN4852"
+HREF="#AEN4887"
 >Events</A
 ></DT
 ><DD
 ><DL
 ><DT
 >B.1. <A
-HREF="#AEN4855"
+HREF="#AEN4890"
 >at_rot_target</A
 ></DT
 ><DT
 >B.2. <A
-HREF="#AEN4869"
+HREF="#AEN4904"
 >at_target</A
 ></DT
 ><DT
 >B.3. <A
-HREF="#AEN4883"
+HREF="#AEN4918"
 >attach</A
 ></DT
 ><DT
 >B.4. <A
-HREF="#AEN4893"
+HREF="#AEN4928"
 >changed</A
 ></DT
 ><DT
 >B.5. <A
-HREF="#AEN4904"
+HREF="#AEN4939"
 >collision</A
 ></DT
 ><DT
 >B.6. <A
-HREF="#AEN4914"
+HREF="#AEN4949"
 >collision_end</A
 ></DT
 ><DT
 >B.7. <A
-HREF="#AEN4924"
+HREF="#AEN4959"
 >collision_start</A
 ></DT
 ><DT
 >B.8. <A
-HREF="#AEN4934"
+HREF="#AEN4969"
 >control</A
 ></DT
 ><DT
 >B.9. <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 ></DT
 ><DT
 >B.10. <A
-HREF="#AEN4965"
+HREF="#AEN5000"
 >email</A
 ></DT
 ><DT
 >B.11. <A
-HREF="#AEN4983"
+HREF="#AEN5018"
 >land_collision</A
 ></DT
 ><DT
 >B.12. <A
-HREF="#AEN4992"
+HREF="#AEN5027"
 >land_collision_end</A
 ></DT
 ><DT
 >B.13. <A
-HREF="#AEN5001"
+HREF="#AEN5036"
 >land_collision_start</A
 ></DT
 ><DT
 >B.14. <A
-HREF="#AEN5010"
+HREF="#AEN5045"
 >link_message</A
 ></DT
 ><DT
 >B.15. <A
-HREF="#AEN5026"
+HREF="#AEN5061"
 >listen</A
 ></DT
 ><DT
 >B.16. <A
-HREF="#AEN5045"
+HREF="#AEN5080"
 >money</A
 ></DT
 ><DT
 >B.17. <A
-HREF="#AEN5058"
+HREF="#AEN5093"
 >moving_end</A
 ></DT
 ><DT
 >B.18. <A
-HREF="#AEN5066"
+HREF="#AEN5101"
 >moving_start</A
 ></DT
 ><DT
 >B.19. <A
-HREF="#AEN5074"
+HREF="#AEN5109"
 >no_sensor</A
 ></DT
 ><DT
 >B.20. <A
-HREF="#AEN5083"
+HREF="#AEN5118"
 >not_at_rot_target</A
 ></DT
 ><DT
 >B.21. <A
-HREF="#AEN5092"
+HREF="#AEN5127"
 >not_at_target</A
 ></DT
 ><DT
 >B.22. <A
-HREF="#AEN5101"
+HREF="#AEN5136"
 >object_rez</A
 ></DT
 ><DT
 >B.23. <A
-HREF="#AEN5112"
+HREF="#AEN5147"
 >on_rez</A
 ></DT
 ><DT
 >B.24. <A
-HREF="#AEN5124"
+HREF="#AEN5159"
 >run_time_permissions</A
 ></DT
 ><DT
 >B.25. <A
-HREF="#AEN5136"
+HREF="#AEN5171"
 >sensor</A
 ></DT
 ><DT
 >B.26. <A
-HREF="#AEN5148"
+HREF="#AEN5183"
 >state_entry</A
 ></DT
 ><DT
 >B.27. <A
-HREF="#AEN5156"
+HREF="#AEN5191"
 >state_exit</A
 ></DT
 ><DT
 >B.28. <A
-HREF="#AEN5164"
+HREF="#AEN5199"
 >timer</A
 ></DT
 ><DT
 >B.29. <A
-HREF="#AEN5173"
+HREF="#AEN5208"
 >touch</A
 ></DT
 ><DT
 >B.30. <A
-HREF="#AEN5184"
+HREF="#AEN5219"
 >touch_end</A
 ></DT
 ><DT
 >B.31. <A
-HREF="#AEN5195"
+HREF="#AEN5230"
 >touch_start</A
 ></DT
 ><DT
 >B.32. <A
-HREF="#AEN5206"
+HREF="#AEN5241"
 >remote_data</A
 ></DT
 ></DL
 ></DD
 ><DT
 >C. <A
-HREF="#AEN5245"
+HREF="#AEN5280"
 >Constants</A
 ></DT
 ><DD
 ><DL
 ><DT
 >C.1. <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >Boolean Constants</A
 ></DT
 ><DT
 >C.2. <A
-HREF="#AEN5257"
+HREF="#AEN5292"
 >Status Constants</A
 ></DT
 ><DT
 >C.3. <A
-HREF="#AEN5291"
+HREF="#AEN5326"
 >Object Type Constants</A
 ></DT
 ><DT
 >C.4. <A
-HREF="#AEN5313"
+HREF="#AEN5348"
 >Permission Constants</A
 ></DT
 ><DT
 >C.5. <A
-HREF="#AEN5364"
+HREF="#AEN5399"
 >Inventory Constants</A
 ></DT
 ><DT
 >C.6. <A
-HREF="#AEN5387"
+HREF="#AEN5422"
 >Pay Price Constants</A
 ></DT
 ><DT
 >C.7. <A
-HREF="#AEN5401"
+HREF="#AEN5436"
 >Attachment Constants</A
 ></DT
 ><DT
 >C.8. <A
-HREF="#AEN5527"
+HREF="#AEN5562"
 >Land Constants</A
 ></DT
 ><DT
 >C.9. <A
-HREF="#AEN5569"
+HREF="#AEN5604"
 >Link Constants</A
 ></DT
 ><DT
 >C.10. <A
-HREF="#AEN5596"
+HREF="#AEN5631"
 >Control Constants</A
 ></DT
 ><DT
 >C.11. <A
-HREF="#AEN5643"
+HREF="#AEN5678"
 >Change Constants</A
 ></DT
 ><DT
 >C.12. <A
-HREF="#AEN5686"
+HREF="#AEN5721"
 >Type Constants</A
 ></DT
 ><DT
 >C.13. <A
-HREF="#AEN5720"
+HREF="#AEN5755"
 >Agent Info Constants</A
 ></DT
 ><DT
 >C.14. <A
-HREF="#AEN5770"
+HREF="#AEN5805"
 >Texture Animation
     Constants</A
 ></DT
 ><DT
 >C.15. <A
-HREF="#AEN5804"
+HREF="#AEN5839"
 >Particle System Constants</A
 ></DT
 ><DT
 >C.16. <A
-HREF="#AEN5958"
+HREF="#AEN5993"
 >Agent Data Constants</A
 ></DT
 ><DT
 >C.17. <A
-HREF="#AEN5994"
+HREF="#AEN6029"
 >Float Constants</A
 ></DT
 ><DT
 >C.18. <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >Key Constant</A
 ></DT
 ><DT
 >C.19. <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >Miscellaneous Integer Constants</A
 ></DT
 ><DT
 >C.20. <A
-HREF="#AEN6029"
+HREF="#AEN6064"
 >Miscellaneous String
     Constants</A
 ></DT
 ><DT
 >C.21. <A
-HREF="#AEN6033"
+HREF="#AEN6068"
 >Vector Constant</A
 ></DT
 ><DT
 >C.22. <A
-HREF="#AEN6036"
+HREF="#AEN6071"
 >Rotation Constant</A
 ></DT
 ><DT
 >C.23. <A
-HREF="#AEN6039"
+HREF="#AEN6074"
 >Simulator Data Constants</A
 ></DT
 ><DT
 >C.24. <A
-HREF="#AEN6065"
+HREF="#AEN6100"
 >Vehicle Parameters</A
 ></DT
 ><DT
 >C.25. <A
-HREF="#AEN6184"
+HREF="#AEN6219"
 >Vehicle Flags</A
 ></DT
 ><DT
 >C.26. <A
-HREF="#AEN6241"
+HREF="#AEN6276"
 >Vehicle Types</A
 ></DT
 ><DT
 >C.27. <A
-HREF="#AEN6276"
+HREF="#AEN6311"
 >Primitive Constants</A
 ></DT
 ><DT
 >C.28. <A
-HREF="#AEN6358"
+HREF="#AEN6393"
 >XML-RPC Constants</A
 ></DT
 ><DT
 >C.29. <A
-HREF="#AEN6361"
+HREF="#AEN6396"
 >Permission Mask Constants</A
 ></DT
 ><DT
 >C.30. <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >Parcel Media Constants (Movies)</A
 ></DT
 ></DL
@@ -2591,12 +2601,12 @@ CLASS="programlisting"
 ></P
 ><P
 >There are many <A
-HREF="#AEN4852"
+HREF="#AEN4887"
 >events</A
 > that can 
           be detected in your scripts by declaring a handler. The 
           <A
-HREF="#AEN5195"
+HREF="#AEN5230"
 > touch_start()</A
 > 
           event is raised when a
@@ -3681,7 +3691,7 @@ CLASS="programlisting"
     non-zero integer. Once a conditional is determined to be true
     (non-zero), no further processing of 'else' conditionals will be
     considered.  The <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > constant
     is counted as FALSE by conditional expressions.</P
@@ -4037,7 +4047,7 @@ NAME="AEN431"
 ></H2
 ><P
 >The <A
-HREF="#AEN5148"
+HREF="#AEN5183"
 >state_entry</A
 >
         event occurs whenever a new state is
@@ -4107,7 +4117,7 @@ NAME="AEN440"
 ></H2
 ><P
 >You will want to provide a <A
-HREF="#AEN5156"
+HREF="#AEN5191"
 >&#13;  state_exit()</A
 > if you need to clean
     up any events that you have requested in the current state, but do
@@ -4180,7 +4190,7 @@ state ListenState
 ></P
 ><P
 >The <A
-HREF="#AEN5156"
+HREF="#AEN5191"
 >state_exit()</A
 > 
         handler is not called when an object is
@@ -4318,21 +4328,21 @@ HREF="#AEN3615"
 ><TR
 ><TD
 ><A
-HREF="#AEN4255"
+HREF="#AEN4290"
 >llSin</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4288"
+HREF="#AEN4323"
 >llSqrt</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4631"
+HREF="#AEN4666"
 >llTan</A
 ></TD
 ></TR
@@ -4361,21 +4371,21 @@ CLASS="CALSTABLE"
 ><TR
 ><TD
 ><A
-HREF="#AEN4763"
+HREF="#AEN4798"
 >llVecDist</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4776"
+HREF="#AEN4811"
 >llVecMag</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4786"
+HREF="#AEN4821"
 >llVecNorm</A
 ></TD
 ></TR
@@ -4555,42 +4565,42 @@ HREF="#AEN2902"
 ><TR
 ><TD
 ><A
-HREF="#AEN4584"
+HREF="#AEN4619"
 >llStringLength</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4594"
+HREF="#AEN4629"
 >llSubStringIndex</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4605"
+HREF="#AEN4640"
 >llStringToBase64</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4690"
+HREF="#AEN4725"
 >llToLower</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4699"
+HREF="#AEN4734"
 >llToUpper</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4839"
+HREF="#AEN4874"
 >llXorBase64Strings</A
 ></TD
 ></TR
@@ -4829,14 +4839,14 @@ HREF="#AEN3637"
 ><TR
 ><TD
 ><A
-HREF="#AEN4241"
+HREF="#AEN4276"
 >llShout</A
 ></TD
 ></TR
 ><TR
 ><TD
 ><A
-HREF="#AEN4815"
+HREF="#AEN4850"
 >llWhisper</A
 ></TD
 ></TR
@@ -5110,22 +5120,22 @@ NAME="AEN790"
 ><P
 >Each scripted object can have one vehicle behavior that is
         configurable through the <A
-HREF="#AEN4202"
+HREF="#AEN4237"
 >llSetVehicleType</A
 >, <A
-HREF="#AEN4188"
+HREF="#AEN4223"
 >llSetVehicleFloatParam</A
 >,
         <A
-HREF="#AEN4227"
+HREF="#AEN4262"
 >llSetVehicleVectorParam</A
 >,
         <A
-HREF="#AEN4213"
+HREF="#AEN4248"
 >llSetVehicleRotationParam</A
 >,
         <A
-HREF="#AEN4177"
+HREF="#AEN4212"
 >llSetVehicleFlags</A
 >,
         and <A
@@ -5173,7 +5183,7 @@ HREF="#AEN3770"
 HREF="#AEN3829"
 >llSetForce</A
 >, <A
-HREF="#AEN4153"
+HREF="#AEN4188"
 >llSetTorque</A
 >, and <A
 HREF="#AEN3860"
@@ -5192,7 +5202,7 @@ HREF="#AEN3556"
 HREF="#AEN2980"
 >llMoveToTarget</A
 >, and <A
-HREF="#AEN4654"
+HREF="#AEN4689"
 >llTargetOmega</A
 > at your own
         risk.</P
@@ -5310,12 +5320,12 @@ NAME="AEN826"
 ><P
 >Before any vehicle parameters can be set the vehicle
         behavior must first be enabled. It is enabled by calling <A
-HREF="#AEN4202"
+HREF="#AEN4237"
 >llSetVehicleType</A
 > with any
         VEHICLE_TYPE_*, except VEHICLE_TYPE_NONE which will disable the
         vehicle. See the <A
-HREF="#AEN6241"
+HREF="#AEN6276"
 >vehicle type
         constants</A
 > section for currently available types. More types
@@ -5436,7 +5446,7 @@ HREF="#AEN990"
         of linear and/or angular deflection or not.  The speed of the
         deflections are controlled by setting the relevant parameters
         using the <A
-HREF="#AEN4188"
+HREF="#AEN4223"
 >llSetVehicleFloatParam</A
 >
         script call.  Each variety of deflection has a
@@ -5495,7 +5505,7 @@ HREF="#AEN1070"
         to make motion smoother and easier to control.
         Their directions can be set using the 
         <A
-HREF="#AEN4227"
+HREF="#AEN4262"
 >llSetVehicleVectorParam</A
 >
         call. For example, to make the vehicle try to move at 5
@@ -6391,7 +6401,7 @@ HREF="#AEN2773"
 >llLoopSound</A
 >. This function
     Has no effect on sounds started with <A
-HREF="#AEN4709"
+HREF="#AEN4744"
 >llTriggerSound</A
 >.</P
 ></DIV
@@ -6634,7 +6644,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >avatar</CODE
 > at point <A
-HREF="#AEN5401"
+HREF="#AEN5436"
 ><CODE
 CLASS="parameter"
 >attachment</CODE
@@ -6674,11 +6684,11 @@ CLASS="FUNCDEF"
 ><P
 >If an avatar is sitting on the sit target, return
     the avatar's key, <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > otherwise.
     This only will detect avatars sitting on sit targets defined with <A
-HREF="#AEN4265"
+HREF="#AEN4300"
 >llSitTarget</A
 >.</P
 ></DIV
@@ -7025,7 +7035,7 @@ CLASS="parameter"
 >id</CODE
 >. Specify
     an empty string or <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > to
     not filter on the corresponding parameter.</P
@@ -7410,7 +7420,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >number</CODE
 >. Returns <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > if number is not valid sensed
     object.</P
@@ -8143,7 +8153,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >id</CODE
 >. Returns a bitfield of <A
-HREF="#AEN5720"
+HREF="#AEN5755"
 >agent info constants</A
 >.</P
 ></DIV
@@ -8214,7 +8224,7 @@ CLASS="parameter"
 >face</CODE
 > is
     <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 > the value returned is
     the mean average of all faces.</P
@@ -8252,7 +8262,7 @@ CLASS="FUNCDEF"
 HREF="#AEN3423"
 >llResetTime</A
 >. Use <A
-HREF="#AEN4141"
+HREF="#AEN4176"
 >llSetTimerEvent</A
 > if you want a
     reliable timing mechanism.</P
@@ -8417,7 +8427,7 @@ CLASS="parameter"
 CLASS="parameter"
 >face</CODE
 > is <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 > the color returned is the
     mean average of each channel.</P
@@ -8718,7 +8728,7 @@ CLASS="parameter"
 >type</CODE
 >. Use
     the <A
-HREF="#AEN5364"
+HREF="#AEN5399"
 >inventory constants</A
 > to
     specify the <CODE
@@ -8757,7 +8767,7 @@ CLASS="parameter"
 >type</CODE
 > in
     the object inventory. Use the <A
-HREF="#AEN5364"
+HREF="#AEN5399"
 >inventory constants</A
 > to specify
     the <CODE
@@ -8796,7 +8806,7 @@ CLASS="parameter"
 >mask</CODE
 > for the 
         specified inventory item.  See <A
-HREF="#AEN6361"
+HREF="#AEN6396"
 >Permission Mask Constants</A
 >
         for more information.  Example usage:
@@ -8855,7 +8865,7 @@ CLASS="parameter"
 CLASS="parameter"
 >name</CODE
 > is found.  Use the <A
-HREF="#AEN5364"
+HREF="#AEN5399"
 >inventory constants</A
 > to compare
     against the return value.</P
@@ -8919,7 +8929,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >pos</CODE
 > or <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > if public.</P
 ></DIV
@@ -9044,7 +9054,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >Returns the <A
-HREF="#AEN5686"
+HREF="#AEN5721"
 >type</A
 > of the
     variable at <CODE
@@ -9281,21 +9291,21 @@ CLASS="parameter"
 CLASS="parameter"
 >name</CODE
 > and returns the data through the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event. The line count
     starts at zero. If the requested line is past the end of the
     notecard the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 >
     event will return the constant <A
-HREF="#AEN6029"
+HREF="#AEN6064"
 >EOF</A
 > string. The key returned by
     this function is a unique identifier which will be supplied to the
     <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event in the
     <CODE
@@ -9334,12 +9344,12 @@ CLASS="parameter"
 >name</CODE
 >
         and returns this information through the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event.  
         The key returned by this function is a unique identifier which will be supplied to the
         <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event in the <CODE
 CLASS="parameter"
@@ -9491,7 +9501,7 @@ CLASS="parameter"
 >mask</CODE
 > for the root object the
         task is attached to.  See <A
-HREF="#AEN6361"
+HREF="#AEN6396"
 >Permission Mask Constants</A
 >
         for more information.  Example usage:
@@ -9677,7 +9687,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >Returns avatar that has enabled permissions. Returns <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > if not enabled.</P
 ></DIV
@@ -9743,12 +9753,12 @@ CLASS="parameter"
 CLASS="parameter"
 >parameters</CODE
 > are identical to the rules of <A
-HREF="#AEN3973"
+HREF="#AEN4008"
 >llSetPrimitiveParams</A
 >, and the returned list is ordered as such.  Most requested parameters do not require a value to be associated, except for texture-related requests (PRIM_TEXTURE, PRIM_COLOR, and PRIM_BUMP_SHINY) which require a side number to be specified as well.  
   
     Valid parameters can be found in the <A
-HREF="#AEN6276"
+HREF="#AEN6311"
 >Primitive Constants</A
 >.
     Here is a simple example:
@@ -10142,7 +10152,7 @@ CLASS="parameter"
 >status</CODE
 >. The
     value will be one of the <A
-HREF="#AEN5257"
+HREF="#AEN5292"
 >status
     constants</A
 >.</P
@@ -10392,7 +10402,7 @@ HREF="#AEN1638"
 HREF="#AEN3423"
 >llResetTime</A
 >. Use <A
-HREF="#AEN4141"
+HREF="#AEN4176"
 >llSetTimerEvent</A
 > if you want a
     reliable timing mechanism.</P
@@ -10658,7 +10668,7 @@ CLASS="parameter"
 >destination</CODE
 >. This call will fail if
     <A
-HREF="#AEN5313"
+HREF="#AEN5348"
 >PERMISSION_DEBIT</A
 > has not
     been set.</P
@@ -11502,7 +11512,7 @@ CLASS="parameter"
 CLASS="parameter"
 >ascending</CODE
 > is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >. Note that sort only works in
     the head of each sort block is the same type.</P
@@ -11597,7 +11607,7 @@ CLASS="parameter"
 >number</CODE
 > parameter to specify which
     event you are controlling. Use <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >boolean</A
 > values to specify
     <CODE
@@ -11853,7 +11863,7 @@ HREF="#AEN3181"
 >, this function plays
     a sound attached to an object, but will continuously loop that
     sound until <A
-HREF="#AEN4573"
+HREF="#AEN4608"
 >llStopSound</A
 > or
     <A
@@ -11868,12 +11878,12 @@ CLASS="parameter"
 >volume</CODE
 >
     to 0 is not the same as calling <A
-HREF="#AEN4573"
+HREF="#AEN4608"
 >llStopSound</A
 >; a sound with 0
     volume will continue to loop. To restart the sound from the
     beginning, call <A
-HREF="#AEN4573"
+HREF="#AEN4608"
 >llStopSound</A
 >
     before calling llLoopSound again.</P
@@ -12185,7 +12195,7 @@ CLASS="parameter"
 HREF="#AEN1867"
 >llGetLinkNumber</A
 > or a <A
-HREF="#AEN5569"
+HREF="#AEN5604"
 >link constant</A
 >.</P
 ></DIV
@@ -12252,7 +12262,7 @@ CLASS="parameter"
 >size</CODE
 > area. The parameters can be chosen
     from the <A
-HREF="#AEN5527"
+HREF="#AEN5562"
 >land constants</A
 >.</P
 ></DIV
@@ -12376,7 +12386,7 @@ CLASS="parameter"
 >face</CODE
 > is
     <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 > this
     function sets the texture offsets for all faces.</P
@@ -12437,7 +12447,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >Returns <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 > if
     <CODE
@@ -12445,7 +12455,7 @@ CLASS="parameter"
 >id</CODE
 > is over land owned by the object owner,
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >FALSE</A
 > otherwise.</P
 ></DIV
@@ -12481,43 +12491,43 @@ CLASS="parameter"
 >command</CODE
 > can be one of 
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_STOP</A
 >, 
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_PAUSE</A
 >, 
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_PLAY</A
 >,
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_LOOP</A
 >,
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_TEXTURE</A
 >,
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_URL</A
 >,
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_TIME</A
 >,
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_AGENT</A
 >,
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_UNLOAD</A
 >, or
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_AUTO_ALIGN</A
 >.
         </P
@@ -12700,11 +12710,11 @@ CLASS="parameter"
 >command</CODE
 > can be one of 
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_TEXTURE</A
 > or
         <A
-HREF="#AEN6408"
+HREF="#AEN6443"
 >PARCEL_MEDIA_COMMAND_URL</A
 >.
         </P
@@ -12907,7 +12917,7 @@ CLASS="parameter"
 > are specified as an ordered list
     of parameter and value. Valid parameters and their expected values
     can be found in the <A
-HREF="#AEN5804"
+HREF="#AEN5839"
 >particle system
     constants</A
 >. Here is a simple example:
@@ -12959,7 +12969,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >pass</CODE
 > is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >, land and object collisions
     are passed from children on to parents.</P
@@ -12994,7 +13004,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >pass</CODE
 > is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >, touches are passed from
     children on to parents.</P
@@ -13028,7 +13038,7 @@ CLASS="FUNCDEF"
 >Plays a sound once. The sound will be attached to an object
     and follow object movement. Only one sound may be attached to an
     object at a time, and attaching a new sound or calling <A
-HREF="#AEN4573"
+HREF="#AEN4608"
 >llStopSound</A
 > will stop the
     previously attached sound. A second call to llPlaySound with the
@@ -13039,7 +13049,7 @@ CLASS="parameter"
     the new volume will be used, which allows control over the volume
     of already playing sounds. To restart the sound from the
     beginning, call <A
-HREF="#AEN4573"
+HREF="#AEN4608"
 >llStopSound</A
 >
     before calling llPlaySound again.</P
@@ -13454,7 +13464,7 @@ CLASS="parameter"
 >flags</CODE
 > to
     FALSE. Valid parameters can be found in the <A
-HREF="#AEN6184"
+HREF="#AEN6219"
 >vehicle flags constants</A
 >
     section.</P
@@ -13491,7 +13501,7 @@ CLASS="parameter"
 >id</CODE
 >. If and when the information is
     collected, the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 >
     event is called with the returned key returned from this function
@@ -13500,7 +13510,7 @@ CLASS="parameter"
 >requested</CODE
 > parameter. See the
     <A
-HREF="#AEN5958"
+HREF="#AEN5993"
 >agent data constants</A
 > for
     details about valid values of <CODE
@@ -13508,7 +13518,7 @@ CLASS="parameter"
 >data</CODE
 > and what
     each will return in the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event.</P
 ></DIV
@@ -13543,7 +13553,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >name</CODE
 >. When data is available the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event will be raised
     with the key returned from this function in the
@@ -13597,7 +13607,7 @@ CLASS="parameter"
 >perm</CODE
 >
     parameter should be a <A
-HREF="#AEN5313"
+HREF="#AEN5348"
 >permission
     constant</A
 >. Multiple permissions can be requested
@@ -13605,7 +13615,7 @@ HREF="#AEN5313"
     permissions requests can only go to object owner. This call will
     not stop script execution - if the specified avatar grants the
     requested permissions, the <A
-HREF="#AEN5124"
+HREF="#AEN5159"
 >run_time_permissions</A
 >
     event will be called.</P
@@ -13642,7 +13652,7 @@ CLASS="parameter"
 >sim_name</CODE
 >. When the information is
     collected, the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 >
     event is called with the returned key returned from this function
@@ -13651,7 +13661,7 @@ CLASS="parameter"
 >requested</CODE
 > parameter. See the
     <A
-HREF="#AEN6039"
+HREF="#AEN6074"
 >simulator data constants</A
 > for
     details about valid values of <CODE
@@ -13659,7 +13669,7 @@ CLASS="parameter"
 >data</CODE
 > and what
     each will return in the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event.</P
 ></DIV
@@ -13806,7 +13816,7 @@ CLASS="parameter"
 >param</CODE
 > value
     will be available to the newly created object in the <A
-HREF="#AEN5112"
+HREF="#AEN5147"
 >on_rez</A
 > event or through the <A
 HREF="#AEN2164"
@@ -13864,7 +13874,7 @@ CLASS="parameter"
 >param</CODE
 > value
     will be available to the newly created object in the <A
-HREF="#AEN5112"
+HREF="#AEN5147"
 >on_rez</A
 > event or through the <A
 HREF="#AEN2164"
@@ -14266,7 +14276,7 @@ CLASS="parameter"
 >face</CODE
 >
     <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, rotate the
     texture of all faces.</P
@@ -14330,7 +14340,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >Returns <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 > if the
     object or agent <CODE
@@ -14339,7 +14349,7 @@ CLASS="parameter"
 > is in the same simulator
     and has the same active group as this object. Otherwise, returns
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >FALSE</A
 >.</P
 ></DIV
@@ -14422,7 +14432,7 @@ CLASS="parameter"
 CLASS="parameter"
 >scale_t</CODE
 > respectively. If face is <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, scale the texture
     to all faces.</P
@@ -14532,7 +14542,7 @@ CLASS="parameter"
 >arc</CODE
 >
     radians of forward vector. Specifying a blank name or <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > id will not filter results for
     any particular name or id.  A range of 0.0 does not perform a
@@ -14540,16 +14550,16 @@ HREF="#AEN6023"
 CLASS="parameter"
 >type</CODE
 > parameter should be an <A
-HREF="#AEN5291"
+HREF="#AEN5326"
 >object type constant</A
 > value.  If anything is found
         during the scan, a <A
-HREF="#AEN5136"
+HREF="#AEN5171"
 >sensor</A
 > event is triggered.  A maximum
         of 16 items are passed to this event.  If nothing is found during the scan, a 
         <A
-HREF="#AEN5074"
+HREF="#AEN5109"
 >no sensor</A
 > event is triggered instead.</P
 ></DIV
@@ -14631,7 +14641,7 @@ CLASS="parameter"
 >rate</CODE
 > seconds. Specifying a blank name or
     <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 > id will not filter
     results for any particular name or id.  A range of 0.0 cancels the
@@ -14639,16 +14649,16 @@ HREF="#AEN6023"
 CLASS="parameter"
 >type</CODE
 > parameter should be an <A
-HREF="#AEN5291"
+HREF="#AEN5326"
 >object type constant</A
 >
     value. If anything is found during the scan, a <A
-HREF="#AEN5136"
+HREF="#AEN5171"
 >sensor</A
 > 
         event is triggered.  A maximum of 16 items are passed to this event.  If nothing is found 
         during the scan, a <A
-HREF="#AEN5074"
+HREF="#AEN5109"
 >no sensor</A
 > event is triggered instead.</P
 ></DIV
@@ -14683,7 +14693,7 @@ CLASS="parameter"
 >face</CODE
 >. If
     face is <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, set
     the alpha to all faces. The <CODE
@@ -14848,7 +14858,7 @@ CLASS="parameter"
 CLASS="parameter"
 >face</CODE
 >. If face is <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, set the alpha to
     all faces.</P
@@ -14915,11 +14925,11 @@ CLASS="parameter"
 >force</CODE
 >. The vector is in local coordinates if
     local is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >, global if
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >FALSE</A
 >.</P
 ></DIV
@@ -14959,11 +14969,11 @@ CLASS="parameter"
 >torque</CODE
 >. The vectors are in local coordinates
     if local is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >, global if
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >FALSE</A
 >.</P
 ></DIV
@@ -14998,7 +15008,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >water</CODE
 > is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >.</P
 ></DIV
@@ -15031,25 +15041,24 @@ CLASS="FUNCDEF"
 >Sets the <CODE
 CLASS="parameter"
 >alpha</CODE
-> of the linked child
-    specified by <CODE
-CLASS="parameter"
->linknumber</CODE
->. A value of 0 means
-    no link, 1 the root, 2 for first child, etc. If
-    <CODE
+> of a prim in the link set.
+    The <CODE
 CLASS="parameter"
->linknumber</CODE
-> is <A
-HREF="#AEN6026"
->ALL_SIDES</A
->, set the alpha of
-    all objects in the linked set. If <CODE
+>linknum</CODE
+>
+    parameter is either the linked number available through <A
+HREF="#AEN1867"
+>llGetLinkNumber</A
+> or a <A
+HREF="#AEN5604"
+>link constant</A
+>.
+    If <CODE
 CLASS="parameter"
 >face</CODE
 > is
     <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, set the alpha 
     of all faces.</P
@@ -15083,25 +15092,24 @@ CLASS="FUNCDEF"
 >Sets the <CODE
 CLASS="parameter"
 >color</CODE
-> of the linked child
-    specified by <CODE
-CLASS="parameter"
->linknumber</CODE
->. A value of 0 means
-    no link, 1 the root, 2 for first child, etc. If
-    <CODE
+> of a prim in the link set.
+    The <CODE
 CLASS="parameter"
->linknumber</CODE
-> is <A
-HREF="#AEN6026"
->ALL_SIDES</A
->, set the color of
-    all objects in the linked set. If <CODE
+>linknum</CODE
+>
+    parameter is either the linked number available through <A
+HREF="#AEN1867"
+>llGetLinkNumber</A
+> or a <A
+HREF="#AEN5604"
+>link constant</A
+>.
+    If <CODE
 CLASS="parameter"
 >face</CODE
 > is
     <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, set the color
     of all faces.</P
@@ -15112,7 +15120,7 @@ CLASS="section"
 CLASS="section"
 ><A
 NAME="AEN3913"
->A.234. llSetLocalRot</A
+>A.234. llSetLinkPrimitiveParams</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
@@ -15125,6 +15133,105 @@ NAME="AEN3915"
 ><CODE
 ><CODE
 CLASS="FUNCDEF"
+>llSetLinkPrimitiveParams</CODE
+>(integer linknumber, list rules);</CODE
+></P
+><P
+></P
+></DIV
+><P
+>Sets the primitive parameters of a prim in the link set.
+    The <CODE
+CLASS="parameter"
+>linknum</CODE
+>
+    parameter is either the linked number available through <A
+HREF="#AEN1867"
+>llGetLinkNumber</A
+> or a <A
+HREF="#AEN5604"
+>link constant</A
+>.
+    The <CODE
+CLASS="parameter"
+>rules</CODE
+>
+        list is identical to that of 
+        <A
+HREF="#AEN4008"
+>llSetPrimitiveParams</A
+>.</P
+></DIV
+><DIV
+CLASS="section"
+><HR><H2
+CLASS="section"
+><A
+NAME="AEN3929"
+>A.235. llSetLinkTexture</A
+></H2
+><DIV
+CLASS="funcsynopsis"
+><P
+></P
+><A
+NAME="AEN3931"
+></A
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
+>llSetLinkTexture</CODE
+>(integer linknumber, string texture, integer face);</CODE
+></P
+><P
+></P
+></DIV
+><P
+>Sets the <CODE
+CLASS="parameter"
+>texture</CODE
+> of a prim in the link set.
+    The <CODE
+CLASS="parameter"
+>linknum</CODE
+>
+    parameter is either the linked number available through <A
+HREF="#AEN1867"
+>llGetLinkNumber</A
+> or a <A
+HREF="#AEN5604"
+>link constant</A
+>.
+    If <CODE
+CLASS="parameter"
+>face</CODE
+> is
+    <A
+HREF="#AEN6061"
+>ALL_SIDES</A
+>, set the texture
+    of all faces.</P
+></DIV
+><DIV
+CLASS="section"
+><HR><H2
+CLASS="section"
+><A
+NAME="AEN3948"
+>A.236. llSetLocalRot</A
+></H2
+><DIV
+CLASS="funcsynopsis"
+><P
+></P
+><A
+NAME="AEN3950"
+></A
+><P
+><CODE
+><CODE
+CLASS="FUNCDEF"
 >llSetLocalRot</CODE
 >(rotation rot);</CODE
 ></P
@@ -15141,15 +15248,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3922"
->A.235. llSetObjectDesc</A
+NAME="AEN3957"
+>A.237. llSetObjectDesc</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3924"
+NAME="AEN3959"
 ></A
 ><P
 ><CODE
@@ -15172,15 +15279,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3932"
->A.236. llSetObjectName</A
+NAME="AEN3967"
+>A.238. llSetObjectName</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3934"
+NAME="AEN3969"
 ></A
 ><P
 ><CODE
@@ -15203,15 +15310,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3942"
->A.237. llSetParcelMusicURL</A
+NAME="AEN3977"
+>A.239. llSetParcelMusicURL</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3944"
+NAME="AEN3979"
 ></A
 ><P
 ><CODE
@@ -15236,15 +15343,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3952"
->A.238. llSetPayPrice</A
+NAME="AEN3987"
+>A.240. llSetPayPrice</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3954"
+NAME="AEN3989"
 ></A
 ><P
 ><CODE
@@ -15260,7 +15367,7 @@ CLASS="FUNCDEF"
 >Sets the default pay price and optionally the quick pay buttons
     for the 'Pay' window when someone pays this object.  
     See also <A
-HREF="#AEN5387"
+HREF="#AEN5422"
 >Pay Button Constants</A
 >. </P
 ></DIV
@@ -15269,15 +15376,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3964"
->A.239. llSetPos</A
+NAME="AEN3999"
+>A.241. llSetPos</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3966"
+NAME="AEN4001"
 ></A
 ><P
 ><CODE
@@ -15300,15 +15407,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3973"
->A.240. llSetPrimitiveParams</A
+NAME="AEN4008"
+>A.242. llSetPrimitiveParams</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3975"
+NAME="AEN4010"
 ></A
 ><P
 ><CODE
@@ -15331,7 +15438,7 @@ CLASS="parameter"
 > are specified as an ordered list
     of parameter and value(s). Valid parameters and their expected values
     can be found in the <A
-HREF="#AEN6276"
+HREF="#AEN6311"
 >Primitive Constants</A
 >. 
     Here is a simple example:
@@ -15340,7 +15447,7 @@ CLASS="informalexample"
 ><P
 ></P
 ><A
-NAME="AEN3985"
+NAME="AEN4020"
 ></A
 ><PRE
 CLASS="programlisting"
@@ -15357,15 +15464,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3987"
->A.241. llSetRemoteScriptAccessPin</A
+NAME="AEN4022"
+>A.243. llSetRemoteScriptAccessPin</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3989"
+NAME="AEN4024"
 ></A
 ><P
 ><CODE
@@ -15387,15 +15494,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN3996"
->A.242. llSetRot</A
+NAME="AEN4031"
+>A.244. llSetRot</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN3998"
+NAME="AEN4033"
 ></A
 ><P
 ><CODE
@@ -15417,15 +15524,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4005"
->A.243. llSetScale</A
+NAME="AEN4040"
+>A.245. llSetScale</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4007"
+NAME="AEN4042"
 ></A
 ><P
 ><CODE
@@ -15445,15 +15552,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4014"
->A.244. llSetScriptState</A
+NAME="AEN4049"
+>A.246. llSetScriptState</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4016"
+NAME="AEN4051"
 ></A
 ><P
 ><CODE
@@ -15473,15 +15580,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4025"
->A.245. llSetSitText</A
+NAME="AEN4060"
+>A.247. llSetSitText</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4027"
+NAME="AEN4062"
 ></A
 ><P
 ><CODE
@@ -15505,15 +15612,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4035"
->A.246. llSetSoundQueueing</A
+NAME="AEN4070"
+>A.248. llSetSoundQueueing</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4037"
+NAME="AEN4072"
 ></A
 ><P
 ><CODE
@@ -15535,11 +15642,11 @@ HREF="#AEN2773"
 >, etc., (attached
     sounds) interrupt the playing sound. The default for objects is
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >FALSE</A
 >. Setting this value to
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 > will make the sound wait
     until the current playing sound reaches its end. The queue is one
@@ -15550,15 +15657,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4048"
->A.247. llSetStatus</A
+NAME="AEN4083"
+>A.249. llSetStatus</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4050"
+NAME="AEN4085"
 ></A
 ><P
 ><CODE
@@ -15579,7 +15686,7 @@ CLASS="parameter"
 CLASS="parameter"
 >value</CODE
 >. Use <A
-HREF="#AEN5257"
+HREF="#AEN5292"
 >status constants</A
 > for the values of
     <CODE
@@ -15592,15 +15699,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4063"
->A.248. llSetText</A
+NAME="AEN4098"
+>A.250. llSetText</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4065"
+NAME="AEN4100"
 ></A
 ><P
 ><CODE
@@ -15632,15 +15739,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4079"
->A.249. llSetTexture</A
+NAME="AEN4114"
+>A.251. llSetTexture</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4081"
+NAME="AEN4116"
 ></A
 ><P
 ><CODE
@@ -15661,7 +15768,7 @@ CLASS="parameter"
 CLASS="parameter"
 >face</CODE
 >. If face is <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, set the texture to
     all faces.</P
@@ -15671,15 +15778,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4093"
->A.250. llSetTextureAnim</A
+NAME="AEN4128"
+>A.252. llSetTextureAnim</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4095"
+NAME="AEN4130"
 ></A
 ><P
 ><CODE
@@ -15694,7 +15801,7 @@ CLASS="FUNCDEF"
 ><P
 >Animates a texture by setting the texture scale and
     offset. The mode is a mask of <A
-HREF="#AEN5770"
+HREF="#AEN5805"
 >texture animation
     constants</A
 >. You can only have one texture animation on an
@@ -15702,17 +15809,17 @@ HREF="#AEN5770"
     reset it.</P
 ><P
 >You can only do one traditional animation, <A
-HREF="#AEN5770"
+HREF="#AEN5805"
 >ROTATE</A
 > or <A
-HREF="#AEN5770"
+HREF="#AEN5805"
 >SCALE</A
 > at a time, you
     cannot combine masks. In the case of <A
-HREF="#AEN5770"
+HREF="#AEN5805"
 >ROTATE</A
 > or <A
-HREF="#AEN5770"
+HREF="#AEN5805"
 >SCALE</A
 >,
     <CODE
@@ -15748,7 +15855,7 @@ CLASS="parameter"
 CLASS="parameter"
 >face</CODE
 > is <A
-HREF="#AEN6026"
+HREF="#AEN6061"
 >ALL_SIDES</A
 >, all textures on the
     object are animated. </P
@@ -15797,15 +15904,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4141"
->A.251. llSetTimerEvent</A
+NAME="AEN4176"
+>A.253. llSetTimerEvent</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4143"
+NAME="AEN4178"
 ></A
 ><P
 ><CODE
@@ -15819,7 +15926,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >Sets the <A
-HREF="#AEN5164"
+HREF="#AEN5199"
 >timer</A
 > event to
     be triggered every <CODE
@@ -15827,7 +15934,7 @@ CLASS="parameter"
 >sec</CODE
 > seconds. Passing in
     0.0 stops further <A
-HREF="#AEN5164"
+HREF="#AEN5199"
 >timer</A
 >
     events.</P
@@ -15837,15 +15944,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4153"
->A.252. llSetTorque</A
+NAME="AEN4188"
+>A.254. llSetTorque</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4155"
+NAME="AEN4190"
 ></A
 ><P
 ><CODE
@@ -15864,11 +15971,11 @@ CLASS="parameter"
 >torque</CODE
 >. The vector is in local coordinates
     if local is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >, global if
     <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >FALSE</A
 >.</P
 ></DIV
@@ -15877,15 +15984,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4167"
->A.253. llSetTouchText</A
+NAME="AEN4202"
+>A.255. llSetTouchText</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4169"
+NAME="AEN4204"
 ></A
 ><P
 ><CODE
@@ -15909,15 +16016,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4177"
->A.254. llSetVehicleFlags</A
+NAME="AEN4212"
+>A.256. llSetVehicleFlags</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4179"
+NAME="AEN4214"
 ></A
 ><P
 ><CODE
@@ -15935,7 +16042,7 @@ CLASS="parameter"
 >flags</CODE
 > to TRUE. Valid
     parameters can be found in the <A
-HREF="#AEN6184"
+HREF="#AEN6219"
 >vehicle flags constants</A
 >
     section.</P
@@ -15945,15 +16052,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4188"
->A.255. llSetVehicleFloatParam</A
+NAME="AEN4223"
+>A.257. llSetVehicleFloatParam</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4190"
+NAME="AEN4225"
 ></A
 ><P
 ><CODE
@@ -15976,7 +16083,7 @@ CLASS="parameter"
 >param_value</CODE
 >. Valid parameters and their
     expected values can be found in the <A
-HREF="#AEN6065"
+HREF="#AEN6100"
 >vehicle parameter
     constants</A
 > section.</P
@@ -15986,15 +16093,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4202"
->A.256. llSetVehicleType</A
+NAME="AEN4237"
+>A.258. llSetVehicleType</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4204"
+NAME="AEN4239"
 ></A
 ><P
 ><CODE
@@ -16013,7 +16120,7 @@ CLASS="parameter"
 >type</CODE
 >. Valid types and an explanation of
     their characteristics can be found in the <A
-HREF="#AEN6241"
+HREF="#AEN6276"
 >vehicle type constants</A
 >
     section.</P
@@ -16023,15 +16130,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4213"
->A.257. llSetVehicleRotationParam</A
+NAME="AEN4248"
+>A.259. llSetVehicleRotationParam</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4215"
+NAME="AEN4250"
 ></A
 ><P
 ><CODE
@@ -16054,7 +16161,7 @@ CLASS="parameter"
 >param_value</CODE
 >. Valid parameters can be found
     in the <A
-HREF="#AEN6065"
+HREF="#AEN6100"
 >vehicle parameter
     constants</A
 > section.</P
@@ -16064,15 +16171,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4227"
->A.258. llSetVehicleVectorParam</A
+NAME="AEN4262"
+>A.260. llSetVehicleVectorParam</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4229"
+NAME="AEN4264"
 ></A
 ><P
 ><CODE
@@ -16095,7 +16202,7 @@ CLASS="parameter"
 >param_value</CODE
 >. Valid parameters can be found
     in the <A
-HREF="#AEN6065"
+HREF="#AEN6100"
 >vehicle parameter
     constants</A
 > section.</P
@@ -16105,15 +16212,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4241"
->A.259. llShout</A
+NAME="AEN4276"
+>A.261. llShout</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4243"
+NAME="AEN4278"
 ></A
 ><P
 ><CODE
@@ -16146,15 +16253,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4255"
->A.260. llSin</A
+NAME="AEN4290"
+>A.262. llSin</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4257"
+NAME="AEN4292"
 ></A
 ><P
 ><CODE
@@ -16178,15 +16285,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4265"
->A.261. llSitTarget</A
+NAME="AEN4300"
+>A.263. llSitTarget</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4267"
+NAME="AEN4302"
 ></A
 ><P
 ><CODE
@@ -16204,7 +16311,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >offset</CODE
 > == <A
-HREF="#AEN6033"
+HREF="#AEN6068"
 >ZERO_VECTOR</A
 >
     clear the sit target.</P
@@ -16214,15 +16321,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4278"
->A.262. llSleep</A
+NAME="AEN4313"
+>A.264. llSleep</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4280"
+NAME="AEN4315"
 ></A
 ><P
 ><CODE
@@ -16246,15 +16353,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4288"
->A.263. llSqrt</A
+NAME="AEN4323"
+>A.265. llSqrt</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4290"
+NAME="AEN4325"
 ></A
 ><P
 ><CODE
@@ -16282,15 +16389,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4299"
->A.264. llStartAnimation</A
+NAME="AEN4334"
+>A.266. llStartAnimation</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4301"
+NAME="AEN4336"
 ></A
 ><P
 ><CODE
@@ -16659,15 +16766,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4531"
->A.265. llStopAnimation</A
+NAME="AEN4566"
+>A.267. llStopAnimation</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4533"
+NAME="AEN4568"
 ></A
 ><P
 ><CODE
@@ -16691,15 +16798,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4541"
->A.266. llStopHover</A
+NAME="AEN4576"
+>A.268. llStopHover</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4543"
+NAME="AEN4578"
 ></A
 ><P
 ><CODE
@@ -16719,15 +16826,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4549"
->A.267. llStopLookAt</A
+NAME="AEN4584"
+>A.269. llStopLookAt</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4551"
+NAME="AEN4586"
 ></A
 ><P
 ><CODE
@@ -16747,15 +16854,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4557"
->A.268. llStopMoveToTarget</A
+NAME="AEN4592"
+>A.270. llStopMoveToTarget</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4559"
+NAME="AEN4594"
 ></A
 ><P
 ><CODE
@@ -16775,15 +16882,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4565"
->A.269. llStopPointAt</A
+NAME="AEN4600"
+>A.271. llStopPointAt</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4567"
+NAME="AEN4602"
 ></A
 ><P
 ><CODE
@@ -16803,15 +16910,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4573"
->A.270. llStopSound</A
+NAME="AEN4608"
+>A.272. llStopSound</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4575"
+NAME="AEN4610"
 ></A
 ><P
 ><CODE
@@ -16832,7 +16939,7 @@ HREF="#AEN2773"
 >llLoopSound</A
 >. Has no effect on
     sounds started with <A
-HREF="#AEN4709"
+HREF="#AEN4744"
 >llTriggerSound</A
 >.</P
 ></DIV
@@ -16841,15 +16948,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4584"
->A.271. llStringLength</A
+NAME="AEN4619"
+>A.273. llStringLength</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4586"
+NAME="AEN4621"
 ></A
 ><P
 ><CODE
@@ -16873,15 +16980,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4594"
->A.272. llSubStringIndex</A
+NAME="AEN4629"
+>A.274. llSubStringIndex</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4596"
+NAME="AEN4631"
 ></A
 ><P
 ><CODE
@@ -16902,15 +17009,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4605"
->A.273. llStringToBase64</A
+NAME="AEN4640"
+>A.275. llStringToBase64</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4607"
+NAME="AEN4642"
 ></A
 ><P
 ><CODE
@@ -16930,15 +17037,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4614"
->A.274. llTakeControls</A
+NAME="AEN4649"
+>A.276. llTakeControls</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4616"
+NAME="AEN4651"
 ></A
 ><P
 ><CODE
@@ -16963,7 +17070,7 @@ CLASS="parameter"
 CLASS="parameter"
 >pass_on</CODE
 > is <A
-HREF="#AEN5248"
+HREF="#AEN5283"
 >TRUE</A
 >, also send input to
     avatar.</P
@@ -16973,15 +17080,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4631"
->A.275. llTan</A
+NAME="AEN4666"
+>A.277. llTan</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4633"
+NAME="AEN4668"
 ></A
 ><P
 ><CODE
@@ -17005,15 +17112,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4641"
->A.276. llTarget</A
+NAME="AEN4676"
+>A.278. llTarget</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4643"
+NAME="AEN4678"
 ></A
 ><P
 ><CODE
@@ -17041,15 +17148,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4654"
->A.277. llTargetOmega</A
+NAME="AEN4689"
+>A.279. llTargetOmega</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4656"
+NAME="AEN4691"
 ></A
 ><P
 ><CODE
@@ -17086,15 +17193,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4671"
->A.278. llTargetRemove</A
+NAME="AEN4706"
+>A.280. llTargetRemove</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4673"
+NAME="AEN4708"
 ></A
 ><P
 ><CODE
@@ -17117,15 +17224,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4681"
->A.279. llTeleportAgentHome</A
+NAME="AEN4716"
+>A.281. llTeleportAgentHome</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4683"
+NAME="AEN4718"
 ></A
 ><P
 ><CODE
@@ -17146,15 +17253,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4690"
->A.280. llToLower</A
+NAME="AEN4725"
+>A.282. llToLower</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4692"
+NAME="AEN4727"
 ></A
 ><P
 ><CODE
@@ -17174,15 +17281,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4699"
->A.281. llToUpper</A
+NAME="AEN4734"
+>A.283. llToUpper</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4701"
+NAME="AEN4736"
 ></A
 ><P
 ><CODE
@@ -17205,15 +17312,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4709"
->A.282. llTriggerSound</A
+NAME="AEN4744"
+>A.284. llTriggerSound</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4711"
+NAME="AEN4746"
 ></A
 ><P
 ><CODE
@@ -17231,7 +17338,7 @@ CLASS="FUNCDEF"
     object at the time of the trigger. There is no limit to the number
     of triggered sounds which can be generated by an object, and
     calling <A
-HREF="#AEN4709"
+HREF="#AEN4744"
 >llTriggerSound</A
 >
     does not affect the attached sounds created by <A
@@ -17250,15 +17357,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4723"
->A.283. llTriggerSoundLimited</A
+NAME="AEN4758"
+>A.285. llTriggerSoundLimited</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4725"
+NAME="AEN4760"
 ></A
 ><P
 ><CODE
@@ -17285,7 +17392,7 @@ CLASS="parameter"
     the time of the trigger. There is no limit to the number of
     triggered sounds which can be generated by an object, and calling
     <A
-HREF="#AEN4709"
+HREF="#AEN4744"
 >llTriggerSound</A
 > does not
     affect the attached sounds created by <A
@@ -17304,15 +17411,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4743"
->A.284. llUnescapeURL</A
+NAME="AEN4778"
+>A.286. llUnescapeURL</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4745"
+NAME="AEN4780"
 ></A
 ><P
 ><CODE
@@ -17336,15 +17443,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4753"
->A.285. llUnSit</A
+NAME="AEN4788"
+>A.287. llUnSit</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4755"
+NAME="AEN4790"
 ></A
 ><P
 ><CODE
@@ -17369,15 +17476,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4763"
->A.286. llVecDist</A
+NAME="AEN4798"
+>A.288. llVecDist</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4765"
+NAME="AEN4800"
 ></A
 ><P
 ><CODE
@@ -17404,15 +17511,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4776"
->A.287. llVecMag</A
+NAME="AEN4811"
+>A.289. llVecMag</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4778"
+NAME="AEN4813"
 ></A
 ><P
 ><CODE
@@ -17435,15 +17542,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4786"
->A.288. llVecNorm</A
+NAME="AEN4821"
+>A.290. llVecNorm</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4788"
+NAME="AEN4823"
 ></A
 ><P
 ><CODE
@@ -17466,15 +17573,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4796"
->A.289. llVolumeDetect</A
+NAME="AEN4831"
+>A.291. llVolumeDetect</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4798"
+NAME="AEN4833"
 ></A
 ><P
 ><CODE
@@ -17494,15 +17601,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4805"
->A.290. llWater</A
+NAME="AEN4840"
+>A.292. llWater</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4807"
+NAME="AEN4842"
 ></A
 ><P
 ><CODE
@@ -17526,15 +17633,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4815"
->A.291. llWhisper</A
+NAME="AEN4850"
+>A.293. llWhisper</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4817"
+NAME="AEN4852"
 ></A
 ><P
 ><CODE
@@ -17567,15 +17674,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4829"
->A.292. llWind</A
+NAME="AEN4864"
+>A.294. llWind</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4831"
+NAME="AEN4866"
 ></A
 ><P
 ><CODE
@@ -17599,15 +17706,15 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4839"
->A.293. llXorBase64Strings</A
+NAME="AEN4874"
+>A.295. llXorBase64Strings</A
 ></H2
 ><DIV
 CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4841"
+NAME="AEN4876"
 ></A
 ><P
 ><CODE
@@ -17635,7 +17742,7 @@ CLASS="parameter"
 CLASS="appendix"
 ><HR><H1
 ><A
-NAME="AEN4852"
+NAME="AEN4887"
 ></A
 >Appendix B. Events</H1
 ><P
@@ -17647,7 +17754,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4855"
+NAME="AEN4890"
 >B.1. at_rot_target</A
 ></H2
 ><DIV
@@ -17655,7 +17762,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4857"
+NAME="AEN4892"
 ></A
 ><P
 ><CODE
@@ -17679,7 +17786,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4869"
+NAME="AEN4904"
 >B.2. at_target</A
 ></H2
 ><DIV
@@ -17687,7 +17794,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4871"
+NAME="AEN4906"
 ></A
 ><P
 ><CODE
@@ -17703,7 +17810,7 @@ CLASS="FUNCDEF"
 >This event is triggered when a script comes within a defined
     range from a target position. The range and position are set by a
     call to <A
-HREF="#AEN4641"
+HREF="#AEN4676"
 >llTarget</A
 >.</P
 ></DIV
@@ -17712,7 +17819,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4883"
+NAME="AEN4918"
 >B.3. attach</A
 ></H2
 ><DIV
@@ -17720,7 +17827,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4885"
+NAME="AEN4920"
 ></A
 ><P
 ><CODE
@@ -17737,7 +17844,7 @@ CLASS="FUNCDEF"
     is attached or detached from an avatar. If it is attached,
     attached is the key of the avatar it is attached to, otherwise
     attached is <A
-HREF="#AEN6023"
+HREF="#AEN6058"
 >NULL_KEY</A
 >.</P
 ></DIV
@@ -17746,7 +17853,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4893"
+NAME="AEN4928"
 >B.4. changed</A
 ></H2
 ><DIV
@@ -17754,7 +17861,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4895"
+NAME="AEN4930"
 ></A
 ><P
 ><CODE
@@ -17772,7 +17879,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >changed</CODE
 > will be a bitfield of <A
-HREF="#AEN5643"
+HREF="#AEN5678"
 >change constants</A
 >.</P
 ></DIV
@@ -17781,7 +17888,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4904"
+NAME="AEN4939"
 >B.5. collision</A
 ></H2
 ><DIV
@@ -17789,7 +17896,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4906"
+NAME="AEN4941"
 ></A
 ><P
 ><CODE
@@ -17817,7 +17924,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4914"
+NAME="AEN4949"
 >B.6. collision_end</A
 ></H2
 ><DIV
@@ -17825,7 +17932,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4916"
+NAME="AEN4951"
 ></A
 ><P
 ><CODE
@@ -17853,7 +17960,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4924"
+NAME="AEN4959"
 >B.7. collision_start</A
 ></H2
 ><DIV
@@ -17861,7 +17968,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4926"
+NAME="AEN4961"
 ></A
 ><P
 ><CODE
@@ -17889,7 +17996,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4934"
+NAME="AEN4969"
 >B.8. control</A
 ></H2
 ><DIV
@@ -17897,7 +18004,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4936"
+NAME="AEN4971"
 ></A
 ><P
 ><CODE
@@ -17920,7 +18027,7 @@ CLASS="parameter"
 CLASS="parameter"
 >edges</CODE
 > are bitfields of <A
-HREF="#AEN5596"
+HREF="#AEN5631"
 >control constants</A
 >.</P
 ></DIV
@@ -17929,7 +18036,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4950"
+NAME="AEN4985"
 >B.9. dataserver</A
 ></H2
 ><DIV
@@ -17937,7 +18044,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4952"
+NAME="AEN4987"
 ></A
 ><P
 ><CODE
@@ -17973,7 +18080,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4965"
+NAME="AEN5000"
 >B.10. email</A
 ></H2
 ><DIV
@@ -17981,7 +18088,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4967"
+NAME="AEN5002"
 ></A
 ><P
 ><CODE
@@ -18006,7 +18113,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4983"
+NAME="AEN5018"
 >B.11. land_collision</A
 ></H2
 ><DIV
@@ -18014,7 +18121,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4985"
+NAME="AEN5020"
 ></A
 ><P
 ><CODE
@@ -18035,7 +18142,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN4992"
+NAME="AEN5027"
 >B.12. land_collision_end</A
 ></H2
 ><DIV
@@ -18043,7 +18150,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN4994"
+NAME="AEN5029"
 ></A
 ><P
 ><CODE
@@ -18064,7 +18171,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5001"
+NAME="AEN5036"
 >B.13. land_collision_start</A
 ></H2
 ><DIV
@@ -18072,7 +18179,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5003"
+NAME="AEN5038"
 ></A
 ><P
 ><CODE
@@ -18093,7 +18200,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5010"
+NAME="AEN5045"
 >B.14. link_message</A
 ></H2
 ><DIV
@@ -18101,7 +18208,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5012"
+NAME="AEN5047"
 ></A
 ><P
 ><CODE
@@ -18125,7 +18232,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5026"
+NAME="AEN5061"
 >B.15. listen</A
 ></H2
 ><DIV
@@ -18133,7 +18240,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5028"
+NAME="AEN5063"
 ></A
 ><P
 ><CODE
@@ -18173,7 +18280,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5045"
+NAME="AEN5080"
 >B.16. money</A
 ></H2
 ><DIV
@@ -18181,7 +18288,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5047"
+NAME="AEN5082"
 ></A
 ><P
 ><CODE
@@ -18210,7 +18317,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5058"
+NAME="AEN5093"
 >B.17. moving_end</A
 ></H2
 ><DIV
@@ -18218,7 +18325,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5060"
+NAME="AEN5095"
 ></A
 ><P
 ><CODE
@@ -18239,7 +18346,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5066"
+NAME="AEN5101"
 >B.18. moving_start</A
 ></H2
 ><DIV
@@ -18247,7 +18354,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5068"
+NAME="AEN5103"
 ></A
 ><P
 ><CODE
@@ -18268,7 +18375,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5074"
+NAME="AEN5109"
 >B.19. no_sensor</A
 ></H2
 ><DIV
@@ -18276,7 +18383,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5076"
+NAME="AEN5111"
 ></A
 ><P
 ><CODE
@@ -18300,7 +18407,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5083"
+NAME="AEN5118"
 >B.20. not_at_rot_target</A
 ></H2
 ><DIV
@@ -18308,7 +18415,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5085"
+NAME="AEN5120"
 ></A
 ><P
 ><CODE
@@ -18332,7 +18439,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5092"
+NAME="AEN5127"
 >B.21. not_at_target</A
 ></H2
 ><DIV
@@ -18340,7 +18447,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5094"
+NAME="AEN5129"
 ></A
 ><P
 ><CODE
@@ -18354,7 +18461,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >When a target is set via the <A
-HREF="#AEN4641"
+HREF="#AEN4676"
 >llTarget</A
 > library call, but the
     script is outside the specified range this event is raised.</P
@@ -18364,7 +18471,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5101"
+NAME="AEN5136"
 >B.22. object_rez</A
 ></H2
 ><DIV
@@ -18372,7 +18479,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5103"
+NAME="AEN5138"
 ></A
 ><P
 ><CODE
@@ -18401,7 +18508,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5112"
+NAME="AEN5147"
 >B.23. on_rez</A
 ></H2
 ><DIV
@@ -18409,7 +18516,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5114"
+NAME="AEN5149"
 ></A
 ><P
 ><CODE
@@ -18440,7 +18547,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5124"
+NAME="AEN5159"
 >B.24. run_time_permissions</A
 ></H2
 ><DIV
@@ -18448,7 +18555,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5126"
+NAME="AEN5161"
 ></A
 ><P
 ><CODE
@@ -18470,7 +18577,7 @@ HREF="#AEN3372"
 >
     library function is used to request these permissions and the
     various <A
-HREF="#AEN5313"
+HREF="#AEN5348"
 >permissions integer
     constants</A
 > can be supplied. The integer returned to this
@@ -18486,7 +18593,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5136"
+NAME="AEN5171"
 >B.25. sensor</A
 ></H2
 ><DIV
@@ -18494,7 +18601,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5138"
+NAME="AEN5173"
 ></A
 ><P
 ><CODE
@@ -18530,7 +18637,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5148"
+NAME="AEN5183"
 >B.26. state_entry</A
 ></H2
 ><DIV
@@ -18538,7 +18645,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5150"
+NAME="AEN5185"
 ></A
 ><P
 ><CODE
@@ -18560,7 +18667,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5156"
+NAME="AEN5191"
 >B.27. state_exit</A
 ></H2
 ><DIV
@@ -18568,7 +18675,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5158"
+NAME="AEN5193"
 ></A
 ><P
 ><CODE
@@ -18590,7 +18697,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5164"
+NAME="AEN5199"
 >B.28. timer</A
 ></H2
 ><DIV
@@ -18598,7 +18705,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5166"
+NAME="AEN5201"
 ></A
 ><P
 ><CODE
@@ -18612,7 +18719,7 @@ CLASS="FUNCDEF"
 ></DIV
 ><P
 >This event is raised at regular intervals set by the <A
-HREF="#AEN4141"
+HREF="#AEN4176"
 >llSetTimerEvent</A
 > library
     function.</P
@@ -18622,7 +18729,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5173"
+NAME="AEN5208"
 >B.29. touch</A
 ></H2
 ><DIV
@@ -18630,7 +18737,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5175"
+NAME="AEN5210"
 ></A
 ><P
 ><CODE
@@ -18661,7 +18768,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5184"
+NAME="AEN5219"
 >B.30. touch_end</A
 ></H2
 ><DIV
@@ -18669,7 +18776,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5186"
+NAME="AEN5221"
 ></A
 ><P
 ><CODE
@@ -18700,7 +18807,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5195"
+NAME="AEN5230"
 >B.31. touch_start</A
 ></H2
 ><DIV
@@ -18708,7 +18815,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5197"
+NAME="AEN5232"
 ></A
 ><P
 ><CODE
@@ -18739,7 +18846,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5206"
+NAME="AEN5241"
 >B.32. remote_data</A
 ></H2
 ><DIV
@@ -18747,7 +18854,7 @@ CLASS="funcsynopsis"
 ><P
 ></P
 ><A
-NAME="AEN5208"
+NAME="AEN5243"
 ></A
 ><P
 ><CODE
@@ -18840,7 +18947,7 @@ CLASS="parameter"
 CLASS="appendix"
 ><HR><H1
 ><A
-NAME="AEN5245"
+NAME="AEN5280"
 ></A
 >Appendix C. Constants</H1
 ><P
@@ -18851,7 +18958,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5248"
+NAME="AEN5283"
 >C.1. Boolean Constants</A
 ></H2
 ><P
@@ -18880,12 +18987,12 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5257"
+NAME="AEN5292"
 >C.2. Status Constants</A
 ></H2
 ><P
 >The status constants are used in the <A
-HREF="#AEN4048"
+HREF="#AEN4083"
 >llSetStatus</A
 > and <A
 HREF="#AEN2184"
@@ -18971,7 +19078,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5291"
+NAME="AEN5326"
 >C.3. Object Type Constants</A
 ></H2
 ><P
@@ -19022,7 +19129,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5313"
+NAME="AEN5348"
 >C.4. Permission Constants</A
 ></H2
 ><P
@@ -19036,7 +19143,7 @@ HREF="#AEN2048"
 >llGetPermissions</A
 >, and
     explicitly passed to the <A
-HREF="#AEN5124"
+HREF="#AEN5159"
 >run_time_permissions</A
 >
     event. For many of the basic library functions to work, a
@@ -19068,7 +19175,7 @@ HREF="#AEN2342"
 ><P
 >If this permission enabled, the object can
         successfully call the <A
-HREF="#AEN4614"
+HREF="#AEN4649"
 >llTakeControls</A
 > library
         call.</P
@@ -19085,7 +19192,7 @@ HREF="#AEN4614"
 ><P
 >If this permission is enabled, the object can
         successfully call <A
-HREF="#AEN4299"
+HREF="#AEN4334"
 >llStartAnimation</A
 > for the
         avatar that owns this object.</P
@@ -19150,7 +19257,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5364"
+NAME="AEN5399"
 >C.5. Inventory Constants</A
 ></H2
 ><P
@@ -19192,7 +19299,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5387"
+NAME="AEN5422"
 >C.6. Pay Price Constants</A
 ></H2
 ><P
@@ -19229,7 +19336,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5401"
+NAME="AEN5436"
 >C.7. Attachment Constants</A
 ></H2
 ><P
@@ -19435,7 +19542,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5527"
+NAME="AEN5562"
 >C.8. Land Constants</A
 ></H2
 ><P
@@ -19518,7 +19625,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5569"
+NAME="AEN5604"
 >C.9. Link Constants</A
 ></H2
 ><P
@@ -19581,16 +19688,16 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5596"
+NAME="AEN5631"
 >C.10. Control Constants</A
 ></H2
 ><P
 >These constants are used in <A
-HREF="#AEN4614"
+HREF="#AEN4649"
 >llTakeControls</A
 > as well as the
     <A
-HREF="#AEN4934"
+HREF="#AEN4969"
 >control</A
 > event handler.</P
 ><P
@@ -19680,12 +19787,12 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5643"
+NAME="AEN5678"
 >C.11. Change Constants</A
 ></H2
 ><P
 >These constants are used in the <A
-HREF="#AEN4893"
+HREF="#AEN4928"
 >changed</A
 > event handler.</P
 ><P
@@ -19767,7 +19874,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5686"
+NAME="AEN5721"
 >C.12. Type Constants</A
 ></H2
 ><P
@@ -19836,7 +19943,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5720"
+NAME="AEN5755"
 >C.13. Agent Info Constants</A
 ></H2
 ><P
@@ -19930,13 +20037,13 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5770"
+NAME="AEN5805"
 >C.14. Texture Animation
     Constants</A
 ></H2
 ><P
 >These constants are used in the <A
-HREF="#AEN4093"
+HREF="#AEN4128"
 >llSetTextureAnim</A
 > api to
     control the animation mode.</P
@@ -20001,7 +20108,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5804"
+NAME="AEN5839"
 >C.15. Particle System Constants</A
 ></H2
 ><P
@@ -20314,7 +20421,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5958"
+NAME="AEN5993"
 >C.16. Agent Data Constants</A
 ></H2
 ><P
@@ -20324,7 +20431,7 @@ HREF="#AEN3343"
 > api to
     collect information about an agent which will be provided in the
     <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver event</A
 >.</P
 ><P
@@ -20402,7 +20509,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN5994"
+NAME="AEN6029"
 >C.17. Float Constants</A
 ></H2
 ><P
@@ -20471,7 +20578,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6023"
+NAME="AEN6058"
 >C.18. Key Constant</A
 ></H2
 ><P
@@ -20483,7 +20590,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6026"
+NAME="AEN6061"
 >C.19. Miscellaneous Integer Constants</A
 ></H2
 ><P
@@ -20495,14 +20602,14 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6029"
+NAME="AEN6064"
 >C.20. Miscellaneous String
     Constants</A
 ></H2
 ><P
 >There is one uncategorized string constant
     which is used in the <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver</A
 > event:
     EOF</P
@@ -20512,7 +20619,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6033"
+NAME="AEN6068"
 >C.21. Vector Constant</A
 ></H2
 ><P
@@ -20524,7 +20631,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6036"
+NAME="AEN6071"
 >C.22. Rotation Constant</A
 ></H2
 ><P
@@ -20536,7 +20643,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6039"
+NAME="AEN6074"
 >C.23. Simulator Data Constants</A
 ></H2
 ><P
@@ -20546,7 +20653,7 @@ HREF="#AEN3388"
 > api to
     collect information about a simulator which will be provided in the
     <A
-HREF="#AEN4950"
+HREF="#AEN4985"
 >dataserver event</A
 >.</P
 ><P
@@ -20610,7 +20717,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6065"
+NAME="AEN6100"
 >C.24. Vehicle Parameters</A
 ></H2
 ><P
@@ -20892,7 +20999,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6184"
+NAME="AEN6219"
 >C.25. Vehicle Flags</A
 ></H2
 ><P
@@ -21073,7 +21180,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6241"
+NAME="AEN6276"
 >C.26. Vehicle Types</A
 ></H2
 ><P
@@ -21096,7 +21203,7 @@ CLASS="informalexample"
 ><P
 ></P
 ><A
-NAME="AEN6249"
+NAME="AEN6284"
 ></A
 ><PRE
 CLASS="programlisting"
@@ -21164,7 +21271,7 @@ llSetVehicleFlags( VEHICLE_FLAG_NO_DEFLECTION_UP
 ><P
 >Another vehicle that bounces along the ground but
         needs the motors to be driven from external controls or <A
-HREF="#AEN5164"
+HREF="#AEN5199"
 >timer</A
 > events.</P
 ><DIV
@@ -21172,7 +21279,7 @@ CLASS="informalexample"
 ><P
 ></P
 ><A
-NAME="AEN6256"
+NAME="AEN6291"
 ></A
 ><PRE
 CLASS="programlisting"
@@ -21243,7 +21350,7 @@ CLASS="informalexample"
 ><P
 ></P
 ><A
-NAME="AEN6262"
+NAME="AEN6297"
 ></A
 ><PRE
 CLASS="programlisting"
@@ -21314,7 +21421,7 @@ CLASS="informalexample"
 ><P
 ></P
 ><A
-NAME="AEN6268"
+NAME="AEN6303"
 ></A
 ><PRE
 CLASS="programlisting"
@@ -21385,7 +21492,7 @@ CLASS="informalexample"
 ><P
 ></P
 ><A
-NAME="AEN6274"
+NAME="AEN6309"
 ></A
 ><PRE
 CLASS="programlisting"
@@ -21452,12 +21559,12 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6276"
+NAME="AEN6311"
 >C.27. Primitive Constants</A
 ></H2
 ><P
 >These constants are used in calls to the <A
-HREF="#AEN3973"
+HREF="#AEN4008"
 >llSetPrimitiveParams</A
 > and <A
 HREF="#AEN2075"
@@ -21608,7 +21715,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6358"
+NAME="AEN6393"
 >C.28. XML-RPC Constants</A
 ></H2
 ><P
@@ -21619,7 +21726,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6361"
+NAME="AEN6396"
 >C.29. Permission Mask Constants</A
 ></H2
 ><P
@@ -21707,7 +21814,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6408"
+NAME="AEN6443"
 >C.30. Parcel Media Constants (Movies)</A
 ></H2
 ><P
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index 7974bc1..1665528 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -23,6 +23,10 @@
 /* Begin PBXBuildFile section */
                 0633E5D209E341F500712406 /* llfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0633E5D009E341F500712406 /* llfile.cpp */; };
                 0633E5D509E3421500712406 /* llstreamtools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0633E5D309E3421500712406 /* llstreamtools.cpp */; };
+                1A02016F0B7A85DE00D5C589 /* llbase64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02016D0B7A85DE00D5C589 /* llbase64.cpp */; };
+                1A0201850B7A861200D5C589 /* llblowfishcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */; };
+                1A0201860B7A861200D5C589 /* llnullcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0201810B7A861200D5C589 /* llnullcipher.cpp */; };
+                1A0201870B7A861200D5C589 /* llxorcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0201830B7A861200D5C589 /* llxorcipher.cpp */; };
                 1A1C61620847AEE6005D7227 /* llvolumemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C615E0847AEE6005D7227 /* llvolumemgr.cpp */; };
                 1A1C61630847AEE6005D7227 /* llvolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C615F0847AEE6005D7227 /* llvolume.cpp */; };
                 1A1C61760847B307005D7227 /* llvolumemessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C61740847B307005D7227 /* llvolumemessage.cpp */; };
@@ -39,6 +43,8 @@
                 1A89230808B12D2E00A04AA9 /* llfloateropenobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A89230608B12D2E00A04AA9 /* llfloateropenobject.cpp */; };
                 1A89230A08B12D9900A04AA9 /* llmediabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A89230908B12D9800A04AA9 /* llmediabase.cpp */; };
                 1A89231108B12DDE00A04AA9 /* llmediamoviebase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A89230F08B12DDE00A04AA9 /* llmediamoviebase.cpp */; };
+                1A97C4560B8BCF9C00331A24 /* llliveappconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */; };
+                1A9897E90B98E2F4005C45D7 /* llbase32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9897E80B98E2F4005C45D7 /* llbase32.cpp */; };
                 1A9EC237083EA0100023D510 /* llfloatereditui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9EC236083EA0100023D510 /* llfloatereditui.cpp */; };
                 1AD61F6B0AC09B1900507FB9 /* llimview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD61F6A0AC09B1900507FB9 /* llimview.cpp */; };
                 1AE5D7120844FBD300278605 /* llwebbrowserctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE5D7100844FBD300278605 /* llwebbrowserctrl.cpp */; };
@@ -84,13 +90,11 @@
                 5503BB3F05446B20003D051F /* llwaterpatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C5051F61DF00A80050 /* llwaterpatch.cpp */; };
                 5503BB4005446B20003D051F /* llvowater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C6051F61DF00A80050 /* llvowater.cpp */; };
                 5503BB4105446B20003D051F /* llvovolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C7051F61DF00A80050 /* llvovolume.cpp */; };
-                5503BB4205446B20003D051F /* llvotreenew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C8051F61DF00A80050 /* llvotreenew.cpp */; };
                 5503BB4305446B20003D051F /* llvotree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C9051F61DF00A80050 /* llvotree.cpp */; };
                 5503BB4405446B20003D051F /* llvotextbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CA051F61DF00A80050 /* llvotextbubble.cpp */; };
                 5503BB4505446B20003D051F /* llvosurfacepatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CB051F61DF00A80050 /* llvosurfacepatch.cpp */; };
                 5503BB4605446B20003D051F /* llvosky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CC051F61DF00A80050 /* llvosky.cpp */; };
                 5503BB4705446B20003D051F /* llvopartgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CD051F61DF00A80050 /* llvopartgroup.cpp */; };
-                5503BB4805446B20003D051F /* llvopart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CE051F61DF00A80050 /* llvopart.cpp */; };
                 5503BB4905446B20003D051F /* llvoground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529CF051F61DF00A80050 /* llvoground.cpp */; };
                 5503BB4A05446B20003D051F /* llvograss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D0051F61DF00A80050 /* llvograss.cpp */; };
                 5503BB4B05446B20003D051F /* llvoclouds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529D1051F61DF00A80050 /* llvoclouds.cpp */; };
@@ -137,7 +141,6 @@
                 5503BB7D05446B20003D051F /* llconsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A03051F61DF00A80050 /* llconsole.cpp */; };
                 5503BB7E05446B20003D051F /* lllandmarklist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A04051F61DF00A80050 /* lllandmarklist.cpp */; };
                 5503BB7F05446B20003D051F /* llfloaterbuildoptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A05051F61DF00A80050 /* llfloaterbuildoptions.cpp */; };
-                5503BB8105446B20003D051F /* llfloateraccounthistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A07051F61DF00A80050 /* llfloateraccounthistory.cpp */; };
                 5503BB8605446B20003D051F /* lluserauth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A0C051F61DF00A80050 /* lluserauth.cpp */; };
                 5503BB8705446B20003D051F /* llurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A0D051F61DF00A80050 /* llurl.cpp */; };
                 5503BB8805446B20003D051F /* lluploaddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A0E051F61DF00A80050 /* lluploaddialog.cpp */; };
@@ -158,7 +161,6 @@
                 5503BBA005446B20003D051F /* lldrawpoolalpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A26051F61DF00A80050 /* lldrawpoolalpha.cpp */; };
                 5503BBA105446B20003D051F /* lltexturetable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A27051F61DF00A80050 /* lltexturetable.cpp */; };
                 5503BBA205446B20003D051F /* lltexturectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A28051F61DF00A80050 /* lltexturectrl.cpp */; };
-                5503BBA305446B20003D051F /* lltexturebar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A29051F61DF00A80050 /* lltexturebar.cpp */; };
                 5503BBA405446B20003D051F /* llpanelobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2A051F61DF00A80050 /* llpanelobject.cpp */; };
                 5503BBA505446B20003D051F /* llpanelnetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2B051F61DF00A80050 /* llpanelnetwork.cpp */; };
                 5503BBA605446B20003D051F /* lldrawpool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A2C051F61DF00A80050 /* lldrawpool.cpp */; };
@@ -224,7 +226,6 @@
                 5503BBFD05446B20003D051F /* llhoverview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A85051F61DF00A80050 /* llhoverview.cpp */; };
                 5503BBFE05446B20003D051F /* llcylinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A86051F61DF00A80050 /* llcylinder.cpp */; };
                 5503BBFF05446B20003D051F /* llhippo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A87051F61DF00A80050 /* llhippo.cpp */; };
-                5503BC0105446B20003D051F /* llpanelmoney.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A89051F61DF00A80050 /* llpanelmoney.cpp */; };
                 5503BC0305446B20003D051F /* llfloateravatarinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8B051F61DF00A80050 /* llfloateravatarinfo.cpp */; };
                 5503BC0405446B20003D051F /* llcallingcard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8C051F61DF00A80050 /* llcallingcard.cpp */; };
                 5503BC0505446B20003D051F /* llhudeffectbeam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A8D051F61DF00A80050 /* llhudeffectbeam.cpp */; };
@@ -239,7 +240,6 @@
                 5503BC1005446B20003D051F /* llnamelistctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A98051F61DF00A80050 /* llnamelistctrl.cpp */; };
                 5503BC1205446B20003D051F /* llmaniptranslate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9A051F61DF00A80050 /* llmaniptranslate.cpp */; };
                 5503BC1305446B20003D051F /* llmanipscale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9B051F61DF00A80050 /* llmanipscale.cpp */; };
-                5503BC1405446B20003D051F /* lldrawpooltreenew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9C051F61DF00A80050 /* lldrawpooltreenew.cpp */; };
                 5503BC1505446B20003D051F /* head.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9D051F61DF00A80050 /* head.cpp */; };
                 5503BC1705446B20003D051F /* llfloaternamedesc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A9F051F61DF00A80050 /* llfloaternamedesc.cpp */; };
                 5503BC1805446B20003D051F /* llpanelplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA0051F61DF00A80050 /* llpanelplace.cpp */; };
@@ -303,8 +303,6 @@
                 619222E8074A9B5B005E1F34 /* bitpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192211F074A9B57005E1F34 /* bitpack.cpp */; };
                 619222F0074A9B5B005E1F34 /* llcriticaldamp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922127074A9B57005E1F34 /* llcriticaldamp.cpp */; };
                 619222F8074A9B5B005E1F34 /* llerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6192212F074A9B57005E1F34 /* llerror.cpp */; };
-                619222FA074A9B5B005E1F34 /* llerrorbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922131074A9B57005E1F34 /* llerrorbuffer.cpp */; };
-                619222FC074A9B5B005E1F34 /* llerrorstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922133074A9B57005E1F34 /* llerrorstream.cpp */; };
                 619222FE074A9B5B005E1F34 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922135074A9B57005E1F34 /* llfasttimer.cpp */; };
                 61922300074A9B5B005E1F34 /* llfixedbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922137074A9B57005E1F34 /* llfixedbuffer.cpp */; };
                 61922302074A9B5B005E1F34 /* llframetimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61922139074A9B57005E1F34 /* llframetimer.cpp */; };
@@ -501,7 +499,6 @@
                 9967E9B30B375D9D0087BD1B /* libfmod.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765009BEA39600AF6316 /* libfmod.a */; };
                 9985A1280AC1FE4E00579AFB /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9985A1270AC1FE4E00579AFB /* AppKit.framework */; };
                 99AAD74F09DC8B9D0036C309 /* lllfsthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99AAD74E09DC8B9D0036C309 /* lllfsthread.cpp */; };
-                99B0682909A54FBB00F4AD09 /* lldrawpoolhud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99B0682709A54FBB00F4AD09 /* lldrawpoolhud.cpp */; };
                 99BB5168099ABDEB004BF9F2 /* llfloaterbuyland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB5166099ABDEB004BF9F2 /* llfloaterbuyland.cpp */; };
                 99BB516B099AC1AE004BF9F2 /* llxmlrpctransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB516A099AC1AE004BF9F2 /* llxmlrpctransaction.cpp */; };
                 99BB516F099AC1E9004BF9F2 /* llviewchildren.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BB516D099AC1E9004BF9F2 /* llviewchildren.cpp */; };
@@ -536,35 +533,35 @@
                 A241CB9007B3E383001A39E3 /* lllogtextmessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB8C07B3E383001A39E3 /* lllogtextmessage.cpp */; };
                 A241CB9207B3E383001A39E3 /* llmessagethrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB8E07B3E383001A39E3 /* llmessagethrottle.cpp */; };
                 A241CB9507B3E3A7001A39E3 /* llperlin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A241CB9407B3E3A7001A39E3 /* llperlin.cpp */; };
+                A30273570B3A13D800704420 /* llvertexbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A30273550B3A13D800704420 /* llvertexbuffer.cpp */; };
                 A3077C0709DCB8140059ED75 /* lldrawpoolstars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3077BFB09DCB8140059ED75 /* lldrawpoolstars.cpp */; };
                 A3077C0909DCB8140059ED75 /* llfloaterhtmlhelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3077BFF09DCB8140059ED75 /* llfloaterhtmlhelp.cpp */; };
                 A3077C0B09DCB8140059ED75 /* llpanelvolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3077C0309DCB8140059ED75 /* llpanelvolume.cpp */; };
                 A3077C0C09DCB8140059ED75 /* llvostars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3077C0509DCB8140059ED75 /* llvostars.cpp */; };
+                A32748BF0B5F38A00099BE18 /* llfontgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315D0B4F3FA100F8830F /* llfontgl.cpp */; };
+                A32748C00B5F38A20099BE18 /* llimagegl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831610B4F3FA200F8830F /* llimagegl.cpp */; };
+                A32748C10B5F38A80099BE18 /* llfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315B0B4F3FA100F8830F /* llfont.cpp */; };
+                A3274AD20B5F39130099BE18 /* text_out.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831670B4F3FA200F8830F /* text_out.cpp */; };
                 A3285A360A7141A200F619A5 /* llinventorybridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3285A340A71419F00F619A5 /* llinventorybridge.cpp */; };
                 A3285A3B0A71425A00F619A5 /* llinventoryactions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3285A3A0A71425100F619A5 /* llinventoryactions.cpp */; };
                 A3AF6BCB0A544C71005B5E2C /* llevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AF6BC80A544C71005B5E2C /* llevent.cpp */; };
                 A3AF6BCF0A544EF0005B5E2C /* llpanellogin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3AF6BCE0A544EF0005B5E2C /* llpanellogin.cpp */; };
                 A3D969160A6ED4CB007E8BD2 /* llfloaternewim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A3D968F00A6EBCA7007E8BD2 /* llfloaternewim.cpp */; };
                 A3D9691F0A6ED666007E8BD2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3D9691B0A6ED5F6007E8BD2 /* IOKit.framework */; };
+                AA02B9BC0B0CE44D00F2996D /* lltexturefetch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA02B9BA0B0CE44D00F2996D /* lltexturefetch.cpp */; };
                 AA0E2A610A2FDAEE0066250A /* llcontrol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0E2A5F0A2FDAEE0066250A /* llcontrol.cpp */; };
                 AA0E2A640A2FDB340066250A /* lltoolpipette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0E2A620A2FDB340066250A /* lltoolpipette.cpp */; };
+                AA348DFA0B0EAB31002C3015 /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA348DF80B0EAB31002C3015 /* llcurl.cpp */; };
                 AAA1336B0A3F94D000419F7C /* lluistring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA133690A3F94D000419F7C /* lluistring.cpp */; };
                 AAC121A50A93A8380080E8A9 /* llfloatersellland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC121A30A93A8380080E8A9 /* llfloatersellland.cpp */; };
+                AAE98CC20B38FE0800E2F204 /* llimageworker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE98CC00B38FE0800E2F204 /* llimageworker.cpp */; };
                 AAEAAF270A8104D8005F0707 /* llscrollingpanellist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAEAAF250A8104D8005F0707 /* llscrollingpanellist.cpp */; };
+                AAF5FFD20B13F71900D28A84 /* lltexturecache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */; };
                 C16C08500B4AE6C7009AD67F /* llfloaterinspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C16C084E0B4AE6C7009AD67F /* llfloaterinspect.cpp */; };
                 C1F5D0A50B138AEB00827F1D /* lluserrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */; };
                 C64F673F0AFBED80009732B5 /* lllogchat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64F673D0AFBED80009732B5 /* lllogchat.cpp */; };
                 C64F67420AFBED91009732B5 /* lldirpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C64F67400AFBED91009732B5 /* lldirpicker.cpp */; };
                 D62830DB0B4DC76300F8830F /* llimagej2coj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62830D80B4DC76300F8830F /* llimagej2coj.cpp */; };
-                D628316C0B4F3FA200F8830F /* llagpmempool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831510B4F3FA100F8830F /* llagpmempool.cpp */; };
-                D628316D0B4F3FA200F8830F /* llagpmempoolapple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831530B4F3FA100F8830F /* llagpmempoolapple.cpp */; };
-                D628316E0B4F3FA200F8830F /* llagpmempoolarb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831550B4F3FA100F8830F /* llagpmempoolarb.cpp */; };
-                D62831710B4F3FA200F8830F /* llfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315B0B4F3FA100F8830F /* llfont.cpp */; };
-                D62831720B4F3FA200F8830F /* llfontgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315D0B4F3FA100F8830F /* llfontgl.cpp */; };
-                D62831730B4F3FA200F8830F /* llgldbg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D628315F0B4F3FA100F8830F /* llgldbg.cpp */; };
-                D62831740B4F3FA200F8830F /* llimagegl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831610B4F3FA200F8830F /* llimagegl.cpp */; };
-                D62831760B4F3FA200F8830F /* llvertexprogramgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831640B4F3FA200F8830F /* llvertexprogramgl.cpp */; };
-                D62831780B4F3FA200F8830F /* text_out.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62831670B4F3FA200F8830F /* text_out.cpp */; };
                 D64594620B3B731700FAB68F /* llimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D9B074AE4F2005E1F34 /* llimage.cpp */; };
                 D64594630B3B731800FAB68F /* llimagebmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D9D074AE4F2005E1F34 /* llimagebmp.cpp */; };
                 D64594640B3B731A00FAB68F /* llimagedxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE725083AC2F2002BF676 /* llimagedxt.cpp */; };
@@ -572,6 +569,12 @@
                 D64594680B3B732200FAB68F /* llimagejpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923DA2074AE4F2005E1F34 /* llimagejpeg.cpp */; };
                 D64594690B3B732300FAB68F /* llimagetga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923DA4074AE4F2005E1F34 /* llimagetga.cpp */; };
                 D651349D0B3C40870042C56E /* llqueuedthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF9D84F08B405630094E8E7 /* llqueuedthread.cpp */; };
+                DA9C40E00B54B4BA00DD6F44 /* llformat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */; };
+                DA9C41140B54B8CA00DD6F44 /* lllivefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C41120B54B8CA00DD6F44 /* lllivefile.cpp */; };
+                DA9C411F0B54B9AE00DD6F44 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764F09BEA39600AF6316 /* libexpat.a */; };
+                DA9C41200B54B9B300DD6F44 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
+                DA9C412B0B54B9DA00DD6F44 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
+                DA9C412C0B54B9DE00DD6F44 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764F09BEA39600AF6316 /* libexpat.a */; };
                 E224ACBE0874D6150039C1A6 /* llfloaterimport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E224ACBC0874D6150039C1A6 /* llfloaterimport.cpp */; };
                 E34C14740AE6A3F0009BF4DE /* llmapresponders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E34C14730AE6A3F0009BF4DE /* llmapresponders.cpp */; };
                 EB3EE6C6083ABB5E002BF676 /* llbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE68E083ABB5D002BF676 /* llbutton.cpp */; };
@@ -633,7 +636,6 @@
                 FD6C9A4809C75BCD00AA1849 /* llioutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD6C9A4609C75BCD00AA1849 /* llioutil.cpp */; };
                 FD6C9A5309C773A000AA1849 /* libaprutil-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6C9A5209C773A000AA1849 /* libaprutil-1.a */; };
                 FD835B810AD1CB6700038B74 /* llchainio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD835B800AD1CB6700038B74 /* llchainio.cpp */; };
-                FD870C5009EAC19700F5956C /* lldrawpoolclouds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD870C4E09EAC19700F5956C /* lldrawpoolclouds.cpp */; };
                 FDA39C790A372074006E8A2D /* metaclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C6B0A37203E006E8A2D /* metaclass.cpp */; };
                 FDA39C7A0A372074006E8A2D /* metaproperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C6E0A37203E006E8A2D /* metaproperty.cpp */; };
                 FDA39C7B0A372074006E8A2D /* reflective.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA39C710A37203E006E8A2D /* reflective.cpp */; };
@@ -651,6 +653,9 @@
                 FDAA36C309B919F600FBF1CA /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36C209B919F600FBF1CA /* libmx.dylib */; };
                 FDCB54F60AFBC5060033B433 /* llhttpnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB54F40AFBC5060033B433 /* llhttpnode.cpp */; };
                 FDCB55290AFBD4310033B433 /* lleventpoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB55270AFBD4310033B433 /* lleventpoll.cpp */; };
+                FDD3FD710B6A89A0009173F1 /* libcares.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD3FD700B6A89A0009173F1 /* libcares.a */; };
+                FDD3FD720B6A89A0009173F1 /* libcares.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD3FD700B6A89A0009173F1 /* libcares.a */; };
+                FDD3FD730B6A89A0009173F1 /* libcares.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDD3FD700B6A89A0009173F1 /* libcares.a */; };
                 FDE8765909BEA3B800AF6316 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
                 FDE8765A09BEA3BC00AF6316 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
                 FDE8765C09BEA3C300AF6316 /* libapr-1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8764E09BEA39600AF6316 /* libapr-1.a */; };
@@ -770,6 +775,15 @@
                 0633E5D309E3421500712406 /* llstreamtools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstreamtools.cpp; sourceTree = "<group>"; };
                 0633E5D409E3421500712406 /* llstreamtools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstreamtools.h; sourceTree = "<group>"; };
                 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+                1A02016D0B7A85DE00D5C589 /* llbase64.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase64.cpp; sourceTree = "<group>"; };
+                1A02016E0B7A85DE00D5C589 /* llbase64.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbase64.h; sourceTree = "<group>"; };
+                1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llblowfishcipher.cpp; sourceTree = "<group>"; };
+                1A02017F0B7A861200D5C589 /* llblowfishcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llblowfishcipher.h; sourceTree = "<group>"; };
+                1A0201800B7A861200D5C589 /* llcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcipher.h; sourceTree = "<group>"; };
+                1A0201810B7A861200D5C589 /* llnullcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnullcipher.cpp; sourceTree = "<group>"; };
+                1A0201820B7A861200D5C589 /* llnullcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnullcipher.h; sourceTree = "<group>"; };
+                1A0201830B7A861200D5C589 /* llxorcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llxorcipher.cpp; sourceTree = "<group>"; };
+                1A0201840B7A861200D5C589 /* llxorcipher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxorcipher.h; sourceTree = "<group>"; };
                 1A1C615E0847AEE6005D7227 /* llvolumemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvolumemgr.cpp; sourceTree = "<group>"; };
                 1A1C615F0847AEE6005D7227 /* llvolume.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvolume.cpp; sourceTree = "<group>"; };
                 1A1C61600847AEE6005D7227 /* llvolumemgr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvolumemgr.h; sourceTree = "<group>"; };
@@ -813,6 +827,10 @@
                 1A8BF3770A1AAB7B005B9D5A /* llcallbackmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallbackmap.h; sourceTree = "<group>"; };
                 1A8BF3780A1AAB99005B9D5A /* llfloatertest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatertest.cpp; sourceTree = "<group>"; };
                 1A8BF3790A1AABAD005B9D5A /* llfloatertest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatertest.h; sourceTree = "<group>"; };
+                1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llliveappconfig.cpp; sourceTree = "<group>"; };
+                1A97C4550B8BCF9C00331A24 /* llliveappconfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llliveappconfig.h; sourceTree = "<group>"; };
+                1A9897E70B98E2F4005C45D7 /* llbase32.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbase32.h; sourceTree = "<group>"; };
+                1A9897E80B98E2F4005C45D7 /* llbase32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbase32.cpp; sourceTree = "<group>"; };
                 1A9EC236083EA0100023D510 /* llfloatereditui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatereditui.cpp; sourceTree = "<group>"; };
                 1A9EC23A083EA01F0023D510 /* llfloatereditui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatereditui.h; sourceTree = "<group>"; };
                 1AB0DADC0A52E8A0001CACEB /* message_template.msg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = message_template.msg; path = ../../scripts/messages/message_template.msg; sourceTree = SOURCE_ROOT; };
@@ -865,13 +883,11 @@
                 26F529C5051F61DF00A80050 /* llwaterpatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwaterpatch.cpp; sourceTree = SOURCE_ROOT; };
                 26F529C6051F61DF00A80050 /* llvowater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvowater.cpp; sourceTree = SOURCE_ROOT; };
                 26F529C7051F61DF00A80050 /* llvovolume.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvovolume.cpp; sourceTree = SOURCE_ROOT; };
-                26F529C8051F61DF00A80050 /* llvotreenew.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvotreenew.cpp; sourceTree = SOURCE_ROOT; };
                 26F529C9051F61DF00A80050 /* llvotree.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvotree.cpp; sourceTree = SOURCE_ROOT; };
                 26F529CA051F61DF00A80050 /* llvotextbubble.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvotextbubble.cpp; sourceTree = SOURCE_ROOT; };
                 26F529CB051F61DF00A80050 /* llvosurfacepatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvosurfacepatch.cpp; sourceTree = SOURCE_ROOT; };
                 26F529CC051F61DF00A80050 /* llvosky.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvosky.cpp; sourceTree = SOURCE_ROOT; };
                 26F529CD051F61DF00A80050 /* llvopartgroup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvopartgroup.cpp; sourceTree = SOURCE_ROOT; };
-                26F529CE051F61DF00A80050 /* llvopart.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvopart.cpp; sourceTree = SOURCE_ROOT; };
                 26F529CF051F61DF00A80050 /* llvoground.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoground.cpp; sourceTree = SOURCE_ROOT; };
                 26F529D0051F61DF00A80050 /* llvograss.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvograss.cpp; sourceTree = SOURCE_ROOT; };
                 26F529D1051F61DF00A80050 /* llvoclouds.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvoclouds.cpp; sourceTree = SOURCE_ROOT; };
@@ -918,7 +934,6 @@
                 26F52A03051F61DF00A80050 /* llconsole.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llconsole.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A04051F61DF00A80050 /* lllandmarklist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllandmarklist.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A05051F61DF00A80050 /* llfloaterbuildoptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuildoptions.cpp; sourceTree = SOURCE_ROOT; };
-                26F52A07051F61DF00A80050 /* llfloateraccounthistory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateraccounthistory.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A0C051F61DF00A80050 /* lluserauth.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserauth.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A0D051F61DF00A80050 /* llurl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llurl.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A0E051F61DF00A80050 /* lluploaddialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluploaddialog.cpp; sourceTree = SOURCE_ROOT; };
@@ -939,7 +954,6 @@
                 26F52A26051F61DF00A80050 /* lldrawpoolalpha.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolalpha.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A27051F61DF00A80050 /* lltexturetable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturetable.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A28051F61DF00A80050 /* lltexturectrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturectrl.cpp; sourceTree = SOURCE_ROOT; };
-                26F52A29051F61DF00A80050 /* lltexturebar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturebar.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A2A051F61DF00A80050 /* llpanelobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelobject.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A2B051F61DF00A80050 /* llpanelnetwork.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelnetwork.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A2C051F61DF00A80050 /* lldrawpool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpool.cpp; sourceTree = SOURCE_ROOT; };
@@ -1006,7 +1020,6 @@
                 26F52A85051F61DF00A80050 /* llhoverview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhoverview.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A86051F61DF00A80050 /* llcylinder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcylinder.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A87051F61DF00A80050 /* llhippo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhippo.cpp; sourceTree = SOURCE_ROOT; };
-                26F52A89051F61DF00A80050 /* llpanelmoney.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelmoney.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A8B051F61DF00A80050 /* llfloateravatarinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateravatarinfo.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A8C051F61DF00A80050 /* llcallingcard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcallingcard.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A8D051F61DF00A80050 /* llhudeffectbeam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudeffectbeam.cpp; sourceTree = SOURCE_ROOT; };
@@ -1021,7 +1034,6 @@
                 26F52A98051F61DF00A80050 /* llnamelistctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llnamelistctrl.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A9A051F61DF00A80050 /* llmaniptranslate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmaniptranslate.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A9B051F61DF00A80050 /* llmanipscale.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmanipscale.cpp; sourceTree = SOURCE_ROOT; };
-                26F52A9C051F61DF00A80050 /* lldrawpooltreenew.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpooltreenew.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A9D051F61DF00A80050 /* head.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = head.cpp; sourceTree = SOURCE_ROOT; };
                 26F52A9F051F61DF00A80050 /* llfloaternamedesc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaternamedesc.cpp; sourceTree = SOURCE_ROOT; };
                 26F52AA0051F61DF00A80050 /* llpanelplace.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelplace.cpp; sourceTree = SOURCE_ROOT; };
@@ -1071,7 +1083,6 @@
                 2EA4CEED09F83BE8008F60F7 /* llpanelgrouplandmoney.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgrouplandmoney.cpp; sourceTree = SOURCE_ROOT; };
                 2EA4CEEE09F83C0B008F60F7 /* llpanelgrouplandmoney.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgrouplandmoney.h; sourceTree = SOURCE_ROOT; };
                 2EA4CEEF09F83C16008F60F7 /* llpanelgrouproles.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelgrouproles.h; sourceTree = SOURCE_ROOT; };
-                2EC08F1B09EF129800F87546 /* llfloateraccounthistory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloateraccounthistory.cpp; sourceTree = SOURCE_ROOT; };
                 2EFEA8E809F4556F00CB0193 /* llgroupnotify.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llgroupnotify.cpp; sourceTree = "<group>"; };
                 2EFEA8EA09F4557900CB0193 /* llgroupnotify.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llgroupnotify.h; sourceTree = "<group>"; };
                 2EFEA8EB09F455B900CB0193 /* llpanelgroup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroup.cpp; sourceTree = "<group>"; };
@@ -1123,10 +1134,6 @@
                 6192212E074A9B57005E1F34 /* llendianswizzle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llendianswizzle.h; sourceTree = "<group>"; };
                 6192212F074A9B57005E1F34 /* llerror.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerror.cpp; sourceTree = "<group>"; };
                 61922130074A9B57005E1F34 /* llerror.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerror.h; sourceTree = "<group>"; };
-                61922131074A9B57005E1F34 /* llerrorbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerrorbuffer.cpp; sourceTree = "<group>"; };
-                61922132074A9B57005E1F34 /* llerrorbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerrorbuffer.h; sourceTree = "<group>"; };
-                61922133074A9B57005E1F34 /* llerrorstream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerrorstream.cpp; sourceTree = "<group>"; };
-                61922134074A9B57005E1F34 /* llerrorstream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerrorstream.h; sourceTree = "<group>"; };
                 61922135074A9B57005E1F34 /* llfasttimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfasttimer.cpp; sourceTree = "<group>"; };
                 61922136074A9B57005E1F34 /* llfasttimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfasttimer.h; sourceTree = "<group>"; };
                 61922137074A9B57005E1F34 /* llfixedbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfixedbuffer.cpp; sourceTree = "<group>"; };
@@ -1226,7 +1233,6 @@
                 619221BD074A9B59005E1F34 /* llcallbacklisth.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallbacklisth.h; sourceTree = "<group>"; };
                 619221BE074A9B59005E1F34 /* llcircuit.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcircuit.cpp; sourceTree = "<group>"; };
                 619221BF074A9B59005E1F34 /* llcircuit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcircuit.h; sourceTree = "<group>"; };
-                619221C0074A9B59005E1F34 /* llcrypto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcrypto.h; sourceTree = "<group>"; };
                 619221C5074A9B59005E1F34 /* lldatapacker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldatapacker.cpp; sourceTree = "<group>"; };
                 619221C6074A9B59005E1F34 /* lldatapacker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldatapacker.h; sourceTree = "<group>"; };
                 619221C7074A9B59005E1F34 /* lldbstrings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldbstrings.h; sourceTree = "<group>"; };
@@ -1540,7 +1546,6 @@
                 990CDBDF05C1EA7900739545 /* mac_updater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mac_updater.cpp; sourceTree = "<group>"; };
                 990CDBE005C1EA7900739545 /* MoreFilesX.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = MoreFilesX.c; sourceTree = "<group>"; };
                 990CDBE105C1EA7900739545 /* MoreFilesX.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MoreFilesX.h; sourceTree = "<group>"; };
-                99142BE60AB625730063BC96 /* rsyncfiles.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = rsyncfiles.txt; sourceTree = SOURCE_ROOT; };
                 991ED2DF0883646B003EC818 /* llclassifiedinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llclassifiedinfo.cpp; sourceTree = "<group>"; };
                 9928ACA4056D9353003865BE /* CrashReporter.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = CrashReporter.nib; sourceTree = "<group>"; };
                 99321B11081DD26000678159 /* llworkerthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llworkerthread.h; sourceTree = "<group>"; };
@@ -1574,7 +1579,6 @@
                 997B4BEB06015821001B0407 /* llvosurfacepatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvosurfacepatch.h; sourceTree = SOURCE_ROOT; };
                 997B4BEC06015821001B0407 /* llvosky.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvosky.h; sourceTree = SOURCE_ROOT; };
                 997B4BED06015821001B0407 /* llvopartgroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvopartgroup.h; sourceTree = SOURCE_ROOT; };
-                997B4BEE06015821001B0407 /* llvopart.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvopart.h; sourceTree = SOURCE_ROOT; };
                 997B4BEF06015821001B0407 /* llvoground.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoground.h; sourceTree = SOURCE_ROOT; };
                 997B4BF006015821001B0407 /* llvograss.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvograss.h; sourceTree = SOURCE_ROOT; };
                 997B4BF106015821001B0407 /* llvoclouds.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoclouds.h; sourceTree = SOURCE_ROOT; };
@@ -1636,7 +1640,6 @@
                 997B4C3406015821001B0407 /* lltextureview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltextureview.h; sourceTree = SOURCE_ROOT; };
                 997B4C3506015821001B0407 /* lltexturetable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturetable.h; sourceTree = SOURCE_ROOT; };
                 997B4C3606015821001B0407 /* lltexturectrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturectrl.h; sourceTree = SOURCE_ROOT; };
-                997B4C3706015821001B0407 /* lltexturebar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturebar.h; sourceTree = SOURCE_ROOT; };
                 997B4C3B06015821001B0407 /* lltexlayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexlayer.h; sourceTree = SOURCE_ROOT; };
                 997B4C3D06015821001B0407 /* lltable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltable.h; sourceTree = SOURCE_ROOT; };
                 997B4C4006015821001B0407 /* llstatview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatview.h; sourceTree = SOURCE_ROOT; };
@@ -1669,7 +1672,6 @@
                 997B4C6C06015821001B0407 /* llpanelobject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelobject.h; sourceTree = SOURCE_ROOT; };
                 997B4C6D06015822001B0407 /* llpanelnetwork.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelnetwork.h; sourceTree = SOURCE_ROOT; };
                 997B4C6F06015822001B0407 /* llpanelmorph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelmorph.h; sourceTree = SOURCE_ROOT; };
-                997B4C7006015822001B0407 /* llpanelmoney.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelmoney.h; sourceTree = SOURCE_ROOT; };
                 997B4C7106015822001B0407 /* llpanelleaderboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelleaderboard.h; sourceTree = SOURCE_ROOT; };
                 997B4C7206015822001B0407 /* llpanelland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelland.h; sourceTree = SOURCE_ROOT; };
                 997B4C7306015822001B0407 /* llpanelinventory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelinventory.h; sourceTree = SOURCE_ROOT; };
@@ -1759,7 +1761,6 @@
                 997B4CE006015822001B0407 /* llfloaterbuildoptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuildoptions.h; sourceTree = SOURCE_ROOT; };
                 997B4CE206015822001B0407 /* llfloateravatarinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateravatarinfo.h; sourceTree = SOURCE_ROOT; };
                 997B4CE306015822001B0407 /* llfloaterauction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterauction.h; sourceTree = SOURCE_ROOT; };
-                997B4CE406015822001B0407 /* llfloateraccounthistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloateraccounthistory.h; sourceTree = SOURCE_ROOT; };
                 997B4CE506015822001B0407 /* llfloaterabout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterabout.h; sourceTree = SOURCE_ROOT; };
                 997B4CE706015822001B0407 /* llfirstuse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfirstuse.h; sourceTree = SOURCE_ROOT; };
                 997B4CE906015822001B0407 /* llfilepicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfilepicker.h; sourceTree = SOURCE_ROOT; };
@@ -1813,8 +1814,6 @@
                 9985A1270AC1FE4E00579AFB /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = ../../../../../../../../System/Library/Frameworks/AppKit.framework; sourceTree = "<group>"; };
                 99AAD74D09DC8B9D0036C309 /* lllfsthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllfsthread.h; sourceTree = "<group>"; };
                 99AAD74E09DC8B9D0036C309 /* lllfsthread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllfsthread.cpp; sourceTree = "<group>"; };
-                99B0682709A54FBB00F4AD09 /* lldrawpoolhud.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolhud.cpp; sourceTree = SOURCE_ROOT; };
-                99B0682809A54FBB00F4AD09 /* lldrawpoolhud.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolhud.h; sourceTree = SOURCE_ROOT; };
                 99BB5166099ABDEB004BF9F2 /* llfloaterbuyland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterbuyland.cpp; sourceTree = SOURCE_ROOT; };
                 99BB5167099ABDEB004BF9F2 /* llfloaterbuyland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbuyland.h; sourceTree = SOURCE_ROOT; };
                 99BB5169099AC1AE004BF9F2 /* llxmlrpctransaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llxmlrpctransaction.h; sourceTree = SOURCE_ROOT; };
@@ -1877,6 +1876,8 @@
                 A241CB8F07B3E383001A39E3 /* llmessagethrottle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagethrottle.h; sourceTree = "<group>"; };
                 A241CB9407B3E3A7001A39E3 /* llperlin.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llperlin.cpp; sourceTree = "<group>"; };
                 A2A57EBA0ADF10FD00F6EF97 /* llavatarconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llavatarconstants.h; sourceTree = "<group>"; };
+                A30273550B3A13D800704420 /* llvertexbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvertexbuffer.cpp; sourceTree = "<group>"; };
+                A30273560B3A13D800704420 /* llvertexbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvertexbuffer.h; sourceTree = "<group>"; };
                 A3077BFB09DCB8140059ED75 /* lldrawpoolstars.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolstars.cpp; sourceTree = "<group>"; };
                 A3077BFC09DCB8140059ED75 /* lldrawpoolstars.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolstars.h; sourceTree = "<group>"; };
                 A3077BFF09DCB8140059ED75 /* llfloaterhtmlhelp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterhtmlhelp.cpp; sourceTree = "<group>"; };
@@ -1897,16 +1898,24 @@
                 A3D968F00A6EBCA7007E8BD2 /* llfloaternewim.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaternewim.cpp; sourceTree = "<group>"; };
                 A3D968F10A6EBCA7007E8BD2 /* llfloaternewim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaternewim.h; sourceTree = "<group>"; };
                 A3D9691B0A6ED5F6007E8BD2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
+                AA02B9BA0B0CE44D00F2996D /* lltexturefetch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturefetch.cpp; sourceTree = "<group>"; };
+                AA02B9BB0B0CE44D00F2996D /* lltexturefetch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturefetch.h; sourceTree = "<group>"; };
                 AA0E2A5F0A2FDAEE0066250A /* llcontrol.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcontrol.cpp; sourceTree = "<group>"; };
                 AA0E2A600A2FDAEE0066250A /* llcontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcontrol.h; sourceTree = "<group>"; };
                 AA0E2A620A2FDB340066250A /* lltoolpipette.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltoolpipette.cpp; sourceTree = "<group>"; };
                 AA0E2A630A2FDB340066250A /* lltoolpipette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltoolpipette.h; sourceTree = "<group>"; };
+                AA348DF80B0EAB31002C3015 /* llcurl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcurl.cpp; sourceTree = "<group>"; };
+                AA348DF90B0EAB31002C3015 /* llcurl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcurl.h; sourceTree = "<group>"; };
                 AAA133690A3F94D000419F7C /* lluistring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluistring.cpp; sourceTree = "<group>"; };
                 AAA1336A0A3F94D000419F7C /* lluistring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluistring.h; sourceTree = "<group>"; };
                 AAC121A30A93A8380080E8A9 /* llfloatersellland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatersellland.cpp; sourceTree = "<group>"; };
                 AAC121A40A93A8380080E8A9 /* llfloatersellland.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatersellland.h; sourceTree = "<group>"; };
+                AAE98CC00B38FE0800E2F204 /* llimageworker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimageworker.cpp; sourceTree = "<group>"; };
+                AAE98CC10B38FE0800E2F204 /* llimageworker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimageworker.h; sourceTree = "<group>"; };
                 AAEAAF250A8104D8005F0707 /* llscrollingpanellist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llscrollingpanellist.cpp; sourceTree = "<group>"; };
                 AAEAAF260A8104D8005F0707 /* llscrollingpanellist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llscrollingpanellist.h; sourceTree = "<group>"; };
+                AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltexturecache.cpp; sourceTree = "<group>"; };
+                AAF5FFD10B13F71900D28A84 /* lltexturecache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltexturecache.h; sourceTree = "<group>"; };
                 C16C084E0B4AE6C7009AD67F /* llfloaterinspect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterinspect.cpp; sourceTree = "<group>"; };
                 C16C084F0B4AE6C7009AD67F /* llfloaterinspect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterinspect.h; sourceTree = "<group>"; };
                 C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserrelations.cpp; sourceTree = "<group>"; };
@@ -1917,12 +1926,6 @@
                 C64F67410AFBED91009732B5 /* lldirpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldirpicker.h; sourceTree = "<group>"; };
                 D62830D80B4DC76300F8830F /* llimagej2coj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagej2coj.cpp; sourceTree = "<group>"; };
                 D62830D90B4DC76300F8830F /* llimagej2coj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagej2coj.h; sourceTree = "<group>"; };
-                D62831510B4F3FA100F8830F /* llagpmempool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llagpmempool.cpp; sourceTree = "<group>"; };
-                D62831520B4F3FA100F8830F /* llagpmempool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagpmempool.h; sourceTree = "<group>"; };
-                D62831530B4F3FA100F8830F /* llagpmempoolapple.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llagpmempoolapple.cpp; sourceTree = "<group>"; };
-                D62831540B4F3FA100F8830F /* llagpmempoolapple.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagpmempoolapple.h; sourceTree = "<group>"; };
-                D62831550B4F3FA100F8830F /* llagpmempoolarb.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llagpmempoolarb.cpp; sourceTree = "<group>"; };
-                D62831560B4F3FA100F8830F /* llagpmempoolarb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagpmempoolarb.h; sourceTree = "<group>"; };
                 D628315B0B4F3FA100F8830F /* llfont.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfont.cpp; sourceTree = "<group>"; };
                 D628315C0B4F3FA100F8830F /* llfont.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfont.h; sourceTree = "<group>"; };
                 D628315D0B4F3FA100F8830F /* llfontgl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfontgl.cpp; sourceTree = "<group>"; };
@@ -1935,6 +1938,12 @@
                 D62831650B4F3FA200F8830F /* llvertexprogramgl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvertexprogramgl.h; sourceTree = "<group>"; };
                 D62831670B4F3FA200F8830F /* text_out.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = text_out.cpp; sourceTree = "<group>"; };
                 D62831680B4F3FA200F8830F /* text_out.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = text_out.h; sourceTree = "<group>"; };
+                DA55FCB20B59F75C001C28B6 /* llerrorcontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerrorcontrol.h; sourceTree = "<group>"; };
+                DA9C40DE0B54B4BA00DD6F44 /* llformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llformat.h; sourceTree = "<group>"; };
+                DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llformat.cpp; sourceTree = "<group>"; };
+                DA9C40EC0B54B5C700DD6F44 /* llerrorlegacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llerrorlegacy.h; sourceTree = "<group>"; };
+                DA9C41120B54B8CA00DD6F44 /* lllivefile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllivefile.cpp; sourceTree = "<group>"; };
+                DA9C41130B54B8CA00DD6F44 /* lllivefile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllivefile.h; sourceTree = "<group>"; };
                 E224ACBC0874D6150039C1A6 /* llfloaterimport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterimport.cpp; sourceTree = "<group>"; };
                 E224ACBD0874D6150039C1A6 /* llfloaterimport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterimport.h; sourceTree = "<group>"; };
                 E34C14730AE6A3F0009BF4DE /* llmapresponders.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmapresponders.cpp; sourceTree = "<group>"; };
@@ -2031,7 +2040,7 @@
                 FD1558280A06BB5F00DE9AE5 /* lluri.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluri.cpp; sourceTree = "<group>"; };
                 FD1558290A06BB5F00DE9AE5 /* lluri.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluri.h; sourceTree = "<group>"; };
                 FD1558B00A06C16C00DE9AE5 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
-                FD34696A0B5C3C55007318E5 /* libllcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libllcurl.a; path = build/Universal/libllcurl.a; sourceTree = "<group>"; };
+                FD34696A0B5C3C55007318E5 /* libllcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libllcurl.a; sourceTree = BUILT_PRODUCTS_DIR; };
                 FD53B3DB09BDE88B00BFE3BC /* macutil_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macutil_Prefix.h; sourceTree = "<group>"; };
                 FD59ED5D0AF2AF460086642A /* llassetuploadresponders.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llassetuploadresponders.cpp; sourceTree = "<group>"; };
                 FD59ED5E0AF2AF460086642A /* llassetuploadresponders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llassetuploadresponders.h; sourceTree = "<group>"; };
@@ -2058,7 +2067,6 @@
                 FD6C9A4709C75BCD00AA1849 /* llioutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llioutil.h; sourceTree = "<group>"; };
                 FD6C9A5209C773A000AA1849 /* libaprutil-1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libaprutil-1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
                 FD835B800AD1CB6700038B74 /* llchainio.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llchainio.cpp; sourceTree = "<group>"; };
-                FD870C4E09EAC19700F5956C /* lldrawpoolclouds.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolclouds.cpp; sourceTree = "<group>"; };
                 FD870C4F09EAC19700F5956C /* lldrawpoolclouds.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldrawpoolclouds.h; sourceTree = "<group>"; };
                 FDA39C6B0A37203E006E8A2D /* metaclass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = metaclass.cpp; sourceTree = "<group>"; };
                 FDA39C6C0A37203E006E8A2D /* metaclass.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = metaclass.h; sourceTree = "<group>"; };
@@ -2077,6 +2085,7 @@
                 FDCB54F50AFBC5060033B433 /* llhttpnode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpnode.h; sourceTree = "<group>"; };
                 FDCB55270AFBD4310033B433 /* lleventpoll.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lleventpoll.cpp; sourceTree = "<group>"; };
                 FDCB55280AFBD4310033B433 /* lleventpoll.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lleventpoll.h; sourceTree = "<group>"; };
+                FDD3FD700B6A89A0009173F1 /* libcares.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcares.a; sourceTree = BUILT_PRODUCTS_DIR; };
                 FDE8764E09BEA39600AF6316 /* libapr-1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libapr-1.a"; sourceTree = BUILT_PRODUCTS_DIR; };
                 FDE8764F09BEA39600AF6316 /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; };
                 FDE8765009BEA39600AF6316 /* libfmod.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfmod.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2122,6 +2131,7 @@
                                 9967E9200B3754800087BD1B /* libfmodwrapper.dylib in Frameworks */,
                                 9950AFEC0B376E24007E36E0 /* libopenjpeg.a in Frameworks */,
                                 FD34696B0B5C3C55007318E5 /* libllcurl.a in Frameworks */,
+                                FDD3FD730B6A89A0009173F1 /* libcares.a in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -2136,6 +2146,9 @@
                                 FDAA36BD09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */,
                                 FDAA36C109B919DF00FBF1CA /* libz.dylib in Frameworks */,
                                 FD34696F0B5C47B0007318E5 /* libllcurl.a in Frameworks */,
+                                FDD3FD720B6A89A0009173F1 /* libcares.a in Frameworks */,
+                                DA9C412B0B54B9DA00DD6F44 /* libaprutil-1.a in Frameworks */,
+                                DA9C412C0B54B9DE00DD6F44 /* libexpat.a in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -2158,7 +2171,10 @@
                                 FDAA36B709B919AD00FBF1CA /* libssl.dylib in Frameworks */,
                                 FDAA36BB09B919CD00FBF1CA /* libcrypto.dylib in Frameworks */,
                                 FDAA36BF09B919DF00FBF1CA /* libz.dylib in Frameworks */,
+                                DA9C411F0B54B9AE00DD6F44 /* libexpat.a in Frameworks */,
+                                DA9C41200B54B9B300DD6F44 /* libaprutil-1.a in Frameworks */,
                                 FD34696E0B5C47B0007318E5 /* libllcurl.a in Frameworks */,
+                                FDD3FD710B6A89A0009173F1 /* libcares.a in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -2227,7 +2243,6 @@
                 20286C2CFDCF999611CA2CEA /* Resources */ = {
                         isa = PBXGroup;
                         children = (
-                                99142BE60AB625730063BC96 /* rsyncfiles.txt */,
                                 019200F204DD7D3500A800A7 /* macview.r */,
                                 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */,
                         );
@@ -2248,6 +2263,10 @@
                 26F529A0051F61CD00A80050 /* newview */ = {
                         isa = PBXGroup;
                         children = (
+                                AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */,
+                                AAF5FFD10B13F71900D28A84 /* lltexturecache.h */,
+                                AA02B9BA0B0CE44D00F2996D /* lltexturefetch.cpp */,
+                                AA02B9BB0B0CE44D00F2996D /* lltexturefetch.h */,
                                 C16C084E0B4AE6C7009AD67F /* llfloaterinspect.cpp */,
                                 C16C084F0B4AE6C7009AD67F /* llfloaterinspect.h */,
                                 C64F67400AFBED91009732B5 /* lldirpicker.cpp */,
@@ -2282,7 +2301,6 @@
                                 1A3143E00A02B73D005B87E7 /* llprefschat.cpp */,
                                 1A3143DE0A02B737005B87E7 /* llprefsim.cpp */,
                                 1A3143D00A02B701005B87E7 /* llviewernetwork.cpp */,
-                                FD870C4E09EAC19700F5956C /* lldrawpoolclouds.cpp */,
                                 FD870C4F09EAC19700F5956C /* lldrawpoolclouds.h */,
                                 A3077BFB09DCB8140059ED75 /* lldrawpoolstars.cpp */,
                                 A3077BFC09DCB8140059ED75 /* lldrawpoolstars.h */,
@@ -2305,7 +2323,6 @@
                                 2EA4CEEC09F83AC2008F60F7 /* llpanelgrouproles.cpp */,
                                 2EA4CEED09F83BE8008F60F7 /* llpanelgrouplandmoney.cpp */,
                                 FD6C9A4309C75B8900AA1849 /* llfloatertopobjects.h */,
-                                2EC08F1B09EF129800F87546 /* llfloateraccounthistory.cpp */,
                                 FD6C9A3409C75A8500AA1849 /* llfloaterpermissionsmgr.cpp */,
                                 2E6FE90D09FD560A00AF02FF /* llpanelgroupnotices.cpp */,
                                 FD6C9A3509C75A8500AA1849 /* llfloaterpermissionsmgr.h */,
@@ -2318,8 +2335,6 @@
                                 FD6C9A2609C758BC00AA1849 /* llfollowcam.h */,
                                 FD6C9A2709C758BC00AA1849 /* llhudicon.cpp */,
                                 FD6C9A2809C758BC00AA1849 /* llhudicon.h */,
-                                99B0682709A54FBB00F4AD09 /* lldrawpoolhud.cpp */,
-                                99B0682809A54FBB00F4AD09 /* lldrawpoolhud.h */,
                                 99E43515092D64E6003AE728 /* llvoinventorylistener.h */,
                                 99E43516092D64E6003AE728 /* llvoinventorylistener.cpp */,
                                 99E43512092D64CC003AE728 /* llmemoryview.h */,
@@ -2425,7 +2440,6 @@
                                 26F52A14051F61DF00A80050 /* lldrawpoolsky.cpp */,
                                 26F529EF051F61DF00A80050 /* lldrawpoolterrain.cpp */,
                                 26F52A7B051F61DF00A80050 /* lldrawpooltree.cpp */,
-                                26F52A9C051F61DF00A80050 /* lldrawpooltreenew.cpp */,
                                 26F52A3F051F61DF00A80050 /* lldrawpoolwater.cpp */,
                                 26F52A84051F61DF00A80050 /* lldriverparam.cpp */,
                                 26F52A62051F61DF00A80050 /* llemote.cpp */,
@@ -2435,7 +2449,6 @@
                                 26F52AD3051F61DF00A80050 /* llfilepicker.cpp */,
                                 8B2ECF9E0534C17A00A80059 /* llfirstuse.h */,
                                 26F52A82051F61DF00A80050 /* llfloaterabout.cpp */,
-                                26F52A07051F61DF00A80050 /* llfloateraccounthistory.cpp */,
                                 916083920649560B00CAF63E /* llfloateranimpreview.cpp */,
                                 26F52A8B051F61DF00A80050 /* llfloateravatarinfo.cpp */,
                                 26F52A05051F61DF00A80050 /* llfloaterbuildoptions.cpp */,
@@ -2519,7 +2532,6 @@
                                 26F52AC7051F61DF00A80050 /* llpanelgroupvoting.cpp */,
                                 26F529EE051F61DF00A80050 /* llpanelinventory.cpp */,
                                 26F529ED051F61DF00A80050 /* llpanelland.cpp */,
-                                26F52A89051F61DF00A80050 /* llpanelmoney.cpp */,
                                 26F52A5A051F61DF00A80050 /* llpanelmorph.cpp */,
                                 26F52A2B051F61DF00A80050 /* llpanelnetwork.cpp */,
                                 26F52A2A051F61DF00A80050 /* llpanelobject.cpp */,
@@ -2549,7 +2561,6 @@
                                 26F52A43051F61DF00A80050 /* llsurface.cpp */,
                                 26F52A42051F61DF00A80050 /* llsurfacepatch.cpp */,
                                 26F52AB8051F61DF00A80050 /* lltexlayer.cpp */,
-                                26F52A29051F61DF00A80050 /* lltexturebar.cpp */,
                                 26F52A28051F61DF00A80050 /* lltexturectrl.cpp */,
                                 26F52A27051F61DF00A80050 /* lltexturetable.cpp */,
                                 26F529F6051F61DF00A80050 /* lltextureview.cpp */,
@@ -2608,13 +2619,11 @@
                                 26F529D1051F61DF00A80050 /* llvoclouds.cpp */,
                                 26F529D0051F61DF00A80050 /* llvograss.cpp */,
                                 26F529CF051F61DF00A80050 /* llvoground.cpp */,
-                                26F529CE051F61DF00A80050 /* llvopart.cpp */,
                                 26F529CD051F61DF00A80050 /* llvopartgroup.cpp */,
                                 26F529CC051F61DF00A80050 /* llvosky.cpp */,
                                 26F529CB051F61DF00A80050 /* llvosurfacepatch.cpp */,
                                 26F529CA051F61DF00A80050 /* llvotextbubble.cpp */,
                                 26F529C9051F61DF00A80050 /* llvotree.cpp */,
-                                26F529C8051F61DF00A80050 /* llvotreenew.cpp */,
                                 26F529C7051F61DF00A80050 /* llvovolume.cpp */,
                                 26F529C6051F61DF00A80050 /* llvowater.cpp */,
                                 26F529C5051F61DF00A80050 /* llwaterpatch.cpp */,
@@ -2642,6 +2651,15 @@
                 6192211E074A9B57005E1F34 /* llcommon */ = {
                         isa = PBXGroup;
                         children = (
+                                1A9897E70B98E2F4005C45D7 /* llbase32.h */,
+                                1A9897E80B98E2F4005C45D7 /* llbase32.cpp */,
+                                1A97C4540B8BCF9C00331A24 /* llliveappconfig.cpp */,
+                                1A97C4550B8BCF9C00331A24 /* llliveappconfig.h */,
+                                1A02016D0B7A85DE00D5C589 /* llbase64.cpp */,
+                                1A02016E0B7A85DE00D5C589 /* llbase64.h */,
+                                DA55FCB20B59F75C001C28B6 /* llerrorcontrol.h */,
+                                DA9C41120B54B8CA00DD6F44 /* lllivefile.cpp */,
+                                DA9C41130B54B8CA00DD6F44 /* lllivefile.h */,
                                 A2A57EBA0ADF10FD00F6EF97 /* llavatarconstants.h */,
                                 9B2863B00ABF637200A05D7C /* llerrorthread.cpp */,
                                 91E333730ABB79AC004351DE /* llrun.cpp */,
@@ -2717,10 +2735,6 @@
                                 6192212E074A9B57005E1F34 /* llendianswizzle.h */,
                                 6192212F074A9B57005E1F34 /* llerror.cpp */,
                                 61922130074A9B57005E1F34 /* llerror.h */,
-                                61922131074A9B57005E1F34 /* llerrorbuffer.cpp */,
-                                61922132074A9B57005E1F34 /* llerrorbuffer.h */,
-                                61922133074A9B57005E1F34 /* llerrorstream.cpp */,
-                                61922134074A9B57005E1F34 /* llerrorstream.h */,
                                 61922135074A9B57005E1F34 /* llfasttimer.cpp */,
                                 61922136074A9B57005E1F34 /* llfasttimer.h */,
                                 61922137074A9B57005E1F34 /* llfixedbuffer.cpp */,
@@ -2766,6 +2780,9 @@
                                 6192215E074A9B58005E1F34 /* string_table.h */,
                                 61922161074A9B58005E1F34 /* timing.cpp */,
                                 61922162074A9B58005E1F34 /* timing.h */,
+                                DA9C40DE0B54B4BA00DD6F44 /* llformat.h */,
+                                DA9C40DF0B54B4BA00DD6F44 /* llformat.cpp */,
+                                DA9C40EC0B54B5C700DD6F44 /* llerrorlegacy.h */,
                         );
                         name = llcommon;
                         path = ../llcommon;
@@ -2867,6 +2884,15 @@
                 619221B8074A9B58005E1F34 /* llmessage */ = {
                         isa = PBXGroup;
                         children = (
+                                AA348DF80B0EAB31002C3015 /* llcurl.cpp */,
+                                AA348DF90B0EAB31002C3015 /* llcurl.h */,
+                                1A02017E0B7A861200D5C589 /* llblowfishcipher.cpp */,
+                                1A02017F0B7A861200D5C589 /* llblowfishcipher.h */,
+                                1A0201800B7A861200D5C589 /* llcipher.h */,
+                                1A0201810B7A861200D5C589 /* llnullcipher.cpp */,
+                                1A0201820B7A861200D5C589 /* llnullcipher.h */,
+                                1A0201830B7A861200D5C589 /* llxorcipher.cpp */,
+                                1A0201840B7A861200D5C589 /* llxorcipher.h */,
                                 91469E790B4486C10009E8F9 /* llmime.cpp */,
                                 91469E7A0B4486C10009E8F9 /* llmime.h */,
                                 FDFAD3E50AFFBA270048A0C7 /* llsdmessagesystem.cpp */,
@@ -2909,7 +2935,6 @@
                                 619221BF074A9B59005E1F34 /* llcircuit.h */,
                                 99FBB071087365E90048A5CC /* llclassifiedflags.cpp */,
                                 99FBB072087365E90048A5CC /* llclassifiedflags.h */,
-                                619221C0074A9B59005E1F34 /* llcrypto.h */,
                                 619221C5074A9B59005E1F34 /* lldatapacker.cpp */,
                                 619221C6074A9B59005E1F34 /* lldatapacker.h */,
                                 619221C7074A9B59005E1F34 /* lldbstrings.h */,
@@ -3325,6 +3350,8 @@
                 61923D8D074AE4F2005E1F34 /* llimage */ = {
                         isa = PBXGroup;
                         children = (
+                                AAE98CC00B38FE0800E2F204 /* llimageworker.cpp */,
+                                AAE98CC10B38FE0800E2F204 /* llimageworker.h */,
                                 EB3EE725083AC2F2002BF676 /* llimagedxt.cpp */,
                                 EB3EE726083AC2F2002BF676 /* llimagedxt.h */,
                                 61923D9B074AE4F2005E1F34 /* llimage.cpp */,
@@ -3441,7 +3468,6 @@
                                 997B4BEB06015821001B0407 /* llvosurfacepatch.h */,
                                 997B4BEC06015821001B0407 /* llvosky.h */,
                                 997B4BED06015821001B0407 /* llvopartgroup.h */,
-                                997B4BEE06015821001B0407 /* llvopart.h */,
                                 997B4BEF06015821001B0407 /* llvoground.h */,
                                 997B4BF006015821001B0407 /* llvograss.h */,
                                 997B4BF106015821001B0407 /* llvoclouds.h */,
@@ -3503,7 +3529,6 @@
                                 997B4C3406015821001B0407 /* lltextureview.h */,
                                 997B4C3506015821001B0407 /* lltexturetable.h */,
                                 997B4C3606015821001B0407 /* lltexturectrl.h */,
-                                997B4C3706015821001B0407 /* lltexturebar.h */,
                                 997B4C3B06015821001B0407 /* lltexlayer.h */,
                                 997B4C3D06015821001B0407 /* lltable.h */,
                                 997B4C4006015821001B0407 /* llstatview.h */,
@@ -3536,7 +3561,6 @@
                                 997B4C6C06015821001B0407 /* llpanelobject.h */,
                                 997B4C6D06015822001B0407 /* llpanelnetwork.h */,
                                 997B4C6F06015822001B0407 /* llpanelmorph.h */,
-                                997B4C7006015822001B0407 /* llpanelmoney.h */,
                                 997B4C7106015822001B0407 /* llpanelleaderboard.h */,
                                 997B4C7206015822001B0407 /* llpanelland.h */,
                                 997B4C7306015822001B0407 /* llpanelinventory.h */,
@@ -3628,7 +3652,6 @@
                                 997B4CE006015822001B0407 /* llfloaterbuildoptions.h */,
                                 997B4CE206015822001B0407 /* llfloateravatarinfo.h */,
                                 997B4CE306015822001B0407 /* llfloaterauction.h */,
-                                997B4CE406015822001B0407 /* llfloateraccounthistory.h */,
                                 997B4CE506015822001B0407 /* llfloaterabout.h */,
                                 997B4CE706015822001B0407 /* llfirstuse.h */,
                                 997B4CE906015822001B0407 /* llfilepicker.h */,
@@ -3696,12 +3719,8 @@
                 D628314D0B4F3FA100F8830F /* llrender */ = {
                         isa = PBXGroup;
                         children = (
-                                D62831510B4F3FA100F8830F /* llagpmempool.cpp */,
-                                D62831520B4F3FA100F8830F /* llagpmempool.h */,
-                                D62831530B4F3FA100F8830F /* llagpmempoolapple.cpp */,
-                                D62831540B4F3FA100F8830F /* llagpmempoolapple.h */,
-                                D62831550B4F3FA100F8830F /* llagpmempoolarb.cpp */,
-                                D62831560B4F3FA100F8830F /* llagpmempoolarb.h */,
+                                A30273550B3A13D800704420 /* llvertexbuffer.cpp */,
+                                A30273560B3A13D800704420 /* llvertexbuffer.h */,
                                 D628315B0B4F3FA100F8830F /* llfont.cpp */,
                                 D628315C0B4F3FA100F8830F /* llfont.h */,
                                 D628315D0B4F3FA100F8830F /* llfontgl.cpp */,
@@ -3747,6 +3766,7 @@
                 FDE8761909BE9C7D00AF6316 /* Third Party Libraries */ = {
                         isa = PBXGroup;
                         children = (
+                                FDD3FD700B6A89A0009173F1 /* libcares.a */,
                                 FD34696A0B5C3C55007318E5 /* libllcurl.a */,
                                 FDE8764E09BEA39600AF6316 /* libapr-1.a */,
                                 FD6C9A5209C773A000AA1849 /* libaprutil-1.a */,
@@ -3950,7 +3970,7 @@
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "# exit on any error\nset -e\n\n# For some reason, this isn't provided.\nRESOURCES_DIRECTORY=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Resources/\"\nFRAMEWORKS_DIRECTORY=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/\"\nMACOS_DIRECTORY=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/MacOS\"\n\n# SRCROOT is the project directory (linden/indra/newview)\n\n# make sure the resources directory is there\nmkdir -p \"${RESOURCES_DIRECTORY}\"\n\n# rsync the necessary bits from the newview directory into the Resources directory of the application bundle\n# See the include/exclude list in rsyncfiles.txt for which files are actually copied.\n# Note that having the --exclude='/*' at the end here is a safety feature.\n# if all excludes were in rsyncfiles.txt and that file disappeared, it would be possible for source code to get copied into the application bundle.\n# This would be, as we say, \"bad\".\nrsync --verbose --recursive --checksum --include-from=\"${SRCROOT}/rsyncfiles.txt\" --exclude='/*' \"${SRCROOT}/\" \"${RESOURCES_DIRECTORY}/\"\n\ncp \"${SRCROOT}/../../scripts/messages/message_template.msg\" \"${RESOURCES_DIRECTORY}/app_settings/message_template.msg\"\n\n# make sure the <bundle>/Contents/MacOS/ directory exists (it may not be there yet on a clean build)\nmkdir -p \"${MACOS_DIRECTORY}\"\n\n# Expand the tar file containing the assorted mozilla bits into <bundle>/Contents/MacOS/\ntar -zx -C \"${MACOS_DIRECTORY}\" -f \"${SRCROOT}/mozilla-universal-darwin.tgz\"\n\n# replace the default theme with our custom theme (so scrollbars work).\ncp \"${SRCROOT}/mozilla-theme/classic.jar\" \"${SRCROOT}/mozilla-theme/classic.manifest\" \"${MACOS_DIRECTORY}/chrome\"\n\n#copy over the universal llkdu dynamic library to the resource directory if it doesn't already exist\nif [ ! -f \"${RESOURCES_DIRECTORY}/libllkdu.dylib\" ]\nthen\n\tcp \"${SRCROOT}/../../libraries/universal-darwin/lib_release/libllkdu.dylib\" \"${RESOURCES_DIRECTORY}\"\nfi ";
+                        shellScript = "# exit on any error\nset -e\n\n# Copy the necessary resources into the build directory.\npython viewer_manifest.py --actions=\"copy\" --configuration=\"${CONFIGURATION}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\n";
                 };
                 FD53B40409BDF9F600BFE3BC /* ShellScript */ = {
                         isa = PBXShellScriptBuildPhase;
@@ -3963,7 +3983,7 @@
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "LIBS=\"apr-1 aprutil-1 expat ogg vorbis fmod freetype llcurl lljpeg openjpeg vorbisenc vorbisfile xmlrpc\"\nLIBDIR=\"${SRCROOT}/../../libraries\"\n\ncd \"${LIBDIR}\"\n\nif [ \\! -e ppc-darwin ]\nthen\n\tln -s powerpc-darwin ppc-darwin\nfi\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"\n\nfor i in ${LIBS}; do\n\tNEED_UPDATE=false\n\tARCH_COUNT=0\n\tOUT=\"${BUILT_PRODUCTS_DIR}/lib$i.a\"\n\tTEST_ARCH=`echo \"${ARCHS}\" | grep i386`\n\tif [ -n \"$TEST_ARCH\" ]; then\n\t\tIN_i386=\"i386-darwin/lib_release/lib$i.a\"\n\t\tARCH_COUNT=`expr $ARCH_COUNT \"+\" 1`\n\t\tif [ \"$IN_i386\" -nt \"$OUT\" ]; then\n\t\t\tNEED_UPDATE=true\n\t\tfi\n\tfi\n\tTEST_ARCH=`echo \"${ARCHS}\" | grep ppc`\n\tif [ -n \"$TEST_ARCH\" ]; then\n\t\tIN_ppc=\"ppc-darwin/lib_release/lib$i.a\"\n\t\tARCH_COUNT=`expr $ARCH_COUNT \"+\" 1`\n\t\tif [ \"$IN_ppc\" -nt \"$OUT\" ]; then\n\t\t\tNEED_UPDATE=true\n\t\tfi\n\tfi\n\tif [ $ARCH_COUNT -eq 0 ]; then\n\t\techo \"No supported architectures found.\"\n\t\texit 1\n\tfi\n\tif [ ! -f \"$OUT\" -o NEED_UPDATE = \"true\" ]; then\n\t\techo Preparing third party library lib$i.a\n\t\tif [ $ARCH_COUNT -eq 1 ]; then\n\t\t\tIN=\"$IN_i386\"\"$IN_ppc\"\n\t\t\t#echo cp \"$IN\" \"$OUT\"\n\t\t\tcp \"$IN\" \"$OUT\"\n\t\telse\n\t\t\t#echo libtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\t\tlibtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\tfi\n\t\tranlib \"$OUT\"\n\telse\n\t\techo Third party library lib$i.a is up to date\n\tfi\ndone\n";
+                        shellScript = "# Glue together intel and ppc versions of .a files\nLIBS=\"apr-1 aprutil-1 expat ogg vorbis fmod freetype cares llcurl lljpeg openjpeg vorbisenc vorbisfile xmlrpc\"\nLIBDIR=\"${SRCROOT}/../../libraries\"\n\ncd \"${LIBDIR}\"\n\nif [ \\! -e ppc-darwin ]\nthen\n\tln -s powerpc-darwin ppc-darwin\nfi\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"\n\nfor i in ${LIBS}; do\n\tNEED_UPDATE=false\n\tARCH_COUNT=0\n\tOUT=\"${BUILT_PRODUCTS_DIR}/lib$i.a\"\n\tTEST_ARCH=`echo \"${ARCHS}\" | grep i386`\n\tif [ -n \"$TEST_ARCH\" ]; then\n\t\tIN_i386=\"i386-darwin/lib_release/lib$i.a\"\n\t\tARCH_COUNT=`expr $ARCH_COUNT \"+\" 1`\n\t\tif [ \"$IN_i386\" -nt \"$OUT\" ]; then\n\t\t\tNEED_UPDATE=true\n\t\tfi\n\tfi\n\tTEST_ARCH=`echo \"${ARCHS}\" | grep ppc`\n\tif [ -n \"$TEST_ARCH\" ]; then\n\t\tIN_ppc=\"ppc-darwin/lib_release/lib$i.a\"\n\t\tARCH_COUNT=`expr $ARCH_COUNT \"+\" 1`\n\t\tif [ \"$IN_ppc\" -nt \"$OUT\" ]; then\n\t\t\tNEED_UPDATE=true\n\t\tfi\n\tfi\n\tif [ $ARCH_COUNT -eq 0 ]; then\n\t\techo \"No supported architectures found.\"\n\t\texit 1\n\tfi\n\tif [ ! -f \"$OUT\" -o NEED_UPDATE = \"true\" ]; then\n\t\techo Preparing third party library lib$i.a\n\t\tif [ $ARCH_COUNT -eq 1 ]; then\n\t\t\tIN=\"$IN_i386\"\"$IN_ppc\"\n\t\t\t#echo cp \"$IN\" \"$OUT\"\n\t\t\tcp \"$IN\" \"$OUT\"\n\t\telse\n\t\t\t#echo libtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\t\tlibtool -static -o \"$OUT\" \"$IN_i386\" \"$IN_ppc\"\n\t\tfi\n\t\tranlib \"$OUT\"\n\telse\n\t\techo Third party library lib$i.a is up to date\n\tfi\ndone\n";
                 };
 /* End PBXShellScriptBuildPhase section */
 
@@ -3994,13 +4014,11 @@
                                 5503BB3F05446B20003D051F /* llwaterpatch.cpp in Sources */,
                                 5503BB4005446B20003D051F /* llvowater.cpp in Sources */,
                                 5503BB4105446B20003D051F /* llvovolume.cpp in Sources */,
-                                5503BB4205446B20003D051F /* llvotreenew.cpp in Sources */,
                                 5503BB4305446B20003D051F /* llvotree.cpp in Sources */,
                                 5503BB4405446B20003D051F /* llvotextbubble.cpp in Sources */,
                                 5503BB4505446B20003D051F /* llvosurfacepatch.cpp in Sources */,
                                 5503BB4605446B20003D051F /* llvosky.cpp in Sources */,
                                 5503BB4705446B20003D051F /* llvopartgroup.cpp in Sources */,
-                                5503BB4805446B20003D051F /* llvopart.cpp in Sources */,
                                 5503BB4905446B20003D051F /* llvoground.cpp in Sources */,
                                 5503BB4A05446B20003D051F /* llvograss.cpp in Sources */,
                                 5503BB4B05446B20003D051F /* llvoclouds.cpp in Sources */,
@@ -4047,7 +4065,6 @@
                                 5503BB7D05446B20003D051F /* llconsole.cpp in Sources */,
                                 5503BB7E05446B20003D051F /* lllandmarklist.cpp in Sources */,
                                 5503BB7F05446B20003D051F /* llfloaterbuildoptions.cpp in Sources */,
-                                5503BB8105446B20003D051F /* llfloateraccounthistory.cpp in Sources */,
                                 5503BB8605446B20003D051F /* lluserauth.cpp in Sources */,
                                 5503BB8705446B20003D051F /* llurl.cpp in Sources */,
                                 5503BB8805446B20003D051F /* lluploaddialog.cpp in Sources */,
@@ -4068,7 +4085,6 @@
                                 5503BBA005446B20003D051F /* lldrawpoolalpha.cpp in Sources */,
                                 5503BBA105446B20003D051F /* lltexturetable.cpp in Sources */,
                                 5503BBA205446B20003D051F /* lltexturectrl.cpp in Sources */,
-                                5503BBA305446B20003D051F /* lltexturebar.cpp in Sources */,
                                 5503BBA405446B20003D051F /* llpanelobject.cpp in Sources */,
                                 5503BBA505446B20003D051F /* llpanelnetwork.cpp in Sources */,
                                 5503BBA605446B20003D051F /* lldrawpool.cpp in Sources */,
@@ -4134,7 +4150,6 @@
                                 5503BBFD05446B20003D051F /* llhoverview.cpp in Sources */,
                                 5503BBFE05446B20003D051F /* llcylinder.cpp in Sources */,
                                 5503BBFF05446B20003D051F /* llhippo.cpp in Sources */,
-                                5503BC0105446B20003D051F /* llpanelmoney.cpp in Sources */,
                                 5503BC0305446B20003D051F /* llfloateravatarinfo.cpp in Sources */,
                                 5503BC0405446B20003D051F /* llcallingcard.cpp in Sources */,
                                 5503BC0505446B20003D051F /* llhudeffectbeam.cpp in Sources */,
@@ -4149,7 +4164,6 @@
                                 5503BC1005446B20003D051F /* llnamelistctrl.cpp in Sources */,
                                 5503BC1205446B20003D051F /* llmaniptranslate.cpp in Sources */,
                                 5503BC1305446B20003D051F /* llmanipscale.cpp in Sources */,
-                                5503BC1405446B20003D051F /* lldrawpooltreenew.cpp in Sources */,
                                 5503BC1505446B20003D051F /* head.cpp in Sources */,
                                 5503BC1705446B20003D051F /* llfloaternamedesc.cpp in Sources */,
                                 5503BC1805446B20003D051F /* llpanelplace.cpp in Sources */,
@@ -4334,7 +4348,6 @@
                                 99BB516F099AC1E9004BF9F2 /* llviewchildren.cpp in Sources */,
                                 99BB5172099AC1FC004BF9F2 /* llcurrencyuimanager.cpp in Sources */,
                                 99BB5176099AC2A4004BF9F2 /* llconfirmationmanager.cpp in Sources */,
-                                99B0682909A54FBB00F4AD09 /* lldrawpoolhud.cpp in Sources */,
                                 FD6C9A2909C758BC00AA1849 /* llfloaterscriptdebug.cpp in Sources */,
                                 FD6C9A2A09C758BC00AA1849 /* llfloatertelehub.cpp in Sources */,
                                 FD6C9A2B09C758BC00AA1849 /* llfollowcam.cpp in Sources */,
@@ -4353,7 +4366,6 @@
                                 A3077C0909DCB8140059ED75 /* llfloaterhtmlhelp.cpp in Sources */,
                                 A3077C0B09DCB8140059ED75 /* llpanelvolume.cpp in Sources */,
                                 A3077C0C09DCB8140059ED75 /* llvostars.cpp in Sources */,
-                                FD870C5009EAC19700F5956C /* lldrawpoolclouds.cpp in Sources */,
                                 1AFA409C0A2DFC7F00C13F70 /* llviewernetwork.cpp in Sources */,
                                 1AFA409F0A2DFC8700C13F70 /* llprefsim.cpp in Sources */,
                                 1AFA40A20A2DFC9000C13F70 /* llprefschat.cpp in Sources */,
@@ -4389,25 +4401,29 @@
                                 C64F673F0AFBED80009732B5 /* lllogchat.cpp in Sources */,
                                 C64F67420AFBED91009732B5 /* lldirpicker.cpp in Sources */,
                                 1AF7C1E40AF6C44800C4BF4A /* llweb.cpp in Sources */,
+                                AA02B9BC0B0CE44D00F2996D /* lltexturefetch.cpp in Sources */,
                                 FD59ED5F0AF2AF460086642A /* llassetuploadresponders.cpp in Sources */,
                                 FDCB54F60AFBC5060033B433 /* llhttpnode.cpp in Sources */,
                                 FDCB55290AFBD4310033B433 /* lleventpoll.cpp in Sources */,
                                 FDFAD3EA0AFFBB230048A0C7 /* llsdmessagesystem.cpp in Sources */,
+                                AA348DFA0B0EAB31002C3015 /* llcurl.cpp in Sources */,
+                                AAF5FFD20B13F71900D28A84 /* lltexturecache.cpp in Sources */,
                                 C1F5D0A50B138AEB00827F1D /* lluserrelations.cpp in Sources */,
                                 D62830DB0B4DC76300F8830F /* llimagej2coj.cpp in Sources */,
+                                AAE98CC20B38FE0800E2F204 /* llimageworker.cpp in Sources */,
                                 1AEF0A580B2DFE67003F107C /* llctrlselectioninterface.cpp in Sources */,
                                 1AEF0A5B0B2DFE72003F107C /* llrootview.cpp in Sources */,
+                                A30273570B3A13D800704420 /* llvertexbuffer.cpp in Sources */,
                                 1A1F130C0B3919F100845A6C /* lleditmenuhandler.cpp in Sources */,
                                 C16C08500B4AE6C7009AD67F /* llfloaterinspect.cpp in Sources */,
-                                D628316C0B4F3FA200F8830F /* llagpmempool.cpp in Sources */,
-                                D628316D0B4F3FA200F8830F /* llagpmempoolapple.cpp in Sources */,
-                                D628316E0B4F3FA200F8830F /* llagpmempoolarb.cpp in Sources */,
-                                D62831710B4F3FA200F8830F /* llfont.cpp in Sources */,
-                                D62831720B4F3FA200F8830F /* llfontgl.cpp in Sources */,
-                                D62831730B4F3FA200F8830F /* llgldbg.cpp in Sources */,
-                                D62831740B4F3FA200F8830F /* llimagegl.cpp in Sources */,
-                                D62831760B4F3FA200F8830F /* llvertexprogramgl.cpp in Sources */,
-                                D62831780B4F3FA200F8830F /* text_out.cpp in Sources */,
+                                A32748C10B5F38A80099BE18 /* llfont.cpp in Sources */,
+                                A32748BF0B5F38A00099BE18 /* llfontgl.cpp in Sources */,
+                                A32748C00B5F38A20099BE18 /* llimagegl.cpp in Sources */,
+                                A3274AD20B5F39130099BE18 /* text_out.cpp in Sources */,
+                                1A02016F0B7A85DE00D5C589 /* llbase64.cpp in Sources */,
+                                1A0201850B7A861200D5C589 /* llblowfishcipher.cpp in Sources */,
+                                1A0201860B7A861200D5C589 /* llnullcipher.cpp in Sources */,
+                                1A0201870B7A861200D5C589 /* llxorcipher.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -4437,8 +4453,6 @@
                                 619222E8074A9B5B005E1F34 /* bitpack.cpp in Sources */,
                                 619222F0074A9B5B005E1F34 /* llcriticaldamp.cpp in Sources */,
                                 619222F8074A9B5B005E1F34 /* llerror.cpp in Sources */,
-                                619222FA074A9B5B005E1F34 /* llerrorbuffer.cpp in Sources */,
-                                619222FC074A9B5B005E1F34 /* llerrorstream.cpp in Sources */,
                                 619222FE074A9B5B005E1F34 /* llfasttimer.cpp in Sources */,
                                 61922300074A9B5B005E1F34 /* llfixedbuffer.cpp in Sources */,
                                 61922302074A9B5B005E1F34 /* llframetimer.cpp in Sources */,
@@ -4582,6 +4596,10 @@
                                 D651349D0B3C40870042C56E /* llqueuedthread.cpp in Sources */,
                                 91469E7B0B4486C10009E8F9 /* llmime.cpp in Sources */,
                                 913B26990B4DDCDA0030C3EC /* lllandmark.cpp in Sources */,
+                                DA9C40E00B54B4BA00DD6F44 /* llformat.cpp in Sources */,
+                                DA9C41140B54B8CA00DD6F44 /* lllivefile.cpp in Sources */,
+                                1A97C4560B8BCF9C00331A24 /* llliveappconfig.cpp in Sources */,
+                                1A9897E90B98E2F4005C45D7 /* llbase32.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -4679,8 +4697,10 @@
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 PRODUCT_NAME = AutoUpdater;
                         };
                         name = Universal;
@@ -4694,8 +4714,10 @@
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 PRODUCT_NAME = crashreporter;
                         };
                         name = Universal;
@@ -4715,8 +4737,10 @@
                                         "$(LIBRARY_SEARCH_PATHS)",
                                         "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 OTHER_LDFLAGS = "";
                                 PRODUCT_NAME = "Second Life";
                                 SEPARATE_STRIP = YES;
@@ -4857,8 +4881,10 @@
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 PRODUCT_NAME = crashreporter;
                         };
                         name = Development;
@@ -4872,8 +4898,10 @@
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 PRODUCT_NAME = crashreporter;
                         };
                         name = Deployment;
@@ -4887,8 +4915,10 @@
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 PRODUCT_NAME = AutoUpdater;
                         };
                         name = Development;
@@ -4902,8 +4932,10 @@
                                 LIBRARY_SEARCH_PATHS = (
                                         "$(inherited)",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 PRODUCT_NAME = AutoUpdater;
                         };
                         name = Deployment;
@@ -4923,8 +4955,10 @@
                                         "$(LIBRARY_SEARCH_PATHS)",
                                         "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 OTHER_LDFLAGS = "-weak-lllmozlib";
                                 PRODUCT_NAME = "Second Life";
                                 SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
@@ -4953,8 +4987,10 @@
                                         "$(LIBRARY_SEARCH_PATHS)",
                                         "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
                                         "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
                                 );
                                 LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
                                 OTHER_LDFLAGS = "-lllmozlib";
                                 PRODUCT_NAME = "Second Life";
                                 SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
diff --git a/linden/indra/newview/macview_Prefix.h b/linden/indra/newview/macview_Prefix.h
index 651cc88..ddfcfec 100644
--- a/linden/indra/newview/macview_Prefix.h
+++ b/linden/indra/newview/macview_Prefix.h
@@ -130,17 +130,15 @@
 #include "lldrawpoolalpha.h"
 #include "lldrawpoolavatar.h"
 #include "lldrawpooltree.h"
-#include "lldrawpooltreenew.h"
 #include "lldrawpoolterrain.h"
 #include "lldrawpoolsky.h"
 #include "lldrawpoolwater.h"
 #include "lldrawpoolground.h"
 #include "lldrawpoolbump.h"
-#include "llvotreenew.h"
 
 /////////////////// From llface.cpp
 #include "llgl.h"
-#include "llviewerimagelist.h"
+#include "llviewerimage.h"
 #include "llsky.h"
 #include "llvosky.h"
 #include "llcontrol.h"
diff --git a/linden/indra/newview/moviemaker.cpp b/linden/indra/newview/moviemaker.cpp
index 1054f1a..0f60bb1 100644
--- a/linden/indra/newview/moviemaker.cpp
+++ b/linden/indra/newview/moviemaker.cpp
@@ -52,7 +52,7 @@ HBITMAP LoadBMPFromFB( int w, int h );
 
 MovieMaker::MovieMaker()
 {
-    sprintf( fname, "movie.avi" );
+    snprintf( fname, sizeof(fname), "movie.avi" );              /* Flawfinder: ignore */
     width  = -1;
     height = -1;
 
@@ -104,7 +104,8 @@ MovieMaker::~MovieMaker()
 
 void MovieMaker::StartCapture( char *name , int x, int y)
 {
-    strcpy( fname, name );
+    strncpy( fname, name, sizeof(fname) -1 );           /* Flawfinder: ignore */
+    fname[sizeof(fname) -1] = '\0';
 
     // Get the width and height.
     width = x;
@@ -498,7 +499,7 @@ MovieMaker::~MovieMaker()
 
 void MovieMaker::StartCapture( char *name , int x, int y)
 {
-    strncpy( fname, name, sizeof(fname));
+    strncpy( fname, name, sizeof(fname));               /* Flawfinder: ignore */
         width = x;
         height = y;
         
@@ -577,7 +578,7 @@ OSStatus MovieMaker::setupMovie()
         if (error == noErr)
         {
                 // This is stoopid. I have to take the passed full path, create the file so I can get an FSRef, and Get Info to get the FSSpec for QuickTime. Could Apple make this any more difficult...
-                FILE            *file = LLFile::fopen(fname, "w");
+                FILE* file = LLFile::fopen(fname, "w");         /* Flawfinder: ignore */
                 if (file)
                 {
                         fclose(file);
diff --git a/linden/indra/newview/moviemaker.h b/linden/indra/newview/moviemaker.h
index ff1aa9b..0f1c79f 100644
--- a/linden/indra/newview/moviemaker.h
+++ b/linden/indra/newview/moviemaker.h
@@ -83,7 +83,7 @@ public:
 
 class MovieMaker {
 private:
-    char fname[64];
+    char fname[64];             /*Flawfinder: ignore*/
 
         Movie   movie;
         short   movieResRef;
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 8eec1bb..99e182c 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -79,7 +79,7 @@
                         CharacterSet="1">
                         <Tool
                                 Name="VCCLCompilerTool"
-                                GlobalOptimizations="TRUE"
+                                GlobalOptimizations="FALSE"
                                 InlineFunctionExpansion="2"
                                 EnableIntrinsicFunctions="TRUE"
                                 OptimizeForProcessor="3"
@@ -210,7 +210,6 @@
                                 ForceConformanceInForLoopScope="TRUE"
                                 UsePrecompiledHeader="3"
                                 PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-                                BrowseInformation="1"
                                 WarningLevel="3"
                                 WarnAsError="TRUE"
                                 Detect64BitPortabilityProblems="FALSE"
@@ -276,9 +275,6 @@
                                 RelativePath=".\llagentpilot.cpp">
                         </File>
                         <File
-                                RelativePath=".\llagparray.inl">
-                        </File>
-                        <File
                                 RelativePath=".\llanimalcontrols.cpp">
                         </File>
                         <File
@@ -381,15 +377,9 @@
                                 RelativePath=".\lldrawpoolbump.cpp">
                         </File>
                         <File
-                                RelativePath=".\lldrawpoolclouds.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\lldrawpoolground.cpp">
                         </File>
                         <File
-                                RelativePath=".\lldrawpoolhud.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\lldrawpoolsimple.cpp">
                         </File>
                         <File
@@ -405,9 +395,6 @@
                                 RelativePath=".\lldrawpooltree.cpp">
                         </File>
                         <File
-                                RelativePath=".\lldrawpooltreenew.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\lldrawpoolwater.cpp">
                         </File>
                         <File
@@ -456,9 +443,6 @@
                                 RelativePath=".\llfloaterabout.cpp">
                         </File>
                         <File
-                                RelativePath=".\llfloateraccounthistory.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\llfloateranimpreview.cpp">
                         </File>
                         <File
@@ -867,9 +851,6 @@
                                 RelativePath=".\llpanellogin.cpp">
                         </File>
                         <File
-                                RelativePath=".\llpanelmoney.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\llpanelmorph.cpp">
                         </File>
                         <File
@@ -987,7 +968,7 @@
                                 RelativePath=".\lltexlayer.cpp">
                         </File>
                         <File
-                                RelativePath=".\lltexturebar.cpp">
+                                RelativePath=".\lltexturecache.cpp">
                         </File>
                         <File
                                 RelativePath=".\lltexturectrl.cpp">
@@ -1209,9 +1190,6 @@
                                 RelativePath=".\llvolumesliderctrl.cpp">
                         </File>
                         <File
-                                RelativePath=".\llvopart.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\llvopartgroup.cpp">
                         </File>
                         <File
@@ -1230,9 +1208,6 @@
                                 RelativePath=".\llvotree.cpp">
                         </File>
                         <File
-                                RelativePath=".\llvotreenew.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\llvovolume.cpp">
                         </File>
                         <File
@@ -1304,9 +1279,6 @@
                                 RelativePath=".\llagentpilot.h">
                         </File>
                         <File
-                                RelativePath=".\llagparray.h">
-                        </File>
-                        <File
                                 RelativePath=".\llanimalcontrols.h">
                         </File>
                         <File
@@ -1409,15 +1381,9 @@
                                 RelativePath=".\lldrawpoolbump.h">
                         </File>
                         <File
-                                RelativePath=".\lldrawpoolclouds.h">
-                        </File>
-                        <File
                                 RelativePath=".\lldrawpoolground.h">
                         </File>
                         <File
-                                RelativePath=".\lldrawpoolhud.h">
-                        </File>
-                        <File
                                 RelativePath=".\lldrawpoolsimple.h">
                         </File>
                         <File
@@ -1433,9 +1399,6 @@
                                 RelativePath=".\lldrawpooltree.h">
                         </File>
                         <File
-                                RelativePath=".\lldrawpooltreenew.h">
-                        </File>
-                        <File
                                 RelativePath=".\lldrawpoolwater.h">
                         </File>
                         <File
@@ -1487,9 +1450,6 @@
                                 RelativePath=".\llfloaterabout.h">
                         </File>
                         <File
-                                RelativePath=".\llfloateraccounthistory.h">
-                        </File>
-                        <File
                                 RelativePath=".\llfloateranimpreview.h">
                         </File>
                         <File
@@ -1895,9 +1855,6 @@
                                 RelativePath=".\llpanellogin.h">
                         </File>
                         <File
-                                RelativePath=".\llpanelmoney.h">
-                        </File>
-                        <File
                                 RelativePath=".\llpanelmorph.h">
                         </File>
                         <File
@@ -2030,6 +1987,9 @@
                                 RelativePath=".\lltexturebar.h">
                         </File>
                         <File
+                                RelativePath=".\lltexturecache.h">
+                        </File>
+                        <File
                                 RelativePath=".\lltexturectrl.h">
                         </File>
                         <File
@@ -2249,9 +2209,6 @@
                                 RelativePath=".\llvolumesliderctrl.h">
                         </File>
                         <File
-                                RelativePath=".\llvopart.h">
-                        </File>
-                        <File
                                 RelativePath=".\llvopartgroup.h">
                         </File>
                         <File
@@ -2270,9 +2227,6 @@
                                 RelativePath=".\llvotree.h">
                         </File>
                         <File
-                                RelativePath=".\llvotreenew.h">
-                        </File>
-                        <File
                                 RelativePath=".\llvovolume.h">
                         </File>
                         <File
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
new file mode 100644
index 0000000..402c62d
--- /dev/null
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -0,0 +1,3957 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="newview"

+        ProjectGUID="{E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}"

+        RootNamespace="newview"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"

+                                MinimalRebuild="false"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                PrecompiledHeaderThrough="llviewerprecompiledheaders.h"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(ConfigurationName)/debugview.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"

+                                IgnoreDefaultLibraryNames="msvcrtd;libcd.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(TargetName).pdb"

+                                SubSystem="2"

+                                OptimizeReferences="1"

+                                EnableCOMDATFolding="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                                Description="Executing post-build batch file"

+                                CommandLine="postbuild.bat debug"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                InlineFunctionExpansion="2"

+                                EnableIntrinsicFunctions="true"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"

+                                StringPooling="true"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="2"

+                                PrecompiledHeaderThrough="llviewerprecompiledheaders.h"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(ConfigurationName)/newview.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"

+                                IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(TargetName).pdb"

+                                SubSystem="2"

+                                OptimizeReferences="1"

+                                EnableCOMDATFolding="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                                Description="Executing post-build batch file"

+                                CommandLine="postbuild.bat release"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseForDownload|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                                Description="Copying $(TargetFileName) to $(ProjectDir)"

+                                CommandLine="copy $(TargetDir)\$(TargetFileName) $(ProjectDir)&#x0D;&#x0A;"

+                                Outputs="$(TargetFileName)"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                WholeProgramOptimization="true"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                UsePrecompiledHeader="2"

+                                PrecompiledHeaderThrough="llviewerprecompiledheaders.h"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(ConfigurationName)/SecondLife.exe"

+                                LinkIncremental="0"

+                                AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"

+                                IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(TargetName).pdb"

+                                SubSystem="2"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                LinkTimeCodeGeneration="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                                Description="Executing post-build batch file"

+                                CommandLine="postbuild.bat releasefordownload"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="2"

+                                PrecompiledHeaderThrough="llviewerprecompiledheaders.h"

+                                BrowseInformation="1"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib qtmlclient.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib vorbis_static_mt.lib vorbisenc_static_mt.lib vorbisfile_static_mt.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(ConfigurationName)/newview_noopt.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"

+                                IgnoreDefaultLibraryNames="msvcrt.lib;libc.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(TargetName).pdb"

+                                GenerateMapFile="false"

+                                MapFileName="newview.map"

+                                SubSystem="2"

+                                OptimizeReferences="1"

+                                EnableCOMDATFolding="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                                Description="Executing post-build batch file"

+                                CommandLine="postbuild.bat releasenoopt"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\head.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagent.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagentdata.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagentpilot.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llanimalcontrols.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llassetuploadresponders.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llasynchostbyname.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llaudiosourcevo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llaudiostatus.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbbox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallbacklist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallingcard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcameraview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcape.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llchatbar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclassifiedinfo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcloud.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcolorscheme.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcolorswatch.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcompass.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcompilequeue.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llconfirmationmanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llconsole.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcontainerview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcontroldef.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcountdown.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcubemap.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcurrencyuimanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcylinder.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldebugmessagebox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldebugview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldirpicker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawable.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpool.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolalpha.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolavatar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolbump.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolground.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolsimple.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolsky.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolstars.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolterrain.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpooltree.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolwater.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldriverparam.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldynamictexture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llemote.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventinfo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventnotifier.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventpoll.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llface.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llface.inl"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfasttimerview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfeaturemanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfft.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfilepicker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfirstuse.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llflexibleobject.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterabout.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateranimpreview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterauction.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateravatarinfo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateravatarpicker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateravatartextures.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuildoptions.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbump.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuy.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuycontents.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuycurrency.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuyland.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterchat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterclothing.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatercolorpicker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatercustomize.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterdirectory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatereditui.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterfriends.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergesture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergodtools.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergroupinfo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergroupinvite.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergroups.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterhtml.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterhtmlfind.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterhtmlhelp.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterimagepreview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterimport.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterinspect.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterland.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterlandholdings.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatermap.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatermute.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaternamedesc.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaternewim.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateropenobject.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterpermissionsmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterpostcard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterpreference.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterproperties.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterrate.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterregioninfo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterreporter.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatersaveavatar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterscriptdebug.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatersellland.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatersnapshot.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertelehub.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertest.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertools.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertopobjects.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertos.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterworldmap.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfolderview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfollowcam.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframestats.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframestatview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgenepool.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgesturemgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgivemoney.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llglsandbox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgroupmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgroupnotify.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhippo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhoverview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudconnector.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffect.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffectbeam.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffectlookat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffectpointat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffecttrail.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudicon.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudmanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudobject.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudrender.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudtext.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimpanel.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventoryactions.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventorybridge.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventoryclipboard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventorymodel.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventoryview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljoystickbutton.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllandmarklist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllocalanimationobject.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllogchat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmanip.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmaniprotate.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmanipscale.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmaniptranslate.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmapresponders.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaremotectrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemoryview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmenucommands.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmorphview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmoveview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmutelist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnamebox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnameeditor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnamelistctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnetmap.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnotify.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lloverlaybar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelaudioprefs.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelavatar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelclassified.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelcontents.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldebug.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirbrowser.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirclassified.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirevents.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirfind.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirgroups.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirland.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirpeople.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirplaces.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirpopular.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldisplay.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelevent.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelface.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgeneral.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroup.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupgeneral.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupinvite.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgrouplandmoney.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupnotices.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgrouproles.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupvoting.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelinput.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelinventory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelland.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanellandobjects.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanellandoptions.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanellogin.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelmorph.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelmsgs.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelnetwork.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelobject.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelpermissions.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelpick.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelplace.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelvolume.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelweb.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpatchvertexarray.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpolymesh.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpolymorph.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprefschat.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprefsim.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewanim.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewgesture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewlandmark.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewnotecard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewscript.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewsound.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewtexture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprogressview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llregionposition.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llroam.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsavedsettingsglue.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llselectmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsky.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llspatialpartition.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsphere.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsprite.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstartup.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatbar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatgraph.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatusbar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsurface.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsurfacepatch.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexlayer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturecache.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturectrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturefetch.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturetable.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextureview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltool.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolbar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolbrush.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolcomp.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltooldraganddrop.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolface.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolfocus.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolgrab.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolgun.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolindividual.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolmorph.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolobjpicker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolpie.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolpipette.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolplacer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolselect.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolselectland.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolselectrect.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltracker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluploaddialog.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llurl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llurlwhitelist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluserauth.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvelocitybar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewchildren.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerassetstorage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerassetstorage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewercamera.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewercontrol.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerdisplay.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewergesture.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerimage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerimagelist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerinventory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjoint.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjointattachment.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjointmesh.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjointshape.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerkeyboard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerlayer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewermenu.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewermessage.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewernetwork.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerobject.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerobjectlist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerparcelmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerparceloverlay.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerpartsim.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerpartsource.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerregion.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerreputation.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerstats.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewertexteditor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewertextureanim.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerthrottle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvieweruictrlfactory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewervisualparam.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerwindow.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvlcomposition.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvlmanager.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoavatar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvocache.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoclouds.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvograss.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoground.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoinventorylistener.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumesliderctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvopart.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvopartgroup.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvosky.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvostars.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvosurfacepatch.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvotextbubble.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvotree.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvovolume.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvowater.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwaterpatch.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwearable.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwearablelist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llweb.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwebbrowserctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwind.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindebug.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworld.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworldmap.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworldmapview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmlrpctransaction.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\moviemaker.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\noise.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\pipeline.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\viewer.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\audiosettings.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\head.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagent.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagentdata.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagentpilot.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llagparray.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llanimalcontrols.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llappearance.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llasynchostbyname.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llaudiosourcevo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llaudiostatus.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llautocomplete.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbbox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallbacklist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallingcard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcameraview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcape.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llchatbar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclassifiedinfo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcloud.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcolorscheme.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcolorswatch.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcompass.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcompilequeue.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llconfirmationmanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llconsole.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcontainerview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcountdown.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcubemap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcurrencyuimanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcylinder.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldebugmessagebox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldebugview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldirpicker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpool.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolalpha.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolavatar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolbump.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolclouds.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolground.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolhud.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolsimple.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolsky.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolstars.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolterrain.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpooltree.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpooltreenew.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldrawpoolwater.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldriverparam.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldynamictexture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llemote.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventemitter.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventinfo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventnotifier.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleventpoll.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llface.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfasttimerview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfeaturemanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfft.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfilepicker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfilist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfirstuse.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llflexibleobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterabout.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateranimpreview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterauction.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateravatarinfo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateravatarpicker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateravatartextures.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuildoptions.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbump.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuy.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuycontents.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuycurrency.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterbuyland.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterchat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterclothing.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatercolorpicker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatercustomize.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterdirectory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatereditui.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterfriends.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergesture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergodtools.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergroupinfo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergroupinvite.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatergroups.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterhtml.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterhtmlfind.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterhtmlhelp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterimagepreview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterimport.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterinspect.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterland.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterlandholdings.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatermap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatermute.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaternamedesc.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaternewim.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloateropenobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterpermissionsmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterpostcard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterpreference.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterproperties.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterrate.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterregioninfo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterreporter.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatersaveavatar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterscriptdebug.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatersellland.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatersnapshot.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertelehub.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertest.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertools.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertopobjects.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloatertos.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloaterworldmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfolderview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfollowcam.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframestats.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llframestatview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgenepool.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgesturemgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgivemoney.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgroupmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llgroupnotify.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhippo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhoverview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudconnector.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffect.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffectbeam.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffectlookat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffectpointat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudeffecttrail.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudicon.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudmanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudrender.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudtext.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhudview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimpanel.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llimview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventorybridge.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventoryclipboard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventorymodel.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llinventoryview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lljoystickbutton.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllandmarklist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllightconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllocalanimationobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllogchat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmanip.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmaniprotate.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmanipscale.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmaniptranslate.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmediaremotectrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemoryview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmenucommands.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmorphview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmoveview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmutelist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnamebox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnameeditor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnamelistctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnetmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llnotify.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lloverlaybar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelaudioprefs.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelavatar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelclassified.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelcontents.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelcreate.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldebug.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirbrowser.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirclassified.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirevents.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirfind.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirgroups.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirland.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirpeople.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirplaces.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldirpopular.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpaneldisplay.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelevent.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelface.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgeneral.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroup.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupgeneral.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupinvite.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgrouplandmoney.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupnotices.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgrouproles.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelgroupvoting.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelinput.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelinventory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelland.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanellandobjects.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanellandoptions.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanellogin.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelmorph.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelmsgs.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelnetwork.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelpermissions.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelpick.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelplace.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelvolume.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanelweb.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpatchvertexarray.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpbuffer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpolymesh.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpolymorph.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprefschat.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprefsim.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewanim.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewgesture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewlandmark.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewnotecard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewscript.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewsound.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpreviewtexture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llprogressview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llregionposition.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrig.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llroam.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsavedsettingsglue.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llselectmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsky.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llspatialpartition.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsphere.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsprite.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstartup.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatbar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatgraph.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatusbar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstatview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsurface.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsurfacepatch.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexlayer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturebar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturecache.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturectrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturefetch.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexturetable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextureview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltool.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolbar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolbrush.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolcomp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltooldraganddrop.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolface.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolfocus.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolgrab.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolgun.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolindividual.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolmorph.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolobjpicker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolpie.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolpipette.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolplacer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolselect.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolselectland.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolselectrect.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltoolview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltracker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluploaddialog.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llurl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llurlwhitelist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluserauth.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluvscreen.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvelocitybar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewchildren.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerbuild.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewercamera.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewercontrol.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerdisplay.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewergesture.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerimage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerimagelist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerinventory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjoint.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjointattachment.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjointmesh.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerjointshape.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerkeyboard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerlayer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewermenu.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewermessage.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewernetwork.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerobject.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerobjectlist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerparcelmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerparceloverlay.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerpartsim.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerpartsource.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerregion.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerreputation.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerstats.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewertexteditor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewertextureanim.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerthrottle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvieweruictrlfactory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewervisualparam.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewerwindow.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvlcomposition.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvlmanager.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoavatar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvocache.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoclouds.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvograss.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoground.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvoinventorylistener.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvolumesliderctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvopart.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvopartgroup.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvosky.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvostars.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvosurfacepatch.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvotextbubble.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvotree.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvotreenew.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvovolume.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llvowater.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwaterpatch.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwearable.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwearablelist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llweb.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwebbrowserctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwind.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llwindebug.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworld.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworldmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llworldmapview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llxmlrpctransaction.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\macmain.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\moviemaker.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\noise.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\pipeline.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\randgauss.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\VertexCache.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\viewer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\VorbisFramework.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                        <File

+                                RelativePath=".\skins\xui\en-us\alerts.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\anim.ini"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\arrowcop.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\arrowcopmulti.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\bitmap2.bmp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\bitmap4.bmp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\colors.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\colors_base.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_about.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_about_land.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_account_history.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_animation_preview.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_auction.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_avatar_picker.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_avatar_textures.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_build_options.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_bumps.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_buy_contents.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_buy_currency.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_buy_land.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_buy_object.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_chat_history.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_choose_group.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_clothing.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_color_picker.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_critical.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_customize.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_directory.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_friends.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_gesture.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_god_tools.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_group_info.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_groups.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_html.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_html_help.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_im.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_image_preview.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_import.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_inspect.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_instant_message.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_inventory.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_inventory_item_properties.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_inventory_view_finder.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_land_holdings.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_live_lsleditor.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_moveview.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_mute.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_name_description.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_new_im.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_new_outfit_dialog.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_openobject.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_pay.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_pay_object.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_postcard.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preferences.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_animation.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_embedded_texture.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_existing_landmark.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_gesture.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_new_landmark.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_notecard.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_notecard_keep_discard.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_sound.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_texture.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_preview_texture_keep_discard.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_price_for_listing.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_profile.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_rate.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_report_abuse.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_report_bug.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_script_debug.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_script_ed_panel.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_script_preview.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_script_preview_new.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_script_queue.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_script_search.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_sell_land.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_settings_debug.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_snapshot.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_sound_preview.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_telehub.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_texture_ctrl.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_tools.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_top_objects.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_tos.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_wearable_save_as.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\floater_world_map.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\grass.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\Info-SecondLife.plist"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\English.lproj\InfoPlist.strings"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\install_icon.ico"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\keys.ini"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\keywords.ini"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\ll_icon.ico"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\llarrow.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\llarrowdrag.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\llarrowdragmulti.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\llarrowlocked.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\llgrablocked.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\llnolocked.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolcamera.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolcreate.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolfocus.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolgrab.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolland.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolpan.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolpipette.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolrotate.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolscale.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltooltranslate.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\lltoolzoomin.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\loginbackground.bmp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_inventory.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_pie_attachment.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_pie_avatar.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_pie_land.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_pie_object.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_pie_self.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\menu_viewer.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\newViewRes.rc"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\notify.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_account_details.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_account_planning.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_account_transactions.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_avatar.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_avatar_classified.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_avatar_pick.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_chat_bar.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_classified.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_event.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_finder.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_general.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_invite.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_land_money.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_notices.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_roles.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_group_voting.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_land_covenant.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_login.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_media_remote.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_music_remote.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_overlaybar.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_place.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_place_small.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_audio.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_chat.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_general.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_graphics1.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_graphics2.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_graphics3.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_im.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_input.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_network.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_preferences_popups.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_region_covenant.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_region_debug.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_region_estate.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_region_general.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_region_terrain.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_region_texture.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_scrolling_param.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_settings_chat.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_settings_im.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_settings_im.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_settings_msgbox.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_settings_network.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_settings_web.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_status_bar.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_toolbar.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\panel_top_pick.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\popups.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\releasenotes.full.txt"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\releasenotes.txt"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\resource.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\skins\xui\en-us\role_actions.xml"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\std_bump.ini"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\toolbuy.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\toolopen.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\toolpay.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\toolpickobject3.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\toolpipette.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\res\toolsit.cur"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\app_settings\trees.xml"

+                                >

+                        </File>

+                </Filter>

+                <File

+                        RelativePath=".\llviewerprecompiledheaders.cpp"

+                        >

+                        <FileConfiguration

+                                Name="Debug|Win32"

+                                >

+                                <Tool

+                                        Name="VCCLCompilerTool"

+                                        UsePrecompiledHeader="1"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="Release|Win32"

+                                >

+                                <Tool

+                                        Name="VCCLCompilerTool"

+                                        UsePrecompiledHeader="1"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="ReleaseForDownload|Win32"

+                                >

+                                <Tool

+                                        Name="VCCLCompilerTool"

+                                        UsePrecompiledHeader="1"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="ReleaseNoOpt|Win32"

+                                >

+                                <Tool

+                                        Name="VCCLCompilerTool"

+                                        UsePrecompiledHeader="1"

+                                />

+                        </FileConfiguration>

+                </File>

+                <File

+                        RelativePath=".\llviewerprecompiledheaders.h"

+                        >

+                </File>

+                <File

+                        RelativePath="..\..\scripts\messages\message_template.msg"

+                        >

+                        <FileConfiguration

+                                Name="Debug|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Copying message template"

+                                        CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"

+                                        Outputs="./app_settings/message_template.msg"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="Release|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Copying message template"

+                                        CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"

+                                        Outputs="./app_settings/message_template.msg"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="ReleaseForDownload|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Copying message template"

+                                        CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"

+                                        Outputs="./app_settings/message_template.msg"

+                                />

+                        </FileConfiguration>

+                        <FileConfiguration

+                                Name="ReleaseNoOpt|Win32"

+                                >

+                                <Tool

+                                        Name="VCCustomBuildTool"

+                                        Description="Copying message template"

+                                        CommandLine="copy &quot;$(InputPath)&quot; .\app_settings\message_template.msg&#x0D;&#x0A;"

+                                        Outputs="./app_settings/message_template.msg"

+                                />

+                        </FileConfiguration>

+                </File>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index a7b4d47..1a5b4f1 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -32,12 +32,12 @@
 // library includes
 #include "audioengine.h" // For MAX_BUFFERS for debugging.
 #include "imageids.h"
-#include "llagpmempool.h"
 #include "llerror.h"
 #include "llviewercontrol.h"
 #include "llfasttimer.h"
 #include "llfontgl.h"
 #include "llmemory.h"
+#include "llmemtype.h"
 #include "llnamevalue.h"
 #include "llprimitive.h"
 #include "llvolume.h"
@@ -45,17 +45,17 @@
 #include "timing.h"
 #include "v3color.h"
 #include "llui.h"
+#include "llglheaders.h"
 
 // newview includes
 #include "llagent.h"
-#include "llagparray.h"
 #include "lldrawable.h"
 #include "lldrawpoolalpha.h"
 #include "lldrawpoolavatar.h"
 #include "lldrawpoolground.h"
 #include "lldrawpoolsimple.h"
+#include "lldrawpoolbump.h"
 #include "lldrawpooltree.h"
-#include "lldrawpoolhud.h"
 #include "lldrawpoolwater.h"
 #include "llface.h"
 #include "llfeaturemanager.h"
@@ -82,10 +82,13 @@
 #include "llvosky.h"
 #include "llvotree.h"
 #include "llvovolume.h"
+#include "llvosurfacepatch.h"
+#include "llvowater.h"
+#include "llvotree.h"
+#include "llvopartgroup.h"
 #include "llworld.h"
 #include "viewer.h"
-#include "llagpmempoolarb.h"
-#include "llagparray.inl"
+#include "llcubemap.h"
 
 #ifdef _DEBUG
 // Debug indices is disabled for now for debug performance - djs 4/24/02
@@ -94,6 +97,8 @@
 //#define DEBUG_INDICES
 #endif
 
+#define AGGRESSIVE_OCCLUSION 0
+
 const F32 BACKLIGHT_DAY_MAGNITUDE_AVATAR = 0.2f;
 const F32 BACKLIGHT_NIGHT_MAGNITUDE_AVATAR = 0.1f;
 const F32 BACKLIGHT_DAY_MAGNITUDE_OBJECT = 0.1f;
@@ -117,18 +122,12 @@ extern S32 gBoxFrame;
 extern BOOL gRenderLightGlows;
 extern BOOL gHideSelectedObjects;
 
-
 BOOL    gAvatarBacklight = FALSE;
 
-F32             gMinObjectDistance = MIN_NEAR_PLANE;
 S32             gTrivialAccepts = 0;
 
 BOOL    gRenderForSelect = FALSE;
 
-BOOL    gUsePickAlpha = TRUE;
-F32             gPickAlphaThreshold = 0.f;
-F32             gPickAlphaTargetThreshold = 0.f;
-
 //glsl parameter tables
 const char* LLPipeline::sReservedAttribs[] =
 {
@@ -177,6 +176,13 @@ const char* LLPipeline::sTerrainUniforms[] =
 
 U32 LLPipeline::sTerrainUniformCount = sizeof(LLPipeline::sTerrainUniforms)/sizeof(char*);
 
+const char* LLPipeline::sShinyUniforms[] = 
+{
+        "origin"
+};
+
+U32 LLPipeline::sShinyUniformCount = sizeof(LLPipeline::sShinyUniforms)/sizeof(char*);
+
 const char* LLPipeline::sWaterUniforms[] =
 {
         "screenTex",
@@ -193,8 +199,6 @@ const char* LLPipeline::sWaterUniforms[] =
 
 U32 LLPipeline::sWaterUniformCount =  sizeof(LLPipeline::sWaterUniforms)/sizeof(char*);
 
-// the SSE variable is dependent on software blending being enabled. 
-
 //----------------------------------------
 
 void stamp(F32 x, F32 y, F32 xs, F32 ys)
@@ -216,40 +220,35 @@ void stamp(F32 x, F32 y, F32 xs, F32 ys)
 //----------------------------------------
 
 S32             LLPipeline::sCompiles = 0;
-S32             LLPipeline::sAGPMaxPoolSize = 1 << 25; // 32MB
+
+BOOL    LLPipeline::sShowHUDAttachments = TRUE;
 BOOL    LLPipeline::sRenderPhysicalBeacons = FALSE;
 BOOL    LLPipeline::sRenderScriptedBeacons = FALSE;
 BOOL    LLPipeline::sRenderParticleBeacons = FALSE;
 BOOL    LLPipeline::sRenderSoundBeacons = FALSE;
+BOOL    LLPipeline::sUseOcclusion = FALSE;
+BOOL    LLPipeline::sSkipUpdate = FALSE;
+BOOL    LLPipeline::sDynamicReflections = FALSE;
 
 LLPipeline::LLPipeline() :
+        mCubeBuffer(NULL),
+        mCubeList(0),
         mVertexShadersEnabled(FALSE),
         mVertexShadersLoaded(0),
         mLastRebuildPool(NULL),
         mAlphaPool(NULL),
+        mAlphaPoolPostWater(NULL),
         mSkyPool(NULL),
         mStarsPool(NULL),
-        mCloudsPool(NULL),
         mTerrainPool(NULL),
         mWaterPool(NULL),
         mGroundPool(NULL),
-        mHUDPool(NULL),
-        mAGPMemPool(NULL),
-        mGlobalFence(0),
-        mBufferIndex(0),
-        mBufferCount(kMaxBufferCount),
-        mUseOcclusionCulling(FALSE),
+        mSimplePool(NULL),
+        mBumpPool(NULL),
         mLightMask(0),
         mLightMovingMask(0)
 {
-        for(S32 i = 0; i < kMaxBufferCount; i++)
-        {
-                mBufferMemory[i] = NULL;
-        }
-        for (S32 i = 0; i < kMaxBufferCount; i++)
-        {
-                mBufferFence[i] = 0;
-        }
+
 }
 
 void LLPipeline::init()
@@ -258,8 +257,25 @@ void LLPipeline::init()
         
         stop_glerror();
 
-        mAGPBound = FALSE;
-        mObjectPartition = new LLSpatialPartition;
+        //create object partitions
+        //MUST MATCH declaration of eObjectPartitions
+        mObjectPartition.push_back(new LLVolumePartition());    //PARTITION_VOLUME
+        mObjectPartition.push_back(new LLBridgePartition());    //PARTITION_BRIDGE
+        mObjectPartition.push_back(new LLHUDPartition());               //PARTITION_HUD
+        mObjectPartition.push_back(new LLTerrainPartition());   //PARTITION_TERRAIN
+        mObjectPartition.push_back(new LLWaterPartition());             //PARTITION_WATER
+        mObjectPartition.push_back(new LLTreePartition());              //PARTITION_TREE
+        mObjectPartition.push_back(new LLParticlePartition());  //PARTITION_PARTICLE
+        mObjectPartition.push_back(new LLCloudPartition());             //PARTITION_CLOUD
+        mObjectPartition.push_back(new LLGrassPartition());             //PARTITION_GRASS
+        mObjectPartition.push_back(NULL);                                               //PARTITION_NONE
+        
+        //create render pass pools
+        getPool(LLDrawPool::POOL_ALPHA);
+        getPool(LLDrawPool::POOL_ALPHA_POST_WATER);
+        getPool(LLDrawPool::POOL_SIMPLE);
+        getPool(LLDrawPool::POOL_BUMP);
+
         mTrianglesDrawnStat.reset();
         resetFrameStats();
 
@@ -268,43 +284,15 @@ void LLPipeline::init()
         mRenderFeatureMask = 0; // All features start off
         mRenderDebugMask = 0;   // All debug starts off
 
+        mOldRenderDebugMask = mRenderDebugMask;
+        
         mBackfaceCull = TRUE;
 
-        // Disable AGP initially.
-        mRenderFeatureMask &= ~RENDER_FEATURE_AGP;
-
         stop_glerror();
         
         // Enable features
-
-        mUseVBO = gSavedSettings.getBOOL("RenderUseVBO");
-
-        // Allocate the shared buffers for software skinning
-        for(S32 i=0; i < mBufferCount; i++)
-        {
-                mBufferMemory[i] = new LLAGPArray<U8>;
-                mBufferMemory[i]->reserve_block(AVATAR_VERTEX_BYTES*AVATAR_BUFFER_ELEMENTS);
-        }
-
-        if (gFeatureManagerp->isFeatureAvailable("RenderAGP"))
-        {
-                setUseAGP(gSavedSettings.getBOOL("RenderUseAGP") && gGLManager.mHasAnyAGP);
-        }
-        else
-        {
-                setUseAGP(FALSE);
-        }
-
         stop_glerror();
-        
-        for(S32 i=0; i < mBufferCount; i++)
-        {
-                if (!mBufferMemory[i]->isAGP() && usingAGP())
-                {
-                        llwarns << "pipeline buffer memory is non-AGP when AGP available!" << llendl;
-                }
-        }
-        
+                
         setShaders();
 }
 
@@ -327,7 +315,17 @@ void LLPipeline::cleanup()
         {
                 pool_set_t::iterator curiter = iter++;
                 LLDrawPool* poolp = *curiter;
-                if (poolp->mReferences.empty())
+                if (poolp->isFacePool())
+                {
+                        LLFacePool* face_pool = (LLFacePool*) poolp;
+                        if (face_pool->mReferences.empty())
+                        {
+                                mPools.erase(curiter);
+                                removeFromQuickLookup( poolp );
+                                delete poolp;
+                        }
+                }
+                else
                 {
                         mPools.erase(curiter);
                         removeFromQuickLookup( poolp );
@@ -335,10 +333,6 @@ void LLPipeline::cleanup()
                 }
         }
         
-        if (!mSimplePools.empty())
-        {
-                llwarns << "Simple Pools not cleaned up" << llendl;
-        }
         if (!mTerrainPools.empty())
         {
                 llwarns << "Terrain Pools not cleaned up" << llendl;
@@ -347,208 +341,105 @@ void LLPipeline::cleanup()
         {
                 llwarns << "Tree Pools not cleaned up" << llendl;
         }
-        if (!mTreeNewPools.empty())
-        {
-                llwarns << "TreeNew Pools not cleaned up" << llendl;
-        }
-        if (!mBumpPools.empty())
-        {
-                llwarns << "Bump Pools not cleaned up" << llendl;
-        }
+                
         delete mAlphaPool;
         mAlphaPool = NULL;
+        delete mAlphaPoolPostWater;
+        mAlphaPoolPostWater = NULL;
         delete mSkyPool;
         mSkyPool = NULL;
         delete mStarsPool;
         mStarsPool = NULL;
-        delete mCloudsPool;
-        mCloudsPool = NULL;
         delete mTerrainPool;
         mTerrainPool = NULL;
         delete mWaterPool;
         mWaterPool = NULL;
         delete mGroundPool;
         mGroundPool = NULL;
-        delete mHUDPool;
-        mHUDPool = NULL;
+        delete mSimplePool;
+        mSimplePool = NULL;
+        delete mBumpPool;
+        mBumpPool = NULL;
 
-        mBloomImagep = NULL;
-        mBloomImage2p = NULL;
-        mFaceSelectImagep = NULL;
-        mAlphaSizzleImagep = NULL;
-
-        for(S32 i=0; i < mBufferCount; i++)
+        if (mCubeBuffer)
         {
-                delete mBufferMemory[i];
-                mBufferMemory[i] = NULL;
+                delete mCubeBuffer;
+                mCubeBuffer = NULL;
         }
 
-        delete mObjectPartition;
-        mObjectPartition = NULL;
-
-        if (mAGPMemPool && mGlobalFence)
+        if (mCubeList)
         {
-                mAGPMemPool->deleteFence(mGlobalFence);
-                mGlobalFence = 0;
+                glDeleteLists(mCubeList, 1);
+                mCubeList = 0;
         }
-        delete mAGPMemPool;
-        mAGPMemPool = NULL;
-}
-
-//============================================================================
 
-BOOL LLPipeline::initAGP()
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        
-        mAGPMemPool = LLAGPMemPool::createPool(sAGPMaxPoolSize, mUseVBO);
+        mBloomImagep = NULL;
+        mBloomImage2p = NULL;
+        mFaceSelectImagep = NULL;
+        mAlphaSizzleImagep = NULL;
 
-        if (!mAGPMemPool)
-        {
-                llinfos << "Warning! Couldn't allocate AGP memory!" << llendl;
-                llinfos << "Disabling AGP!" << llendl;
-                mAGPMemPool = NULL;
-                mRenderFeatureMask &= ~RENDER_FEATURE_AGP; // Need to disable the using AGP flag
-                return FALSE;
-        }
-        else if (!mAGPMemPool->getSize())
-        {
-                llinfos << "Warning!  Unable to allocate AGP memory! Disabling AGP" << llendl;
-                delete mAGPMemPool;
-                mAGPMemPool = NULL;
-                mRenderFeatureMask &= ~RENDER_FEATURE_AGP; // Need to disable the using AGP flag
-                return FALSE;
-        }
-        else
+        for (S32 i = 0; i < NUM_PARTITIONS-1; i++)
         {
-                llinfos << "Allocated " << mAGPMemPool->getSize() << " bytes of AGP memory" << llendl;
-                mAGPMemPool->bind();
-
-                if (mAGPMemPool->getSize() < MIN_AGP_SIZE)
-                {
-                        llwarns << "Not enough AGP memory!" << llendl;
-                        delete mAGPMemPool;
-                        mAGPMemPool = NULL;
-                        mRenderFeatureMask &= ~RENDER_FEATURE_AGP; // Need to disable the using AGP flag
-                        return FALSE;
-                }
-
-
-            if (mAGPMemPool)
-            {
-                // Create the fence that we use for global synchronization.
-                mGlobalFence = mAGPMemPool->createFence();
-            }
-                return TRUE;
+                delete mObjectPartition[i];
         }
+        mObjectPartition.clear();
 
+        mVisibleList.clear();
+        mVisibleGroups.clear();
+        mDrawableGroups.clear();
+        mActiveGroups.clear();
+        mVisibleBridge.clear();
+        mMovedBridge.clear();
+        mOccludedBridge.clear();
+        mAlphaGroups.clear();
+        clearRenderMap();
 }
 
-void LLPipeline::cleanupAGP()
-{
-        int i;
-        for(i=0; i < mBufferCount; i++)
-        {
-                mBufferMemory[i]->deleteFence(mBufferFence[i]);
-                mBufferMemory[i]->setUseAGP(FALSE);
-        }
-        
-        flushAGPMemory();
-        if (mAGPMemPool && mGlobalFence)
-        {
-            mAGPMemPool->deleteFence(mGlobalFence);
-            mGlobalFence = 0;
-        }
-        delete mAGPMemPool;
-        mAGPMemPool = NULL;
-}
+//============================================================================
 
-BOOL LLPipeline::usingAGP() const
+void LLPipeline::destroyGL() 
 {
-        return (mRenderFeatureMask & RENDER_FEATURE_AGP) ? TRUE : FALSE; 
-}
+        stop_glerror();
+        unloadShaders();
+        mHighlightFaces.clear();
+        mVisibleList.clear();
+        mVisibleGroups.clear();
+        mDrawableGroups.clear();
+        mActiveGroups.clear();
+        mVisibleBridge.clear();
+        mOccludedBridge.clear();
+        mAlphaGroups.clear();
+        clearRenderMap();
+        resetVertexBuffers();
 
-void LLPipeline::setUseAGP(const BOOL use_agp)
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        
-        if (use_agp == usingAGP())
+        if (mCubeBuffer)
         {
-                return;
+                delete mCubeBuffer;
+                mCubeBuffer = NULL;
         }
-        else if (use_agp)
-        {
-                mRenderFeatureMask |= RENDER_FEATURE_AGP;
-                initAGP();
 
-                // Forces us to allocate an AGP memory block immediately.
-                int i;
-                for(i=0; i < mBufferCount; i++)
-                {
-                        mBufferMemory[i]->setUseAGP(use_agp);
-                        mBufferMemory[i]->realloc(mBufferMemory[i]->getMax());
-                        mBufferFence[i] = mBufferMemory[i]->createFence();
-                }
-                
-                // Must be done AFTER you initialize AGP
-                for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-                {
-                        LLDrawPool *poolp = *iter;
-                        poolp->setUseAGP(use_agp);
-                }
-        }
-        else
+        if (mCubeList)
         {
-                unbindAGP();
-                mRenderFeatureMask &= ~RENDER_FEATURE_AGP;
-
-                // Must be done BEFORE you blow away AGP
-                for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-                {
-                        LLDrawPool *poolp = *iter;
-                        poolp->setUseAGP(use_agp);
-                }
-
-                int i;
-                for(i=0; i < mBufferCount; i++)
-                {
-                        if (mBufferMemory[i])
-                        {
-                                mBufferMemory[i]->setUseAGP(use_agp);
-                                mBufferMemory[i]->deleteFence(mBufferFence[i]);
-                                mBufferFence[i] = 0;
-                        }
-                        else
-                        {
-                                llerrs << "setUseAGP without buffer memory" << llendl;
-                        }
-                }
-                
-                cleanupAGP();
+                glDeleteLists(mCubeList, 1);
+                mCubeList = 0;
         }
-
-}
-
-//============================================================================
-
-void LLPipeline::destroyGL() 
-{
-        setUseAGP(FALSE);
-        stop_glerror();
-        unloadShaders();
-        mHighlightFaces.reset();
 }
 
 void LLPipeline::restoreGL() 
 {
+        resetVertexBuffers();
+
         if (mVertexShadersEnabled)
         {
                 setShaders();
         }
         
-        if (mObjectPartition)
+        for (U32 i = 0; i < mObjectPartition.size()-1; i++)
         {
-                mObjectPartition->restoreGL();
+                if (mObjectPartition[i])
+                {
+                        mObjectPartition[i]->restoreGL();
+                }
         }
 }
 
@@ -616,8 +507,8 @@ GLhandleARB LLPipeline::loadShader(const LLString& filename, S32 cls, GLenum typ
                 fname << gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "shaders/class");
                 fname << gpu_class << "/" << filename;
                 
-                llinfos << "Looking in " << fname.str().c_str() << llendl;
-                file = fopen(fname.str().c_str(), "r");
+//              llinfos << "Looking in " << fname.str().c_str() << llendl;
+                file = fopen(fname.str().c_str(), "r");         /* Flawfinder: ignore */
                 if (file)
                 {
                         break; // done
@@ -791,6 +682,11 @@ BOOL LLPipeline::validateProgramObject(GLhandleARB obj)
 
 void LLPipeline::setShaders()
 {
+        sDynamicReflections = gSavedSettings.getBOOL("RenderDynamicReflections");
+
+        //hack to reset buffers that change behavior with shaders
+        resetVertexBuffers();
+
         if (gViewerWindow)
         {
                 gViewerWindow->setCursor(UI_CURSOR_WAIT);
@@ -809,6 +705,8 @@ void LLPipeline::setShaders()
         {
                 S32 light_class = 2;
                 S32 env_class = 2;
+                S32 obj_class = 0;
+
                 if (getLightingDetail() == 0)
                 {
                         light_class = 1;
@@ -818,7 +716,11 @@ void LLPipeline::setShaders()
                 mMaxVertexShaderLevel[SHADER_LIGHTING] = light_class;
                 mVertexShaderLevel[SHADER_ENVIRONMENT] = env_class;
                 mMaxVertexShaderLevel[SHADER_ENVIRONMENT] = env_class;
+                mVertexShaderLevel[SHADER_OBJECT] = obj_class;
+                mMaxVertexShaderLevel[SHADER_OBJECT] = obj_class;
+
                 BOOL loaded = loadShadersLighting();
+
                 if (loaded)
                 {
                         mVertexShadersEnabled = TRUE;
@@ -826,7 +728,7 @@ void LLPipeline::setShaders()
 
                         // Load all shaders to set max levels
                         loadShadersEnvironment();
-                
+                        loadShadersObject();
                         // Load max avatar shaders to set the max level
                         mVertexShaderLevel[SHADER_AVATAR] = 3;
                         mMaxVertexShaderLevel[SHADER_AVATAR] = 3;
@@ -898,6 +800,7 @@ BOOL LLPipeline::canUseVertexShaders()
 void LLPipeline::unloadShaders()
 {
         mObjectSimpleProgram.unload();
+        mObjectShinyProgram.unload();
         mObjectBumpProgram.unload();
         mObjectAlphaProgram.unload();
         mWaterProgram.unload();
@@ -939,7 +842,8 @@ BOOL LLPipeline::loadShaders()
                 light_class = 2; // Use medium lighting shader
         }
         mVertexShaderLevel[SHADER_LIGHTING] = light_class;
-        mVertexShaderLevel[SHADER_OBJECT] = llmin(mMaxVertexShaderLevel[SHADER_OBJECT], gSavedSettings.getS32("VertexShaderLevelObject"));
+        //mVertexShaderLevel[SHADER_OBJECT] = llmin(mMaxVertexShaderLevel[SHADER_OBJECT], gSavedSettings.getS32("VertexShaderLevelObject"));
+        mVertexShaderLevel[SHADER_OBJECT] = 0;
         mVertexShaderLevel[SHADER_AVATAR] = llmin(mMaxVertexShaderLevel[SHADER_AVATAR], gSavedSettings.getS32("VertexShaderLevelAvatar"));
         mVertexShaderLevel[SHADER_ENVIRONMENT] = llmin(mMaxVertexShaderLevel[SHADER_ENVIRONMENT], gSavedSettings.getS32("VertexShaderLevelEnvironment"));
         mVertexShaderLevel[SHADER_INTERFACE] = mMaxVertexShaderLevel[SHADER_INTERFACE];
@@ -1120,12 +1024,14 @@ BOOL LLPipeline::loadShadersObject()
 
         if (mVertexShaderLevel[SHADER_OBJECT] == 0)
         {
+                mObjectShinyProgram.unload();
                 mObjectSimpleProgram.unload();
                 mObjectBumpProgram.unload();
                 mObjectAlphaProgram.unload();
                 return FALSE;
         }
-        
+
+#if 0
         if (success)
         {
                 //load object (volume/tree) vertex shader
@@ -1186,6 +1092,28 @@ BOOL LLPipeline::loadShadersObject()
                         llwarns << "Failed to load " << alphavertex << llendl;
                 }
         }
+#endif
+
+        if (success)
+        {
+                //load shiny vertex shader
+                std::string shinyvertex = "objects/shinyV.glsl";
+                std::string shinyfragment = "objects/shinyF.glsl";
+                mObjectShinyProgram.mProgramObject = glCreateProgramObjectARB();
+                mObjectShinyProgram.attachObjects(baseObjects, baseCount);
+                mObjectShinyProgram.attachObject(loadShader(shinyvertex, SHADER_OBJECT, GL_VERTEX_SHADER_ARB));
+                mObjectShinyProgram.attachObject(loadShader(shinyfragment, SHADER_OBJECT, GL_FRAGMENT_SHADER_ARB));
+
+                success = mObjectShinyProgram.mapAttributes();
+                if (success)
+                {
+                        success = mObjectShinyProgram.mapUniforms(LLPipeline::sShinyUniforms, LLPipeline::sShinyUniformCount);
+                }
+                if( !success )
+                {
+                        llwarns << "Failed to load " << shinyvertex << llendl;
+                }
+        }
 
         if( !success )
         {
@@ -1342,11 +1270,11 @@ void LLPipeline::enableShadows(const BOOL enable_shadows)
 
 S32 LLPipeline::getMaxLightingDetail() const
 {
-        if (mVertexShaderLevel[SHADER_OBJECT] >= LLDrawPoolSimple::SHADER_LEVEL_LOCAL_LIGHTS)
+        /*if (mVertexShaderLevel[SHADER_OBJECT] >= LLDrawPoolSimple::SHADER_LEVEL_LOCAL_LIGHTS)
         {
                 return 3;
         }
-        else
+        else*/
         {
                 return 1;
         }
@@ -1376,79 +1304,62 @@ S32 LLPipeline::setLightingDetail(S32 level)
         return mLightingDetail;
 }
 
-LLAGPMemBlock *LLPipeline::allocAGPFromPool(const S32 bytes, const U32 target)
+class LLOctreeDirtyTexture : public LLOctreeTraveler<LLDrawable>
 {
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        
-        if (!mAGPMemPool)
-        {
-                llwarns << "Attempting to allocate AGP memory when AGP disabled!" << llendl;
-                return NULL;
-        }
-        else
+public:
+        const std::set<LLViewerImage*>& mTextures;
+
+        LLOctreeDirtyTexture(const std::set<LLViewerImage*>& textures) : mTextures(textures) { }
+
+        virtual void visit(const LLOctreeState<LLDrawable>* state)
         {
-                if (mUseVBO)
+                LLSpatialGroup* group = (LLSpatialGroup*) state->getNode()->getListener(0);
+
+                if (!group->isState(LLSpatialGroup::GEOM_DIRTY) && !group->getData().empty())
                 {
-                        return ((LLAGPMemPoolARB*) mAGPMemPool)->allocBlock(bytes, target);
+                        for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
+                        {
+                                for (std::vector<LLDrawInfo*>::iterator j = i->second.begin(); j != i->second.end(); ++j)
+                                {
+                                        LLDrawInfo* params = *j;
+                                        if (mTextures.find(params->mTexture) != mTextures.end())
+                                        { 
+                                                group->setState(LLSpatialGroup::GEOM_DIRTY);
+                                        }
+                                }
+                        }
                 }
-                else
+
+                for (LLSpatialGroup::bridge_list_t::iterator i = group->mBridgeList.begin(); i != group->mBridgeList.end(); ++i)
                 {
-                        return mAGPMemPool->allocBlock(bytes);
+                        LLSpatialBridge* bridge = *i;
+                        traverse(bridge->mOctree);
                 }
         }
-}
-
-
-void LLPipeline::unbindAGP()
-{
-        if (mAGPMemPool && mAGPBound)
-        {
-                mAGPMemPool->disable();
-                mAGPBound = FALSE;
-        }
-}
-
-void LLPipeline::bindAGP()
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        
-        if (mAGPMemPool && !mAGPBound && usingAGP())
-        {
-                mAGPMemPool->enable();
-                mAGPBound = TRUE;
-        }
-}
-
-U8* LLPipeline::bufferGetScratchMemory(void)
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        return(mBufferMemory[mBufferIndex]->getScratchMemory());
-}
-
-void LLPipeline::bufferWaitFence(void)
-{
-        mBufferMemory[mBufferIndex]->waitFence(mBufferFence[mBufferIndex]);
-}
-
-void LLPipeline::bufferSendFence(void)
-{
-        mBufferMemory[mBufferIndex]->sendFence(mBufferFence[mBufferIndex]);
-}
+};
 
-void LLPipeline::bufferRotate(void)
+// Called when a texture changes # of channels (causes faces to move to alpha pool)
+void LLPipeline::dirtyPoolObjectTextures(const std::set<LLViewerImage*>& textures)
 {
-        mBufferIndex++;
-        if(mBufferIndex >= mBufferCount)
-                mBufferIndex = 0;
-}
+        // *TODO: This is inefficient and causes frame spikes; need a better way to do this
+        //        Most of the time is spent in dirty.traverse.
 
-// Called when a texture changes # of channels (rare, may cause faces to move to alpha pool)
-void LLPipeline::dirtyPoolObjectTextures(const LLViewerImage *texturep)
-{
         for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
         {
                 LLDrawPool *poolp = *iter;
-                poolp->dirtyTexture(texturep);
+                if (poolp->isFacePool())
+                {
+                        ((LLFacePool*) poolp)->dirtyTextures(textures);
+                }
+        }
+        
+        LLOctreeDirtyTexture dirty(textures);
+        for (U32 i = 0; i < mObjectPartition.size(); i++)
+        {
+                if (mObjectPartition[i])
+                {
+                        dirty.traverse(mObjectPartition[i]->mOctree);
+                }
         }
 }
 
@@ -1458,33 +1369,29 @@ LLDrawPool *LLPipeline::findPool(const U32 type, LLViewerImage *tex0)
         switch( type )
         {
         case LLDrawPool::POOL_SIMPLE:
-                poolp = get_if_there(mSimplePools, (uintptr_t)tex0, (LLDrawPool*)0 );
+                poolp = mSimplePool;
                 break;
 
         case LLDrawPool::POOL_TREE:
                 poolp = get_if_there(mTreePools, (uintptr_t)tex0, (LLDrawPool*)0 );
                 break;
 
-        case LLDrawPool::POOL_TREE_NEW:
-                poolp = get_if_there(mTreeNewPools, (uintptr_t)tex0, (LLDrawPool*)0 );
-                break;
-
         case LLDrawPool::POOL_TERRAIN:
                 poolp = get_if_there(mTerrainPools, (uintptr_t)tex0, (LLDrawPool*)0 );
                 break;
 
         case LLDrawPool::POOL_BUMP:
-                poolp = get_if_there(mBumpPools, (uintptr_t)tex0, (LLDrawPool*)0 );
-                break;
-
-        case LLDrawPool::POOL_MEDIA:
-                poolp = get_if_there(mMediaPools, (uintptr_t)tex0, (LLDrawPool*)0 );
+                poolp = mBumpPool;
                 break;
 
         case LLDrawPool::POOL_ALPHA:
                 poolp = mAlphaPool;
                 break;
 
+        case LLDrawPool::POOL_ALPHA_POST_WATER:
+                poolp = mAlphaPoolPostWater;
+                break;
+
         case LLDrawPool::POOL_AVATAR:
                 break; // Do nothing
 
@@ -1496,10 +1403,6 @@ LLDrawPool *LLPipeline::findPool(const U32 type, LLViewerImage *tex0)
                 poolp = mStarsPool;
                 break;
 
-        case LLDrawPool::POOL_CLOUDS:
-                poolp = mCloudsPool;
-                break;
-
         case LLDrawPool::POOL_WATER:
                 poolp = mWaterPool;
                 break;
@@ -1508,10 +1411,6 @@ LLDrawPool *LLPipeline::findPool(const U32 type, LLViewerImage *tex0)
                 poolp = mGroundPool;
                 break;
 
-        case LLDrawPool::POOL_HUD:
-                poolp = mHUDPool;
-                break;
-
         default:
                 llassert(0);
                 llerrs << "Invalid Pool Type in  LLPipeline::findPool() type=" << type << llendl;
@@ -1542,29 +1441,37 @@ LLDrawPool *LLPipeline::getPool(const U32 type,	LLViewerImage *tex0)
 LLDrawPool* LLPipeline::getPoolFromTE(const LLTextureEntry* te, LLViewerImage* imagep)
 {
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        U32 type = getPoolTypeFromTE(te, imagep);
+        return gPipeline.getPool(type, imagep);
+}
+
+//static 
+U32 LLPipeline::getPoolTypeFromTE(const LLTextureEntry* te, LLViewerImage* imagep)
+{
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        
+        if (!te || !imagep)
+        {
+                return 0;
+        }
+                
         bool alpha = te->getColor().mV[3] < 0.999f;
         if (imagep)
         {
                 alpha = alpha || (imagep->getComponents() == 4) || (imagep->getComponents() == 2);
         }
-#if 0 // Not currently used
-        if (te->getMediaFlags() == LLTextureEntry::MF_WEB_PAGE)
-        {
-                return gPipeline.getPool(LLDrawPool::POOL_MEDIA, imagep);
-        }
-        else
-#endif
+
         if (alpha)
         {
-                return gPipeline.getPool(LLDrawPool::POOL_ALPHA);
+                return LLDrawPool::POOL_ALPHA;
         }
         else if ((te->getBumpmap() || te->getShiny()))
         {
-                return gPipeline.getPool(LLDrawPool::POOL_BUMP, imagep);
+                return LLDrawPool::POOL_BUMP;
         }
         else
         {
-                return gPipeline.getPool(LLDrawPool::POOL_SIMPLE, imagep);
+                return LLDrawPool::POOL_SIMPLE;
         }
 }
 
@@ -1595,14 +1502,20 @@ void LLPipeline::allocDrawable(LLViewerObject *vobj)
 }
 
 
-void LLPipeline::unlinkDrawable(LLDrawable *drawablep)
+void LLPipeline::unlinkDrawable(LLDrawable *drawable)
 {
         LLFastTimer t(LLFastTimer::FTM_PIPELINE);
+
+        LLPointer<LLDrawable> drawablep = drawable; // make sure this doesn't get deleted before we are done
         
         // Based on flags, remove the drawable from the queues that it's on.
         if (drawablep->isState(LLDrawable::ON_MOVE_LIST))
         {
-                mMovedList.erase(drawablep);
+                LLDrawable::drawable_vector_t::iterator iter = std::find(mMovedList.begin(), mMovedList.end(), drawablep);
+                if (iter != mMovedList.end())
+                {
+                        mMovedList.erase(iter);
+                }
         }
 
         if (drawablep->getSpatialGroup())
@@ -1632,9 +1545,6 @@ U32 LLPipeline::addObject(LLViewerObject *vobj)
 
         llassert(drawablep);
 
-        //mCompleteSet.put(drawable);
-        //gResyncObjects = TRUE;
-
         if (vobj->getParent())
         {
                 vobj->setDrawableParent(((LLViewerObject*)vobj->getParent())->mDrawable); // LLPipeline::addObject 1
@@ -1644,28 +1554,6 @@ U32 LLPipeline::addObject(LLViewerObject *vobj)
                 vobj->setDrawableParent(NULL); // LLPipeline::addObject 2
         }
 
-        
-        if ((!drawablep->getVOVolume()) &&
-                (vobj->getPCode() != LLViewerObject::LL_VO_SKY) &&
-                (vobj->getPCode() != LLViewerObject::LL_VO_STARS) &&
-                (vobj->getPCode() != LLViewerObject::LL_VO_GROUND))
-        {
-                drawablep->getSpatialPartition()->put(drawablep);
-                if (!drawablep->getSpatialGroup())
-                {
-#ifdef LL_RELEASE_FOR_DOWNLOAD
-                        llwarns << "Failure adding drawable to object partition!" << llendl;
-#else
-                        llerrs << "Failure adding drawable to object partition!" << llendl;
-#endif
-                }
-        }
-        else
-        {
-                markMoved(drawablep);
-        }
-        
-        markMaterialed(drawablep);
         markRebuild(drawablep, LLDrawable::REBUILD_ALL, TRUE);
 
         return 1;
@@ -1674,11 +1562,27 @@ U32 LLPipeline::addObject(LLViewerObject *vobj)
 
 void LLPipeline::resetFrameStats()
 {
+        mCompilesStat.addValue(sCompiles);
+        mLightingChangesStat.addValue(mLightingChanges);
+        mGeometryChangesStat.addValue(mGeometryChanges);
+        mTrianglesDrawnStat.addValue(mTrianglesDrawn/1000.f);
+        mVerticesRelitStat.addValue(mVerticesRelit);
+        mNumVisibleFacesStat.addValue(mNumVisibleFaces);
+        mNumVisibleDrawablesStat.addValue((S32)mVisibleList.size());
+
+        mTrianglesDrawn = 0;
         sCompiles        = 0;
         mVerticesRelit   = 0;
         mLightingChanges = 0;
         mGeometryChanges = 0;
         mNumVisibleFaces = 0;
+
+        if (mOldRenderDebugMask != mRenderDebugMask)
+        {
+                gObjectList.clearDebugText();
+                mOldRenderDebugMask = mRenderDebugMask;
+        }
+                
 }
 
 //external functions for asynchronous updating
@@ -1703,7 +1607,7 @@ void LLPipeline::updateMoveDampedAsync(LLDrawable* drawablep)
         // Put on move list so that EARLY_MOVE gets cleared
         if (!drawablep->isState(LLDrawable::ON_MOVE_LIST))
         {
-                mMovedList.insert(drawablep);
+                mMovedList.push_back(drawablep);
                 drawablep->setState(LLDrawable::ON_MOVE_LIST);
         }
 }
@@ -1729,15 +1633,35 @@ void LLPipeline::updateMoveNormalAsync(LLDrawable* drawablep)
         // Put on move list so that EARLY_MOVE gets cleared
         if (!drawablep->isState(LLDrawable::ON_MOVE_LIST))
         {
-                mMovedList.insert(drawablep);
+                mMovedList.push_back(drawablep);
                 drawablep->setState(LLDrawable::ON_MOVE_LIST);
         }
 }
 
+void LLPipeline::updateMovedList(LLDrawable::drawable_vector_t& moved_list)
+{
+        for (LLDrawable::drawable_vector_t::iterator iter = moved_list.begin();
+                 iter != moved_list.end(); )
+        {
+                LLDrawable::drawable_vector_t::iterator curiter = iter++;
+                LLDrawable *drawablep = *curiter;
+                BOOL done = TRUE;
+                if (!drawablep->isDead() && (!drawablep->isState(LLDrawable::EARLY_MOVE)))
+                {
+                        done = drawablep->updateMove();
+                }
+                drawablep->clearState(LLDrawable::EARLY_MOVE | LLDrawable::MOVE_UNDAMPED);
+                if (done)
+                {
+                        drawablep->clearState(LLDrawable::ON_MOVE_LIST);
+                        iter = moved_list.erase(curiter);
+                }
+        }
+}
+
 void LLPipeline::updateMove()
 {
-        mObjectPartition->mOctree->validate();
-        LLFastTimer t(LLFastTimer::FTM_UPDATE_MOVE);
+        //LLFastTimer t(LLFastTimer::FTM_UPDATE_MOVE);
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
 
         if (gSavedSettings.getBOOL("FreezeTime"))
@@ -1747,23 +1671,18 @@ void LLPipeline::updateMove()
 
         mMoveChangesStat.addValue((F32)mMovedList.size());
 
-        for (LLDrawable::drawable_set_t::iterator iter = mMovedList.begin();
-                 iter != mMovedList.end(); )
+        for (LLDrawable::drawable_set_t::iterator iter = mRetexturedList.begin();
+                 iter != mRetexturedList.end(); ++iter)
         {
-                LLDrawable::drawable_set_t::iterator curiter = iter++;
-                LLDrawable *drawablep = *curiter;
-                BOOL done = TRUE;
-                if (!drawablep->isDead() && (!drawablep->isState(LLDrawable::EARLY_MOVE)))
-                {
-                        done = drawablep->updateMove();
-                }
-                drawablep->clearState(LLDrawable::EARLY_MOVE | LLDrawable::MOVE_UNDAMPED);
-                if (done)
+                LLDrawable* drawablep = *iter;
+                if (drawablep && !drawablep->isDead())
                 {
-                        mMovedList.erase(curiter);
-                        drawablep->clearState(LLDrawable::ON_MOVE_LIST);
+                        drawablep->updateTexture();
                 }
         }
+        mRetexturedList.clear();
+
+        updateMovedList(mMovedList);
 
         for (LLDrawable::drawable_set_t::iterator iter = mActiveQ.begin();
                  iter != mActiveQ.end(); )
@@ -1772,7 +1691,8 @@ void LLPipeline::updateMove()
                 LLDrawable* drawablep = *curiter;
                 if (drawablep && !drawablep->isDead()) 
                 {
-                        if (drawablep->mQuietCount++ > MAX_ACTIVE_OBJECT_QUIET_FRAMES && 
+                        if (drawablep->isRoot() && 
+                                drawablep->mQuietCount++ > MAX_ACTIVE_OBJECT_QUIET_FRAMES && 
                                 (!drawablep->getParent() || !drawablep->getParent()->isActive()))
                         {
                                 drawablep->makeStatic(); // removes drawable and its children from mActiveQ
@@ -1785,172 +1705,164 @@ void LLPipeline::updateMove()
                 }
         }
 
-        for (LLDrawable::drawable_set_t::iterator iter = mRetexturedList.begin();
-                 iter != mRetexturedList.end(); ++iter)
+        //balance octrees
         {
-                LLDrawable* drawablep = *iter;
-                if (drawablep && !drawablep->isDead())
-                {
-                        drawablep->updateTexture();
-                }
-        }
-        mRetexturedList.clear();
-
-        for (LLDrawable::drawable_set_t::iterator iter = mRematerialedList.begin();
-                 iter != mRematerialedList.end(); ++iter)
-        {
-                LLDrawable* drawablep = *iter;
-                if (drawablep && !drawablep->isDead())
+                LLFastTimer ot(LLFastTimer::FTM_OCTREE_BALANCE);
+                for (U32 i = 0; i < mObjectPartition.size()-1; i++)
                 {
-                        drawablep->updateMaterial();
+                        if (mObjectPartition[i])
+                        {
+                                mObjectPartition[i]->mOctree->balance();
+                        }
                 }
         }
-        mRematerialedList.clear();
-
-        if (mObjectPartition->mOctree)
-        {
-                //balance octree
-                LLFastTimer ot(LLFastTimer::FTM_OCTREE_BALANCE);
-                mObjectPartition->mOctree->validate();
-                mObjectPartition->mOctree->balance();
-                mObjectPartition->mOctree->validate();
-        }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // Culling and occlusion testing
 /////////////////////////////////////////////////////////////////////////////
 
-void LLPipeline::updateCull()
+//static
+F32 LLPipeline::calcPixelArea(LLVector3 center, LLVector3 size, LLCamera &camera)
 {
-        LLFastTimer t(LLFastTimer::FTM_CULL);
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-
-        LLDrawable::incrementVisible();
-        mVisibleList.resize(0);
-        mVisibleList.reserve(ESTIMATED_VISIBLE_OBJECT_COUNT);
-        
-        gTrivialAccepts = 0;
+        LLVector3 lookAt = center - camera.getOrigin();
+        F32 dist = lookAt.magVec();
 
-        if (mObjectPartition) 
+        //ramp down distance for nearby objects
+        if (dist < 16.f)
         {
-                if (gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery)
-                {
-                        mObjectPartition->processOcclusion(gCamera);
-                        stop_glerror();
-                }
-                mObjectPartition->cull(*gCamera);
+                dist /= 16.f;
+                dist *= dist;
+                dist *= 16.f;
         }
-        
-        // Hack for avatars - warning - this is really FRAGILE! - djs 05/06/02
-        LLVOAvatar::updateAllAvatarVisiblity();
-
-        // If there are any other hacks here, make sure to add them to the
-        // standard pick code.
 
-        gMinObjectDistance = llclamp(gMinObjectDistance, MIN_NEAR_PLANE, MAX_NEAR_PLANE);
+        //get area of circle around node
+        F32 app_angle = atanf(size.magVec()/dist);
+        F32 radius = app_angle*LLDrawable::sCurPixelAngle;
+        return radius*radius * 3.14159f;
+}
 
-        F32 water_height = gAgent.getRegion()->getWaterHeight();
-        F32 camera_height = gAgent.getCameraPositionAgent().mV[2];
-        if (fabs(camera_height - water_height) < 2.f)
-        {
-                gMinObjectDistance = MIN_NEAR_PLANE;
-        }
+void LLPipeline::updateCull(LLCamera& camera)
+{
+        LLFastTimer t(LLFastTimer::FTM_CULL);
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
 
-        gCamera->setNear(gMinObjectDistance);
+        mVisibleList.clear();
+        mVisibleGroups.clear();
+        mDrawableGroups.clear();
+        mActiveGroups.clear();
+        gTrivialAccepts = 0;
+        mVisibleBridge.clear();
 
-        // Disable near clip stuff for now...
+        processOcclusion(camera);
 
-        // now push it back out to max value
-        gMinObjectDistance = MIN_NEAR_PLANE;
+        for (U32 i = 0; i < mObjectPartition.size(); i++)
+        {       
+                if (mObjectPartition[i] && hasRenderType(mObjectPartition[i]->mDrawableType))
+                {
+                        mObjectPartition[i]->cull(camera);
+                }
+        }
 
         if (gSky.mVOSkyp.notNull() && gSky.mVOSkyp->mDrawable.notNull())
         {
                 // Hack for sky - always visible.
-                gSky.mVOSkyp->mDrawable->setVisible(*gCamera);
-                mVisibleList.push_back(gSky.mVOSkyp->mDrawable);
-                gSky.updateCull();
-                stop_glerror();
+                if (hasRenderType(LLPipeline::RENDER_TYPE_SKY)) 
+                {
+                        gSky.mVOSkyp->mDrawable->setVisible(camera);
+                        mVisibleList.push_back(gSky.mVOSkyp->mDrawable);
+                        gSky.updateCull();
+                        stop_glerror();
+                }
         }
         else
         {
                 llinfos << "No sky drawable!" << llendl;
         }
 
-        if (gSky.mVOGroundp.notNull() && gSky.mVOGroundp->mDrawable.notNull())
+        if (hasRenderType(LLPipeline::RENDER_TYPE_GROUND) && gSky.mVOGroundp.notNull() && gSky.mVOGroundp->mDrawable.notNull())
         {
-                gSky.mVOGroundp->mDrawable->setVisible(*gCamera);
+                gSky.mVOGroundp->mDrawable->setVisible(camera);
                 mVisibleList.push_back(gSky.mVOGroundp->mDrawable);
         }
+}
 
-        // add all HUD attachments
-        LLVOAvatar* my_avatarp = gAgent.getAvatarObject();
-        if (my_avatarp && my_avatarp->hasHUDAttachment())
+void LLPipeline::markNotCulled(LLSpatialGroup* group, LLCamera& camera, BOOL active)
+{
+        if (group->getData().empty())
+        { 
+                return;
+        }
+        
+        if (!sSkipUpdate)
         {
-                for (LLViewerJointAttachment* attachmentp = my_avatarp->mAttachmentPoints.getFirstData();
-                        attachmentp;
-                        attachmentp = my_avatarp->mAttachmentPoints.getNextData())
-                {
-                        if (attachmentp->getIsHUDAttachment() && attachmentp->getObject(0))
-                        {
-                                LLViewerObject* objectp = attachmentp->getObject(0);
-                                markVisible(objectp->mDrawable);
-                                objectp->mDrawable->updateDistance(*gCamera);
-                                for (S32 i = 0; i < (S32)objectp->mChildList.size(); i++)
-                                {
-                                        LLViewerObject* childp = objectp->mChildList[i];
-                                        if (childp->mDrawable.notNull())
-                                        {
-                                                markVisible(childp->mDrawable);
-                                                childp->mDrawable->updateDistance(*gCamera);
-                                        }
-                                }
-                        }
-                }
+                group->updateDistance(camera);
         }
-}
+        
+        const F32 MINIMUM_PIXEL_AREA = 16.f;
 
-void LLPipeline::markNotCulled(LLDrawable* drawablep, LLCamera& camera)
-{
-        if (drawablep->isVisible())
+        if (group->mPixelArea < MINIMUM_PIXEL_AREA)
         {
                 return;
         }
         
-        // Tricky render mode to hide selected objects, but we definitely
-        // don't want to do any unnecessary pointer dereferences.  JC
-        if (gHideSelectedObjects)
-        {
-                if (drawablep->getVObj() && drawablep->getVObj()->isSelected())
+        group->mLastRenderTime = gFrameTimeSeconds;
+        if (!group->mSpatialPartition->mRenderByGroup)
+        { //render by drawable
+                mDrawableGroups.push_back(group);
+                for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
                 {
-                        return;
+                        markVisible(*i, camera);
                 }
         }
-
-        if (drawablep && (hasRenderType(drawablep->mRenderType)))
-        {
-                if (!drawablep->isState(LLDrawable::INVISIBLE|LLDrawable::FORCE_INVISIBLE))
+        else
+        { //render by group
+                if (active)
                 {
-                        mVisibleList.push_back(drawablep);
-                        drawablep->setVisible(camera, NULL, FALSE);
+                        mActiveGroups.push_back(group);
                 }
-                else if (drawablep->isState(LLDrawable::CLEAR_INVISIBLE))
+                else
                 {
-                        // clear invisible flag here to avoid single frame glitch
-                        drawablep->clearState(LLDrawable::FORCE_INVISIBLE|LLDrawable::CLEAR_INVISIBLE);
+                        mVisibleGroups.push_back(group);
+                        for (LLSpatialGroup::bridge_list_t::iterator i = group->mBridgeList.begin(); i != group->mBridgeList.end(); ++i)
+                        {
+                                LLSpatialBridge* bridge = *i;
+                                markVisible(bridge, camera);
+                        }
                 }
         }
 }
 
-void LLPipeline::doOcclusion()
+void LLPipeline::doOcclusion(LLCamera& camera)
 {
-        if (gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery)
+        if (sUseOcclusion)
         {
-                mObjectPartition->doOcclusion(gCamera);
+                for (U32 i = 0; i < mObjectPartition.size(); i++)
+                {
+                        if (mObjectPartition[i] && hasRenderType(mObjectPartition[i]->mDrawableType))
+                        {
+                                mObjectPartition[i]->doOcclusion(&camera);
+                        }
+                }
+                
+#if AGGRESSIVE_OCCLUSION
+                for (LLSpatialBridge::bridge_vector_t::iterator i = mVisibleBridge.begin(); i != mVisibleBridge.end(); ++i)
+                {
+                        LLSpatialBridge* bridge = *i;
+                        if (!bridge->isDead() && hasRenderType(bridge->mDrawableType))
+                        {
+                                glPushMatrix();
+                                glMultMatrixf((F32*)bridge->mDrawable->getRenderMatrix().mMatrix);
+                                LLCamera trans = bridge->transformCamera(camera);
+                                bridge->doOcclusion(&trans);
+                                glPopMatrix();
+                                mOccludedBridge.push_back(bridge);
+                        }
+                }
+#endif 
         }
 }
         
-
 BOOL LLPipeline::updateDrawableGeom(LLDrawable* drawablep, BOOL priority)
 {
         BOOL update_complete = drawablep->updateGeometry(priority);
@@ -1975,19 +1887,31 @@ void LLPipeline::updateGeom(F32 max_dtime)
         LLVOVolume::preUpdateGeom();
 
         // Iterate through all drawables on the priority build queue,
-        for (LLDrawable::drawable_set_t::iterator iter = mBuildQ1.begin();
+        for (LLDrawable::drawable_list_t::iterator iter = mBuildQ1.begin();
                  iter != mBuildQ1.end();)
         {
-                LLDrawable::drawable_set_t::iterator curiter = iter++;
+                LLDrawable::drawable_list_t::iterator curiter = iter++;
                 LLDrawable* drawablep = *curiter;
-                BOOL update_complete = TRUE;
                 if (drawablep && !drawablep->isDead())
                 {
-                        update_complete = updateDrawableGeom(drawablep, TRUE);
+                        if (drawablep->isState(LLDrawable::IN_REBUILD_Q2))
+                        {
+                                drawablep->clearState(LLDrawable::IN_REBUILD_Q2);
+                                LLDrawable::drawable_list_t::iterator find = std::find(mBuildQ2.begin(), mBuildQ2.end(), drawablep);
+                                if (find != mBuildQ2.end())
+                                {
+                                        mBuildQ2.erase(find);
+                                }
+                        }
+
+                        if (updateDrawableGeom(drawablep, TRUE))
+                        {
+                                drawablep->clearState(LLDrawable::IN_REBUILD_Q1);
+                                mBuildQ1.erase(curiter);
+                        }
                 }
-                if (update_complete)
+                else
                 {
-                        drawablep->clearState(LLDrawable::IN_REBUILD_Q1);
                         mBuildQ1.erase(curiter);
                 }
         }
@@ -1998,20 +1922,34 @@ void LLPipeline::updateGeom(F32 max_dtime)
         {
                 min_count = mBuildQ2.size();
         }
-        else
-        {
-                mBuildQ2.sort(LLDrawable::CompareDistanceGreaterVisibleFirst());
-        }
-        
+                
         S32 count = 0;
         
         max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, max_dtime);
-                
+        LLSpatialGroup* last_group = NULL;
+        LLSpatialBridge* last_bridge = NULL;
+
         for (LLDrawable::drawable_list_t::iterator iter = mBuildQ2.begin();
                  iter != mBuildQ2.end(); )
         {
                 LLDrawable::drawable_list_t::iterator curiter = iter++;
                 LLDrawable* drawablep = *curiter;
+
+                LLSpatialBridge* bridge = drawablep->isRoot() ? drawablep->getSpatialBridge() :
+                                                                        drawablep->getParent()->getSpatialBridge();
+
+                if (drawablep->getSpatialGroup() != last_group && 
+                        (!last_bridge || bridge != last_bridge) &&
+                        (update_timer.getElapsedTimeF32() >= max_dtime) && count > min_count)
+                {
+                        break;
+                }
+
+                //make sure updates don't stop in the middle of a spatial group
+                //to avoid thrashing (objects are enqueued by group)
+                last_group = drawablep->getSpatialGroup();
+                last_bridge = bridge;
+
                 BOOL update_complete = TRUE;
                 if (drawablep && !drawablep->isDead())
                 {
@@ -2023,14 +1961,12 @@ void LLPipeline::updateGeom(F32 max_dtime)
                         drawablep->clearState(LLDrawable::IN_REBUILD_Q2);
                         mBuildQ2.erase(curiter);
                 }
-                if ((update_timer.getElapsedTimeF32() >= max_dtime) && count > min_count)
-                {
-                        break;
-                }
-        }
+        }       
+
+        updateMovedList(mMovedBridge);
 }
 
-void LLPipeline::markVisible(LLDrawable *drawablep)
+void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera)
 {
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
         if(!drawablep || drawablep->isDead())
@@ -2038,11 +1974,36 @@ void LLPipeline::markVisible(LLDrawable *drawablep)
                 llwarns << "LLPipeline::markVisible called with NULL drawablep" << llendl;
                 return;
         }
-        if (!drawablep->isVisible())
+        
+        
+#if LL_DEBUG
+        if (drawablep->isSpatialBridge())
+        {
+                if (std::find(mVisibleBridge.begin(), mVisibleBridge.end(), (LLSpatialBridge*) drawablep) !=
+                        mVisibleBridge.end())
+                {
+                        llerrs << "Spatial bridge marked visible redundantly." << llendl;
+                }
+        }
+        else
+        {
+                if (std::find(mVisibleList.begin(), mVisibleList.end(), drawablep) !=
+                        mVisibleList.end())
+                {
+                        llerrs << "Drawable marked visible redundantly." << llendl;
+                }
+        }
+#endif
+
+        if (drawablep->isSpatialBridge())
+        {
+                mVisibleBridge.push_back((LLSpatialBridge*) drawablep);
+        }
+        else
         {
-                drawablep->setVisible(*gCamera);
                 mVisibleList.push_back(drawablep);
         }
+        drawablep->setVisible(camera);
 }
 
 void LLPipeline::markMoved(LLDrawable *drawablep, BOOL damped_motion)
@@ -2066,10 +2027,17 @@ void LLPipeline::markMoved(LLDrawable *drawablep, BOOL damped_motion)
                 markMoved(drawablep->getParent(), damped_motion);
         }
 
-        
+
         if (!drawablep->isState(LLDrawable::ON_MOVE_LIST))
         {
-                mMovedList.insert(drawablep);
+                if (drawablep->isSpatialBridge())
+                {
+                        mMovedBridge.push_back(drawablep);
+                }
+                else
+                {
+                        mMovedList.push_back(drawablep);
+                }
                 drawablep->setState(LLDrawable::ON_MOVE_LIST);
         }
         if (damped_motion == FALSE)
@@ -2118,30 +2086,28 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
         }
         mShiftList.resize(0);
 
-        mObjectPartition->shift(offset);
-}
-
-void LLPipeline::markTextured(LLDrawable *drawablep)
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        if (!drawablep->isDead())
+        for (U32 i = 0; i < mObjectPartition.size()-1; i++)
         {
-                mRetexturedList.insert(drawablep);
+                if (mObjectPartition[i])
+                {
+                        mObjectPartition[i]->shift(offset);
+                }
         }
 }
 
-void LLPipeline::markMaterialed(LLDrawable *drawablep)
+void LLPipeline::markTextured(LLDrawable *drawablep)
 {
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        if (!drawablep->isDead())
+        if (drawablep && !drawablep->isDead())
         {
-                mRematerialedList.insert(drawablep);
+                mRetexturedList.insert(drawablep);
         }
 }
 
 void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags flag, BOOL priority)
 {
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
+
         if (drawablep && !drawablep->isDead())
         {
                 if (!drawablep->isState(LLDrawable::BUILT))
@@ -2150,15 +2116,18 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
                 }
                 if (priority)
                 {
-                        mBuildQ1.insert(drawablep);
-                        drawablep->setState(LLDrawable::IN_REBUILD_Q1); // flag is not needed, just for debugging
+                        if (!drawablep->isState(LLDrawable::IN_REBUILD_Q1))
+                        {
+                                mBuildQ1.push_back(drawablep);
+                                drawablep->setState(LLDrawable::IN_REBUILD_Q1); // mark drawable as being in priority queue
+                        }
                 }
                 else if (!drawablep->isState(LLDrawable::IN_REBUILD_Q2))
                 {
                         mBuildQ2.push_back(drawablep);
                         drawablep->setState(LLDrawable::IN_REBUILD_Q2); // need flag here because it is just a list
                 }
-                if (flag & LLDrawable::REBUILD_VOLUME)
+                if (flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION))
                 {
                         drawablep->getVObj()->setChanged(LLXform::SILHOUETTE);
                 }
@@ -2185,111 +2154,400 @@ void LLPipeline::markRelight(LLDrawable *drawablep, const BOOL priority)
         }
 }
 
-void LLPipeline::stateSort()
+void LLPipeline::stateSort(LLCamera& camera)
 {
         LLFastTimer ftm(LLFastTimer::FTM_STATESORT);
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
 
+        for (LLSpatialGroup::sg_vector_t::iterator iter = mVisibleGroups.begin(); iter != mVisibleGroups.end(); ++iter)
+        {
+                stateSort(*iter, camera);
+        }
+                
+        for (LLSpatialBridge::bridge_vector_t::iterator i = mVisibleBridge.begin(); i != mVisibleBridge.end(); ++i)
+        {
+                LLSpatialBridge* bridge = *i;
+                if (!bridge->isDead())
+                {
+                        stateSort(bridge, camera);
+                }
+        }
+
         for (LLDrawable::drawable_vector_t::iterator iter = mVisibleList.begin();
                  iter != mVisibleList.end(); iter++)
         {
                 LLDrawable *drawablep = *iter;
-                if (drawablep->isDead())
+                if (!drawablep->isDead())
                 {
-                        continue;
+                        stateSort(drawablep, camera);
                 }
+        }
+
+        for (LLSpatialGroup::sg_vector_t::iterator iter = mActiveGroups.begin(); iter != mActiveGroups.end(); ++iter)
+        {
+                stateSort(*iter, camera);
+        }
+
+        postSort(camera);
+}
 
-                if (!drawablep->isActive())
+void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera)
+{
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        if (!sSkipUpdate && group->changeLOD())
+        {
+                for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
                 {
-                        drawablep->updateDistance(*gCamera);
+                        LLDrawable* drawablep = *i;
+                        stateSort(drawablep, camera);
                 }
+        }
+        
+#if !LL_DARWIN
+        if (gFrameTimeSeconds - group->mLastUpdateTime > 4.f)
+        {
+                group->makeStatic();
+        }
+#endif
+}
 
-                /*
-                if (!drawablep->isState(LLDrawable::BUILT))
+void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera)
+{
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        if (!sSkipUpdate)
+        {
+                bridge->updateDistance(camera);
+        }
+}
+
+void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
+{
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        LLFastTimer ftm(LLFastTimer::FTM_STATESORT_DRAWABLE);
+        
+        if (drawablep->isDead() || !hasRenderType(drawablep->getRenderType()))
+        {
+                return;
+        }
+        
+        if (gHideSelectedObjects)
+        {
+                if (drawablep->getVObj() &&
+                        drawablep->getVObj()->isSelected())
                 {
-                        // This geometry hasn't been rebuilt but it's visible, make sure it gets put on the rebuild list.
-                        llerrs << "Visible object " << drawablep << ":" << drawablep->getVObj()->getPCodeString();
-                        llcont << " visible but not built, put on rebuild" << llendl;
-                        markRebuild(drawablep);
-                        continue;
+                        return;
+                }
+        }
+
+        if (drawablep && (hasRenderType(drawablep->mRenderType)))
+        {
+                if (!drawablep->isState(LLDrawable::INVISIBLE|LLDrawable::FORCE_INVISIBLE))
+                {
+                        drawablep->setVisible(camera, NULL, FALSE);
                 }
-                */
+                else if (drawablep->isState(LLDrawable::CLEAR_INVISIBLE))
+                {
+                        // clear invisible flag here to avoid single frame glitch
+                        drawablep->clearState(LLDrawable::FORCE_INVISIBLE|LLDrawable::CLEAR_INVISIBLE);
+                }
+        }
 
-                for (LLDrawable::face_list_t::iterator iter = drawablep->mFaces.begin();
-                         iter != drawablep->mFaces.end(); iter++)
+        if (!drawablep->isActive() && drawablep->isVisible())
+        {
+                if (!sSkipUpdate)
                 {
-                        LLFace* facep = *iter;
-                        if (facep->hasGeometry())
+                        drawablep->updateDistance(camera);
+                }
+        }
+        else if (drawablep->isAvatar() && drawablep->isVisible())
+        {
+                LLVOAvatar* vobj = (LLVOAvatar*) drawablep->getVObj();
+                vobj->updateVisibility(FALSE);
+        }
+
+        for (LLDrawable::face_list_t::iterator iter = drawablep->mFaces.begin();
+                        iter != drawablep->mFaces.end(); iter++)
+        {
+                LLFace* facep = *iter;
+
+                if (facep->hasGeometry())
+                {
+                        if (facep->getPool())
                         {
                                 facep->getPool()->enqueue(facep);
                         }
+                        else
+                        {
+                                break;
+                        }
                 }
-                
-                if (sRenderPhysicalBeacons)
-                {
-                        // Only show the beacon on the root object.
-                        LLViewerObject *vobj = drawablep->getVObj();
-                        if (vobj 
-                                && !vobj->isAvatar() 
-                                && !vobj->getParent()
-                                && vobj->usePhysics())
+        }
+        
+        
+        mNumVisibleFaces += drawablep->getNumFaces();
+}
+
+
+void LLPipeline::forAllDrawables(LLSpatialGroup::sg_vector_t& groups, void (*func)(LLDrawable*))
+{
+        for (LLSpatialGroup::sg_vector_t::iterator i = groups.begin(); i != groups.end(); ++i)
+        {
+                for (LLSpatialGroup::element_iter j = (*i)->getData().begin(); j != (*i)->getData().end(); ++j)
+                {
+                        func(*j);       
+                }
+        }
+}
+
+void LLPipeline::forAllVisibleDrawables(void (*func)(LLDrawable*))
+{
+        forAllDrawables(mDrawableGroups, func);
+        forAllDrawables(mVisibleGroups, func);
+        forAllDrawables(mActiveGroups, func);
+}
+
+//function for creating scripted beacons
+void renderScriptedBeacons(LLDrawable* drawablep)
+{
+        LLViewerObject *vobj = drawablep->getVObj();
+        if (vobj 
+                && !vobj->isAvatar() 
+                && !vobj->getParent()
+                && vobj->flagScripted())
+        {
+                gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(1.f, 0.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f));
+        }
+}
+
+void renderPhysicalBeacons(LLDrawable* drawablep)
+{
+        LLViewerObject *vobj = drawablep->getVObj();
+        if (vobj 
+                && !vobj->isAvatar() 
+                && !vobj->getParent()
+                && vobj->usePhysics())
+        {
+                gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(0.f, 1.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f));
+        }
+}
+
+void renderParticleBeacons(LLDrawable* drawablep)
+{
+        // Look for attachments, objects, etc.
+        LLViewerObject *vobj = drawablep->getVObj();
+        if (vobj 
+                && vobj->isParticleSource())
+        {
+                LLColor4 light_blue(0.5f, 0.5f, 1.f, 0.5f);
+                gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", light_blue, LLColor4(1.f, 1.f, 1.f, 0.5f));
+        }
+}
+
+void LLPipeline::highlightPhysical(LLDrawable* drawablep)
+{
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        LLViewerObject *vobj;
+        vobj = drawablep->getVObj();
+        if (vobj && !vobj->isAvatar())
+        {
+                if (!vobj->isAvatar() && 
+                        (vobj->usePhysics() || vobj->flagHandleTouch()))
+                {
+                        S32 face_id;
+                        for (face_id = 0; face_id < drawablep->getNumFaces(); face_id++)
                         {
-                                gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(0.f, 1.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f));
+                                gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) );
                         }
                 }
+        }
+}
+
+void LLPipeline::postSort(LLCamera& camera)
+{
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT);
+        //reset render data sets
+        clearRenderMap();
+        mAlphaGroups.clear();
+        mAlphaGroupsPostWater.clear();
+        
+        if (!gSavedSettings.getBOOL("RenderRippleWater") && hasRenderType(LLDrawPool::POOL_ALPHA))
+        {       //turn off clip plane for non-ripple water
+                toggleRenderType(LLDrawPool::POOL_ALPHA);
+        }
 
-                if (sRenderScriptedBeacons)
+        F32 water_height = gAgent.getRegion()->getWaterHeight();
+        BOOL above_water = gCamera->getOrigin().mV[2] > water_height ? TRUE : FALSE;
+
+        //prepare occlusion geometry
+        if (sUseOcclusion)
+        {
+                for (U32 i = 0; i < mObjectPartition.size(); i++)
                 {
-                        // Only show the beacon on the root object.
-                        LLViewerObject *vobj = drawablep->getVObj();
-                        if (vobj 
-                                && !vobj->isAvatar() 
-                                && !vobj->getParent()
-                                && vobj->flagScripted())
+                        if (mObjectPartition[i] && hasRenderType(mObjectPartition[i]->mDrawableType))
                         {
-                                gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(1.f, 0.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f));
+                                mObjectPartition[i]->buildOcclusion();
+                        }
+                }
+                
+#if AGGRESSIVE_OCCLUSION
+                for (LLSpatialBridge::bridge_vector_t::iterator i = mVisibleBridge.begin(); i != mVisibleBridge.end(); ++i)
+                {
+                        LLSpatialBridge* bridge = *i;
+                        if (!bridge->isDead() && hasRenderType(bridge->mDrawableType))
+                        {       
+                                bridge->buildOcclusion();
                         }
                 }
+#endif
+        }
+
+
+        if (!sSkipUpdate)
+        {
+                //rebuild drawable geometry
+                for (LLSpatialGroup::sg_vector_t::iterator i = mDrawableGroups.begin(); i != mDrawableGroups.end(); ++i)
+                {
+                        LLSpatialGroup* group = *i;
+                        group->rebuildGeom();
+                }
+        }
 
-                if (sRenderParticleBeacons)
+        //build render map
+        for (LLSpatialGroup::sg_vector_t::iterator i = mVisibleGroups.begin(); i != mVisibleGroups.end(); ++i)
+        {
+                LLSpatialGroup* group = *i;
+                if (!sSkipUpdate)
+                {
+                        group->rebuildGeom();
+                }
+                for (LLSpatialGroup::draw_map_t::iterator j = group->mDrawMap.begin(); j != group->mDrawMap.end(); ++j)
                 {
-                        // Look for attachments, objects, etc.
-                        LLViewerObject *vobj = drawablep->getVObj();
-                        if (vobj 
-                                && vobj->isParticleSource())
+                        std::vector<LLDrawInfo*>& src_vec = j->second;
+                        std::vector<LLDrawInfo*>& dest_vec = mRenderMap[j->first];
+
+                        for (std::vector<LLDrawInfo*>::iterator k = src_vec.begin(); k != src_vec.end(); ++k)
                         {
-                                LLColor4 light_blue(0.5f, 0.5f, 1.f, 0.5f);
-                                gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", light_blue, LLColor4(1.f, 1.f, 1.f, 0.5f));
+                                dest_vec.push_back(*k);
                         }
                 }
+                
+                LLSpatialGroup::draw_map_t::iterator alpha = group->mDrawMap.find(LLRenderPass::PASS_ALPHA);
+                
+                if (alpha != group->mDrawMap.end())
+                { //store alpha groups for sorting
+                        if (!sSkipUpdate)
+                        {
+                                group->updateDistance(camera);
+                        }
+                        
+                        if (hasRenderType(LLDrawPool::POOL_ALPHA))
+                        {
+                                BOOL above = group->mObjectBounds[0].mV[2] + group->mObjectBounds[1].mV[2] > water_height ? TRUE : FALSE;
+                                BOOL below = group->mObjectBounds[0].mV[2] - group->mObjectBounds[1].mV[2] < water_height ? TRUE : FALSE;
+                                
+                                if (below == above_water || above == below)
+                                {
+                                        mAlphaGroups.push_back(group);
+                                }
 
-                // Draw physical objects in red.
-                if (gHUDManager->getShowPhysical())
+                                if (above == above_water || below == above)
+                                {
+                                        mAlphaGroupsPostWater.push_back(group);
+                                }
+                        }
+                        else
+                        {
+                                mAlphaGroupsPostWater.push_back(group);
+                        }
+                }
+        }
+        
+        //store active alpha groups
+        for (LLSpatialGroup::sg_vector_t::iterator i = mActiveGroups.begin(); i != mActiveGroups.end(); ++i)
+        {
+                LLSpatialGroup* group = *i;
+                if (!sSkipUpdate)
+                {
+                        group->rebuildGeom();
+                }
+                LLSpatialGroup::draw_map_t::iterator alpha = group->mDrawMap.find(LLRenderPass::PASS_ALPHA);
+                
+                if (alpha != group->mDrawMap.end())
                 {
-                        LLViewerObject *vobj;
-                        vobj = drawablep->getVObj();
-                        if (vobj && !vobj->isAvatar())
+                        LLSpatialBridge* bridge = group->mSpatialPartition->asBridge();
+                        LLCamera trans_camera = bridge->transformCamera(camera);
+                        if (!sSkipUpdate)
                         {
-                                if (!vobj->isAvatar() && 
-                                        (vobj->usePhysics() || vobj->flagHandleTouch()))
+                                group->updateDistance(trans_camera);
+                        }
+                        
+                        if (hasRenderType(LLDrawPool::POOL_ALPHA))
+                        {
+                                LLSpatialGroup* bridge_group = bridge->getSpatialGroup();
+                                BOOL above = bridge_group->mObjectBounds[0].mV[2] + bridge_group->mObjectBounds[1].mV[2] > water_height ? TRUE : FALSE;
+                                BOOL below = bridge_group->mObjectBounds[0].mV[2] - bridge_group->mObjectBounds[1].mV[2] < water_height ? TRUE : FALSE;
+                                        
+                                
+                                if (below == above_water || above == below)
                                 {
-                                        if (!drawablep->isVisible())
-                                        {
-                                                // Skip objects that aren't visible.
-                                                continue;
-                                        }
-                                        S32 face_id;
-                                        for (face_id = 0; face_id < drawablep->getNumFaces(); face_id++)
-                                        {
-                                                mHighlightFaces.put(drawablep->getFace(face_id) );
-                                        }
+                                        mAlphaGroups.push_back(group);
+                                }
+                                
+                                if (above == above_water || below == above)
+                                {
+                                        mAlphaGroupsPostWater.push_back(group);
                                 }
                         }
+                        else
+                        {
+                                mAlphaGroupsPostWater.push_back(group);
+                        }
                 }
+        }
 
-                mNumVisibleFaces += drawablep->getNumFaces();
+        //sort by texture or bump map
+        for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; ++i)
+        {
+                if (!mRenderMap[i].empty())
+                {
+                        if (i == LLRenderPass::PASS_BUMP)
+                        {
+                                std::sort(mRenderMap[i].begin(), mRenderMap[i].end(), LLDrawInfo::CompareBump());
+                        }
+                        else 
+                        {
+                                std::sort(mRenderMap[i].begin(), mRenderMap[i].end(), LLDrawInfo::CompareTexturePtr());
+                        }
+                }
         }
-        
+
+        std::sort(mAlphaGroups.begin(), mAlphaGroups.end(), LLSpatialGroup::CompareDepthGreater());
+        std::sort(mAlphaGroupsPostWater.begin(), mAlphaGroupsPostWater.end(), LLSpatialGroup::CompareDepthGreater());
+
+        if (sRenderScriptedBeacons)
+        {
+                // Only show the beacon on the root object.
+                forAllVisibleDrawables(renderScriptedBeacons);
+        }
+
+        if (sRenderPhysicalBeacons)
+        {
+                // Only show the beacon on the root object.
+                forAllVisibleDrawables(renderPhysicalBeacons);
+        }
+
+        if (sRenderParticleBeacons)
+        {
+                forAllVisibleDrawables(renderParticleBeacons);
+        }
+
+        // Draw physical objects in red.
+        if (gHUDManager->getShowPhysical())
+        {
+                forAllVisibleDrawables(highlightPhysical);
+        }
+
         // If god mode, also show audio cues
         if (sRenderSoundBeacons && gAudiop)
         {
@@ -2312,66 +2570,19 @@ void LLPipeline::stateSort()
                 LLFloaterTelehub::addBeacons();
         }
 
-        mSelectedFaces.reset();
+        mSelectedFaces.clear();
         
         // Draw face highlights for selected faces.
         if (gSelectMgr->getTEMode())
         {
                 LLViewerObject *vobjp;
                 S32             te;
-                gSelectMgr->getFirstTE(&vobjp,&te);
+                gSelectMgr->getSelection()->getFirstTE(&vobjp,&te);
 
                 while (vobjp)
                 {
-                        LLDrawable *drawablep = vobjp->mDrawable;
-                        if (!drawablep || drawablep->isDead() || (!vobjp->isHUDAttachment() && !drawablep->isVisible()))
-                        {
-                                llwarns << "Dead drawable on selected face list!" << llendl;
-                        }
-                        else
-                        {
-                                LLVOVolume *volp = drawablep->getVOVolume();
-                                if (volp)
-                                {
-                                        if (volp->getAllTEsSame())
-                                        {
-                                                SelectedFaceInfo* faceinfo = mSelectedFaces.reserve_block(1);
-                                                faceinfo->mFacep = drawablep->getFace(vobjp->getFaceIndexOffset());
-                                                faceinfo->mTE = te;
-                                        }
-                                        else
-                                        {
-                                                // This is somewhat inefficient, but works correctly.
-                                                S32 face_id;
-                                                for (face_id = 0; face_id < vobjp->getVolume()->getNumFaces(); face_id++)
-                                                {
-                                                        LLFace *facep = drawablep->getFace(face_id + vobjp->getFaceIndexOffset());
-                                                        if (te == facep->getTEOffset())
-                                                        {
-                                                                SelectedFaceInfo* faceinfo = mSelectedFaces.reserve_block(1);
-                                                                faceinfo->mFacep = facep;
-                                                                faceinfo->mTE = -1;
-                                                        }
-                                                }
-                                        }
-                                }
-                                else
-                                {
-                                        // This is somewhat inefficient, but works correctly.
-                                        S32 face_id;
-                                        for (face_id = 0; face_id <  drawablep->getNumFaces(); face_id++)
-                                        {
-                                                LLFace *facep = drawablep->getFace(face_id + vobjp->getFaceIndexOffset());
-                                                if (te == facep->getTEOffset())
-                                                {
-                                                        SelectedFaceInfo* faceinfo = mSelectedFaces.reserve_block(1);
-                                                        faceinfo->mFacep = facep;
-                                                        faceinfo->mTE = -1;
-                                                }
-                                        }
-                                }
-                        }
-                        gSelectMgr->getNextTE(&vobjp,&te);
+                        mSelectedFaces.push_back(vobjp->mDrawable->getFace(te));
+                        gSelectMgr->getSelection()->getNextTE(&vobjp,&te);
                 }
         }
 }
@@ -2383,13 +2594,13 @@ static void render_hud_elements()
         gPipeline.disableLights();              
         
         gPipeline.renderDebug();
-        
+
         LLGLDisable fog(GL_FOG);
         LLGLSUIDefault gls_ui;
         
         if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
         {
-                gViewerWindow->renderSelections(FALSE, FALSE, FALSE); // For HUD bersion in render_ui_3d()
+                gViewerWindow->renderSelections(FALSE, FALSE, FALSE); // For HUD version in render_ui_3d()
         
                 // Draw the tracking overlays
                 LLTracker::render3D();
@@ -2404,7 +2615,7 @@ static void render_hud_elements()
                         gParcelMgr->render();
                         gParcelMgr->renderParcelCollision();
                 }
-                
+        
                 // Render debugging beacons.
                 gObjectList.renderObjectBeacons();
                 LLHUDObject::renderAll();
@@ -2415,11 +2626,15 @@ static void render_hud_elements()
                 // This is only set when not rendering the UI, for parcel snapshots
                 gParcelMgr->render();
         }
-
+        else if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
+        {
+                LLHUDText::renderAllHUD();
+        }
 }
 
 void LLPipeline::renderHighlights()
 {
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
         // Draw 3D UI elements here (before we clear the Z buffer in POOL_HUD)
         // Render highlighted faces.
         LLColor4 color(1.f, 1.f, 1.f, 0.5f);
@@ -2441,48 +2656,15 @@ void LLPipeline::renderHighlights()
                 }
                 mFaceSelectImagep->addTextureStats((F32)MAX_IMAGE_AREA);
 
-                for (S32 i = 0; i < mSelectedFaces.count(); i++)
+                for (U32 i = 0; i < mSelectedFaces.size(); i++)
                 {
-                        LLFace *facep = mSelectedFaces[i].mFacep;
+                        LLFace *facep = mSelectedFaces[i];
                         if (!facep || facep->getDrawable()->isDead())
                         {
                                 llerrs << "Bad face on selection" << llendl;
                         }
                         
-                        LLDrawPool* poolp = facep->getPool();
-
-                        if (!poolp->canUseAGP())
-                        {
-                                unbindAGP();
-                        }
-                        else if (usingAGP())
-                        {
-                                bindAGP();
-                        }
-
-                        if (mSelectedFaces[i].mTE == -1)
-                        {
-                                // Yes, I KNOW this is stupid...
-                                poolp->renderFaceSelected(facep, mFaceSelectImagep, color);
-                        }
-                        else
-                        {
-                                LLVOVolume *volp = (LLVOVolume *)facep->getViewerObject();
-                                // Do the special coalesced face mode.
-                                S32 j;
-                                S32 offset = 0;
-                                S32 count = volp->getVolume()->getVolumeFace(0).mIndices.size();
-                                for (j = 0; j <= mSelectedFaces[i].mTE; j++)
-                                {
-                                        count = volp->getVolume()->getVolumeFace(j).mIndices.size();
-                                        if (j < mSelectedFaces[i].mTE)
-                                        {
-                                                offset += count;
-                                        }
-                                }
-
-                                poolp->renderFaceSelected(facep, mFaceSelectImagep, color, offset, count);
-                        }
+                        facep->renderSelected(mFaceSelectImagep, color);
                 }
         }
 
@@ -2490,26 +2672,16 @@ void LLPipeline::renderHighlights()
         {
                 // Paint 'em red!
                 color.setVec(1.f, 0.f, 0.f, 0.5f);
-                for (S32 i = 0; i < mHighlightFaces.count(); i++)
+                for (U32 i = 0; i < mHighlightFaces.size(); i++)
                 {
                         LLFace* facep = mHighlightFaces[i];
-                        LLDrawPool* poolp = facep->getPool();
-                        if (!poolp->canUseAGP())
-                        {
-                                unbindAGP();
-                        }
-                        else if (usingAGP())
-                        {
-                                bindAGP();
-                        }
-
-                        poolp->renderFaceSelected(facep, LLViewerImage::sNullImagep, color);
+                        facep->renderSelected(LLViewerImage::sNullImagep, color);
                 }
         }
 
         // Contains a list of the faces of objects that are physical or
         // have touch-handlers.
-        mHighlightFaces.reset();
+        mHighlightFaces.clear();
 
         if (mVertexShaderLevel[SHADER_INTERFACE] > 0)
         {
@@ -2517,11 +2689,11 @@ void LLPipeline::renderHighlights()
         }
 }
 
-void LLPipeline::renderGeom()
+void LLPipeline::renderGeom(LLCamera& camera)
 {
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
         LLFastTimer t(LLFastTimer::FTM_RENDER_GEOMETRY);
-
+        
         if (!mAlphaSizzleImagep)
         {
                 mAlphaSizzleImagep = gImageList.getImage(LLUUID(gViewerArt.getString("alpha_sizzle.tga")), MIPMAP_TRUE, TRUE);
@@ -2533,6 +2705,8 @@ void LLPipeline::renderGeom()
         //
         //
 
+        glEnableClientState(GL_VERTEX_ARRAY);
+
         stop_glerror();
         gFrameStats.start(LLFrameStats::RENDER_SYNC);
 
@@ -2540,6 +2714,7 @@ void LLPipeline::renderGeom()
 #ifndef LL_RELEASE_FOR_DOWNLOAD
         LLGLState::checkStates();
         LLGLState::checkTextureChannels();
+        LLGLState::checkClientArrays();
 #endif
         if (mRenderDebugMask & RENDER_DEBUG_VERIFY)
         {
@@ -2549,27 +2724,23 @@ void LLPipeline::renderGeom()
                 }
         }
 
-        if (mAGPMemPool)
         {
-                mAGPMemPool->waitFence(mGlobalFence);
+                //LLFastTimer ftm(LLFastTimer::FTM_TEMP6);
+                LLVertexBuffer::startRender();
         }
 
-        unbindAGP();
         for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
         {
                 LLDrawPool *poolp = *iter;
                 if (hasRenderType(poolp->getType()))
                 {
                         poolp->prerender();
-                        poolp->syncAGP();
                 }
         }
 
         gFrameStats.start(LLFrameStats::RENDER_GEOM);
 
         // Initialize lots of GL state to "safe" values
-        mTrianglesDrawn = 0;
-        
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);
@@ -2577,13 +2748,13 @@ void LLPipeline::renderGeom()
         LLGLSPipeline gls_pipeline;
         
         LLGLState gls_color_material(GL_COLOR_MATERIAL, mLightingDetail < 2);
-        LLGLState normalize(GL_NORMALIZE, TRUE);
+        // LLGLState normalize(GL_NORMALIZE, TRUE);
                         
         // Toggle backface culling for debugging
         LLGLEnable cull_face(mBackfaceCull ? GL_CULL_FACE : 0);
         // Set fog
         LLGLEnable fog_enable(hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FOG) ? GL_FOG : 0);
-
+        gSky.updateFog(camera.getFar());
 
         LLViewerImage::sDefaultImagep->bind(0);
         LLViewerImage::sDefaultImagep->setClamp(FALSE, FALSE);
@@ -2592,19 +2763,20 @@ void LLPipeline::renderGeom()
         //
         // Actually render all of the geometry
         //
-        //
-
+        //      
         stop_glerror();
-        BOOL non_agp = FALSE;
         BOOL did_hud_elements = FALSE;
-        
+        BOOL occlude = sUseOcclusion;
+
         U32 cur_type = 0;
 
-        S32 skipped_vertices = 0;
+        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
+        {
+                gObjectList.renderObjectsForSelect(camera);
+        }
+        else
         {
                 LLFastTimer t(LLFastTimer::FTM_POOLS);
-                BOOL occlude = TRUE;
-
                 calcNearbyLights();
 
                 pool_set_t::iterator iter1 = mPools.begin();
@@ -2614,80 +2786,27 @@ void LLPipeline::renderGeom()
                         
                         cur_type = poolp->getType();
 
-                        if (cur_type >= LLDrawPool::POOL_TREE && occlude)
-                        { //all the occluders have been drawn, do occlusion queries
-                                if (mVertexShadersEnabled)
-                                {
-                                        glUseProgramObjectARB(0);
-                                }
-                                doOcclusion();
+                        if (occlude && cur_type > LLDrawPool::POOL_AVATAR)
+                        {
                                 occlude = FALSE;
+                                doOcclusion(camera);
                         }
-                        
-                        if (cur_type >= LLDrawPool::POOL_HUD && !did_hud_elements)
+
+                        if (cur_type > LLDrawPool::POOL_ALPHA_POST_WATER && !did_hud_elements)
                         {
                                 renderHighlights();
                                 // Draw 3D UI elements here (before we clear the Z buffer in POOL_HUD)
-                                if (mVertexShadersEnabled)
-                                {
-                                        glUseProgramObjectARB(0);
-                                }
                                 render_hud_elements();
                                 did_hud_elements = TRUE;
                         }
 
                         pool_set_t::iterator iter2 = iter1;
-                        if (hasRenderType(poolp->getType()))
+                        if (hasRenderType(poolp->getType()) && poolp->getNumPasses() > 0)
                         {
                                 LLFastTimer t(LLFastTimer::FTM_POOLRENDER);
 
                                 setupHWLights(poolp);
-                                
-                                if (mVertexShadersEnabled && poolp->getVertexShaderLevel() == 0)
-                                {
-                                        glUseProgramObjectARB(0);
-                                }
-                                else if (mVertexShadersEnabled)
-                                {
-                                        mMaterialIndex = mSpecularIndex = 0;
-                                        switch(cur_type)
-                                        {
-                                          case LLDrawPool::POOL_SKY:
-                                          case LLDrawPool::POOL_STARS:
-                                          case LLDrawPool::POOL_CLOUDS:
-                                                glUseProgramObjectARB(0); 
-                                                break;
-                                          case LLDrawPool::POOL_TERRAIN:
-                                                mTerrainProgram.bind();
-                                                break;
-                                          case LLDrawPool::POOL_GROUND:
-                                                mGroundProgram.bind();
-                                                break;
-                                          case LLDrawPool::POOL_TREE:
-                                          case LLDrawPool::POOL_TREE_NEW:
-                                          case LLDrawPool::POOL_SIMPLE:
-                                          case LLDrawPool::POOL_MEDIA:
-                                                mObjectSimpleProgram.bind();
-                                                break;
-                                          case LLDrawPool::POOL_BUMP:
-                                                mObjectBumpProgram.bind();
-                                                break;
-                                          case LLDrawPool::POOL_AVATAR:
-                                                glUseProgramObjectARB(0);
-                        break;
-                                          case LLDrawPool::POOL_WATER:
-                                                glUseProgramObjectARB(0);
-                                                break;
-                                          case LLDrawPool::POOL_ALPHA:
-                                                mObjectAlphaProgram.bind();
-                                                break;
-                                          case LLDrawPool::POOL_HUD:
-                                          default:
-                                                glUseProgramObjectARB(0);
-                                                break;
-                                        }
-                                }
-
+                        
                                 for( S32 i = 0; i < poolp->getNumPasses(); i++ )
                                 {
                                         poolp->beginRenderPass(i);
@@ -2698,33 +2817,19 @@ void LLPipeline::renderGeom()
                                                 {
                                                         break;
                                                 }
-                                                if (p->getType() != LLDrawPool::POOL_AVATAR
-                                                        && p->getType() != LLDrawPool::POOL_ALPHA
-                                                        && p->getType() != LLDrawPool::POOL_HUD
-                                                        && (!p->getIndexCount() || !p->getVertexCount()))
-                                                {
-                                                        continue;
-                                                }
-
-                                                if (p->canUseAGP() && usingAGP())
-                                                {
-                                                        bindAGP();
-                                                }
-                                                else
-                                                {
-                                                        //llinfos << "Rendering pool type " << p->getType() << " without AGP!" << llendl;
-                                                        unbindAGP();
-                                                        non_agp = TRUE;
-                                                }
-                                        
+                                                
                                                 p->resetTrianglesDrawn();
                                                 p->render(i);
                                                 mTrianglesDrawn += p->getTrianglesDrawn();
-                                                skipped_vertices += p->mSkippedVertices;
-                                                p->mSkippedVertices = 0;
                                         }
                                         poolp->endRenderPass(i);
 #ifndef LL_RELEASE_FOR_DOWNLOAD
+                                        GLint depth;
+                                        glGetIntegerv(GL_MODELVIEW_STACK_DEPTH, &depth);
+                                        if (depth > 3)
+                                        {
+                                                llerrs << "GL matrix stack corrupted!" << llendl;
+                                        }
                                         LLGLState::checkStates();
                                         LLGLState::checkTextureChannels();
                                         LLGLState::checkClientArrays();
@@ -2746,21 +2851,18 @@ void LLPipeline::renderGeom()
                         iter1 = iter2;
                         stop_glerror();
                 }
-
-                if (occlude)
-                {
-                        if (mVertexShadersEnabled)
-                        {
-                                glUseProgramObjectARB(0);
-                        }
-                        doOcclusion();
-                }
         }
-        stop_glerror();
-        
-        if (mVertexShadersEnabled)
+
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+                LLGLState::checkStates();
+                LLGLState::checkTextureChannels();
+                LLGLState::checkClientArrays();
+#endif
+
+        if (occlude)
         {
-                glUseProgramObjectARB(0);
+                doOcclusion(camera);
+                occlude = FALSE;
         }
 
         if (!did_hud_elements)
@@ -2768,32 +2870,49 @@ void LLPipeline::renderGeom()
                 renderHighlights();
                 render_hud_elements();
         }
+
+        stop_glerror();
         
-        static S32 agp_mix_count = 0;
-        if (non_agp && usingAGP())
-        {
-                if (0 == agp_mix_count % 16)
-                {
-                        lldebugs << "Mixing AGP and non-AGP pools, slow!" << llendl;
-                }
-                agp_mix_count++;
-        }
-        else
         {
-                agp_mix_count = 0;
+                LLVertexBuffer::stopRender();
         }
-
+        
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+                LLGLState::checkStates();
+                LLGLState::checkTextureChannels();
+                LLGLState::checkClientArrays();
+#endif
+        
         // Contains a list of the faces of objects that are physical or
         // have touch-handlers.
-        mHighlightFaces.reset();
+        mHighlightFaces.clear();
+}
 
-        // This wait is in case we try to do multiple renders of a frame,
-        // I don't know what happens when we send a fence multiple times without
-        // checking it.
-        if (mAGPMemPool)
+void LLPipeline::processOcclusion(LLCamera& camera)
+{
+        //process occlusion (readback)
+        if (sUseOcclusion)
         {
-                mAGPMemPool->waitFence(mGlobalFence);
-                mAGPMemPool->sendFence(mGlobalFence);
+                for (U32 i = 0; i < mObjectPartition.size(); i++)
+                {
+                        if (mObjectPartition[i] && hasRenderType(mObjectPartition[i]->mDrawableType))
+                        {
+                                mObjectPartition[i]->processOcclusion(&camera);
+                        }
+                }
+                
+#if AGGRESSIVE_OCCLUSION
+                for (LLSpatialBridge::bridge_vector_t::iterator i = mOccludedBridge.begin(); i != mOccludedBridge.end(); ++i)
+                {
+                        LLSpatialBridge* bridge = *i;
+                        if (!bridge->isDead() && hasRenderType(bridge->mDrawableType))
+                        {
+                                LLCamera trans = bridge->transformCamera(camera);
+                                bridge->processOcclusion(&trans);
+                        }
+                }
+#endif
+                mOccludedBridge.clear();
         }
 }
 
@@ -2802,13 +2921,30 @@ void LLPipeline::renderDebug()
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
 
         // Disable all client state
-    glDisableClientState(GL_VERTEX_ARRAY);
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
     glDisableClientState(GL_NORMAL_ARRAY);
-    glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_COLOR_ARRAY);
 
         // Debug stuff.
-        mObjectPartition->renderDebug();
+        for (U32 i = 0; i < mObjectPartition.size(); i++)
+        {
+                if (mObjectPartition[i] && hasRenderType(mObjectPartition[i]->mDrawableType))
+                {
+                        mObjectPartition[i]->renderDebug();
+                }
+        }
+
+        for (LLSpatialBridge::bridge_vector_t::iterator i = mVisibleBridge.begin(); i != mVisibleBridge.end(); ++i)
+        {
+                LLSpatialBridge* bridge = *i;
+                if (!bridge->isDead() && hasRenderType(bridge->mDrawableType))
+                {
+                        glPushMatrix();
+                        glMultMatrixf((F32*)bridge->mDrawable->getRenderMatrix().mMatrix);
+                        bridge->renderDebug();
+                        glPopMatrix();
+                }
+        }
 
         if (mRenderDebugMask & LLPipeline::RENDER_DEBUG_LIGHT_TRACE)
         {
@@ -2855,81 +2991,6 @@ void LLPipeline::renderDebug()
                 }
         }
 
-        mCompilesStat.addValue(sCompiles);
-        mLightingChangesStat.addValue(mLightingChanges);
-        mGeometryChangesStat.addValue(mGeometryChanges);
-        mTrianglesDrawnStat.addValue(mTrianglesDrawn/1000.f);
-        mVerticesRelitStat.addValue(mVerticesRelit);
-        mNumVisibleFacesStat.addValue(mNumVisibleFaces);
-        mNumVisibleDrawablesStat.addValue((S32)mVisibleList.size());
-
-        if (gRenderLightGlows)
-        {
-                displaySSBB();
-        }
-
-        /*if (mRenderDebugMask & RENDER_DEBUG_BBOXES)
-        {
-                LLGLSPipelineAlpha gls_pipeline_alpha;
-                LLGLSNoTexture no_texture;
-
-                for (LLDrawable::drawable_vector_t::iterator iter = mVisibleList.begin(); iter != mVisibleList.end(); iter++)
-                {
-                        LLDrawable *drawablep = *iter;
-                        if (drawablep->isDead())
-                        {
-                                continue;
-                        }
-                        LLVector3 min, max;
-                        
-                        if (drawablep->getVObj() && drawablep->getVObj()->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH)
-                        {
-                                // Render drawable bbox
-                                drawablep->getBounds(min, max);
-                                glColor4f(0.f, 1.f, 0.f, 0.25f);
-                                render_bbox(min, max);
-
-                                // Render object bbox
-                                LLVector3 scale = drawablep->getVObj()->getScale();
-                                LLVector3 pos = drawablep->getVObj()->getPositionAgent();
-                                min = pos - scale * 0.5f;
-                                max = pos + scale * 0.5f;
-                                glColor4f(1.f, 0.f, 0.f, 0.25f);
-                                render_bbox(min, max);
-                        }
-                }
-        }*/
-
-        /*
-        // Debugging code for parcel sound.
-        F32 x, y;
-
-        LLGLSNoTexture gls_no_texture;
-
-        glBegin(GL_POINTS);
-        if (gAgent.getRegion())
-        {
-                // Draw the composition layer for the region that I'm in.
-                for (x = 0; x <= 260; x++)
-                {
-                        for (y = 0; y <= 260; y++)
-                        {
-                                if (gParcelMgr->isSoundLocal(gAgent.getRegion()->getOriginGlobal() + LLVector3d(x, y, 0.f)))
-                                {
-                                        glColor4f(1.f, 0.f, 0.f, 1.f);
-                                }
-                                else
-                                {
-                                        glColor4f(0.f, 0.f, 1.f, 1.f);
-                                }
-
-                                glVertex3f(x, y, gAgent.getRegion()->getLandHeightRegion(LLVector3(x, y, 0.f)));
-                        }
-                }
-        }
-        glEnd();
-        */
-
         if (mRenderDebugMask & RENDER_DEBUG_COMPOSITION)
         {
                 // Debug composition layers
@@ -2962,358 +3023,163 @@ void LLPipeline::renderDebug()
                 }
                 glEnd();
         }
-
-        if (mRenderDebugMask & RENDER_DEBUG_AGP_MEM)
-        {
-                displayAGP();
-        }
-
-        if (mRenderDebugMask & RENDER_DEBUG_POOLS)
-        {
-                displayPools();
-        }
-
-//      if (mRenderDebugMask & RENDER_DEBUG_QUEUES)
-//      {
-//              displayQueues();
-//      }
-
-        if (mRenderDebugMask & RENDER_DEBUG_MAP)
-        {
-                displayMap();
-        }
 }
 
-
-
-
-BOOL compute_min_max(LLMatrix4& box, LLVector2& min, LLVector2& max)
+void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
 {
-        min.setVec(1000,1000);
-        max.setVec(-1000,-1000);
-
-        if (box.mMatrix[3][3] <= 0.0f) return FALSE;
+        LLMemType mt(LLMemType::MTYPE_PIPELINE);
+        
+        LLVertexBuffer::startRender();
+        
+        glMatrixMode(GL_MODELVIEW);
 
-        const F32 vec[8][3] = { 
-                { -0.5f,-0.5f,-0.5f },
-                { -0.5f,-0.5f,+0.5f },
-                { -0.5f,+0.5f,-0.5f },
-                { -0.5f,+0.5f,+0.5f },
-                { +0.5f,-0.5f,-0.5f },
-                { +0.5f,-0.5f,+0.5f },
-                { +0.5f,+0.5f,-0.5f },
-                { +0.5f,+0.5f,+0.5f } };
-   
-        LLVector4 v;
+        LLGLSDefault gls_default;
+        LLGLSObjectSelect gls_object_select;
+        LLGLDepthTest gls_depth(GL_TRUE,GL_TRUE);
+        disableLights();
+        
+    glEnableClientState ( GL_VERTEX_ARRAY );
 
-        for (S32 i=0;i<8;i++)
+        //for each drawpool
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+        LLGLState::checkStates();
+        LLGLState::checkTextureChannels();
+        LLGLState::checkClientArrays();
+        U32 last_type = 0;
+#endif
+        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
         {
-                v.setVec(vec[i][0],vec[i][1],vec[i][2],1);
-                v = v * box;
-                F32 iw = 1.0f / v.mV[3];
-                v.mV[0] *= iw;
-                v.mV[1] *= iw;
-
-                min.mV[0] = llmin(min.mV[0],v.mV[0]);
-                max.mV[0] = llmax(max.mV[0],v.mV[0]);
-
-                min.mV[1] = llmin(min.mV[1],v.mV[1]);
-                max.mV[1] = llmax(max.mV[1],v.mV[1]);
+                LLDrawPool *poolp = *iter;
+                if (poolp->isFacePool() && hasRenderType(poolp->getType()))
+                {
+                        LLFacePool* face_pool = (LLFacePool*) poolp;
+                        face_pool->renderForSelect();
+                
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+                        if (poolp->getType() != last_type)
+                        {
+                                last_type = poolp->getType();
+                                LLGLState::checkStates();
+                                LLGLState::checkTextureChannels();
+                                LLGLState::checkClientArrays();
+                        }
+#endif
+                }
         }
 
-        /*
-        min.mV[0] = max.mV[0] = box.mMatrix[3][0];
-        min.mV[1] = max.mV[1] = box.mMatrix[3][1];
-        F32        iw  = 1.0f / box.mMatrix[3][3];
-
-        F32 f0 = (fabs(box.mMatrix[0][0])+fabs(box.mMatrix[1][0])+fabs(box.mMatrix[2][0])) * 0.5f;
-        F32 f1 = (fabs(box.mMatrix[0][1])+fabs(box.mMatrix[1][1])+fabs(box.mMatrix[2][1])) * 0.5f;
-        F32 f2 = (fabs(box.mMatrix[0][2])+fabs(box.mMatrix[1][2])+fabs(box.mMatrix[2][2])) * 0.5f;
-
-        min.mV[0] -= f0; 
-        min.mV[1] -= f1; 
-
-        max.mV[0] += f0; 
-        max.mV[1] += f1; 
-
-        min.mV[0] *= iw;
-        min.mV[1] *= iw;
-
-        max.mV[0] *= iw;
-        max.mV[1] *= iw;
-        */
-        return TRUE;
-}
-
-void LLPipeline::displaySSBB()
-{
-        LLMatrix4 proj;
-        LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
-        LLMatrix4 camera;
-        LLMatrix4 comb;
-
-        gCamera->getMatrixToLocal(camera);
-        
-        if (!mBloomImagep)
+        LLGLEnable tex(GL_TEXTURE_2D);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        LLGLEnable alpha_test(GL_ALPHA_TEST);
+        if (gPickTransparent)
         {
-                mBloomImagep = gImageList.getImage(IMG_BLOOM1);
+                glAlphaFunc(GL_GEQUAL, 0.0f);
+        }
+        else
+        {
+                glAlphaFunc(GL_GREATER, 0.2f);
         }
 
-        // don't write to depth buffer with light glows so that chat bubbles can pop through
-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-        LLViewerImage::bindTexture(mBloomImagep);
-
-        glGetFloatv(GL_PROJECTION_MATRIX,(float*)proj.mMatrix);
-
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
+        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
+        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_REPLACE);
+        glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB,         GL_MODULATE);
 
-        LLGLSPipelineAlpha gls_pipeline_alpha;
+        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB,           GL_PRIMARY_COLOR);
+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB,          GL_SRC_COLOR);
 
-        //glScalef(0.25,0.25,0.25);
+        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);
+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
 
-        S32 sizex = gViewerWindow->getWindowWidth() / 2;
-        S32 sizey = gViewerWindow->getWindowHeight() / 2;
+        glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB,         GL_PRIMARY_COLOR_ARB);
+        glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB,        GL_SRC_ALPHA);
 
-        F32 aspect = (float)sizey / (float)sizex;
+        U32 prim_mask = LLVertexBuffer::MAP_VERTEX | 
+                                        LLVertexBuffer::MAP_TEXCOORD;
 
-        for (LLDrawable::drawable_set_t::iterator iter = mLights.begin();
-                 iter != mLights.end(); iter++)
+        for (std::set<LLViewerObject*>::iterator i = objects.begin(); i != objects.end(); ++i)
         {
-                LLDrawable *lightp = *iter;
-                if (lightp->isDead())
+                LLViewerObject* vobj = *i;
+                LLDrawable* drawable = vobj->mDrawable;
+                if (vobj->isDead() || 
+                        vobj->isHUDAttachment() ||
+                        (gHideSelectedObjects && vobj->isSelected()) ||
+                        drawable->isDead() || 
+                        !hasRenderType(drawable->getRenderType()))
                 {
                         continue;
                 }
-                
-                LLMatrix4 mat = lightp->mXform.getWorldMatrix();
 
-                mat *= camera;
-                mat *= cfr;
-                mat *= proj;
-
-                U8  color[64];
-
-                LLVector2 min,max;
-                if (mat.mMatrix[3][3] < 160 && compute_min_max(mat,min,max))
+                for (S32 j = 0; j < drawable->getNumFaces(); ++j)
                 {
-                        F32 cx = (max.mV[0] + min.mV[0]) * 0.5f;
-                        F32 cy = (max.mV[1] + min.mV[1]) * 0.5f;
-                        F32 sx = (max.mV[0] - min.mV[0]) * 2.0f;
-                        F32 sy = (max.mV[1] - min.mV[1]) * 2.0f;
-                        S32 x  = (S32)(cx * (F32)sizex) + sizex;
-                        S32 y  = (S32)(cy * (F32)sizey) + sizey;
-
-                        if (cx > -1 && cx < 1 && cy > -1 && cy < 1)
+                        LLFace* facep = drawable->getFace(j);
+                        if (!facep->getPool())
                         {
-                                glReadPixels(x-2,y-2,4,4,GL_RGBA,GL_UNSIGNED_BYTE,&color[0]);
-
-                                S32 total = 0;
-                                for (S32 i=0;i<64;i++)
-                                {
-                                        total += color[i];
-                                }
-                                total /= 64;
-
-                                sx = (sy = (sx + sy) * 0.5f * ((float)total/255.0f)) * aspect;
-
-
-                                if (total > 60)
-                                {
-                                        color[3+32] = total >> 1;
-                                        glBegin(GL_QUADS);
-                                        glColor4ubv(&color[32]);
-                                        glTexCoord2f(0,0);
-                                        glVertex3f(cx-sx,cy-sy,0);
-                                        glTexCoord2f(1,0);
-                                        glVertex3f(cx+sx,cy-sy,0);
-                                        glTexCoord2f(1,1);
-                                        glVertex3f(cx+sx,cy+sy,0);
-                                        glTexCoord2f(0,1);
-                                        glVertex3f(cx-sx,cy+sy,0);
-                                        glEnd();
-                                }
+                                facep->renderForSelect(prim_mask);
                         }
                 }
-
         }
 
-        // sun
+        // pick HUD objects
+        LLVOAvatar* avatarp = gAgent.getAvatarObject();
+        if (avatarp && sShowHUDAttachments)
         {
-                LLVector4 sdir(gSky.getSunDirection() * 10000.0f + gAgent.getPositionAgent());
-                sdir.mV[3] = 1.0f;
-                sdir = sdir * camera;
-                sdir = sdir * cfr;
-                sdir = sdir * proj; // todo: preconcat
+                glMatrixMode(GL_PROJECTION);
+                glPushMatrix();
+                glMatrixMode(GL_MODELVIEW);
+                glPushMatrix();
 
-                sdir.mV[0] /= sdir.mV[3];
-                sdir.mV[1] /= sdir.mV[3];
-
-                U8  color[64];
-
-                if (sdir.mV[3] > 0)
+                setup_hud_matrices(TRUE);
+                LLViewerJointAttachment* attachmentp;
+                for (attachmentp = avatarp->mAttachmentPoints.getFirstData();
+                        attachmentp;
+                        attachmentp = avatarp->mAttachmentPoints.getNextData())
                 {
-                        F32 cx = sdir.mV[0];
-                        F32 cy = sdir.mV[1];
-                        F32 sx, sy;
-                        S32 x  = (S32)(cx * (F32)sizex) + sizex;
-                        S32 y  = (S32)(cy * (F32)sizey) + sizey;
-
-                        if (cx > -1 && cx < 1 && cy > -1 && cy < 1)
+                        if (attachmentp->getIsHUDAttachment())
                         {
-                                glReadPixels(x-2,y-2,4,4,GL_RGBA,GL_UNSIGNED_BYTE,&color[0]);
-
-                                S32 total = 0;
-                                for (S32 i=0;i<64;i++)
+                                LLViewerObject* objectp = attachmentp->getObject();
+                                if (objectp)
                                 {
-                                        total += color[i];
-                                }
-                                total >>= 7;
-
-                                sx = (sy = ((float)total/255.0f)) * aspect;
-
-                                const F32 fix = -0.1f;
+                                        LLDrawable* drawable = objectp->mDrawable;
+                                        if (drawable->isDead())
+                                        {
+                                                continue;
+                                        }
 
-                                color[32] = (U8)(color[32] * 0.5f + 255 * 0.5f);
-                                color[33] = (U8)(color[33] * 0.5f + 255 * 0.5f);
-                                color[34] = (U8)(color[34] * 0.5f + 255 * 0.5f);
+                                        for (S32 j = 0; j < drawable->getNumFaces(); ++j)
+                                        {
+                                                LLFace* facep = drawable->getFace(j);
+                                                if (!facep->getPool())
+                                                {
+                                                        facep->renderForSelect(prim_mask);
+                                                }
+                                        }
 
-                                if (total > 80)
-                                {
-                                        color[32+3]  = (U8)total;
-                                        glBegin(GL_QUADS);
-                                        glColor4ubv(&color[32]);
-                                        glTexCoord2f(0,0);
-                                        glVertex3f(cx-sx,cy-sy+fix,0);
-                                        glTexCoord2f(1,0);
-                                        glVertex3f(cx+sx,cy-sy+fix,0);
-                                        glTexCoord2f(1,1);
-                                        glVertex3f(cx+sx,cy+sy+fix,0);
-                                        glTexCoord2f(0,1);
-                                        glVertex3f(cx-sx,cy+sy+fix,0);
-                                        glEnd();
-                                }
+                                        //render child faces
+                                        for (U32 k = 0; k < drawable->getChildCount(); ++k)
+                                        {
+                                                LLDrawable* child = drawable->getChild(k);
+                                                for (S32 l = 0; l < child->getNumFaces(); ++l)
+                                                {
+                                                        LLFace* facep = child->getFace(l);
+                                                        if (!facep->getPool())
+                                                        {
+                                                                facep->renderForSelect(prim_mask);
+                                                        }
+                                                }
+                                        }
+                                }       
                         }
                 }
-        }
 
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-}
-
-void LLPipeline::displayMap()
-{
-        LLGLSPipelineAlpha gls_pipeline_alpha;
-        LLGLSNoTexture no_texture;
-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-
-        glTranslatef(-1,-1,0);
-        glScalef(2,2,0);
-
-        glColor4f(0,0,0,0.5);
-        glBegin(GL_QUADS);
-        glVertex3f(0,0,0);
-        glVertex3f(1,0,0);
-        glVertex3f(1,1,0);
-        glVertex3f(0,1,0);
-        glEnd();
-
-        static F32 totalW = 1.5f;
-        static F32 offset = 0.5f;
-        static F32 scale  = 1.0f;
-
-        S32 mousex = gViewerWindow->getCurrentMouseX();
-        S32 mousey = gViewerWindow->getCurrentMouseY();
-        S32 w      = gViewerWindow->getWindowWidth();
-        S32 h      = gViewerWindow->getWindowHeight();
-
-        if (mousex < 20 && offset > 0) offset -= (20 - mousex) * 0.02f;
-        if (mousex > (w - 20))         offset += (20 - (w - mousex)) * 0.02f;
-        if (offset > (totalW-1))       offset = (totalW-1);
-
-        if (mousey < 20 && scale > 0.1)        scale -= (20 - mousey) * 0.001f;
-        if (mousey > (h - 20) && scale < 1.0f) scale += (20 - (h - mousey)) * 0.001f;
-
-        glScalef(scale*scale,scale,1);
-        glTranslatef(-offset,0,0);
-        //totalW = mStaticTree->render2D(0,0.8f/scale);
-        //mDynamicTree->render2D(0,0.4f/scale);
-
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-}
-
-void LLPipeline::renderForSelect()
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-        //for each drawpool
-
-        glMatrixMode(GL_MODELVIEW);
-
-        LLGLSDefault gls_default;
-        LLGLSObjectSelect gls_object_select;
-        LLGLDepthTest gls_depth(GL_TRUE);
-        disableLights();
-        
-    glEnableClientState ( GL_VERTEX_ARRAY );
-        glDisableClientState( GL_NORMAL_ARRAY );
-    glDisableClientState( GL_TEXTURE_COORD_ARRAY );
-
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        LLGLState::checkStates();
-        LLGLState::checkTextureChannels();
-        LLGLState::checkClientArrays();
-        U32 last_type = 0;
-#endif
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                if (poolp->canUseAGP() && usingAGP())
-                {
-                        bindAGP();
-                }
-                else
-                {
-                        //llinfos << "Rendering pool type " << p->getType() << " without AGP!" << llendl;
-                        unbindAGP();
-                }
-                poolp->renderForSelect();
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-                if (poolp->getType() != last_type)
-                {
-                        last_type = poolp->getType();
-                        LLGLState::checkStates();
-                        LLGLState::checkTextureChannels();
-                        LLGLState::checkClientArrays();
-                }
-#endif
+                glMatrixMode(GL_PROJECTION);
+                glPopMatrix();
+                glMatrixMode(GL_MODELVIEW);
+                glPopMatrix();
         }
 
-        // Disable all of the client state
-        glDisableClientState( GL_VERTEX_ARRAY );
-
-        if (mAGPMemPool)
-        {
-                mAGPMemPool->waitFence(mGlobalFence);
-                mAGPMemPool->sendFence(mGlobalFence);
-        }
+        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+        glDisableClientState( GL_TEXTURE_COORD_ARRAY );
+        
+        LLVertexBuffer::stopRender();
 }
 
 void LLPipeline::renderFaceForUVSelect(LLFace* facep)
@@ -3325,7 +3191,6 @@ void LLPipeline::rebuildPools()
 {
         LLMemType mt(LLMemType::MTYPE_PIPELINE);
         S32 max_count = mPools.size();
-        S32 num_rebuilds = 0;
         pool_set_t::iterator iter1 = mPools.upper_bound(mLastRebuildPool);
         while(max_count > 0 && mPools.size() > 0) // && num_rebuilds < MAX_REBUILDS)
         {
@@ -3334,8 +3199,8 @@ void LLPipeline::rebuildPools()
                         iter1 = mPools.begin();
                 }
                 LLDrawPool* poolp = *iter1;
-                num_rebuilds += poolp->rebuild();
-                if (poolp->mReferences.empty())
+
+                if (poolp->isDead())
                 {
                         mPools.erase(iter1++);
                         removeFromQuickLookup( poolp );
@@ -3365,27 +3230,35 @@ void LLPipeline::addToQuickLookup( LLDrawPool* new_poolp )
         switch( new_poolp->getType() )
         {
         case LLDrawPool::POOL_SIMPLE:
-                mSimplePools[ uintptr_t(new_poolp->getTexture()) ] = new_poolp ;
+                if (mSimplePool)
+                {
+                        llassert(0);
+                        llwarns << "Ignoring duplicate simple pool." << llendl;
+                }
+                else
+                {
+                        mSimplePool = (LLRenderPass*) new_poolp;
+                }
                 break;
 
         case LLDrawPool::POOL_TREE:
                 mTreePools[ uintptr_t(new_poolp->getTexture()) ] = new_poolp ;
                 break;
-
-        case LLDrawPool::POOL_TREE_NEW:
-                mTreeNewPools[ uintptr_t(new_poolp->getTexture()) ] = new_poolp ;
-                break;
  
         case LLDrawPool::POOL_TERRAIN:
                 mTerrainPools[ uintptr_t(new_poolp->getTexture()) ] = new_poolp ;
                 break;
 
         case LLDrawPool::POOL_BUMP:
-                mBumpPools[ uintptr_t(new_poolp->getTexture()) ] = new_poolp ;
-                break;
-
-        case LLDrawPool::POOL_MEDIA:
-                mMediaPools[ uintptr_t(new_poolp->getTexture()) ] = new_poolp ;
+                if (mBumpPool)
+                {
+                        llassert(0);
+                        llwarns << "Ignoring duplicate bump pool." << llendl;
+                }
+                else
+                {
+                        mBumpPool = new_poolp;
+                }
                 break;
 
         case LLDrawPool::POOL_ALPHA:
@@ -3400,6 +3273,18 @@ void LLPipeline::addToQuickLookup( LLDrawPool* new_poolp )
                 }
                 break;
 
+        case LLDrawPool::POOL_ALPHA_POST_WATER:
+                if( mAlphaPoolPostWater )
+                {
+                        llassert(0);
+                        llwarns << "LLPipeline::addPool(): Ignoring duplicate Alpha pool" << llendl;
+                }
+                else
+                {
+                        mAlphaPoolPostWater = new_poolp;
+                }
+                break;
+
         case LLDrawPool::POOL_AVATAR:
                 break; // Do nothing
 
@@ -3426,19 +3311,7 @@ void LLPipeline::addToQuickLookup( LLDrawPool* new_poolp )
                         mStarsPool = new_poolp;
                 }
                 break;
-
-        case LLDrawPool::POOL_CLOUDS:
-                if( mCloudsPool )
-                {
-                        llassert(0);
-                        llwarns << "LLPipeline::addPool(): Ignoring duplicate Clouds pool" << llendl;
-                }
-                else
-                {
-                        mCloudsPool = new_poolp;
-                }
-                break;
-
+        
         case LLDrawPool::POOL_WATER:
                 if( mWaterPool )
                 {
@@ -3463,14 +3336,6 @@ void LLPipeline::addToQuickLookup( LLDrawPool* new_poolp )
                 }
                 break;
 
-        case LLDrawPool::POOL_HUD:
-                if( mHUDPool )
-                {
-                        llerrs << "LLPipeline::addPool(): Duplicate HUD Pool!" << llendl;
-                }
-                mHUDPool = new_poolp;
-                break;
-
         default:
                 llassert(0);
                 llwarns << "Invalid Pool Type in  LLPipeline::addPool()" << llendl;
@@ -3491,14 +3356,8 @@ void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp )
         switch( poolp->getType() )
         {
         case LLDrawPool::POOL_SIMPLE:
-                #ifdef _DEBUG
-                        {
-                                BOOL found = mSimplePools.erase( (uintptr_t)poolp->getTexture() );
-                                llassert( found );
-                        }
-                #else
-                        mSimplePools.erase( (uintptr_t)poolp->getTexture() );
-                #endif
+                llassert(mSimplePool == poolp);
+                mSimplePool = NULL;
                 break;
 
         case LLDrawPool::POOL_TREE:
@@ -3512,17 +3371,6 @@ void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp )
                 #endif
                 break;
 
-        case LLDrawPool::POOL_TREE_NEW:
-                #ifdef _DEBUG
-                        {
-                                BOOL found = mTreeNewPools.erase( (uintptr_t)poolp->getTexture() );
-                                llassert( found );
-                        }
-                #else
-                        mTreeNewPools.erase( (uintptr_t)poolp->getTexture() );
-                #endif
-                break;
-
         case LLDrawPool::POOL_TERRAIN:
                 #ifdef _DEBUG
                         {
@@ -3535,32 +3383,20 @@ void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp )
                 break;
 
         case LLDrawPool::POOL_BUMP:
-                #ifdef _DEBUG
-                        {
-                                BOOL found = mBumpPools.erase( (uintptr_t)poolp->getTexture() );
-                                llassert( found );
-                        }
-                #else
-                        mBumpPools.erase( (uintptr_t)poolp->getTexture() );
-                #endif
-                break;
-
-        case LLDrawPool::POOL_MEDIA:
-                #ifdef _DEBUG
-                        {
-                                BOOL found = mMediaPools.erase( (uintptr_t)poolp->getTexture() );
-                                llassert( found );
-                        }
-                #else
-                        mMediaPools.erase( (uintptr_t)poolp->getTexture() );
-                #endif
+                llassert( poolp == mBumpPool );
+                mBumpPool = NULL;
                 break;
-
+        
         case LLDrawPool::POOL_ALPHA:
                 llassert( poolp == mAlphaPool );
                 mAlphaPool = NULL;
                 break;
 
+        case LLDrawPool::POOL_ALPHA_POST_WATER:
+                llassert( poolp == mAlphaPoolPostWater );
+                mAlphaPoolPostWater = NULL;
+                break;
+
         case LLDrawPool::POOL_AVATAR:
                 break; // Do nothing
 
@@ -3574,11 +3410,6 @@ void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp )
                 mStarsPool = NULL;
                 break;
 
-        case LLDrawPool::POOL_CLOUDS:
-                llassert( poolp == mCloudsPool );
-                mCloudsPool = NULL;
-                break;
-
         case LLDrawPool::POOL_WATER:
                 llassert( poolp == mWaterPool );
                 mWaterPool = NULL;
@@ -3589,11 +3420,6 @@ void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp )
                 mGroundPool = NULL;
                 break;
 
-        case LLDrawPool::POOL_HUD:
-                llassert( poolp == mHUDPool );
-                mHUDPool = NULL;
-                break;
-
         default:
                 llassert(0);
                 llwarns << "Invalid Pool Type in  LLPipeline::removeFromQuickLookup() type=" << poolp->getType() << llendl;
@@ -3601,17 +3427,6 @@ void LLPipeline::removeFromQuickLookup( LLDrawPool* poolp )
         }
 }
 
-void LLPipeline::flushAGPMemory()
-{
-        LLMemType mt(LLMemType::MTYPE_PIPELINE);
-
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                poolp->flushAGP();
-        }
-}
-
 void LLPipeline::resetDrawOrders()
 {
         // Iterate through all of the draw pools and rebuild them.
@@ -3622,346 +3437,6 @@ void LLPipeline::resetDrawOrders()
         }
 }
 
-//-------------------------------
-
-
-LLViewerObject *LLPipeline::nearestObjectAt(F32 yaw, F32 pitch)
-{
-        // Stub to find nearest Object at given yaw and pitch
-
-        /*
-        LLEdge *vd = NULL;
-
-        if (vd) 
-        {
-                return (LLViewerObject*)vd->mDrawablep->getVObj();
-        }
-        */
-
-        return NULL;
-}
-
-void LLPipeline::printPools()
-{
-        /*
-        // Iterate through all of the draw pools and rebuild them.
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                if (pool->mTexturep[0])
-                {
-                        llinfos << "Op pool " << pool->mTexturep[0]->mID << llendflush;
-                }
-                else
-                {
-                        llinfos << "Opaque pool NULL" << llendflush;
-                }
-                llinfos << " Vertices: \t" << pool->getVertexCount() << llendl;
-        }
-
-
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                llinfos << "Al pool " << pool;
-                llcont << " Vertices: \t" << pool->getVertexCount() << llendl;
-        }
-
-        pool = mHighlightPools.getFirst();
-        llinfos << "Si pool " << pool;
-        llcont << " Vertices: \t" << pool->getVertexCount() << llendl;
-        */
-}
-
-
-void LLPipeline::displayPools()
-{
-        // Needs to be fixed to handle chained pools - djs
-        LLUI::setLineWidth(1.0);
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        LLGLSPipelineAlpha gls_pipeline_alpha;
-        LLGLSNoTexture no_texture;
-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-
-        glScalef(2,2,1);
-        glTranslatef(-0.5f,-0.5f,0);
-
-        F32 x   = 0.0f,    y   = 0.05f;
-        F32 xs  = 0.01f,   ys  = 0.01f;
-        F32 xs2 = xs*0.1f, ys2 = ys * 0.1f;
-
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLGLSTexture gls_texture;
-                LLDrawPool *poolp = *iter;
-                if (poolp->getDebugTexture())
-                {
-                        poolp->getDebugTexture()->bind();
-                        glColor4f(1,1,1,1);
-                        stamp(x,y,xs*4,ys*4);
-                }
-
-                LLGLSNoTexture no_texture;
-
-                F32 a = 1.f - (F32)poolp->mRebuildTime / (F32)poolp->mRebuildFreq;
-                glColor4f(a,a,a,1);
-                stamp(x,y,xs,ys);
-
-                x =  (xs + xs2) * 4.0f;
-
-                F32 h = ys * 0.5f;
-
-                S32 total = 0;
-                
-                for (std::vector<LLFace*>::iterator iter = poolp->mReferences.begin();
-                         iter != poolp->mReferences.end(); iter++)
-                {
-                        LLFace *face = *iter;
-                        F32        w = xs;
-
-                        if (!face || !face->getDrawable())
-                        {
-                                w = 16 / 3000.0f;
-
-                                stamp(x,y,w,h);
-
-                                if (x+w > 0.95f) 
-                                {
-                                        x  = (xs + xs2) * 4.0f;
-                                        y +=  h + ys2;
-                                }
-                                else
-                                {
-                                        if (w) x += w + xs2;
-                                }
-
-                                continue;
-                        }
-
-                        if (face->getDrawable()->isVisible())
-                        {
-                                if (face->isState(LLFace::BACKLIST))
-                                {
-                                        glColor4f(1,0,1,1);
-                                }
-                                else if (total > poolp->getMaxVertices())
-                                {
-                                        glColor4f(1,0,0,1);
-                                }
-                                else
-                                {
-                                        glColor4f(0,1,0,1);
-                                        total += face->getGeomCount();
-                                }
-                        }
-                        else
-                        {
-                                if (face->isState(LLFace::BACKLIST))
-                                {
-                                        glColor4f(0,0,1,1);
-                                }
-                                else
-                                {
-                                        glColor4f(1,1,0,1);
-                                }
-                        }
-
-                        w = face->getGeomCount() / 3000.0f;
-
-                        stamp(x,y,w,h);
-
-                        if (x+w > 0.95f) 
-                        {
-                                x  = (xs + xs2) * 4.0f;
-                                y +=  h + ys2;
-                        }
-                        else
-                        {
-                                if (w) x += w + xs2;
-                        }
-                }
-
-                y   += ys + ys2;
-                x    = 0;
-        }
-
-        glPopMatrix();
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-        glMatrixMode(GL_MODELVIEW);
-}
-
-static F32 xs  = 0.01f,   ys  = 0.01f;
-static F32 xs2 = xs*0.1f, ys2 = ys * 0.1f;
-static F32 winx, winy;
-
-void displayDrawable(F32 &x, F32 &y, LLDrawable *drawable, F32 alpha = 0.5f)
-{
-        F32 w   = 0;
-        F32 h   = ys * 0.5f;
-
-        if (drawable && !drawable->isDead())
-        {
-                for (S32 f=0;f < drawable->getNumFaces(); f++)
-                {
-                        w += drawable->getFace(f)->getGeomCount() / 30000.0f;
-                }
-                w+=xs;
-                glColor4f(1,1,0, alpha);
-        }
-        else
-        {
-                w = 0.01f;
-                glColor4f(0,0,0,alpha);
-        }
-
-//      const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
-
-//      U8 pcode = drawable->getVObj()->getPCode();
-
-        //char *string = (char*)LLPrimitive::pCodeToString(pcode);
-        //if (pcode == 0x3e)      string = "terrain";
-        //else if (pcode == 0x2e) string = "cloud";
-        //string[3] = 0;
-
-        stamp(x * winx,y * winy,w * winx,h * winy);
-
-        /*
-        glColor4f(0,0,0,1);
-        font->render(string,x*winx+1,y*winy+1);
-        LLGLSNoTexture no_texture;
-        */
-
-        if (x+w > 0.95f) 
-        {
-                x  = (xs + xs2) * 4.0f;
-                y +=  h + ys2;
-        }
-        else
-        {
-                if (w) x += w + xs2;
-        }
-
-}
-
-#if 0 // No longer up date
-
-void displayQueue(F32 &x, F32 &y, LLDynamicArray<LLDrawable*>& processed, LLDynamicQueuePtr<LLPointer<LLDrawable> >& remaining)
-{
-        S32 i;
-        for (i=0;i<processed.count();i++)
-        {
-                displayDrawable(x,y,processed[i],1);
-        }
-
-        x += xs * 2;
-
-        S32 count = remaining.count();
-        for (i=0;i<count;i++)
-        {
-                LLDrawable* drawablep = remaining[(i + remaining.getFirst()) % remaining.getMax()];
-                if (drawablep && !drawablep->isDead())
-                {
-                        displayDrawable(x,y,drawable,0.5);
-                }
-        }
-
-        y  += ys * 4;
-        x   = (xs + xs2) * 4.0f;
-
-}
-
-void LLPipeline::displayQueues()
-{
-        LLUI::setLineWidth(1.0);
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        LLGLSPipelineAlpha gls_pipeline_alpha;
-        LLGLSNoTexture no_texture;
-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-
-        glScalef(2,2,1);
-        glTranslatef(-0.5f,-0.5f,0);
-
-        winx = (F32)gViewerWindow->getWindowWidth();
-        winy = (F32)gViewerWindow->getWindowHeight();
-
-        glScalef(1.0f/winx,1.0f/winy,1);
-
-        F32 x  = (xs + xs2) * 4.0f;
-        F32 y = 0.1f;
-
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
-
-        font->renderUTF8("Build1", 0,0,(S32)(y*winy),LLColor4(1,1,1,1));
-        displayQueue(x,y, gBuildProcessed, mBuildQ1);
-
-        glPopMatrix();
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-        glMatrixMode(GL_MODELVIEW);
-
-}
-
-#endif
-
-// static
-void render_bbox(const LLVector3 &min, const LLVector3 &max)
-{
-        S32 i;
-        LLVector3 verticesp[16];
-
-        verticesp[0].setVec(min.mV[0],min.mV[1],max.mV[2]);
-        verticesp[1].setVec(min.mV[0],min.mV[1],min.mV[2]);
-        verticesp[2].setVec(min.mV[0],max.mV[1],min.mV[2]);
-        verticesp[3].setVec(min.mV[0],max.mV[1],max.mV[2]);
-        verticesp[4].setVec(max.mV[0],max.mV[1],max.mV[2]);
-        verticesp[5].setVec(max.mV[0],max.mV[1],min.mV[2]);
-        verticesp[6].setVec(max.mV[0],min.mV[1],min.mV[2]);
-        verticesp[7].setVec(max.mV[0],min.mV[1],max.mV[2]);
-        verticesp[8 ] = verticesp[0];
-        verticesp[9 ] = verticesp[1];
-        verticesp[10] = verticesp[6];
-        verticesp[11] = verticesp[7];
-        verticesp[12] = verticesp[4];
-        verticesp[13] = verticesp[5];
-        verticesp[14] = verticesp[2];
-        verticesp[15] = verticesp[3];
-
-        LLGLSNoTexture gls_no_texture;
-        {
-                LLUI::setLineWidth(1.f);
-                glBegin(GL_LINE_LOOP);
-                for (i = 0; i < 16; i++)
-                {
-                        glVertex3fv(verticesp[i].mV);
-                }
-                glEnd();
-        }
-        {
-                LLGLDepthTest gls_depth(GL_TRUE);
-                LLUI::setLineWidth(3.0f);
-                glBegin(GL_LINE_LOOP);
-                for (i = 0; i < 16; i++)
-                {
-                        glVertex3fv(verticesp[i].mV);
-                }
-                glEnd();
-        }
-        LLUI::setLineWidth(1.0f);
-}
-
 //============================================================================
 // Once-per-frame setup of hardware lights,
 // including sun/moon, avatar backlight, and up to 6 local lights
@@ -4173,8 +3648,6 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
 {
         const LLColor4 black(0,0,0,1);
 
-        setLightingDetail(-1); // update
-        
         // Ambient
         LLColor4 ambient = gSky.getTotalAmbientColor();
         glLightModelfv(GL_LIGHT_MODEL_AMBIENT,ambient.mV);
@@ -4430,16 +3903,6 @@ class LLVOBranch;
 class LLVOLeaf;
 class Foo;
 
-template<> char* LLAGPArray<U8>::sTypeName               = "U8        [AGP]";
-template<> char* LLAGPArray<U32>::sTypeName              = "U32       [AGP]";
-template<> char* LLAGPArray<F32>::sTypeName              = "F32       [AGP]";
-template<> char* LLAGPArray<LLColor4>::sTypeName         = "LLColor4  [AGP]";
-template<> char* LLAGPArray<LLColor4U>::sTypeName        = "LLColor4U [AGP]";
-template<> char* LLAGPArray<LLVector4>::sTypeName        = "LLVector4 [AGP]";
-template<> char* LLAGPArray<LLVector3>::sTypeName        = "LLVector3 [AGP]";
-template<> char* LLAGPArray<LLVector2>::sTypeName        = "LLVector2 [AGP]";
-template<> char* LLAGPArray<LLFace*>::sTypeName          = "LLFace*   [AGP]";
-
 void scale_stamp(const F32 x, const F32 y, const F32 xs, const F32 ys)
 {
         stamp(0.25f + 0.5f*x,
@@ -4481,221 +3944,6 @@ void drawBars(const F32 begin, const F32 end, const F32 height = 1.f)
         }
 }
 
-void LLPipeline::displayAGP()
-{
-        LLUI::setLineWidth(1.0);
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        LLGLSPipelineAlpha gls_alpha;
-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
-
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-        glScalef(2,2,1);
-        glTranslatef(-0.5f,-0.5f,0);
-
-        glColor4f(0,0,0,0.5f);
-        scale_stamp(0,0,1,1);
-
-        F32 x   = 0.0f,    y   = 0.05f;
-        F32 xs  = 0.015f,   ys  = 0.015f;
-        F32 xs2 = xs*0.1f, ys2 = ys * 0.1f;
-        F32 w   = xs+xs2, h    = ys + ys2;
-        S32 i=0;
-
-        F32 agp_size = 1.f;
-        if (mAGPMemPool)
-        {
-                agp_size = (F32)mAGPMemPool->getSize();
-        }
-
-        x  = (xs + xs2) * 4.0f;
-        
-        static float c = 0.0f;
-        c += 0.0001f;
-
-        LLAGPMemBlock *blockp = mBufferMemory[mBufferIndex]->getAGPMemBlock();
-
-        pool_set_t::iterator iter = mPools.begin();
-        LLDrawPool *poolp = *iter;
-        
-        // Dump the shared AGP buffer
-        if (blockp)
-        {
-                F32 begin = blockp->getOffset()/agp_size;
-                F32 end   = begin + (blockp->getSize()/agp_size);
-                F32 used = begin + (poolp->mMemory.count()/agp_size);
-
-                LLViewerImage::bindTexture(NULL);
-                glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
-                drawBars(begin,end);
-
-                LLViewerImage::bindTexture(NULL);
-                glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
-                drawBars(begin,end);
-
-                LLViewerImage::bindTexture(NULL);
-                glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
-                drawBars(begin,used, 0.5f);
-
-                glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
-                drawBars(begin,end, 0.25f);
-        }
-
-        S32 used_bytes = 0;
-        S32 total_bytes = 0;
-        while (iter != mPools.end())
-        {
-                poolp = *iter++;
-
-                BOOL synced = FALSE;
-                i++;
-                total_bytes += poolp->mMemory.getMax();
-                used_bytes += poolp->mMemory.count();
-                LLViewerImage *texturep = poolp->getDebugTexture();
-
-
-                if (poolp->mMemory.mSynced)
-                {
-                        poolp->mMemory.mSynced = FALSE;
-                        synced = TRUE;
-                }
-
-                LLAGPMemBlock *blockp = poolp->mMemory.getAGPMemBlock();
-                if (blockp)
-                {
-                        F32 begin = blockp->getOffset()/agp_size;
-                        F32 end   = begin + (blockp->getSize()/agp_size);
-                        F32 used = begin + (poolp->mMemory.count()/agp_size);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor4f(1.f, 0.5f, 0.5f, 0.5f);
-                        drawBars(begin,end);
-
-                        LLViewerImage::bindTexture(texturep);
-                        glColor4f(1.f, 0.75f, 0.75f, 0.5f);
-                        drawBars(begin,end);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor4f(1.f, 0.75f, 0.75f, 1.f);
-                        drawBars(begin,used, 0.5f);
-
-                        glColor3fv(poolp->getDebugColor().mV);
-                        drawBars(begin,end, 0.25f);
-
-                        if (synced)
-                        {
-                                LLViewerImage::bindTexture(NULL);
-                                glColor4f(1.f, 1.f, 1.f, 0.4f);
-                                drawBars(begin,end);
-                        }
-                }
-
-                synced = FALSE;
-                if (poolp->mWeights.mSynced)
-                {
-                        poolp->mWeights.mSynced = FALSE;
-                        synced = TRUE;
-                }
-                blockp = poolp->mWeights.getAGPMemBlock();
-                if (blockp)
-                {
-                        F32 begin = blockp->getOffset()/agp_size;
-                        F32 end   = begin + (blockp->getSize()/agp_size);
-                        F32 used = begin + (poolp->mWeights.count()*sizeof(float)/agp_size);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor4f(0.0f, 0.f, 0.75f, 0.5f);
-                        drawBars(begin,end);
-
-                        LLViewerImage::bindTexture(texturep);
-                        glColor4f(0.0, 0.f, 0.75f, 0.5f);
-                        drawBars(begin,end);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor4f(0.0, 0.f, 0.75f, 1.f);
-                        drawBars(begin,used, 0.5f);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor3fv(poolp->getDebugColor().mV);
-                        drawBars(begin,end, 0.25f);
-
-                        if (synced)
-                        {
-                                LLViewerImage::bindTexture(NULL);
-                                glColor4f(1.f, 1.f, 1.f, 0.4f);
-                                drawBars(begin,end);
-                        }
-                }
-
-                synced = FALSE;
-                if (poolp->mClothingWeights.mSynced)
-                {
-                        poolp->mClothingWeights.mSynced = FALSE;
-                        synced = TRUE;
-                }
-                blockp = poolp->mClothingWeights.getAGPMemBlock();
-                if (blockp)
-                {
-                        F32 begin = blockp->getOffset()/agp_size;
-                        F32 end   = begin + (blockp->getSize()/agp_size);
-                        F32 used = begin + (poolp->mClothingWeights.count()*sizeof(LLVector4)/agp_size);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor4f(0.75f, 0.f, 0.75f, 0.5f);
-                        drawBars(begin,end);
-
-                        LLViewerImage::bindTexture(texturep);
-                        glColor4f(0.75f, 0.f, 0.75f, 0.5f);
-                        drawBars(begin,end);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor4f(0.75f, 0.f, 0.75f, 0.5f);
-                        drawBars(begin,used, 0.5f);
-
-                        LLViewerImage::bindTexture(NULL);
-                        glColor3fv(poolp->getDebugColor().mV);
-                        drawBars(begin,end, 0.25f);
-
-                        if (synced)
-                        {
-                                LLViewerImage::bindTexture(NULL);
-                                glColor4f(1.f, 1.f, 1.f, 0.5f);
-                                drawBars(begin,end);
-                        }
-                }
-
-                //
-                // Stamps on bottom of screen
-                //
-                LLViewerImage::bindTexture(texturep);
-                glColor4f(1.f, 1.f, 1.f, 1.f);
-                stamp(x,y,xs,ys);
-
-                LLViewerImage::bindTexture(NULL);
-                glColor3fv(poolp->getDebugColor().mV);
-                stamp(x,y,xs, ys*0.25f);
-                if (x+w > 0.95f) 
-                {
-                        x  = (xs + xs2) * 4.0f;
-                        y +=  h;
-                }
-                else
-                {
-                        x += w + xs2;
-                }
-        }
-
-        glPopMatrix();
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-        glMatrixMode(GL_MODELVIEW);
-}
-
 void LLPipeline::findReferences(LLDrawable *drawablep)
 {
         if (std::find(mVisibleList.begin(), mVisibleList.end(), drawablep) != mVisibleList.end())
@@ -4706,7 +3954,7 @@ void LLPipeline::findReferences(LLDrawable *drawablep)
         {
                 llinfos << "In mLights" << llendl;
         }
-        if (mMovedList.find(drawablep) != mMovedList.end())
+        if (std::find(mMovedList.begin(), mMovedList.end(), drawablep) != mMovedList.end())
         {
                 llinfos << "In mMovedList" << llendl;
         }
@@ -4718,18 +3966,14 @@ void LLPipeline::findReferences(LLDrawable *drawablep)
         {
                 llinfos << "In mRetexturedList" << llendl;
         }
-        if (mRematerialedList.find(drawablep) != mRematerialedList.end())
-        {
-                llinfos << "In mRematerialedList" << llendl;
-        }
-
+        
         if (mActiveQ.find(drawablep) != mActiveQ.end())
         {
                 llinfos << "In mActiveQ" << llendl;
         }
-        if (mBuildQ1.find(drawablep) != mBuildQ1.end())
+        if (std::find(mBuildQ1.begin(), mBuildQ1.end(), drawablep) != mBuildQ1.end())
         {
-                llinfos << "In mBuildQ2" << llendl;
+                llinfos << "In mBuildQ1" << llendl;
         }
         if (std::find(mBuildQ2.begin(), mBuildQ2.end(), drawablep) != mBuildQ2.end())
         {
@@ -4737,19 +3981,7 @@ void LLPipeline::findReferences(LLDrawable *drawablep)
         }
 
         S32 count;
-        /*
-        count = mStaticTree->count(drawablep);
-        if (count)
-        {
-                llinfos << "In mStaticTree: " << count << " references" << llendl;
-        }
-
-        count = mDynamicTree->count(drawablep);
-        if (count)
-        {
-                llinfos << "In mStaticTree: " << count << " references" << llendl;
-        }
-        */
+        
         count = gObjectList.findReferences(drawablep);
         if (count)
         {
@@ -4776,53 +4008,6 @@ BOOL LLPipeline::verify()
         return ok;
 }
 
-S32 LLPipeline::getAGPMemUsage()
-{
-        if (mAGPMemPool)
-        {
-                return mAGPMemPool->getSize();
-        }
-        else
-        {
-                return 0;
-        }
-}
-
-S32 LLPipeline::getMemUsage(const BOOL print)
-{
-        S32 mem_usage = 0;
-
-        if (mAGPMemPool)
-        {
-                S32 agp_usage = 0;
-                agp_usage = mAGPMemPool->getSize();
-                if (print)
-                {
-                        llinfos << "AGP Mem: " << agp_usage << llendl;
-                        llinfos << "AGP Mem used: " << mAGPMemPool->getTotalAllocated() << llendl;
-                }
-                mem_usage += agp_usage;
-        }
-
-
-        S32 pool_usage = 0;
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                pool_usage += poolp->getMemUsage(print);
-        }
-
-        if (print)
-        {
-                llinfos << "Pool Mem: " << pool_usage << llendl;
-        }
-
-        mem_usage += pool_usage;
-
-        return mem_usage;
-
-}
-
 //////////////////////////////
 //
 // Collision detection
@@ -4933,8 +4118,8 @@ void LLPipeline::setLight(LLDrawable *drawablep, BOOL is_light)
                 }
                 else
                 {
-                        mLights.erase(drawablep);
                         drawablep->clearState(LLDrawable::LIGHT);
+                        mLights.erase(drawablep);
                 }
                 markRelight(drawablep);
         }
@@ -4953,9 +4138,16 @@ void LLPipeline::setActive(LLDrawable *drawablep, BOOL active)
 }
 
 //static
-void LLPipeline::toggleRenderType(void* data)
+void LLPipeline::toggleRenderType(U32 type)
 {
-        S32 type = (S32)(intptr_t)data;
+        U32 bit = (1<<type);
+        gPipeline.mRenderTypeMask ^= bit;
+}
+
+//static
+void LLPipeline::toggleRenderTypeControl(void* data)
+{
+        U32 type = (U32)(intptr_t)data;
         U32 bit = (1<<type);
         if (gPipeline.hasRenderType(type))
         {
@@ -4965,13 +4157,13 @@ void LLPipeline::toggleRenderType(void* data)
         {
                 llinfos << "Toggling render type mask " << std::hex << bit << " on" << std::dec << llendl;
         }
-        gPipeline.mRenderTypeMask ^= bit;
+        gPipeline.toggleRenderType(type);
 }
 
 //static
-BOOL LLPipeline::toggleRenderTypeControl(void* data)
+BOOL LLPipeline::hasRenderTypeControl(void* data)
 {
-        S32 type = (S32)(intptr_t)data;
+        U32 type = (U32)(intptr_t)data;
         return gPipeline.hasRenderType(type);
 }
 
@@ -5010,14 +4202,6 @@ BOOL LLPipeline::toggleRenderDebugControl(void* data)
 void LLPipeline::toggleRenderDebugFeature(void* data)
 {
         U32 bit = (U32)(intptr_t)data;
-        if (gPipeline.hasRenderDebugFeatureMask(bit))
-        {
-                llinfos << "Toggling render debug feature mask " << std::hex << bit << " off" << std::dec << llendl;
-        }
-        else
-        {
-                llinfos << "Toggling render debug feature mask " << std::hex << bit << " on" << std::dec << llendl;
-        }
         gPipeline.mRenderDebugFeatureMask ^= bit;
 }
 
@@ -5185,7 +4369,7 @@ void LLGLSLShader::mapUniform(GLint index, const char** uniform_names, S32 count
         GLenum type;
         GLsizei length;
         GLint size;
-        char name[1024];
+        char name[1024];                /* Flawfinder: ignore */
         name[0] = 0;
 
         glGetActiveUniformARB(mProgramObject, index, 1024, &length, &size, &type, name);
@@ -5193,7 +4377,7 @@ void LLGLSLShader::mapUniform(GLint index, const char** uniform_names, S32 count
         //find the index of this uniform
         for (S32 i = 0; i < (S32) LLPipeline::sReservedUniformCount; i++)
         {
-                if (mUniform[i] == -1 && !strncmp(LLPipeline::sReservedUniforms[i],name, strlen(LLPipeline::sReservedUniforms[i])))
+                if (mUniform[i] == -1 && !strncmp(LLPipeline::sReservedUniforms[i],name, strlen(LLPipeline::sReservedUniforms[i])))             /* Flawfinder: ignore */
                 {
                         //found it
                         S32 location = glGetUniformLocationARB(mProgramObject, name);
@@ -5207,7 +4391,7 @@ void LLGLSLShader::mapUniform(GLint index, const char** uniform_names, S32 count
         for (S32 i = 0; i < count; i++)
         {
                 if (mUniform[i+LLPipeline::sReservedUniformCount] == -1 && 
-                        !strncmp(uniform_names[i],name, strlen(uniform_names[i])))
+                        !strncmp(uniform_names[i],name, strlen(uniform_names[i])))              /* Flawfinder: ignore */
                 {
                         //found it
                         S32 location = glGetUniformLocationARB(mProgramObject, name);
@@ -5330,8 +4514,365 @@ void LLGLSLShader::vertexAttrib4fv(U32 index, GLfloat* v)
 
 LLViewerObject* LLPipeline::pickObject(const LLVector3 &start, const LLVector3 &end, LLVector3 &collision)
 {
-        LLDrawable* drawable = mObjectPartition->pickDrawable(start, end, collision);
+        LLDrawable* drawable = mObjectPartition[PARTITION_VOLUME]->pickDrawable(start, end, collision);
         return drawable ? drawable->getVObj() : NULL;
 }
 
+LLSpatialPartition* LLPipeline::getSpatialPartition(LLViewerObject* vobj)
+{
+        if (vobj)
+        {
+                return getSpatialPartition(vobj->getPartitionType());
+        }
+        return NULL;
+}
+
+LLSpatialPartition* LLPipeline::getSpatialPartition(U32 type)
+{
+        if (type < mObjectPartition.size())
+        {
+                return mObjectPartition[type];
+        }
+        return NULL;
+}
+
+void LLPipeline::clearRenderMap()
+{
+        for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
+        {
+                mRenderMap[i].clear();
+        }
+}
+
+
+void LLPipeline::resetVertexBuffers(LLDrawable* drawable)
+{
+        for (S32 i = 0; i < drawable->getNumFaces(); i++)
+        {
+                LLFace* facep = drawable->getFace(i);
+                facep->mVertexBuffer = NULL;
+                facep->mLastVertexBuffer = NULL;
+        }
+}
+
+void LLPipeline::resetVertexBuffers()
+{
+        for (U32 i = 0; i < mObjectPartition.size(); ++i)
+        {
+                if (mObjectPartition[i])
+                {
+                        mObjectPartition[i]->resetVertexBuffers();
+                }
+        }
+
+        resetDrawOrders();
+
+        if (gSky.mVOSkyp.notNull())
+        {
+                resetVertexBuffers(gSky.mVOSkyp->mDrawable);
+                resetVertexBuffers(gSky.mVOGroundp->mDrawable);
+                resetVertexBuffers(gSky.mVOStarsp->mDrawable);
+                markRebuild(gSky.mVOSkyp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+                markRebuild(gSky.mVOGroundp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+                markRebuild(gSky.mVOStarsp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+        }
+
+        if (LLVertexBuffer::sGLCount > 0)
+        {
+                LLVertexBuffer::cleanupClass();
+        }
+}
+
+void LLPipeline::renderObjects(U32 type, U32 mask, BOOL texture)
+{
+        mSimplePool->renderStatic(type, mask, texture);
+        mSimplePool->renderActive(type, mask, texture);
+}
+
+void LLPipeline::setUseVBO(BOOL use_vbo)
+{
+        if (use_vbo != LLVertexBuffer::sEnableVBOs)
+        {
+                if (use_vbo)
+                {
+                        llinfos << "Enabling VBO." << llendl;
+                }
+                else
+                { 
+                        llinfos << "Disabling VBO." << llendl;
+                }
+                
+                resetVertexBuffers();
+                LLVertexBuffer::initClass(use_vbo);
+        }
+}
+
+void apply_cube_face_rotation(U32 face)
+{
+        switch (face)
+        {
+                case 0: 
+                        glRotatef(90.f, 0, 1, 0);
+                        glRotatef(180.f, 1, 0, 0);
+                break;
+                case 2: 
+                        glRotatef(-90.f, 1, 0, 0);
+                break;
+                case 4:
+                        glRotatef(180.f, 0, 1, 0);
+                        glRotatef(180.f, 0, 0, 1);
+                break;
+                case 1: 
+                        glRotatef(-90.f, 0, 1, 0);
+                        glRotatef(180.f, 1, 0, 0);
+                break;
+                case 3:
+                        glRotatef(90, 1, 0, 0);
+                break;
+                case 5: 
+                        glRotatef(180, 0, 0, 1);
+                break;
+        }
+}
+void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam, GLsizei res)
+{
+        //render dynamic cube map
+        U32 type_mask = gPipeline.getRenderTypeMask();
+        BOOL use_occlusion = LLPipeline::sUseOcclusion;
+        LLPipeline::sUseOcclusion = FALSE;
+        LLPipeline::sSkipUpdate = TRUE;
+        static GLuint blur_tex = 0;
+        if (!blur_tex)
+        {
+                glGenTextures(1, &blur_tex);
+        }
+
+        BOOL toggle_ui = gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI);
+        if (toggle_ui)
+        {
+                gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI);
+        }
+        
+        U32 cube_mask = (1 << LLPipeline::RENDER_TYPE_SIMPLE) |
+                                        (1 << LLPipeline::RENDER_TYPE_WATER) |
+                                        (1 << LLPipeline::RENDER_TYPE_BUMP) |
+                                        (1 << LLPipeline::RENDER_TYPE_ALPHA) |
+                                        (1 << LLPipeline::RENDER_TYPE_TREE) |
+                                        (1 << LLDrawPool::POOL_ALPHA_POST_WATER) |
+                                        //(1 << LLPipeline::RENDER_TYPE_PARTICLES) |
+                                        (1 << LLPipeline::RENDER_TYPE_CLOUDS) |
+                                        //(1 << LLPipeline::RENDER_TYPE_STARS) |
+                                        //(1 << LLPipeline::RENDER_TYPE_AVATAR) |
+                                        (1 << LLPipeline::RENDER_TYPE_GRASS) |
+                                        (1 << LLPipeline::RENDER_TYPE_VOLUME) |
+                                        (1 << LLPipeline::RENDER_TYPE_TERRAIN) |
+                                        (1 << LLPipeline::RENDER_TYPE_SKY) |
+                                        (1 << LLPipeline::RENDER_TYPE_GROUND);
+        
+        LLDrawPoolWater::sSkipScreenCopy = TRUE;
+        cube_mask = cube_mask & type_mask;
+        gPipeline.setRenderTypeMask(cube_mask);
+
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+
+        glViewport(0,0,res,res);
+        
+        glClearColor(0,0,0,0);                  
+        
+        U32 cube_face[] = 
+        {
+                GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
+                GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
+                GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
+                GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
+                GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
+                GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB,
+        };
+        
+        LLVector3 origin = cube_cam.getOrigin();
+
+        gPipeline.calcNearbyLights();
+
+        for (S32 i = 0; i < 6; i++)
+        {
+                
+                glMatrixMode(GL_PROJECTION);
+                glLoadIdentity();
+                gluPerspective(90.f, 1.f, 0.1f, 1024.f);
+                glMatrixMode(GL_MODELVIEW);
+                glLoadIdentity();
+                
+                apply_cube_face_rotation(i);
+
+                
+                glTranslatef(-origin.mV[0], -origin.mV[1], -origin.mV[2]);
+                cube_cam.setOrigin(origin);
+                LLViewerCamera::updateFrustumPlanes(cube_cam);
+                cube_cam.setOrigin(gCamera->getOrigin());
+                gPipeline.updateCull(cube_cam);
+                gPipeline.stateSort(cube_cam);
+                
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+                gPipeline.renderGeom(cube_cam);
+
+                cube_map->enable(0);
+                cube_map->bind();
+                glCopyTexImage2D(cube_face[i], 0, GL_RGB, 0, 0, res, res, 0);
+                cube_map->disable();
+        }
+
+        cube_cam.setOrigin(origin);
+        gPipeline.resetDrawOrders();
+        gPipeline.mShinyOrigin.setVec(cube_cam.getOrigin(), cube_cam.getFar()*2.f);
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+
+        gPipeline.setRenderTypeMask(type_mask);
+        LLPipeline::sUseOcclusion = use_occlusion;
+        LLPipeline::sSkipUpdate = FALSE;
+
+        if (toggle_ui)
+        {
+                gPipeline.toggleRenderDebugFeature((void*)LLPipeline::RENDER_DEBUG_FEATURE_UI);
+        }
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        LLDrawPoolWater::sSkipScreenCopy = FALSE;
+}
+
+//send cube map vertices and texture coordinates
+void render_cube_map()
+{
+        
+        U32 idx[36];
+
+        idx[0] = 1; idx[1] = 0; idx[2] = 2; //front
+        idx[3] = 3; idx[4] = 2; idx[5] = 0;
+
+        idx[6] = 4; idx[7] = 5; idx[8] = 1; //top
+        idx[9] = 0; idx[10] = 1; idx[11] = 5; 
+
+        idx[12] = 5; idx[13] = 4; idx[14] = 6; //back
+        idx[15] = 7; idx[16] = 6; idx[17] = 4;
+
+        idx[18] = 6; idx[19] = 7; idx[20] = 3; //bottom
+        idx[21] = 2; idx[22] = 3; idx[23] = 7;
+
+        idx[24] = 0; idx[25] = 5; idx[26] = 3; //left
+        idx[27] = 6; idx[28] = 3; idx[29] = 5;
+
+        idx[30] = 4; idx[31] = 1; idx[32] = 7; //right
+        idx[33] = 2; idx[34] = 7; idx[35] = 1;
+
+        LLVector3 vert[8];
+        LLVector3 r = LLVector3(1,1,1);
+
+        vert[0] = r.scaledVec(LLVector3(-1,1,1)); //   0 - left top front
+        vert[1] = r.scaledVec(LLVector3(1,1,1));  //   1 - right top front
+        vert[2] = r.scaledVec(LLVector3(1,-1,1)); //   2 - right bottom front
+        vert[3] = r.scaledVec(LLVector3(-1,-1,1)); //  3 - left bottom front
+
+        vert[4] = r.scaledVec(LLVector3(1,1,-1)); //  4 - left top back
+        vert[5] = r.scaledVec(LLVector3(-1,1,-1)); //   5 - right top back
+        vert[6] = r.scaledVec(LLVector3(-1,-1,-1)); //  6 - right bottom back
+        vert[7] = r.scaledVec(LLVector3(1,-1,-1)); // 7 -left bottom back
+
+        glBegin(GL_TRIANGLES);
+        for (U32 i = 0; i < 36; i++)
+        {
+                glTexCoord3fv(vert[idx[i]].mV);
+                glVertex3fv(vert[idx[i]].mV);
+        }
+        glEnd();
+}
+
+void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out, U32 res)
+{
+        LLGLEnable cube(GL_TEXTURE_CUBE_MAP_ARB);
+        LLGLDepthTest depth(GL_FALSE);
+
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glLoadIdentity();
+        gluPerspective(90.f+45.f/res, 1.f, 0.1f, 1024.f);
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+
+        glViewport(0, 0, res, res);
+        LLGLEnable blend(GL_BLEND);
+        
+        S32 kernel = 2;
+        F32 step = 90.f/res;
+        F32 alpha = 1.f/((kernel*2+1));
+
+        glColor4f(1,1,1,alpha);
+
+        S32 x = 0;
+
+        U32 cube_face[] = 
+        {
+                GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
+                GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
+                GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
+                GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
+                GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
+                GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB,
+        };
+
+        LLVector3 axis[] = 
+        {
+                LLVector3(1,0,0),
+                LLVector3(0,1,0),
+                LLVector3(0,0,1)
+        };
+
+        
+        glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE);
+        //3-axis blur
+        for (U32 j = 0; j < 3; j++)
+        {
+                glViewport(0,0,res, res*6);
+                glClear(GL_COLOR_BUFFER_BIT);
+                if (j == 0)
+                {
+                        cube_in->bind();
+                }
+
+                for (U32 i = 0; i < 6; i++)
+                {
+                        glViewport(0,i*res, res, res);
+                        glLoadIdentity();
+                        apply_cube_face_rotation(i);
+                        for (x = -kernel; x <= kernel; ++x)
+                        {
+                                glPushMatrix();
+                                glRotatef(x*step, axis[j].mV[0], axis[j].mV[1], axis[j].mV[2]);
+                                render_cube_map();
+                                glPopMatrix();
+                        }
+                }       
+
+                //readback
+                if (j == 0)
+                {
+                        cube_out->bind();
+                }
+                for (U32 i = 0; i < 6; i++)
+                {
+                        glCopyTexImage2D(cube_face[i], 0, GL_RGB, 0, i*res, res, res, 0);
+                }
+        }
         
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+}
+
+
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 5d00959..158c420 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -28,7 +28,6 @@
 #ifndef LL_PIPELINE_H
 #define LL_PIPELINE_H
 
-#include "llagparray.h"
 #include "lldarrayptr.h"
 #include "lldqueueptr.h"
 #include "llstat.h"
@@ -50,8 +49,7 @@ class LLAgent;
 class LLDisplayPrimitive;
 class LLTextureEntry;
 class LLRenderFunc;
-class LLAGPMemPool;
-class LLAGPMemBlock;
+class LLCubeMap;
 
 typedef enum e_avatar_skinning_method
 {
@@ -62,6 +60,7 @@ typedef enum e_avatar_skinning_method
 BOOL compute_min_max(LLMatrix4& box, LLVector2& min, LLVector2& max); // Shouldn't be defined here!
 bool LLRayAABB(const LLVector3 &center, const LLVector3 &size, const LLVector3& origin, const LLVector3& dir, LLVector3 &coord, F32 epsilon = 0);
 BOOL LLLineSegmentAABB(const LLVector3& start, const LLVector3& end, const LLVector3& center, const LLVector3& size);
+BOOL setup_hud_matrices(BOOL for_select);
 
 class LLGLSLShader
 {
@@ -91,7 +90,6 @@ public:
         void bind();
         void unbind();
 
-
         GLhandleARB mProgramObject;
         std::vector<GLint> mAttribute;
         std::vector<GLint> mUniform;
@@ -107,6 +105,11 @@ public:
 
         void destroyGL();
         void restoreGL();
+        void resetVertexBuffers();
+        void resetVertexBuffers(LLDrawable* drawable);
+        void setUseVBO(BOOL use_vbo);
+        void generateReflectionMap(LLCubeMap* cube_map, LLCamera& camera, GLsizei res);
+        void blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out, U32 res);
 
         void init();
         void cleanup();
@@ -121,6 +124,7 @@ public:
 
         /// @brief Figures out draw pool type from texture entry. Creates pool if necessary.
         static LLDrawPool* getPoolFromTE(const LLTextureEntry* te, LLViewerImage* te_image);
+        static U32 getPoolTypeFromTE(const LLTextureEntry* te, LLViewerImage* imagep);
 
         void             addPool(LLDrawPool *poolp);    // Only to be used by LLDrawPool classes for splitting pools!
         void             removePool( LLDrawPool* poolp );
@@ -130,28 +134,25 @@ public:
         void             unlinkDrawable(LLDrawable*);
 
         // Object related methods
-        void        markVisible(LLDrawable *drawablep);
-        void            doOcclusion();
-        void            markNotCulled(LLDrawable* drawablep, LLCamera& camera);
+        void        markVisible(LLDrawable *drawablep, LLCamera& camera);
+        void            doOcclusion(LLCamera& camera);
+        void            markNotCulled(LLSpatialGroup* group, LLCamera &camera, BOOL active = FALSE);
         void        markMoved(LLDrawable *drawablep, BOOL damped_motion = FALSE);
         void        markShift(LLDrawable *drawablep);
         void        markTextured(LLDrawable *drawablep);
-        void            markMaterialed(LLDrawable *drawablep);
         void        markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags flag = LLDrawable::REBUILD_ALL, BOOL priority = FALSE);
         void        markRelight(LLDrawable *drawablep, const BOOL now = FALSE);
         
         //get the object between start and end that's closest to start.  Return the point of collision in collision.
         LLViewerObject* pickObject(const LLVector3 &start, const LLVector3 &end, LLVector3 &collision);
-        
-        void        dirtyPoolObjectTextures(const LLViewerImage *texture); // Something about this texture has changed.  Dirty it.
+
+        // Something about these textures has changed.  Dirty them.
+        void        dirtyPoolObjectTextures(const std::set<LLViewerImage*>& textures);
 
         void        resetDrawOrders();
 
         U32         addObject(LLViewerObject *obj);
 
-        BOOL            usingAGP() const;
-        void            setUseAGP(const BOOL use_agp);  // Attempt to use AGP;
-
         void            enableShadows(const BOOL enable_shadows);
 
 //      void            setLocalLighting(const BOOL local_lighting);
@@ -174,61 +175,42 @@ public:
         BOOL            validateProgramObject(GLhandleARB obj);
         GLhandleARB loadShader(const LLString& filename, S32 cls, GLenum type);
 
-        void            setUseOcclusionCulling(BOOL b) { mUseOcclusionCulling = b; }
-        BOOL            getUseOcclusionCulling() const { return mUseOcclusionCulling; }
-
-        BOOL initAGP();
-        void cleanupAGP();
-        LLAGPMemBlock *allocAGPFromPool(const S32 bytes, const U32 target); // Static flag is ignored for now.
-        void flushAGPMemory(); // Clear all AGP memory blocks (to pack & reduce fragmentation)
-
         // phases
         void resetFrameStats();
 
         void updateMoveDampedAsync(LLDrawable* drawablep);
         void updateMoveNormalAsync(LLDrawable* drawablep);
+        void updateMovedList(LLDrawable::drawable_vector_t& move_list);
         void updateMove();
-        void updateCull();
+        void updateCull(LLCamera& camera);
         void updateGeom(F32 max_dtime);
 
-        void stateSort();
+        //calculate pixel area of given box from vantage point of given camera
+        static F32 calcPixelArea(LLVector3 center, LLVector3 size, LLCamera& camera);
 
-        void renderGeom();
+        void stateSort(LLCamera& camera);
+        void stateSort(LLSpatialGroup* group, LLCamera& camera);
+        void stateSort(LLSpatialBridge* bridge, LLCamera& camera);
+        void stateSort(LLDrawable* drawablep, LLCamera& camera);
+        void postSort(LLCamera& camera);
+        void forAllDrawables(LLSpatialGroup::sg_vector_t& groups, void (*func)(LLDrawable*));
+        void forAllVisibleDrawables(void (*func)(LLDrawable*));
+        static void highlightPhysical(LLDrawable* drawablep);
+
+        void renderObjects(U32 type, U32 mask, BOOL texture = TRUE);
+
+        void renderGeom(LLCamera& camera);
         void renderHighlights();
         void renderDebug();
+        void processOcclusion(LLCamera& camera);
 
-        void renderForSelect();
+        void renderForSelect(std::set<LLViewerObject*>& objects);
         void renderFaceForUVSelect(LLFace* facep);
         void rebuildPools(); // Rebuild pools
 
-        // bindAGP and unbindAGP are used to bind AGP memory.
-        // AGP should never be bound if you're writing/copying data to AGP.
-        // bindAGP will do the correct thing if AGP rendering has been disabled globally.
-        void bindAGP();
-        void unbindAGP();
-        inline BOOL isAGPBound() const                  { return mAGPBound; }
-
-        void setupVisibility();
-        void computeVisibility();
-
-        LLViewerObject *nearestObjectAt(F32 yaw, F32 pitch);    // CCW yaw from +X = 0 radians, pitch down from +Y = 0 radians, NULL if no object
-
-        void displayPools();
-        void displayAGP();
-        void displayMap();
-        void displaySSBB();
-        void displayQueues();
-        void printPools();
-
         void findReferences(LLDrawable *drawablep);     // Find the lists which have references to this object
         BOOL verify();                                          // Verify that all data in the pipeline is "correct"
 
-        // just the AGP part
-        S32 getAGPMemUsage();
-
-        // all pools
-        S32 getMemUsage(const BOOL print = FALSE);
-
         S32  getVisibleCount() const { return mVisibleList.size(); }
         S32  getLightCount() const { return mLights.size(); }
 
@@ -253,18 +235,15 @@ public:
         BOOL hasRenderDebugFeatureMask(const U32 mask) const    { return (mRenderDebugFeatureMask & mask) ? TRUE : FALSE; }
         BOOL hasRenderFeatureMask(const U32 mask) const                 { return (mRenderFeatureMask & mask) ? TRUE : FALSE; }
         BOOL hasRenderDebugMask(const U32 mask) const                   { return (mRenderDebugMask & mask) ? TRUE : FALSE; }
-
-        // Vertex buffer stuff?
-        U8* bufferGetScratchMemory(void);
-        void bufferWaitFence(void);
-        void bufferSendFence(void);
-        void bufferRotate(void);
+        void setRenderTypeMask(const U32 mask)                                  { mRenderTypeMask = mask; }
+        U32  getRenderTypeMask() const                                                  { return mRenderTypeMask; }
+        static void toggleRenderType(U32 type);
 
         // For UI control of render features
-        static void toggleRenderType(void* data);
+        static BOOL hasRenderTypeControl(void* data);
         static void toggleRenderDebug(void* data);
         static void toggleRenderDebugFeature(void* data);
-        static BOOL toggleRenderTypeControl(void* data);
+        static void toggleRenderTypeControl(void* data);
         static BOOL toggleRenderTypeControlNegated(void* data);
         static BOOL toggleRenderDebugControl(void* data);
         static BOOL toggleRenderDebugFeatureControl(void* data);
@@ -314,20 +293,17 @@ public:
                 RENDER_TYPE_GROUND              = LLDrawPool::POOL_GROUND,      
                 RENDER_TYPE_TERRAIN             = LLDrawPool::POOL_TERRAIN,
                 RENDER_TYPE_SIMPLE              = LLDrawPool::POOL_SIMPLE,
-                RENDER_TYPE_MEDIA               = LLDrawPool::POOL_MEDIA,
                 RENDER_TYPE_BUMP                = LLDrawPool::POOL_BUMP,
                 RENDER_TYPE_AVATAR              = LLDrawPool::POOL_AVATAR,
                 RENDER_TYPE_TREE                = LLDrawPool::POOL_TREE,
-                RENDER_TYPE_TREE_NEW    = LLDrawPool::POOL_TREE_NEW,
                 RENDER_TYPE_WATER               = LLDrawPool::POOL_WATER,
-                RENDER_TYPE_CLOUDS              = LLDrawPool::POOL_CLOUDS,
                 RENDER_TYPE_ALPHA               = LLDrawPool::POOL_ALPHA,
-                RENDER_TYPE_HUD                 = LLDrawPool::POOL_HUD,
-
                 // Following are object types (only used in drawable mRenderType)
+                RENDER_TYPE_HUD = LLDrawPool::NUM_POOL_TYPES,
                 RENDER_TYPE_VOLUME,
                 RENDER_TYPE_GRASS,
                 RENDER_TYPE_PARTICLES,
+                RENDER_TYPE_CLOUDS,
         };
 
         enum LLRenderDebugFeatureMask
@@ -341,13 +317,12 @@ public:
                 RENDER_DEBUG_FEATURE_FOG                                = 0x0020,
                 RENDER_DEBUG_FEATURE_PALETTE                    = 0x0040,
                 RENDER_DEBUG_FEATURE_FR_INFO                    = 0x0080,
-                RENDER_DEBUG_FEATURE_CHAIN_FACES                = 0x0100
+                RENDER_DEBUG_FEATURE_FOOT_SHADOWS               = 0x0100,
         };
 
         enum LLRenderFeatureMask
         {
-                RENDER_FEATURE_AGP                                      = 0x01,
-//              RENDER_FEATURE_LOCAL_LIGHTING           = 0x02,
+                RENDER_FEATURE_LOCAL_LIGHTING           = 0x02,
                 RENDER_FEATURE_OBJECT_BUMP                      = 0x04,
                 RENDER_FEATURE_AVATAR_BUMP                      = 0x08,
 //              RENDER_FEATURE_SHADOWS                          = 0x10,
@@ -356,26 +331,46 @@ public:
 
         enum LLRenderDebugMask
         {
-                RENDER_DEBUG_LIGHT_TRACE                = 0x0001,
-                RENDER_DEBUG_POOLS                              = 0x0002,
-                RENDER_DEBUG_MAP                                = 0x0004,
-                RENDER_DEBUG_AGP_MEM                    = 0x0008,
-                RENDER_DEBUG_QUEUES                             = 0x0010,
-                RENDER_DEBUG_COMPOSITION                = 0x0020,
-                RENDER_DEBUG_SSBB                               = 0x0040,
-                RENDER_DEBUG_VERIFY                             = 0x0080,
-                RENDER_DEBUG_SHADOW_MAP                 = 0x0100,
-                RENDER_DEBUG_BBOXES                             = 0x0200,
-                RENDER_DEBUG_OCTREE                             = 0x0400,
-                RENDER_DEBUG_FACE_CHAINS                = 0x0800,
-                RENDER_DEBUG_OCCLUSION                  = 0x1000,
-                RENDER_DEBUG_POINTS                             = 0x2000,
-                RENDER_DEBUG_TEXTURE_PRIORITY   = 0x4000,
+                RENDER_DEBUG_LIGHT_TRACE                = 0x00001,
+                RENDER_DEBUG_COMPOSITION                = 0x00020,
+                RENDER_DEBUG_VERIFY                             = 0x00080,
+                RENDER_DEBUG_SHADOW_MAP                 = 0x00100,
+                RENDER_DEBUG_BBOXES                             = 0x00200,
+                RENDER_DEBUG_OCTREE                             = 0x00400,
+                RENDER_DEBUG_PICKING                    = 0x00800,
+                RENDER_DEBUG_OCCLUSION                  = 0x01000,
+                RENDER_DEBUG_POINTS                             = 0x02000,
+                RENDER_DEBUG_TEXTURE_PRIORITY   = 0x04000,
+                RENDER_DEBUG_TEXTURE_AREA               = 0x08000,
+                RENDER_DEBUG_FACE_AREA                  = 0x10000,
+                RENDER_DEBUG_PARTICLES                  = 0x20000,
+                RENDER_DEBUG_TEXTURE_ANIM               = 0x40000,
         };
 
         LLPointer<LLViewerImage>        mAlphaSizzleImagep;
 
-        LLSpatialPartition *mObjectPartition;
+        //MUST MATCH THE ORDER OF DECLARATION IN LLPipeline::init()
+        typedef enum 
+        {
+                PARTITION_VOLUME = 0,
+                PARTITION_BRIDGE,
+                PARTITION_HUD,
+                PARTITION_TERRAIN,
+                PARTITION_WATER,
+                PARTITION_TREE,
+                PARTITION_PARTICLE,
+                PARTITION_CLOUD,
+                PARTITION_GRASS,
+                PARTITION_NONE,
+                NUM_PARTITIONS
+        } eObjectPartitions;
+
+private:
+        std::vector<LLSpatialPartition*> mObjectPartition;
+public:
+        
+        LLSpatialPartition* getSpatialPartition(LLViewerObject* vobj);
+        LLSpatialPartition* getSpatialPartition(U32 index);
 
         BOOL                                     mBackfaceCull;
         S32                                              mTrianglesDrawn;
@@ -394,10 +389,16 @@ public:
         LLStat                                   mNumVisibleFacesStat;
         LLStat                                   mNumVisibleDrawablesStat;
 
-        static S32                              sAGPMaxPoolSize;
         static S32                              sCompiles;
 
-        BOOL                                    mUseVBO;                // Use ARB vertex buffer objects, if available
+        static BOOL                             sShowHUDAttachments;
+        static BOOL                             sUseOcclusion;
+        static BOOL                             sSkipUpdate; //skip lod updates
+        static BOOL                             sDynamicReflections;
+
+        //cube map for anti-aliasing reflections
+        LLCubeMap*                              mCubeBuffer;
+        GLuint                                  mCubeList;
 
         class LLScatterShader
         {
@@ -432,15 +433,25 @@ public:
                 GLSL_SPECULAR_MAP,
                 GLSL_BUMP_MAP,
                 GLSL_ENVIRONMENT_MAP,
-                GLSL_SCATTER_MAP,
                 GLSL_END_RESERVED_UNIFORMS
         } eGLSLReservedUniforms;
 
+        static const char* sShinyUniforms[];
+        static U32 sShinyUniformCount;
+
+        typedef enum
+        {
+                GLSL_SHINY_ORIGIN = GLSL_END_RESERVED_UNIFORMS
+        } eShinyUniforms;
+
+        LLVector4                               mShinyOrigin;
+
         //object shaders
         LLGLSLShader                    mObjectSimpleProgram;
         LLGLSLShader                    mObjectAlphaProgram;
         LLGLSLShader                    mObjectBumpProgram;
-        
+        LLGLSLShader                    mObjectShinyProgram;
+
         //water parameters
         static const char* sWaterUniforms[];
         static U32 sWaterUniformCount;
@@ -515,15 +526,17 @@ public:
 
         LLColor4                                mSunDiffuse;
         LLVector3                               mSunDir;
+
+        LLSpatialGroup::sg_vector_t mActiveGroups;
+        std::vector<LLDrawInfo*> mRenderMap[LLRenderPass::NUM_RENDER_TYPES];
+        std::vector<LLSpatialGroup* > mAlphaGroups;
+        std::vector<LLSpatialGroup* > mAlphaGroupsPostWater;
+        LLSpatialGroup::sg_vector_t mVisibleGroups;
+        LLSpatialGroup::sg_vector_t mDrawableGroups;
+
+        void clearRenderMap();
         
 protected:
-        class SelectedFaceInfo
-        {
-        public:
-                LLFace *mFacep;
-                S32 mTE;
-        };
-
         BOOL                                    mVertexShadersEnabled;
         S32                                             mVertexShadersLoaded; // 0 = no, 1 = yes, -1 = failed
         S32                                             mVertexShaderLevel[SHADER_COUNT];
@@ -534,12 +547,16 @@ protected:
         U32                                             mRenderDebugFeatureMask;
         U32                                             mRenderDebugMask;
 
+        U32                                             mOldRenderDebugMask;
+        
         /////////////////////////////////////////////
         //
         //
         LLDrawable::drawable_vector_t   mVisibleList;
-        LLDrawable::drawable_set_t              mMovedList;
-        
+        LLSpatialBridge::bridge_vector_t mVisibleBridge;
+        LLSpatialBridge::bridge_vector_t mOccludedBridge;
+        LLDrawable::drawable_vector_t   mMovedList;
+        LLDrawable::drawable_vector_t mMovedBridge;
         LLDrawable::drawable_vector_t   mShiftList;
 
         /////////////////////////////////////////////
@@ -578,13 +595,12 @@ protected:
         //
         // Different queues of drawables being processed.
         //
-        LLDrawable::drawable_set_t              mBuildQ1; // priority
+        LLDrawable::drawable_list_t     mBuildQ1; // priority
         LLDrawable::drawable_list_t     mBuildQ2; // non-priority
         
         LLDrawable::drawable_set_t              mActiveQ;
         
         LLDrawable::drawable_set_t              mRetexturedList;
-        LLDrawable::drawable_set_t              mRematerialedList;
 
         //////////////////////////////////////////////////
         //
@@ -617,45 +633,27 @@ protected:
         LLDrawPool*     mLastRebuildPool;
         
         // For quick-lookups into mPools (mapped by texture pointer)
-        std::map<uintptr_t, LLDrawPool*>        mSimplePools;
         std::map<uintptr_t, LLDrawPool*>        mTerrainPools;
         std::map<uintptr_t, LLDrawPool*>        mTreePools;
-        std::map<uintptr_t, LLDrawPool*>        mTreeNewPools;
-        std::map<uintptr_t, LLDrawPool*>        mBumpPools;
-        std::map<uintptr_t, LLDrawPool*>        mMediaPools;
         LLDrawPool*                                     mAlphaPool;
+        LLDrawPool*                                     mAlphaPoolPostWater;
         LLDrawPool*                                     mSkyPool;
         LLDrawPool*                                     mStarsPool;
-        LLDrawPool*                                     mCloudsPool;
         LLDrawPool*                                     mTerrainPool;
         LLDrawPool*                                     mWaterPool;
         LLDrawPool*                                     mGroundPool;
-        LLDrawPool*                                     mHUDPool;
+        LLRenderPass*                           mSimplePool;
+        LLDrawPool*                                     mBumpPool;
         // Note: no need to keep an quick-lookup to avatar pools, since there's only one per avatar
         
 
-        LLDynamicArray<LLFace*>         mHighlightFaces;        // highlight faces on physical objects
-        LLDynamicArray<SelectedFaceInfo>        mSelectedFaces;
+        std::vector<LLFace*>            mHighlightFaces;        // highlight faces on physical objects
+        std::vector<LLFace*>            mSelectedFaces;
 
         LLPointer<LLViewerImage>        mFaceSelectImagep;
         LLPointer<LLViewerImage>        mBloomImagep;
         LLPointer<LLViewerImage>        mBloomImage2p;
-
-        BOOL                                    mAGPBound;
-        LLAGPMemPool            *mAGPMemPool;
-        U32                                             mGlobalFence;
-
-        // Round-robin AGP buffers for use by the software skinner
-        enum
-        {
-                kMaxBufferCount = 4
-        };
         
-        S32                                             mBufferIndex;
-        S32                                             mBufferCount;
-        LLAGPArray<U8>                  *mBufferMemory[kMaxBufferCount];
-        U32                                             mBufferFence[kMaxBufferCount];
-        BOOL                                    mUseOcclusionCulling;   // object-object occlusion culling
         U32                                             mLightMask;
         U32                                             mLightMovingMask;
         S32                                             mLightingDetail;
@@ -671,8 +669,5 @@ void render_bbox(const LLVector3 &min, const LLVector3 &max);
 
 extern LLPipeline gPipeline;
 extern BOOL gRenderForSelect;
-extern F32 gPickAlphaThreshold;
-extern F32 gPickAlphaTargetThreshold;
-extern BOOL gUsePickAlpha;
 
 #endif
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 01f16b3..b8822dc 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,109 @@
+Release Notes for Second Life 1.14.0(0) March 27, 2007
+=====================================
+New feature:
+* Linux client features embedded Mozilla
+
+Changes:
+* Texture Pipeline Architecture
+** Significant redesign of texture pipeline
+** Improved texture caching
+** Unlimited texture cache size
+** Cache location can be changed
+** Textures from last scene are pre fetched, improving loading speed of inital scene
+* Render Pipeline Architecture
+** Significant changes to render pipeline
+** Introduction of Vertex Buffer Objects for improved stability
+** Better batching of geometry for improved render performance (on some systems)
+** Alpha sorting changes to improve performance
+** Modified texture animations to use hardware acceleration
+** Light objects now affect themselves. 
+*** NOTE: This may cause some objects that are lights to "wash out" requiring some content to be adjusted
+* Setting an object for sale enables "Buy Copy" by default instead of "Buy Original"
+* User inworld money transaction history floater removed
+** Transaction history can be viewed via secondlife.com
+* Moving your avatar no longer deselects objects in build mode automatically
+* Removed old reference to Announcements forum in a login error message
+* Added Port setting in preferences to specify UDP port (ala -port argument)
+* Added setting to change cache location
+* Added 'Empty Lost and Found' option
+* Added 'Use Custom Port' option to Preferences to specify network port
+* Objects set for sale are Buy Copy by default (instead of Buy Original)
+* Increased Classified's maximum L$ payable from 99999 to 999999
+* Added '?' button next to Partner field explaining partnering
+** Added display that shows intersection of prims with translation plane when building.
+
+LSL changes:
+* New script commands
+** void llSetLinkPrimitiveParams( integer linknumber, list rules )
+** void llSetLinkTexture( integer linknumber, string texture, integer face )
+* More documentation is available using Help > Scripting Guide...
+* The following 4 particle commands have been deprecated for some time, and are now approximated by llParticleSystem
+** llMakeExplosion http://wiki.secondlife.com/wiki/LlMakeExplosion
+** llMakeFire http://wiki.secondlife.com/wiki/LlMakeFire
+** llMakeFountain http://wiki.secondlife.com/wiki/LlMakeFountain
+** llMakeSmoke http://wiki.secondlife.com/wiki/LlMakeSmoke
+
+Bug fixes:
+* Fixed texturing all sides of multi-prim object failing under high latency
+* Fixed sitting avatar standing when clothes are dragged onto the avatar
+* Fixed llGiveInventoryList spamming owner with messages
+* Fixed group members ability to set home to land only set to group (not deeded)
+* Fixed objects from library being placed back in Library after editing
+* Fixed loss of no-copy textures when applied to a prim
+* Fixed delivery of Email to IM messages greater than 998 characters
+* Fixed attachments leaving inventory after detaching
+* Fixed Alt-menu taking focus after Alt-zooming
+* Fixed menus not closing when something else is clicked
+* Fixed Friends list not showing online friends on login if "Can see my online status" is disabled
+* Fixed World -> Buy Land menu failures
+* Fixed LSL email converting numbers in the email body to 0
+* Fixed focus issues when closing a window
+* Fixed closed status of folders when opened in inventory
+* Fixed a method of sitting on other avatars
+* Fixed double-clicking on TOS switching to a different text display
+* Fixed rezzed objects appearing at <0,0,0> if you have create rights but do not wear your title
+* Fixed Offer Teleport appearing in your own profile
+* Fixed Ctrl-P failing to open Preferences if Inventory has focus
+* Fixed ability to set sale info on no-modify items
+* Fixed ability to further limit permissions on items if they are already no-modify
+* Fixed Object Entry rules also preventing rezzing from inventory
+* Fixed single-click behavior for objects
+* Fixed object selection while crossing region boundary
+* Fixed textures leaving their window when resized
+* Fixed single items being created in tabbed windows
+* Fixed menus not closing when clicked a second time
+* Fixed resizing of landmarks
+* Fixed textures being applied to all sides when using Select Texture
+* Fixed objects not deleting if they contain no-copy items
+* Fixed Pay dialog while in busy mode
+* Fixed loss of no-copy objects when using llGiveInventory() on a busy avatar
+* Fixed script editor not regaining focus when function dropdown is used
+* Fixed opening multiple inventory items not using tabbed windows
+* Fixed a client crash when opening multiple inventory items (including a script)
+* Fixed notecards opened in a tabbed window extending outside the preview window
+* Fixed blurry web browser widgets when UI Scale is not 1.0
+* Fixed focus not moving to next window when using Ctrl-W on detached IMs or Appearance
+* Fixed Ctrl-W not closing snapshot floater
+* Fixed widget overlap in group proposal tab of a searched group
+* Fixed a client crash when deleting objects
+* Fixed Capslock key detection
+* Fixed context menu for items in an object
+* Fixed avatar animations not changing when editing an attachment
+* Fixed object counts in About Land changing when object loses focus
+* Fixed ESC key behavior (closing tools and resetting camera)
+* Fixed obscured status bar when debug is off
+* Fixed client crash in People Search with Picks tab
+* Fixed incorrect prim count in Buy dialog when using prim multipliers
+* Fixed build button on toolbar remaining disabled when Create Objects is set to group
+* Fixed a client crash while taking an object
+* Fixed a script runtime error when using a list inside a while or do-while loop
+* Fixed renaming a no-copy clothing item failing during Make New Outfit
+* Fixed objects failing to attach when selected from a distance
+* Fixed rare texture swapping on Mac
+* Fixed non-Latin characters such as Japanese Kanji appearing as small square dots
+* Fixed textures in the distance not reducing priority
+* Avatars out of view are no longer animated
+
 Release Notes for Second Life 1.13.3(2) January 30, 2007
 =====================================
 Changes:
@@ -116,7 +222,6 @@ Release Notes for Second Life 1.13.1(6) December 21, 2006
 Bug fixes:
 * Don't display an erroneous 'Critical Message' during login for new residents
 
-
 Release Notes for Second Life 1.13.1(5) December 15, 2006
 =====================================
 New features:
@@ -139,7 +244,6 @@ Bug fixes:
 * Fixed Home key not toggling fly when chat field is empty
 * Fixed Friends list multi-selection
 
-
 Release Notes for Second Life 1.13.1(4) December 13, 2006
 =====================================
 UI changes:
@@ -221,35 +325,6 @@ Bug fixes:
 * Fixed a memory leak on the Intel Mac
 * Fixed greyed Terms of Service agree/disagree options if user cancelled TOS notice
 
-Release Notes for Second Life 1.13.1(0) December 8, 2006
-=====================================
-Changes:
-* 'Access from Mainland' renamed to 'Public Access' in Estate Tools
-* 'Contact Support' link added to Help menu pointing to Second Life Knowledge Base contact page
-
-Bug fixes:
-* Fixed duplicate IMs or IM-to-email being sent (repeatedly)
-* Fixed objects disappearing if they were made flexible via script
-* Fixed a cause of failed estate-to-estate teleports
-* Generalized flexi implementation for attachments and non-attachments
-* Fixed several integer fields being displayed as float values
-* Fixed pie menu options for non-English languages
-* Fixed group notice panel not accepting text
-* Removed incorrect notice that friends could track each other on the map (they cannot)
-* Fixed bug affecting color of scripted/resident chat
-* Temp objects can enter full parcels
-* Fixed client crash when closing tabbed gestures without saving
-* Fixed boolean values in Debug Settings not remembering the correct values
-* Fixed strange characters in popup messages in Preferences
-* Fixed incorrect counts for simulator prim usage
-* Fixed floating point drift (and prim drift) in llTargetOmega
-* Fixed textures on HUDs not rezing until right-clicked
-* Fixed friends list scrolling to the top after a change
-* Fixed a crash caused by tearing off menus in the script editor
-* Fixed ability to add yourself to your friends list
-* Fixed offline notification that a resident left your group (should not send email)
-* Fixed object contents 'Copy to Inventory' and 'Copy and Wear'
-
 Release Notes for Second Life 1.13.0(10) December 4, 2006
 =====================================
 Bug fixes:
@@ -369,7 +444,6 @@ Bug fixes:
 * Fixed a client crash when right-clicking a payment notification window
 * Fixed a client crash for llLoadURL
 
-
 Release Notes for Second Life 1.12.3(6) November 1, 2006
 =====================================
 Other changes:
@@ -399,7 +473,6 @@ Linux fixes:
 * Assorted library fixes
 * Work around an X bug in full-screen mouse handling
 
-
 Release Notes for Second Life 1.12.3(4) October 25, 2006
 =====================================
 New features:
@@ -472,11 +545,11 @@ Bug fixes:
 * Lots of changes to make the client/server protocols more secure
 
 Linux client fixes:
-* MMX-enhanced image decoding
-* Resolve crash: 'undefined symbol: glXGetProcAddress'
-* No longer lose streaming music after visiting a dead stream
-* Startup script now exposes alpha-testing configuration options
-* Disable troublesome GL extensions by default.  See startup script to enable.
+ * MMX-enhanced image decoding
+ * Resolve crash: 'undefined symbol: glXGetProcAddress'
+ * No longer lose streaming music after visiting a dead stream
+ * Startup script now exposes alpha-testing configuration options
+ * Disable troublesome GL extensions by default.  See startup script to enable.
 
 Release Notes for Second Life 1.12.1(13) September 27, 2006
 =====================================
@@ -484,12 +557,6 @@ Bug fixes:
 * Fixed Macintosh autoupdater
 ** Older clients should use the website download if issues are experienced
 
-Linux client fixes:
-* Shiny, Ripple Water, Occlusion Culling, Anisotropic Filtering, Avatar Vertex Programs where supported by drivers
-* On-disk cache persists properly across sessions
-* Screenshots save on-disk to resident profile directory
-* Client less prone to blocking window manager key combos
-
 Release Notes for Second Life 1.12.1(12) September 27, 2006
 =====================================
 Other changes:
@@ -590,35 +657,6 @@ Bug fixes:
 
 Release Notes for Second Life 1.12.1(6) September 13, 2006
 =====================================
-Linux client fixes:
-* Cut & Paste is now supported
-* Work around window managers stopping SL from seeing Alt Zoom (or Ctrl Drag)
-* Improved default Unicode font rendering
-** Easier for user to substitute own fallback unicode.ttf file
-* Bundle libvorbisenc, libcurl, more
-* Key repeating was not working correctly
-* Fix clicking on the world immediately after a desktop switch
-* Show last screenshot during login
-* Fix crash when switching from fullscreen mode
-* Fix hang or crash on linux client shutdown
-* Fix 'Failed to set locale en_US.iso8859-1' warnings
-* Embed icon for the window manager
-* '$L' was not appearing before Linden $$ balance in corner screen
-* Stop the client logging to syslog
-
-Release Notes for Second Life 1.12.0 (linux-51742) August 29, 2006
-=====================================
-Linux client fixes:
-* Audio support on Linux
-* Context-sensitive cursors for Linux
-* Crash when emailing a postcard
-* Group title appears twice
-* Linux Client doesn't notice when it is minimized
-* Gamma settings fail to work and save
-* Linux Client tries to run Mac auto-updater
-
-Release Notes for Second Life 1.12.1(5) September 11, 2006
-=====================================
 New features:
 * Estate access and ban lists boosted up to 300 entries (previously 63)
 * Estate land management now allows subdividing and joining of parcels
@@ -897,500 +935,3 @@ Bug fixes:
 Linux client fixes:
 * No linux client specific fixes in this version
 
-Release Notes for Second Life 1.11.3(2) August 9, 2006
-=====================================
-* Resolved an incompatibility with older scripts causing regions to crash
-* Fixed an issue with agent presence that caused Residents to be unable to see one another
-
-Release Notes for Second Life 1.11.3(1) August 9, 2006
-=====================================
-Other changes:
-* System Sound Effects have been decoupled from the Audio Stream
-** This allows system sounds like typing to be muted while listening to live performances and so forth
-** Sound Effects volume can now be set in Preferences -> Audio & Video -> Sound Effects Volume
-** Streaming Audio volume is set as it was before using the in-world Audio Control panel
-
-Bug fixes:
-* Preferences no longer save when user profile has non-ASCII character in its path
-* Resolved client crash when clicking Preferences -> Popups -> Reset 'Show next time' Dialogs
-* CTRL-ENTER once again activates Chat Shout
-* Drop-down boxes now respond to control keys as expected
-* Resolved client crash related to mute lists
-* Resolved client crash related to applying color to an object
-* Scroll wheel once again causes Chat History window to scroll
-* Drag-selecting text in a type-in field no longer causes selected text to be stuck
-* World Map once again correctly accepts coordinates for pin-point teleporting
-* First name in a search query is once again automatically highlighted when search is performed
-* Resolved a bug which caused an orange flicker to occur (most noticeable during sunset and sunrise)
-* Upper-case file extensions are now recognized when uploading files and no longer cause an error
-* Large chat history, notecards and scripts no longer negatively impact viewer framerate
-* Text is no longer cut off in Search -> Land Sales
-* The mouse scroll wheel now works again within chat history
-* Fixed a lighting bug causing avatars to flicker - most notable at sunset
-* Several exploits have been identified and addressed
-* Restored 'click here to turn off this email' link to outgoing email
-
-Linux client fixes:
-* No Linux client specific fixes in this version
-
-Release Notes for Second Life 1.11.2(4) August 1, 2006
-=====================================
-Other changes:
-* Asset compression expanded to cover objects
-* llRequestAgentData can now return the resident's account type
-** Example usage: llRequestAgentData(llGetOwner(), DATA_PAYINFO);
-** No Payment Info on File: 0
-** Payment Info on File: 1
-** No Payment Info on File AND Payment Info Used: 2 (Only Beta/Lifetime users fall under this status)
-** Payment Info on File AND Payment Info Used: 3 
-* Added PARCEL_FLAG_RESTRICT_PUSHOBJECT to llGetParcelFlags, and REGION_FLAG_RESTRICT_PUSHOBJECT to llGetRegionFlags()
-* Right-click -> Teleport option added to landmarks
-* 'Muted Residents' renamed to 'Mute List', as it can contain muted objects as well
-* Ctrl-\ can now be used to focus the camera on the last agent or object that said something in chat
-
-Bug fixes:
-* Fixed several exploits
-* Friends list now sorts by online status
-* Both the scripted object and the target of llPushObject must be in push-allowed areas
-* Corrected the color of system messages
-* d right-clicking the edges of the viewer window automatically selecting pie menu items
-* Minimap now fits within its window when taking high-res snapshots
-* Telehub spawnpoint removal no longer fails for Estate Owners/Managers
-* Fixed a bug where the clear search button was not visible
-* Send Postcard floater now gets active focus when 'Keep open after saving' is checked
-* Fixed a bug where residents would teleport to the wrong location when using the my land window after using the sort tabs
-* Double-clicking on map icon ('event') no longer opens wrong panel in Search floater
-* Fixed a bug with slow window resize
-* Dragging past the end of text field once again scrolls text
-* Fixed a bug where the avatar picker name field doesn't have focus on show
-* Ctrl+F opening search now puts focus in 'All' tab's 'Find' text box
-* About Land floater no longer goes blank in some use cases
-* Resolved issue which caused Minimap window, Build window and Object Edit window to not appear in snapshots when Show UI is selected
-* 'Update Automatically' no longer clears the 'Send postcard' window from the screen
-* Fonts now render properly with UI scaling on in fullscreen on Macbook Pro
-* Linden Locations shouldn't appear in Popular Places
-* Text in Search > Landsales no longer missing
-* Fixed a bug with keyboard selection of radio buttons
-* Escape now closes menus
-* Land sales description now displays correctly in Search > Land Sales
-* Snapshot window now follows the same position rules as other windows
-* Friends list now sorts by online status
-* Toolbar buttons no longer retain focus after use
-* UI layout tweaks to the About Land > Options > Show in Find Places drop-down menu
-* Improved the experience for uploading a snapshot as a texture
-* Fixed a bug with snapshot floater's settings not being persisted
-* Made double-click process as a normal click if not handled specially
-* Disabled using ALT-Enter to trigger buttons, etc
-* Converted media remote control to be a panel to allow tab focusing
-
-Release Notes for Second Life 1.11.1(2) August 1, 2006
-=====================================
-Bugs fixed:
-* Fixed an exploit
-
-Release Notes for Second Life 1.11.1(1) July 26, 2006
-=====================================
-New features:
-* Additional right-click functionality for inventory folders containing wearables
-** 'Add to Outfit' puts accessories on your avatar without removing existing ones
-*** This is also activated by shift-dragging the folder onto your avatar
-** 'Replace Outfit' removes existing outfit and wears contents of folder
-** 'Take Off' removes ONLY worn items in the folder
-* Region/Estate and About Land now feature the option 'Restricted Pushing'
-** When pushing is restricted, only the following calls of llPushObject will succeed on the land:
-*** Any push called against the owner of the scripted object
-*** An object owned by the landowner
-*** An object deeded (or Set) to the same group the land parcel is deeded (or Set)
-** Region/Estate edits this setting on a per-region basis, not per-estate
-
-Other changes:
-* llGiveInventory() box now supports an option to mute the giving agent (user or object)
-* llPushObject() functionality can now be disabled on a parcel or region
-* Sounds triggered by muted residents are now muted
-
-Bug fixes:
-* Banned users cannot be heard from your parcel
-* Texture tab and picker no longer preview textures on objects you don't own
-* Fixed a bug where IM and Chat history text is blurred on some ATI cards
-* Fixed a bug where skirt mesh blocks attachment editing on legs
-* Group names, parcel names, classified names are now filtered to ASCII characters
-* All default gestures no longer deactivated upon first relogin
-* 'Stop Flying' button is now disabled when flying over No Fly land
-* Right-click IM calling cards now works consistently
-* Fixed a bug where scrollbars failed to appear when IM window holds more IMs than IM panel can display
-* Fixed a bug where multi-select of faces does not always display the last selected face properties
-* Fixed a bug where color settings revert to black when changed from defaults
-* Fixed a bug where clicking set in about land / forsale doesnt automatically show the calling cards
-* Hitting enter while chat history has focus now focuses the chat bar
-
-Linux client fixes:
-* No linux client-specific fixes in this release
-
-Release Notes for Second Life 1.11.0(12) July 23, 2006
-=====================================
-Bug fixes:
-* Resolved a server side exploit
-
-Linux client fixes:
-* No linux client specific fixes in this release
-
-Release Notes for Second Life 1.11.0(11) July 21, 2006
-=====================================
-Bug fixes:
-* Resolved a bug that caused script events to be triggered on region crossing
-* Fixed a bug that caused Estate Tools to return objects other than those selected
-* Fixed a bug that dropped focus while deleting a (no copy) object
-* Fixed a bug that caused the parcel Ban list to clear
-* Fixed a viewer crash/lockup caused by viewing profiles
-* Fixed a viewer crash when double-clicking a group in the 'My Land...' window
-* Fixed a bug that caused the Delete key to incorrectly delete an object when editing text values in the Edit window
-
-Linux client fixes:
-* No linux client specific fixes in this release
-
-Release Notes for Second Life 1.11.0(10) July 19, 2006
-=====================================
-Bug fixes:
-* Resolved a simulator crash caused by script emails
-* Fixed a bug where poseballs and vehichles would stop working after region restart
-
-Release Notes for Second Life 1.11.0(9) July 19, 2006
-=====================================
-Features:
-* Zoomable UI
-** The entire UI can be scaled (including in-world text, manipulators, etc) by a user-supplied scale value (Preferences->Graphics->UI Size)
-** When running fullscreen, the additional option 'Use resolution independent scale' should ensure that the UI looks the same at all resolutions
-** Additionally, changing to a resolution with a different aspect ratio than your monitor's aspect ratio should not result in any squashing or stretching of your display 
-* Improved Snapshot functionality
-** When taking a snapshot, the world will freeze in place and the snapshot will be previewed over the entire screen (but under UI elements)
-** The camera tool will be active by default, allowing you to click and drag to move the camera around while objects/avatars/etc are frozen in place, without having to hold down ALT
-** You can also change snapshot parameters (resolution, JPEG compression level) and the snapshot will update on the fly
-** Any time the camera moves or a parameter is changed, the existing snapshot will 'drop' away and be replaced by a new one 
-** You can also take snapshot of arbitrary resolution, up to 6000x6000 
-*** Be aware that the larger the snapshot is, the more system resources are needed to create it -- you can potentially run out of memory and crash if taking very large snapshots on a low-end system
-* Eyedropper tool
-** Added the ability to pick colors and textures from objects in view (and that you own) inside the color picker and texture picker
-** When depressed, the button changes the mouse cursor and activates a 'pipette' or 'eyedropper' tool
-** The user can then click on another object in world to grab the texture/color of the face that they clicked
-* Gestural pie menus
-** Pie menus now provide a gradually faded border when the right mouse button is down to suggest that you can use them by moving the mouse in a given direction, which is faster and easier than clicking on a pie wedge directly
-** Also, pie sub-menus can be accessed with gestures, making it possible to chain gestures together to perform any operation in the pie menu by memory
-* Tear-off menus
-** Added ability to click on a double line at the top of any menu or sub-menu and pin it in place on the UI as a 'floater'
-** All of the menu items should still work, as well as branching menus, etc. 
-** Closing the floater will make it disappear
-** Accessing a detached menu via its parent menu will bring the floating menu to the foreground, but not reposition it
-
-Other changes:
-* Usability changes to Find/Search menu
-** 'Find' has been renamed 'Search' in the Toolbar, Edit menu, Directory window, and F1 Help
-** Search is still opened with the keyboard shortcut Ctrl-F
-** Searches defaults to 'Show Mature Content ON' for sims, parcels, events, classifieds, etc.
-** The 'Name' column for each listing of returned search results is now wider.
-** The second column for each listing of returned search results (i.e. Dwell, Price, etc.) has its font size reduced to make additional space
-* Improved text field support for INSERT key
-* 'Avatar' ruler mode has been changed to 'Attachment' ruler mode
-** Attachment rotations in 'Attachment' ruler mode are relative to the attach point instead of the root of the avatar
-** This should make adjusting attachments easier without using 'pose stands'
-* Ctrl-tab moves keyboard focus between UI floaters
-* Tab key moves focus to the toolbar if nothing else has focus
-* Dragging an inventory item over the scrollbar allows you to directly scroll the inventory window
-* Hitting Enter when the chat line is blank will close the chat bar
-
-Bug fixes:
-* Scrolling windows should no longer catch scrolling events when they're not the active window
-* Fixed a bug that caused the fullscreen/windowed shortcut (Alt-Enter) to work incorrectly
-* Landowners can no longer ban themselves from their own land based on payment information
-* Fixed snapshot previews in Bug Reports and Postcards
-* Changing the snapshot resolution causes the previously captured image to disappear
-* Snapshot mode is automatically exited when teleporting
-* Fixed a bug that caused snapshot buttons to become greyed out when zooming
-* Fixed a bug with zoomed snapshots
-* Fixed a bug that caused the UI to blur in a screenshot
-* Fixed a bug that caused the UI and HUDs to tile in high-res snapshots
-* Fixed a bug that caused the Texture Picker to automatically select a texture
-* Fixed a bug with the sky when right-clicking objects in the dark
-* Fixed a bug that caused uploaded textures to preview incorrectly
-* Fixed a bug that caused the edit window to be dragged to the bottom of the screen when minimized
-* Nametags now scale properly with UI changes
-* Changed UI Scale label to be consistent across the interface
-* Objects can now be dragged from Recent Items to All Items
-* Mouselook mode works correctly when exiting snapshot mode
-* Removed extraneous headers from Estate -> Debug -> Top Scripts / Top Colliders
-* Fixed the interface tiling when taking high-res snapshots
-* Fixed an ugly rectangle around the Terms of Service buttons
-* Fixed a column width issue with Land Sales
-* Removed the option to flag a Teen Second Life event as Mature
-* Fixed a bug that caused UI elements to scale incorrectly when changing windowed resolutions
-* Fixed a bug that caused a blank Friends list
-* Improved font rendering for UI, HUD, and avatar names
-* Region/Estate -> Debug -> Top Colliders now displays properly
-* Improved UI font scaling to better match window scaling
-* Improved UI appearance at 800x600 resolution
-* Help -> About Second Life displays the proper information
-* Fixed several bugs with snapshots and HUDs
-* Fixed a crash issue with snapshots
-* Snapshot buttons are no longer clipped
-* Fixed a glowing eyes issue with Bump Mapped avatar rendering
-* Fixed a bug that caused the Color Picker text values to have no effect
-* Fixed a bug that caused the Chat bar to appear when other windows had focus
-* Fixed a bug that caused chat bubbles to go offscreen
-* Fixed a bug that caused inventory Rename to lose keyboard focus
-* Script comments are once again orange
-* Profile can now be viewed after searching for one Resident in the finder
-* Preferences > Network > Clear Cache > Apply no longer starts parcel music stream
-* Fixed a bug where objects specifically requested to be returned were skipped if an avatar was sitting on them
-* Autoreturn now functions properly after a parcel is subdivided
-* Parcel object limits are calculated properly when a parcel is subdivided and claimed by a new owner.
-* Terms of Service defaults to 'I Disagree'
-
-MacOS client fixes:
-* Resolved an Intel Mac crash issue
-
-Linux client fixes:
-* No linux client specific fixes in this release
-
-Release Notes for Second Life 1.10.6(1) July 12, 2006
-=====================================
-* Resolved a server-side crash issue
-
-Release Notes for Second Life 1.10.6(0) July 12, 2006
-=====================================
-Changes:
-* The PvP History option has been replaced by 'Bumps, Hits, & Pushes' under the Help menu
-** This window does not open automatically; residents can open and view it manually
-** Entries in Bumps, Hits, & Pushes are now timestamped
-** Residents should use Help -> Report Abuse to provide detailed information regarding Abuse cases
-* 'Find' changed to 'Search' on the toolbar, default for new users is to search 'All' content types
-* Parcel 'access denied' lines now fade significantly faster with distance
-* Parcel owners can ban users based on account settings
-* Chat from banned users cannot be heard from your parcel
-
-Bug fixes:
-* The 'Open' option appears when right-clicking a child prim of an object with contents
-* The Linden Locations list now shows Mature areas
-* Fixed a bug that prevented some offline IMs from appearing
-* Fixed a bug with the INSERT key and text fields
-* Fixed texture preview for skirts (was zoomed in too tight)
-* AGP enabled for additional graphics cards
-* Small flexi objects are now rendered correctly
-* Stars are back!
-
-Linux client fixes:
-* No linux client specific fixes in this release
-
-Release Notes for Second Life 1.10.5(2) June 30, 2006
-=====================================
-Bug fixes:
-* Fixed an exploit
-
-Release Notes for Second Life 1.10.5(1) June 28, 2006
-=====================================
-New features:
-* Each resident's profile now includes a field revealing whether the resident has provided payment information to Linden Lab.
-** The profile's 'Account' field includes account status: 'Resident' or 'Linden Lab Employee' and, in the case of 'Resident' status one of three status entries:
-*** 'No Payment Info on File' - account was created with no credit card or Paypal
-*** 'Payment Info on File' -  account has provided a credit card or Paypal
-*** 'Payment Info Used' - credit card or Paypal on account has successfully been billed
-** We plan to provide features in future updates to mark specific parts of the Second Life world (or allow residents to mark their own land) as accessible only to accounts with payment information.
-
-Other changes:
-* The 'Report PvP Abuse' option has been removed from the Help menu
-** Residents can and should continue to report harrassing PvP abuse via 'Report Abuse' under Help
-** Residents should provide as much relevant information as possible when filing Abuse Reports
-* Residents explicitly banned from a land parcel cannot fly in that parcel's airspace, to a height of 768m
-** Residents not explicitly banned, but not on the access list, can fly over the parcel at an altitude greater than 50m
-* More categories have been added to the Places menu
-* The Library is displayed at the bottom of the Inventory for quicker access to one's own Inventory
-* Snapshots to disk are now taken with CTRL+` instead of just the ` key
-* 'Copy and Wear' now behaves identically to dragging a folder from inventory onto your avatar
-** Existing clothing and attachments will be removed
-
-Bug fixes:
-* Transferring an island to a new owner no longer causes objects on group-owned land to be returned automatically
-* The Open option is not displayed when the object has no contents
-* PCI-Express cards should no longer give errors that AGP is disabled
-* Corrected several error messages about incorrect driver versions
-* The version number of an optional update is now displayed
-* Fixed a bug that caused some objects to be missed by rectangle-select
-* Fixed a display bug with transparent avatar textures in Upload Preview
-* Doubled the space available to display the estate name in Region/Estate
-
-Linux client fixes:
-* No linux client specific fixes in this release
-
-Release Notes for Second Life 1.10.4(4) June 21, 2006
-=====================================
-Other changes:
-* Various usability changes to the inventory Recent Items
-
-Bug Fixes:
-* The autoupdate utility now remembers the SLURL you just used and passes it to SL after updating
-* Fixed a bug with flexible attachments made with Twist Begin
-* Fixed a bug that prevented typing in or exiting from Mouselook
-* Fixed some viewer crashes
-
-Release Notes for Second Life 1.10.2(0) June 1, 2006
-=====================================
-New features:
-* Added the Inventory 'Recent Items' tab
-** Shows items you've received recently (i.e. since your last login)
-** Recent Items can be filtered separately from All Items
-
-Release Notes for Second Life 1.10.1(0) May 31, 2006
-=====================================
-Features:
-* F1 Help using Mozilla
-** Help for all Second Life users now available in a Mozilla window accessed by pressing F1
-
-Bug fixes:
-* Improved avatar lighting to more closely match in 'nearby lights' and 'sun/moon only' modes
-* Improved flexible attachment behavior while crossing a region boundary
-
-Release Notes for Second Life 1.10.0(34) May 26, 2006
-=====================================
-Bug fixes:
-* Resolved a compatibility issue for PowerPC users running Mac OS X 10.3.9
-* Fixed a bug causing HUD objects to work incorrectly
-* Fixed a bug causing child prims on new HUD objects to remain invisible
-* Fixed a bug causing objects to disappear due to occlusion culling
-* Other residents should now be heard after unmuting them and relogging
-* The Mac autoupdate utility should properly show download progress
-
-Release Notes for Second Life 1.10.0(33) May 24, 2006
-=====================================
-* Resolved an issue that caused group invitations to Officers to offer Member status instead
-* First Land no longer misidentified and therefore able to be bought by Residents who have already owned land
-
-Release Notes for Second Life 1.10.0(32) May 24, 2006
-=====================================
-Features:
-* Hardware lighting
-** Any primitive in Second Life may be turned into a light
-*** Light properties are radius, color, intensity, and falloff
-** New options in the Preference panel indicate the type of lighting you want to use
-*** 'Sun or Moon only' is best for low-performance hardware
-**** Everything in-world is lit in real time by the sun or moon only
-*** 'Nearby Lights' is available for any hardware configuration
-**** Everything in-world is lit by sun or moon and up to six nearby light sources
-** More information about the new lighting system is available here:
-*** http://forums.secondlife.com/showthread.php?t=100128
-
-* Flexible objects
-** Cube, prism and cylinder primitive types can now be made flexible as a client-side effect
-** Simulation parameters for material and responsiveness to gravity and wind
-** Objects that are flexible cannot be physical and are always phantom
-** Use of these is currently limited to preserve framerate as they increase amount of client-side processing
-
-* Occlusion culling
-** Frame rate is improved when objects that would normally be rendered are hidden from view
-** FPS will be significantly improved when inside a structure
-*** Windows or other transparent surfaces will decrease effectiveness as objects in view will be rendered, whether or not they are within the structure
-** Toggle with CTRL-SHIFT-o on all platforms
-
-* New 'Click Action' functionality for objects
-** Object creators can select a default left-click action for objects:
-*** Touch (default), Sit, Buy, Pay, or Open
-** These actions happen immediately when a resident left-clicks on the object, without a menu
-** Builders set the action in the build tools 'General' panel, at the bottom
-** Click actions override touch events for scripts
-*** If you want the touch behavior, be sure 'touch (default)' is the click action
-** You can't set 'Buy' as the action unless an object is for sale
-** 'Sit' should be useful for both chairs and vehicles
-** 'Open' should be useful for vendors that sell packaged objects
-
-* Updated functionality for the Top Scripts/Top Colliders dialog
-** Improvements allow Estate owners to return or disable offending objects
-*** Disabling an object makes it non-physical and disables all scripts
-
-* Classified ads now have an auto-renew option
-** Checking the 'Auto renew each week' checkbox in Profile > Classifieds will cause your classified to be republished instead of expiring after one week
-** You will be charged the same listing price as the initial classified
-** To change the listing price, you need to make a new classified
-
-* Universal Binary installer for Mac clients is now standard
-** PowerPC and Intel Mac versions are now bundled together in one 'Universal Binary' installer
-** Minimum required version for Second Life is now 10.3.9
-
-* The Login screen now features a box to select the region to log into
-** This has the same effect as using a SLURL to log into a region
-
-
-New LSL functions:
-
-* llHTTPRequest
-** Added new LSL call & event to support HTTP access from external scripts
-** LSL Function usage:
-*** key llHTTPRequest(string <url>, list <parameters>, string <body>)
-**** Send HTTP request to <url> with <parameters> and <body>, returning key uniquely identifying the request
-**** Currently, the only supported parameter is the following key/value pair: HTTP_METHOD, <method name>
-** LSL Event usage:
-*** http_response(key <request_id>, integer <status>, list <metadata>, string <body>)
-**** Called when a pending HTTP request <request_id> completes with the HTTP <status>, <metadata> and response <body>
-**** This facility supports GET, PUT and POST methods, X-SecondLife-headers, text/* MIME types, and transcoding of body contents to LSL's Unicode strings
-
-* llGetParcelFlags
-** Get the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos
-** Returns an integer that is a bit field of flags
-** This bitfield can be ANDed with a flag to see if that flag is set for that parcel
-** Usage:
-*** integer llGetParcelFlags(vector pos)
-** Example:
-*** if (llGetParcelFlags() & PARCEL_FLAG_ALLOW_CREATE_OBJECTS) llOwnerSay('You may create objects in this parcel!');
-** Bitfields:
-*** PARCEL_FLAG_ALLOW_FLY
-**** Used to determine if a parcel allows flying
-*** PARCEL_FLAG_ALLOW_SCRIPTS
-**** Used to determine if a parcel allows outside scripts
-*** PARCEL_FLAG_ALLOW_LANDMARK
-**** Used to determine if a parcel allows landmarks to be created
-*** PARCEL_FLAG_ALLOW_TERRAFORM
-**** Used to determine if a parcel allows anyone to terraform the land
-*** PARCEL_FLAG_ALLOW_DAMAGE
-**** Used to determine if a parcel allows damage
-*** PARCEL_FLAG_ALLOW_CREATE_OBJECTS
-**** Used to determine if a parcel allows anyone to create objects
-*** PARCEL_FLAG_USE_ACCESS_GROUP
-**** Used to determine if a parcel limits access to a group
-*** PARCEL_FLAG_USE_ACCESS_LIST
-**** Used to determine if a parcel limits access to a list of residents
-*** PARCEL_FLAG_USE_BAN_LIST
-**** Used to determine if a parcel uses a ban list
-*** PARCEL_FLAG_USE_LAND_PASS_LIST
-**** Used to determine if a parcel allows passes to be purchased
-*** PARCEL_FLAG_LOCAL_SOUND_ONLY
-**** Used to determine parcel restricts spatialized sound to the parcel
-
-Other changes:
-* Performance enhancements for audio streaming
-* Texture loading performance improvements
-* Improved 'Interest List' functionality keeps objects from being reloaded in view so often
-* Objects that were set Material Light prior to 1.9.1 will be listed as 'Fullbright(Legacy)'
-** Once this setting is changed for an object, it cannot be set back to this value except via script
-* Added 'Wear' and 'Take' options to 'Open' menu for objects
-* 'Pay' now included in left-click options for objects
-* Improvements to the Properties window for objects
-* Added region rating to listings in the Find menu
-* Initial load of Events page defaults to current and upcoming events
-* World map now puts focus on 'Teleport' button after entering a region name and pressing 'Enter'
-* Mouselook now shows region, position, and damage at the top of the screen, but does not show currency, time, or packet loss
-* IMs now include time stamp for local time when message was received
-
-
-Bug fixes:
-* Offline IMs should appear correctly while logging in
-* Second Life starts correctly when file pathnames include special characters (including non-English operating systems)
-* Fixed a cause of failure for offline inventory offers
-* The 'Purchase' button now greys out while your transaction is being processed
-* Edit axes no longer display behind the object being edited
-* Left-click 'buy' now disables when the object is no longer for sale
-* Residents you have muted can no longer offer you teleports
-* Fixed a bug that caused the mouse pointer to move incorrectly while dragging HUD attachments
-* Estate telehubs now override parcel landing points
-* Fixed a bug that made water turn invisible
-* Low-end video cards no longer display only one terrain texture
-* llMapDestination now properly clamps to 768m on the Z-axis
-* Avatar flying state is persistent across a teleport
-* Fixed an bug that affected uploads of sounds
-* Fixed a bug that caused SLURLs to fail with Internet Explorer
-
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 41c2af1..eeeb1eb 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,13,3,2
- PRODUCTVERSION 1,13,3,2
+ FILEVERSION 1,14,0,0
+ PRODUCTVERSION 1,14,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.13.3.57442"
+            VALUE "FileVersion", "1.14.0.0"
             VALUE "InternalName", "Second Life"
-            VALUE "LegalCopyright", "Copyright © 2001-2006, Linden Research, Inc."
+            VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.13.3.57442"
+            VALUE "ProductVersion", "1.14.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/restore_login_page.bat b/linden/indra/newview/restore_login_page.bat
deleted file mode 100644
index 05a4925..0000000
--- a/linden/indra/newview/restore_login_page.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off

-

-REM ============================================================

-REM restore_login_page

-REM ============================================================

-REM

-REM Purpose:

-REM

-REM     Undo the work of set_login_page.

-REM 

-

-set ORIGINAL=skins\xui\en-us\panel_login.xml

-set TEMPFILE=.\panel_login.xml

-

-if not exist %TEMPFILE% goto end

-

-echo Restoring login page in %ORIGINAL% 

-

-copy /Y %TEMPFILE% %ORIGINAL% 

-del %TEMPFILE%

-

-:END

diff --git a/linden/indra/newview/rsyncfiles.txt b/linden/indra/newview/rsyncfiles.txt
deleted file mode 100644
index 0763c5c..0000000
--- a/linden/indra/newview/rsyncfiles.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-- *.cpp
-- *.c
-- *.h
-- .svn/
-- CVS/
-- .cvsignore
-- .DS_Store
-- /app_settings/mozilla/
-- /app_settings/mozilla_debug/
-+ /app_settings/
-+ /character/
-+ /help/
-+ /trial/
-+ /fonts/
-+ /skins/
-+ /cursors_mac/
-+ /featuretable.txt
-+ /featuretable_mac.txt
-+ /releasenotes.txt
-+ /lsl_guide.html
-+ /secondlife.icns
-+ /gpu_table.txt
diff --git a/linden/indra/newview/secondlife setup build aditi.bat b/linden/indra/newview/secondlife setup build aditi.bat
index 68a2e38..cb52caf 100644
--- a/linden/indra/newview/secondlife setup build aditi.bat
+++ b/linden/indra/newview/secondlife setup build aditi.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DADITI
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=aditi
diff --git a/linden/indra/newview/secondlife setup build agni.bat b/linden/indra/newview/secondlife setup build agni.bat
index 2b2ce29..fe9dd4f 100644
--- a/linden/indra/newview/secondlife setup build agni.bat
+++ b/linden/indra/newview/secondlife setup build agni.bat
@@ -1,11 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/
-set ARGS=
-
-@rem To build optional "update" installer (doesn't have static VFS):
-@rem 
-@rem set ARGS=/DUPDATE
-
-@"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat"
\ No newline at end of file
diff --git a/linden/indra/newview/secondlife setup build dmz.bat b/linden/indra/newview/secondlife setup build dmz.bat
index 9ab6fae..5d5a614 100644
--- a/linden/indra/newview/secondlife setup build dmz.bat
+++ b/linden/indra/newview/secondlife setup build dmz.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DDMZ
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=dmz
diff --git a/linden/indra/newview/secondlife setup build durga.bat b/linden/indra/newview/secondlife setup build durga.bat
index 5bcc744..3ba6bd7 100644
--- a/linden/indra/newview/secondlife setup build durga.bat
+++ b/linden/indra/newview/secondlife setup build durga.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DDURGA
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=durga
diff --git a/linden/indra/newview/secondlife setup build firstlook.bat b/linden/indra/newview/secondlife setup build firstlook.bat
index 099f4fc..73e47ec 100644
--- a/linden/indra/newview/secondlife setup build firstlook.bat
+++ b/linden/indra/newview/secondlife setup build firstlook.bat
@@ -1,11 +1,4 @@
 @rem Invoke the script which preps then runs the installer.

 @rem This batch file is customized per grid.

 

-set LOGINPAGEURL=http://secondlife.com/app/login/firstlook/

-set ARGS=/DFIRSTLOOK

-

-@rem To build optional "update" installer (doesn't have static VFS):

-@rem 

-@rem set ARGS=/DUPDATE

-

-@"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%

+@"secondlife setup build.bat" --grid=firstlook

diff --git a/linden/indra/newview/secondlife setup build ganga.bat b/linden/indra/newview/secondlife setup build ganga.bat
index db1a3ad..f2cff72 100644
--- a/linden/indra/newview/secondlife setup build ganga.bat
+++ b/linden/indra/newview/secondlife setup build ganga.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LONGPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DGANGA
-
-"secondlife setup build.bat" %LONGPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=ganga
\ No newline at end of file
diff --git a/linden/indra/newview/secondlife setup build museum.bat b/linden/indra/newview/secondlife setup build museum.bat
deleted file mode 100644
index e1ec644..0000000
--- a/linden/indra/newview/secondlife setup build museum.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
-
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DMUSEUM
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
diff --git a/linden/indra/newview/secondlife setup build shakti.bat b/linden/indra/newview/secondlife setup build shakti.bat
index 7d5a13c..37aff9b 100644
--- a/linden/indra/newview/secondlife setup build shakti.bat
+++ b/linden/indra/newview/secondlife setup build shakti.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DSHAKTI
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=shakti
\ No newline at end of file
diff --git a/linden/indra/newview/secondlife setup build siva.bat b/linden/indra/newview/secondlife setup build siva.bat
index 300df17..ae66128 100644
--- a/linden/indra/newview/secondlife setup build siva.bat
+++ b/linden/indra/newview/secondlife setup build siva.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DSIVA
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=siva
diff --git a/linden/indra/newview/secondlife setup build soma.bat b/linden/indra/newview/secondlife setup build soma.bat
index eed8e5b..c7a9f64 100644
--- a/linden/indra/newview/secondlife setup build soma.bat
+++ b/linden/indra/newview/secondlife setup build soma.bat
@@ -1,7 +1,4 @@
 @rem Invoke the script which preps then runs the installer.
 @rem This batch file is customized per grid.
 
-set LOGINPAGEURL=http://secondlife.com/app/login/beta/
-set ARGS=/DSOMA
-
-"secondlife setup build.bat" %LOGINPAGEURL% %ARGS%
+@"secondlife setup build.bat" --grid=soma
diff --git a/linden/indra/newview/secondlife setup build.bat b/linden/indra/newview/secondlife setup build.bat
index 169071f..df6dc72 100644
--- a/linden/indra/newview/secondlife setup build.bat
+++ b/linden/indra/newview/secondlife setup build.bat
@@ -12,63 +12,9 @@
 @REM     "secondlife setup build.bat" http://secondlife.com/app/login/beta/ /DADITI 
 @REM 
 
-@IF EXIST ReleaseForDownload\Secondlife.exe GOTO RELEASE_EXE
-@IF EXIST Secondlife.exe GOTO LOCAL_EXE
-@IF EXIST ReleaseNoOpt\newview_noopt.exe GOTO RELEASE_NOOPT_EXE
-
-@echo Could not find Secondlife.exe!
-@pause
-exit 0
-
-:RELEASE_NOOPT_EXE
-@echo Cound not find SecondLife.exe.
-@echo Using newview_noopt.exe - DEVELOPMENT BUILD!
-@pause
-SET EXEFILE=ReleaseNoOpt\newview_noopt.exe
-SET KDUDLL=ReleaseNoOpt\llkdu.dll
-GOTO CONTINUE
-
-:RELEASE_EXE
-SET EXEFILE=ReleaseForDownload\Secondlife.exe
-SET KDUDLL=ReleaseForDownload\llkdu.dll
-GOTO CONTINUE
-
-:LOCAL_EXE
-SET EXEFILE=Secondlife.exe
-SET KDUDLL=..\..\libraries\i686-win32\lib_release\llkdu.dll
-:CONTINUE
-
-@rem Set login page to reflect beta grid status
-call "set_login_page.bat" %1
-
-@rem Extract version information.
-branding\ResHacker -extract %EXEFILE%, branding\version.rc, versioninfo, 1,
-
-@rem Process version information.
-cd branding
-grep FILEVERSION version.rc | gawk "{ print $2; }" > version.txt
-gawk -F , "{ print \"!define VERSION_MAJOR \" $1; }" version.txt > version.include
-gawk -F , "{ print \"!define VERSION_MINOR \" $2; }" version.txt >> version.include
-gawk -F , "{ print \"!define VERSION_PATCH \" $3; }" version.txt >> version.include
-gawk -F , "{ print \"!define VERSION_BUILD \" $4; }" version.txt >> version.include
-echo !define EXE_LOCATION %EXEFILE% >> version.include
-echo !define KDU_DLL %KDUDLL% >> version.include
-
-cd ..
-@rem Build installer
-"C:\Program Files\NSIS\makensis" %2 %3 %4 %5 %6 %7 %8 %9 "secondlife setup.nsi"
-
-@rem Clean up
-del branding\version.include
-del branding\version.rc
-del branding\version.txt
-del branding\ResHacker.log
-del branding\ResHacker.ini
-
-@rem Restore login page changes to avoid accidental commits
-call "restore_login_page.bat"
-
 
+@rem use manifest to build installer
+@"viewer_manifest.py" %1 %2 %3 %4 %5 %6 %7 %8
 
 @rem pause
 
diff --git a/linden/indra/newview/set_login_page.bat b/linden/indra/newview/set_login_page.bat
deleted file mode 100644
index 5cbb77f..0000000
--- a/linden/indra/newview/set_login_page.bat
+++ /dev/null
@@ -1,45 +0,0 @@
-@echo off
-
-REM ============================================================
-REM set_login_page
-REM ============================================================
-REM
-REM Purpose:
-REM
-REM     Modify the login page (panel_login.xml) to point to a 
-REM     specific URL  for a viewer build, e.g. a viewer pointing 
-REM     at a beta grid.
-REM 
-REM Usage:
-REM
-REM     set_login_page.bat url
-REM
-REM Example:
-REM
-REM     set_login_page.bat http://secondlife.com/app/login/beta/
-REM 
-REM Notes:
-REM 
-REM     * Depends on branding\gawk.exe 
-REM     * gawk.exe needs to be a Win32 executable (not Win16)
-REM     * It's pretty dumb, and replaces the regular expression:
-REM             http://secondlife.com/app/login/.*
-
-set ORIGINAL=skins\xui\en-us\panel_login.xml
-set TEMPFILE=.\panel_login.xml
-set LOGINPAGEURL=%1
-
-IF defined LOGINPAGEURL GOTO do_replace
-goto end
-
-:do_replace
-
-echo Setting login page in %ORIGINAL% to "%LOGINPAGEURL%"
-
-copy %ORIGINAL% %TEMPFILE%
-branding\gawk.exe --assign=uri=%LOGINPAGEURL% "{ gsub( /http:\/\/secondlife\.com\/app\/login\/.*/, uri ); print; }" %TEMPFILE% > %ORIGINAL%
-
-REM Leave tempfile in place so it can be restored
-REM del %TEMPFILE%
-
-:END
diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
new file mode 100644
index 0000000..5bfb4d8
--- /dev/null
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -0,0 +1,391 @@
+<textures version = "101">
+        <closebox.tga value="47a8c844-cd2a-4b1a-be01-df8b1612fe5d"/>
+        <close_in_blue.tga value="e5821134-23c0-4bd0-af06-7fa95b9fb01a"/>
+        <tearoffbox.tga value="74e1a96f-4833-a24d-a1bb-1bce1468b0e7"/>
+        <tearoff_pressed.tga value="d2524c13-4ba6-af7c-e305-8ac6cc18d86a"/>
+        <resize_handle_bottom_right_blue.tga value="e3690e25-9690-4f6c-a745-e7dcd885285a"/>
+        <scrollbutton_up_out_blue.tga value="dad084d7-9a46-452a-b0ff-4b9f1cefdde9"/>
+        <scrollbutton_up_in_blue.tga value="a93abdf3-27b5-4e22-a8fa-c48216cd2e3a"/>
+        <scrollbutton_down_out_blue.tga value="b4ecdecf-5c8d-44e7-b882-17a77e88ed55"/>
+        <scrollbutton_down_in_blue.tga value="d2421bab-2eaf-4863-b8f6-5e4c52519247"/>
+        <scrollbutton_left_out_blue.tga value="43773e8d-49aa-48e0-80f3-a04715f4677a"/>
+        <scrollbutton_left_in_blue.tga value="ea137a32-6718-4d05-9c22-7d570d27b2cd"/>
+        <scrollbutton_right_out_blue.tga value="3d700d19-e708-465d-87f2-46c8c0ee7938"/>
+        <scrollbutton_right_in_blue.tga value="b749de64-e903-4c3c-ac0b-25fb6fa39cb5"/>
+        <spin_up_out_blue.tga value="56576e6e-6710-4e66-89f9-471b59122794"/>
+        <spin_up_in_blue.tga value="c8450082-96a0-4319-8090-d3ff900b4954"/>
+        <spin_down_out_blue.tga value="b6d240dd-5602-426f-b606-bbb49a30726d"/>
+        <spin_down_in_blue.tga value="a985ac71-052f-48e6-9c33-d931c813ac92"/>
+        <radio_active_false.tga value="7a1ba9b8-1047-4d1e-9cfc-bc478c80b63f"/>
+        <radio_active_true.tga value="52f09e07-5816-4052-953c-94c6c10479b7"/>
+        <radio_inactive_false.tga value="90688481-67ff-4af0-be69-4aa084bcad1e"/>
+        <radio_inactive_true.tga value="1975db39-aa29-4251-aea0-409ac09d414d"/>
+        <checkbox_enabled_false.tga value="05bb64ee-96fd-4243-b74e-f40a41bc53ba"/>
+        <checkbox_enabled_true.tga value="cf4a2ed7-1533-4686-9dde-df9a37ddca55"/>
+        <checkbox_disabled_false.tga value="7d94cb59-32a2-49bf-a516-9e5a2045f9d9"/>
+        <checkbox_disabled_true.tga value="c817c642-9abd-4236-9287-ae0513fe7d2b"/>
+        <tab_top_blue.tga value="1ed83f57-41cf-4052-a3b4-2e8bb78d8191"/>
+        <tab_top_selected_blue.tga value="16d032e8-817b-4368-8a4e-b7b947ae3889"/>
+        <tab_bottom_blue.tga value="bf0a8779-689b-48c3-bb9a-6af546366ef4"/>
+        <tab_bottom_selected_blue.tga value="c001d8fd-a869-4b6f-86a1-fdcb106df9c7"/>
+        <tab_left.tga value="1097dcb3-aef9-8152-f471-431d840ea89e"/>
+        <tab_left_selected.tga value="bea77041-5835-1661-f298-47e2d32b7a70"/>
+        <crosshairs.tga value="6e1a3980-bf2d-4274-8970-91e60d85fb52"/>
+        <move_backward_in.tga value="db11d956-5e7d-4aa5-b39d-7774d339fc5c"/>
+        <move_backward_out.tga value="3ae8bb18-ed97-4cd3-ae5c-d54bc8479fe7"/>
+        <move_down_in.tga value="b92a70b9-c841-4c94-b4b3-cee9eb460d48"/>
+        <move_down_out.tga value="b5abc9fa-9e62-4e03-bc33-82c4c1b6b689"/>
+        <move_forward_in.tga value="54197a61-f5d1-4c29-95d2-c071d08849cb"/>
+        <move_forward_out.tga value="a0eb4021-1b20-4a53-892d-8faa9265a6f5"/>
+        <move_left_in.tga value="724996f5-b956-46f6-9844-4fcfce1d5e83"/>
+        <move_left_out.tga value="82476321-0374-4c26-9567-521535ab4cd7"/>
+        <move_right_in.tga value="7eeb57d2-3f37-454d-a729-8b217b8be443"/>
+        <move_right_out.tga value="1fbe4e60-0607-44d1-a50a-032eff56ae75"/>
+        <move_turn_left_in.tga value="95463c78-aaa6-464d-892d-3a805b6bb7bf"/>
+        <move_turn_left_out.tga value="13a93910-6b44-45eb-ad3a-4d1324c59bac"/>
+        <move_turn_right_in.tga value="5e616d0d-4335-476f-9977-560bccd009da"/>
+        <move_turn_right_out.tga value="5a44fd04-f52b-4c30-8b00-4a31e27614bd"/>
+        <move_up_out.tga value="f887146d-829f-4e39-9211-cf872b78f97c"/>
+        <move_up_in.tga value="49b4b357-e430-4b56-b9e0-05b8759c3c82"/>
+        <cam_rotate_out.tga value="88745b46-da05-11d5-8ac0-0003477c4611"/>
+        <cam_rotate_in.tga value="70bf2262-3eed-4996-88ac-076907e8921d"/>
+        <cam_zoom_out.tga value="bb02e941-cb3b-4dd3-892a-6841b5de6e45"/>
+        <cam_zoom_plus_in.tga value="c7aefd32-ce13-4242-82cc-2631d44ff9d3"/>
+        <cam_zoom_minus_in.tga value="deed3f4b-93e9-4183-a3b0-a5a98a6de1bb"/>
+        <cam_tracking_out.tga value="95c4ea0e-e3c2-4904-b847-7d7676139ebb"/>
+        <cam_tracking_in.tga value="fe2fc73b-5a64-4a8e-aacc-46fa81faf96a"/>
+        <direction_arrow.tga value="586383e8-4d9b-4fba-9196-2b5938e79c2c"/>
+        <minimize.tga value="34c9398d-bb78-4643-9633-46a2fa3e9637"/>
+        <minimize_inactive.tga value="6e72abba-1378-437f-bf7a-f0c15f3e99a3"/>
+        <minimize_pressed.tga value="39801651-26cb-4926-af57-7af9352c273c"/>
+        <restore.tga value="111b39de-8928-4690-b7b2-e17d5c960277"/>
+        <restore_inactive.tga value="0eafa471-70af-4882-b8c1-40a310929744"/>
+        <restore_pressed.tga value="90a0ed5c-2e7b-4845-9958-a64a1b30f312"/>
+        <combobox_arrow.tga value="b31c1335-0e9c-4927-bc90-53277777d9c1"/>
+        <white.tga value="5748decc-f629-461c-9a36-a35a221fe21f"/>
+        <darkgray.tga value="267e26d3-e0e1-41b8-91b1-3b337102928d"/>
+        <lightgray.tga value="c520bf46-cc5d-412b-a60b-9f1bd245189f"/>
+        <eyes.tga value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
+        <hair.tga value="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"/>
+        <black.tga value="e2244626-f22f-4839-8123-1e7baddeb659"/>
+        <close_inactive_blue.tga value="779e4fa3-9b13-f74a-fba9-3886fe9c86ba"/>
+        <button_disabled_32x128.tga value="f8124d60-2875-c358-7847-2acb63e5400c"/>
+        <button_enabled_32x128.tga value="d8faf8cb-ee6e-b0b5-abd9-bde873ad3461"/>
+        <button_enabled_selected_32x128.tga value="1eddba75-b682-110a-104e-6cdcce616a25"/>
+        <button_anim_play_selected.tga value="119c37bb-24af-45fe-ae11-3a6bc3c85138"/>
+        <button_anim_pause_selected.tga value="ad65d67a-777b-fbfa-693d-4bdcfca2acca"/>
+        <button_anim_pause.tga value="db2d9c2d-0bbd-21e2-e83a-103ea2def7a8"/>
+        <button_anim_play.tga value="2a7f6738-5d82-2ff3-d419-30ed09cbb72b"/>
+        <button_anim_stop.tga value="e10c9e36-d9f6-c8b4-de96-557dccce9205"/>
+        <button_anim_stop_selected.tga value="b8c0e0aa-2771-439e-c919-d2f5dad69a1c"/>
+        <rounded_square.tga value="38ce8b3c-fb30-5c59-9926-bd643613f606"/>
+        <rounded_square_soft.tga value="4c95e6bc-fe77-9cb4-b58a-909848042c1e"/>
+        <badge_ok.tga value="211035a7-c313-378d-478c-e80bbd0fde63"/>
+        <badge_note.tga value="13f6e639-b3f9-28da-a1e6-e990a43052b6"/>
+        <badge_warn.tga value="0992d4bc-7af8-4a1f-f2e6-e6c4083b066e"/>
+        <badge_error.tga value="00c50485-8491-ab70-2ea8-43f26fd028e2"/>
+        <status_money.tga value="5863eb7a-1546-6501-533a-6061f73a36b7"/>
+        <status_health.tga value="4330e8ce-b39b-1eb8-c2ec-a97c0b3947b5"/>
+        <status_fly.tga value="0e058115-5b8f-c3d7-dcaa-9623d92885d1"/>
+        <status_build.tga value="175a6b75-45c9-c2c2-4765-bf37a3909b53"/>
+        <status_busy.tga value="beb0d821-6725-abdf-032d-1f70cdabde82"/>
+        <status_scripts.tga value="4cc1afcd-04dd-178f-e074-0f9dc730ab45"/>
+        <status_buy_currency.tga value="f43a535a-59ac-26e3-84bc-c786735fabe4"/>
+        <status_buy_currency_pressed.tga value="bfa5be70-37c7-8126-fecd-df55390954d5"/>
+        <status_buy_land.tga value="1a0edac5-3e50-fc9b-2752-70c1f69cb959"/>
+        <status_buy_land_pressed.tga value="257647b7-199f-99ff-8be9-f6753289a3aa"/>
+        <terrain_dirt.tga value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/>
+        <terrain_grass.tga value="abb783e6-3e93-26c0-248a-247666855da3"/>
+        <terrain_mountain.tga value="179cdabd-398a-9b6b-1391-4dc333ba321f"/>
+        <terrain_rock.tga value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/>
+        <terrain_dirt_detail.tga value="0bc58228-74a0-7e83-89bc-5c23464bcec5"/>
+        <terrain_grass_detail.tga value="63338ede-0037-c4fd-855b-015d77112fc8"/>
+        <terrain_mountain_detail.tga value="303cd381-8560-7579-23f1-f0a880799740"/>
+        <terrain_rock_detail.tga value="53a2f406-4895-1d13-d541-d2e3b86bc19c"/>
+        <square_btn_32x128.tga value="b28df901-6b8d-d31c-7903-4eb9676d4bfc"/>
+        <square_btn_selected_32x128.tga value="c48c9e95-191b-96d3-08b2-6e8ada58b651"/>
+        <tree_pine_1.tga value="0187babf-6c0d-5891-ebed-4ecab1426683"/>
+        <tree_oak.tga value="8a515889-eac9-fb55-8eba-d2dc09eb32c8"/>
+        <tree_tropical_1.tga value="5bc11cd6-2f40-071e-a8da-0903394204f9"/>
+        <tree_palm_1.tga value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c"/>
+        <tree_dogwood.tga value="64367bd1-697e-b3e6-0b65-3f862a577366"/>
+        <tree_tropical_2.tga value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8"/>
+        <tree_palm_2.tga value="2d784476-d0db-9979-0cff-9408745a7cf3"/>
+        <tree_cypress_1.tga value="fb2ae204-3fd1-df33-594f-c9f882830e66"/>
+        <tree_cypress_2.tga value="30047cec-269d-408e-0c30-b2603b887268"/>
+        <tree_pine_2.tga value="d691a01c-13b7-578d-57c0-5caef0b4e7e1"/>
+        <tree_plumeria.tga value="6de37e4e-7029-61f5-54b8-f5e63f983f58"/>
+        <winter_tree_aspen.tga value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a"/>
+        <winter_tree_pine_1.tga value="10d2a01a-0818-84b9-4b96-c2eb63256519"/>
+        <winter_tree_pine_2.tga value="67931331-0c02-4876-1255-28770896c6a2"/>
+        <tree_eucalyptus.tga value="a6162133-724b-54df-a12f-51cd070ad6f3"/>
+        <tree_fern.tga value="8872f2b8-31db-42d8-580a-b3e4a91262de"/>
+        <tree_eelgrass.tga value="96b4de31-f4fa-337d-ec78-451e3609769e"/>
+        <tree_sea_sword.tga value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3"/>
+        <tree_kelp_1.tga value="2caf1179-7861-6ff3-4b7d-46e17780bdfa"/>
+        <tree_kelp_2.tga value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f"/>
+        <tree_beach_grass_1.tga value="18fb888b-e8f1-dce7-7da7-321d651ea6b0"/>
+        <tool_dozer.tga value="d2a0d4d4-54eb-4d16-be4b-4eae43845c74"/>
+        <tool_dozer_active.tga value="d4afdbbe-1550-4b7d-91de-95731f47e8e3"/>
+        <tool_land.tga value="86fe4df4-0ecb-4382-b9ae-475925a92388"/>
+        <tool_land_active.tga value="34e60587-0791-4a07-8918-f5995fcc22a3"/>
+        <tool_zoom.tga value="27eb8829-fe65-45ed-a49a-73aac42f4b38"/>
+        <tool_zoom_active.tga value="69445f58-5c8e-44e0-9d2e-47408bb43b39"/>
+        <tool_orbit.tga value="06964fe4-033f-448a-95c9-30dc41d1be8b"/>
+        <tool_orbit_active.tga value="ee4e07db-3f72-4098-bd4c-aef34515a7bc"/>
+        <tool_pan.tga value="a32aa302-0a15-48d2-b2b1-4d69f1161173"/>
+        <tool_pan_active.tga value="24d9ad33-0b42-4eb5-99a3-659d838bc5c0"/>
+        <inv_folder_texture.tga value="743f035b-a049-43f4-16c7-7ec8daa2c481"/>
+        <inv_folder_sound.tga value="e10cb910-1e71-da47-bd12-8c53f7793714"/>
+        <inv_folder_callingcard.tga value="a3735971-e2b2-d78a-580d-d265cd8f2484"/>
+        <inv_folder_landmark.tga value="9f921155-7c8c-e276-d5ec-03ac9340584d"/>
+        <inv_folder_script.tga value="baa5c310-6a6d-cc48-51eb-65196ba31d77"/>
+        <inv_folder_object.tga value="113e5133-fd0d-ee51-4a59-9d67ca10e8a7"/>
+        <inv_folder_notecard.tga value="a9e75d84-5073-9cb7-10a9-1ca68ef5c7ba"/>
+        <inv_folder_clothing.tga value="f1427d3d-b2e8-97c4-69ab-1f36d4c0e8f0"/>
+        <inv_folder_bodypart.tga value="1fe05580-1d2f-0345-b28b-52b6e3a20e5d"/>
+        <inv_folder_trash.tga value="88ad072e-ea0b-aabd-5ac0-b37862a6eb66"/>
+        <inv_folder_plain_closed.tga value="86f00960-c3e9-9680-145d-3beffd743e9c"/>
+        <inv_folder_plain_open.tga value="d15dc243-2d0b-47af-0ce1-ec376464bdc8"/>
+        <inv_folder_snapshot.tga value="6efe85e7-800f-1843-296c-a5b7adffe091"/>
+        <inv_folder_lostandfound.tga value="9a371a04-297d-bacf-0d16-5f49753efe1d"/>
+        <inv_folder_animation.tga value="4d59b3ee-f29d-b912-2bcc-9bb1f8a07ec6"/>
+        <inv_folder_gesture.tga value="4de9129a-9fc1-d759-d739-364293906ba2"/>
+        <inv_item_texture.tga value="19f452d7-4eee-9f46-76cc-5497d17f1dd9"/>
+        <inv_item_sound.tga value="eb414d69-c77d-d4e7-66e6-6c2e6f6c1976"/>
+        <inv_item_callingcard_online.tga value="672cc53e-8dc0-ba91-2a4e-574104cf071c"/>
+        <inv_item_callingcard_offline.tga value="d0afe86b-2489-7600-55b7-6abb0a63d9f9"/>
+        <inv_item_landmark.tga value="bf25a2a0-85da-7fa0-0993-e461768d0221"/>
+        <inv_item_landmark_visited.tga value="229fac85-5428-4ab7-adeb-eb8389e91092"/>
+        <inv_item_script.tga value="59a3df81-ed76-06c9-7264-6dada535e7a3"/>
+        <inv_item_clothing.tga value="34dfe476-8e26-0e3a-11cf-76cc4a7126ce"/>
+        <inv_item_object.tga value="0f0780a0-89c4-742a-ef28-26405a41cf85"/>
+        <inv_item_notecard.tga value="23ce8a2c-9ea2-d863-6572-806f0645b0c7"/>
+        <inv_item_bodypart.tga value="d2a5362d-5c55-57dd-a9e9-5c814d1ddc16"/>
+        <inv_item_attach.tga value="5bcae41e-aa5d-02f8-edf1-605ebdd875ab"/>
+        <inv_item_snapshot.tga value="3810d584-b092-7caa-57e0-010f192b9659"/>
+        <inv_item_eyes.tga value="eaa5fd96-5c25-06ef-2280-7ef20203e167"/>
+        <inv_item_gloves.tga value="117b11cb-c04e-5081-13da-1a8846070fd0"/>
+        <inv_item_hair.tga value="6bca3bf4-ed6d-d438-63a0-2a7066d03a0b"/>
+        <inv_item_jacket.tga value="8df59386-56e0-c811-0443-840da3acb3a5"/>
+        <inv_item_pants.tga value="a87a58ca-f857-63b1-0acf-072711ed1bdb"/>
+        <inv_item_shape.tga value="4463e433-4db5-79ef-c1b0-4821b03ddb07"/>
+        <inv_item_shirt.tga value="e2ffb62b-6abc-22d6-952d-764759b4d636"/>
+        <inv_item_shoes.tga value="cf384fa5-1edd-c37c-2134-283dd4fe3396"/>
+        <inv_item_skirt.tga value="0b43f826-2abc-2944-7d72-10777a51d19b"/>
+        <inv_item_socks.tga value="22137c6d-6ec5-6eee-9a2e-2d7a9e6cbcd4"/>
+        <inv_item_underpants.tga value="2f15dc09-4385-526c-aa5d-d9d516ec7d99"/>
+        <inv_item_undershirt.tga value="f72ab629-a3ab-de0c-35c0-5285e27478ce"/>
+        <inv_item_animation.tga value="b5cda0d6-d196-ce48-63db-d04323ef8931"/>
+        <inv_item_gesture.tga value="5579245d-d5bf-5f13-46b0-8624490de24c"/>
+        <pixiesmall.tga value="168e6813-096e-07ea-97ae-fd416826f627"/>
+        <legend.tga value="ca7609c6-6ec6-32d9-332e-0d8f437ef644"/>
+        <propertyline.tga value="e3548c46-8d5e-03da-fcab-4fc36ad818bb"/>
+        <startup_logo.tga value="66864f3c-e095-d9c8-058d-d6575e6ed1b8"/>
+        <grass_texture_1.tga value="79504bf5-c3ec-0763-6563-d843de66d0a1"/>
+        <grass_texture_2.tga value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/>
+        <grass_texture_3.tga value="99bd60a2-3250-efc9-2e39-2fbcadefbecc"/>
+        <grass_texture_4.tga value="7a2b3a4a-53c2-53ac-5716-aac7d743c020"/>
+        <undergrowth_1.tga value="8f458549-173b-23ff-d4ff-bfaa5ea2371b"/>
+        <silhouette.tga value="da5d4079-7819-6b53-d2a4-dc9929381d7d"/>
+        <avatar_thumb_bkgrnd.tga value="3a7f4f0d-be14-ee78-29e3-fc8b0b2a68d3"/>
+        <missing_asset.tga value="32dfd1c8-7ff6-5909-d983-6d4adfb4255d"/>
+        <alpha_gradient.tga value="e97cf410-8e61-7005-ec06-629eba4cd1fb"/>
+        <alpha_gradient_2d.tga value="38b86f85-2575-52a9-a531-23108d8da837"/>
+        <alpha_noise.tga value="b9e1cf8a-9660-c020-0c69-18f1ea27268a"/>
+        <alpha_sizzle.tga value="e121e2fc-7573-740f-edfd-0d45a9ba486e"/>
+        <bump_woodgrain.tga value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc"/>
+        <bump_bark.tga value="6c9fa78a-1c69-2168-325b-3e03ffa348ce"/>
+        <bump_bricks.tga value="b8eed5f0-64b7-6e12-b67f-43fa8e773440"/>
+        <bump_checker.tga value="9deab416-9c63-78d6-d558-9a156f12044c"/>
+        <bump_concrete.tga value="db9d39ec-a896-c287-1ced-64566217021e"/>
+        <bump_crustytile.tga value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94"/>
+        <bump_cutstone.tga value="d9258671-868f-7511-c321-7baef9e948a4"/>
+        <bump_discs.tga value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9"/>
+        <bump_gravel.tga value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61"/>
+        <bump_petridish.tga value="e569711a-27c2-aad4-9246-0c910239a179"/>
+        <bump_siding.tga value="073c9723-540c-5449-cdd4-0e87fdc159e3"/>
+        <bump_stonetile.tga value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0"/>
+        <bump_stucco.tga value="92e66e00-f56f-598a-7997-048aa64cde18"/>
+        <bump_suction.tga value="83b77fc6-10b4-63ec-4de7-f40629f238c5"/>
+        <bump_weave.tga value="735198cf-6ea0-2550-e222-21d3c6a341ae"/>
+        <icon_avatar_online.tga value="529ed15b-3d41-dcc1-79de-90bf21770b5b"/>
+        <icon_avatar_offline.tga value="34648c67-5bfb-5790-e05e-8bd6600fd087"/>
+        <icon_event.tga value="be235ae0-53cf-1d68-b3ae-cf375ed1fb58"/>
+        <icon_event_mature.tga value="cc090999-1b3e-2e97-7a38-c9f4afd10297"/>
+        <icon_group.tga value="04237108-a879-5a95-9b0c-b18fd09bc447"/>
+        <icon_place.tga value="ba0bac4e-815e-14e1-2895-5065b8c703b3"/>
+        <icon_top_pick.tga value="77ca91a2-4431-aeaf-6249-3dd99c7dd86d"/>
+        <icon_popular.tga value="bdd47da5-5b5b-c906-37ad-16aaa64f096f"/>
+        <icon_for_sale.tga value="f20728fd-1670-3771-2293-e0dd3f0bcaab"/>
+        <icon_auction.tga value="96abf5b1-335c-6b76-61e3-74ada07f3cb8"/>
+        <icon_land_for_landless.tga value="c421ddf2-b9d7-b373-503c-f4c423f37f1c"/>
+        <icon_day_cycle.tga value="5b30a285-f1e3-92b1-dcd3-0d07366ced3e"/>
+        <icon_lock.tga value="9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4"/>
+        <noentrylines.tga value="5d3e196b-fd4d-ada7-e4c1-99f8e9f1cfbf"/>
+        <noentrypasslines.tga value="ac8f8627-6a30-8da8-d4bd-958668eea7a0"/>
+        <notify_tip_icon.tga value="74ba3584-58ea-9984-5b76-62d37942ab77"/>
+        <notify_box_icon.tga value="b2ef2d31-9714-a07b-6ca7-31638166364b"/>
+        <notify_next.tga value="07d0ea4c-af0c-aad1-dbbf-c24020ff2b80"/>
+        <map_avatar_you_8.tga value="02fbdc40-5e07-a6e1-228b-58e10f8335b7"/>
+        <map_avatar_8.tga value="0be58a91-8065-c02b-7a12-2cc14dddbc37"/>
+        <map_avatar_16.tga value="db0dadd5-026a-88cf-f5c1-523a0a2daa3e"/>
+        <map_telehub.tga value="bf1b2bb0-13b1-40ae-3354-b1b93761bdb4"/>
+        <map_infohub.tga value="85b1a79a-7f6c-9df3-4d6c-17b1a4efb55a"/>
+        <map_home.tga value="ae9b8f5f-03a1-2e71-db77-6eb27a1ba181"/>
+        <map_event.tga value="6008be5e-9267-2a3a-9798-e81b076c22ca"/>
+        <map_event_mature.tga value="f9cdba28-a227-d613-2f16-ce06209314ae"/>
+        <map_track_8.tga value="bfdc7bf6-e2ee-1754-f4df-cc25887714ad"/>
+        <map_track_16.tga value="a3878395-ef00-a0e6-ee9a-f45ed6b9ce59"/>
+        <object_cone.tga value="c2b8c90a-7dca-26e3-1a63-7aa4a0389cf9"/>
+        <object_cone_active.tga value="cf69c64b-f19e-e1f3-a586-42fef31a23be"/>
+        <object_cube.tga value="70c747ac-1de3-a8b9-514d-101753ca6ccb"/>
+        <object_cube_active.tga value="f9c5e213-1076-7a7d-7889-52388aad2c1a"/>
+        <object_cylinder.tga value="13e35d95-5f6c-9a91-1766-49dedf9b1267"/>
+        <object_cylinder_active.tga value="3f3e4932-8412-e2a7-cfe9-92caf5978b1b"/>
+        <object_grass.tga value="7ca8e672-920b-4653-3970-1abc91abef58"/>
+        <object_grass_active.tga value="d0fc7cc9-646a-6860-cf7c-1d9e58cd6dab"/>
+        <object_hemi_cone.tga value="69d5e60c-739a-40b1-b526-84072121e394"/>
+        <object_hemi_cone_active.tga value="2e0c5435-95bb-1c0d-5da1-42336fb1cfc0"/>
+        <object_hemi_cylinder.tga value="f4be3e06-24a8-f86e-acc7-7daefc0572b7"/>
+        <object_hemi_cylinder_active.tga value="67279486-cfc1-3633-de42-85db65db373c"/>
+        <object_hemi_sphere.tga value="b67251ab-1716-b9fb-f911-967ba3fe027b"/>
+        <object_hemi_sphere_active.tga value="6c489466-3058-6475-6b1b-e5fc1d49f1f3"/>
+        <object_pyramid.tga value="9dde8b56-2cc4-a932-b63a-38c3a83221ad"/>
+        <object_pyramid_active.tga value="e7217b1a-e3d8-e339-d28a-d7714d0b5bee"/>
+        <object_sphere.tga value="7fa122c0-b994-460e-8636-cdc451d67268"/>
+        <object_sphere_active.tga value="f2c3bcbc-2904-41a5-1c22-688f176fd1ee"/>
+        <object_tetrahedron.tga value="e17db404-9fc5-9534-1038-777c82b2771f"/>
+        <object_tetrahedron_active.tga value="2792ea3b-c052-85fe-d168-a62b2f4e9d7c"/>
+        <object_tree.tga value="710d1bec-fb33-28f1-e77e-ddbb5b51f5ed"/>
+        <object_tree_active.tga value="da4835c7-b12a-41dd-11db-dae452f040c2"/>
+        <object_prism.tga value="02935f3a-dcda-3b42-1874-da89d4c12870"/>
+        <object_prism_active.tga value="223aac97-bd2f-ec2e-ad45-5641b77c78f9"/>
+        <object_torus.tga value="19e1f4c9-6aa6-4414-981d-59a1343a6472"/>
+        <object_torus_active.tga value="ef2bca77-5004-4547-b00a-3b96e463f89f"/>
+        <object_tube.tga value="7ce81316-a478-480f-961c-435fcbdecaf0"/>
+        <object_tube_active.tga value="55c3e4d1-cfdc-48a8-af32-a34844b91832"/>
+        <object_ring_active.tga value="2c955a73-fa31-237b-a4a1-5c8ede3bae50"/>
+        <object_ring.tga value="a7610e41-4647-16d8-0e0e-85a1211c1596"/>
+        <container_animation.tga value="c4e657a1-4c86-0159-2da0-32ff948484e6"/>
+        <container_bodypart.tga value="770cb2df-758d-34d5-36c7-e3de06db5b5d"/>
+        <container_clothing.tga value="dd90406f-4c8f-a3f9-41df-d562f94f09e0"/>
+        <container_gesture.tga value="59cd31c0-2791-3c48-f740-f0a36c68653e"/>
+        <container_landmark.tga value="24c63386-04f7-ce6f-4ff2-dfb215d2e21f"/>
+        <container_many_things.tga value="849d3292-d9fa-7186-5465-dd7b5fc1ec48"/>
+        <container_object.tga value="ad887ae1-2bee-f2c9-6786-5599de3c95c4"/>
+        <container_script.tga value="b93bd494-c4bd-bcdf-4a59-35a9497d03f3"/>
+        <container_sound.tga value="5ddea031-cfa3-2776-43e3-c7146c1b4cd6"/>
+        <container_texture.tga value="b3f95caf-bd62-bef3-0ded-dea752920629"/>
+        <fringe.tga value="8ac54e9d-ec09-d804-60ab-47404a9b4a36"/>
+        <foot_shadow.tga value="14e8a47d-1055-0a68-5d55-eafd9ad3da5b"/>
+        <img_smoke_poof.tga value="c734da52-f2ba-f0ba-d59e-15ea49f3d5e9"/>
+        <img_shot.tga value="173b05c7-53a9-4cf8-ce6b-5eec21c5c63f"/>
+        <folder_arrow.tga value="09a324a8-acc1-d9cd-2cbd-7465d90d3a98"/>
+        <color_swatch_alpha.tga value="f13db22f-c55c-8bdf-7b1c-221e56fde253"/>
+        <script_error.tga value="e5a0ec29-f59e-d29e-2c59-ed66c187c26c"/>
+        <status_script_debug.tga value="7775b5cc-93a5-6efd-0d9b-4e079afac217"/>
+        <water_normal.tga value="822ded49-9a6c-f61c-cb89-6df54f42cdf4"/>
+        <icon_groupnotice.tga value="21579c81-a85e-f11c-2d80-33a4c007d88c"/>
+        <icon_groupnoticeinventory.tga value="8fcca699-08e7-3d58-2f05-86c9d52bbe82"/>
+        <tab_background_lightgrey.tga value="c769e547-c307-43ca-2b6a-51cad6d1c527"/>
+        <tab_background_purple.tga value="0ae8a2e9-aff4-249c-fc4a-0f41f89847dd"/>
+        <tab_background_darkpurple.tga value="38ff4f7e-3078-a749-8302-d6cc94b404c4"/>
+        <smicon_warn.tga value="f47c17a3-8bfb-3c9f-22b8-77923de7eed9"/>
+        <uv_test1.tga value="f43b75f5-9aa5-18ec-d5d9-e6d1b8442613"/>
+        <uv_test2.tga value="300ce95f-3d3f-7c1a-3a22-3fc48f873fb9"/>
+        <eye_button_active.tga value="2b42b375-f9b4-788e-46c7-7ef38762d0ba"/>
+        <eye_button_inactive.tga value="be1b7225-98b5-eb2a-2c86-ddaae3328a6e"/>
+        <account_id_blue.tga value="6ab9179a-7308-58db-6c9d-893d3b52bece"/>
+        <account_id_orange.tga value="fbe89371-1251-4e77-d2d8-8eeccffe3ca8"/>
+        <account_id_green.tga value="3bf64d5a-38d3-b752-cf52-3d9f8fca353a"/>
+        <status_push.tga value="07d1f523-e327-4d10-20d6-8bc22a6e8f56"/>
+        <ff_visible_online.tga value="d609a41f-34c0-7aae-b2c6-2fc3ab26d916"/>
+        <ff_visible_map.tga value="20b52706-c1ab-414a-9dea-1cb788ad5689"/>
+        <ff_edit_mine.tga value="1baee0b9-4b89-39eb-8815-866d82300ab5"/>
+        <ff_edit_theirs.tga value="32e981cd-4700-da5a-7fc7-d573ec3742f4"/>
+        <inv_item_script_dangerous.tga value="0b502db8-6fcd-c442-ecfe-483a0dce875e"/>
+        <ff_visible_map_button.tga value="c1079bef-5cf9-90f3-6dcd-48989851c252"/>
+        <ff_visible_online_button.tga value="36749b47-93d6-2c5e-7ebd-d38d30311163"/>
+        <ff_edit_theirs_button.tga value="ca229f65-d7e0-133e-1bc2-674abc33f3d5"/>
+        <ff_edit_mine_button.tga value="57f05b46-63d8-c3d5-66d6-8b915746b956"/>
+        <ff_online_status_button.tga value="3b1b6a53-9c8c-568a-22c5-2a8f3e5286f5"/>
+        <oi_hud_cen_0_0.tga value="3c650257-9caf-7cad-b26c-84c9eca560f1"/>
+        <oi_hud_intro.tga value="7611fb3d-9ff2-abd3-d98f-805c1c87e757"/>
+        <oi_hud_underwater.tga value="cde61aea-83c2-3001-d598-6b348f7a8e0b"/>
+        <oi_hud_got_passport.tga value="1271838d-d777-b811-7c4c-2a00308bd80a"/>
+        <oi_hud_texture_off_edge.tga value="852be205-b1ea-6356-58c8-8c5ee5a841a6"/>
+        <oi_hud_texture_on_edge.tga value="ab11e6ff-a732-be70-67df-c43131274562"/>
+        <oi_hud_flyingabovewater.tga value="c9d150d6-2739-5f8b-cce6-3cf98242920a"/>
+        <oi_hud_walkingabovewater.tga value="78284eeb-05f3-ff25-11a0-3cc9dbb30f0c"/>
+        <oi_hud_landmark.tga value="6cd9c221-9d42-a283-256b-09a113a87271"/>
+        <oi_hud_cus_5_3.tga value="7c12f4fb-f502-26d1-a2f3-cdb6aff61663"/>
+        <oi_hud_cus_5_2.tga value="c52c9c94-adc0-0f4e-6658-ed33d6ea8829"/>
+        <oi_hud_cus_5_1.tga value="9f6d5d11-6ca9-608c-e8a6-b77989350292"/>
+        <oi_hud_cus_5_0.tga value="2000cff1-119f-2023-66c0-ac5630d2f96e"/>
+        <oi_hud_cus_4_5.tga value="f302a935-ccd1-e2f5-3a38-e185cc262f3a"/>
+        <oi_hud_cus_4_3.tga value="af8d5b3c-b40f-cea5-b0b2-440fbd84a11a"/>
+        <oi_hud_cus_4_2.tga value="11b26901-8207-12bc-5224-10a12ac4c651"/>
+        <oi_hud_cus_4_1.tga value="41baadb7-1b94-907e-9443-54e92bba77cd"/>
+        <oi_hud_cus_4_0.tga value="9d627f8e-092c-5d32-6c12-ef76ab81cedc"/>
+        <oi_hud_cus_3_4.tga value="b196486e-d0d2-4fd7-529a-c84b4495fc74"/>
+        <oi_hud_cus_3_2.tga value="0b81c4bb-de33-e493-7bcb-e7221d97e5e7"/>
+        <oi_hud_cus_3_1.tga value="436dab74-25ae-8b60-c648-50663b7faa1d"/>
+        <oi_hud_cus_3_0.tga value="6c1594de-1e66-273c-a2ab-8f0ffa8b4633"/>
+        <oi_hud_cus_2_4.tga value="bb31fe48-8566-eec0-e96b-64025f832b63"/>
+        <oi_hud_cus_2_2.tga value="c946959a-26ae-eb66-efa0-20154057789d"/>
+        <oi_hud_cus_2_1.tga value="c946959a-26ae-eb66-efa0-20154057789d"/>
+        <oi_hud_cus_2_0.tga value="d7833106-b4a8-7666-bde1-64886de289f9"/>
+        <oi_hud_cus_1_0.tga value="811ded22-5940-940c-4821-6fbbfb6611d6"/>
+        <oi_hud_cus_1_1.tga value="eda8513b-a343-5109-1fd6-f1c7ad89b703"/>
+        <oi_hud_cus_1_2.tga value="7a4ce18c-e715-34d4-dfee-704c270a8ac8"/>
+        <oi_hud_cus_1_4.tga value="d3771c15-ac03-b762-b992-d9fd2fedf38a"/>
+        <oi_hud_com_4_4.tga value="d9e1e90d-3cc3-6269-128e-67f7a2b32d26"/>
+        <oi_hud_com_4_2.tga value="0f649a26-6fdb-c73b-ffac-e50fc311d5ce"/>
+        <oi_hud_com_4_1.tga value="ae5b1ce6-a2d2-22d2-f532-6280b3bc6adb"/>
+        <oi_hud_com_4_0.tga value="12cda3a0-58c7-dfa8-7f9b-380e5bb8baf9"/>
+        <oi_hud_com_3_4.tga value="ff326257-0530-356a-e0f8-be535044e540"/>
+        <oi_hud_com_3_2.tga value="66740ddb-1d56-89f9-f0c9-ae5eb7bb9537"/>
+        <oi_hud_com_3_1.tga value="55d662f4-6a28-6388-7c75-af1c9fd33055"/>
+        <oi_hud_com_3_0.tga value="de9d318f-b69e-82f9-0c61-43b868c5ca6b"/>
+        <oi_hud_com_2_4.tga value="01d47e68-400a-d0e1-afb7-d6806d1d477e"/>
+        <oi_hud_com_2_0.tga value="09c98850-27d4-6a12-abae-4af4bba23b6b"/>
+        <oi_hud_com_1_3.tga value="5c2049b9-f797-6608-ca71-758f3716aa90"/>
+        <oi_hud_com_1_1.tga value="1116ff68-cdc4-1cfc-e137-30f8426afeda"/>
+        <oi_hud_com_1_0.tga value="bd847d31-f5af-95f7-2b9c-af47d8ba53bd"/>
+        <oi_hud_nav_4_5.tga value="66194280-b087-db94-35d9-41e8f7518515"/>
+        <oi_hud_nav_4_4.tga value="180c4241-e309-4c05-13ee-9080ab69498d"/>
+        <oi_hud_nav_4_3.tga value="e98a6ba6-99c6-fa15-84b6-9afadea6c467"/>
+        <oi_hud_nav_4_2.tga value="2e19f352-1893-59a9-949b-4d2cfd3a8222"/>
+        <oi_hud_nav_4_1.tga value="13a1675b-fb5a-19b3-b5a3-74b0a6765f7d"/>
+        <oi_hud_nav_4_0.tga value="e7526e8d-b085-b26c-b0ae-2708ec231401"/>
+        <oi_hud_nav_3_5.tga value="5e67b0d0-29a2-6a08-c85e-b12d59e53d6e"/>
+        <oi_hud_nav_3_4.tga value="2ed8fbc2-5c4d-53c2-b289-88baffceab1a"/>
+        <oi_hud_nav_3_3.tga value="e0a72f1a-282e-1c1a-2cb7-6423feb41759"/>
+        <oi_hud_nav_3_2.tga value="4bcebb23-da5e-47d9-eac1-e4453f762c8c"/>
+        <oi_hud_nav_3_1.tga value="6ac87575-330e-3a2d-3b80-a34e7b277e50"/>
+        <oi_hud_nav_3_0.tga value="f1451e8e-7310-9152-47d5-5d037c28fef3"/>
+        <oi_hud_nav_2_6.tga value="c60b42ff-ee60-98e4-e603-ca2470141d4b"/>
+        <oi_hud_nav_2_5.tga value="a02b5a1a-bbdb-5556-ae5b-a2e68494755a"/>
+        <oi_hud_nav_2_4.tga value="625535ab-8abf-b3e7-48fb-43f728b77c79"/>
+        <oi_hud_nav_2_3.tga value="00a609c3-5750-3b5a-3ce3-458bdf632203"/>
+        <oi_hud_nav_2_2.tga value="94903387-d37f-092c-e4d2-c190f68577b8"/>
+        <oi_hud_nav_2_1.tga value="ee0cd82c-6ce8-8e73-307b-6d0dc77b19e8"/>
+        <oi_hud_nav_2_0.tga value="3e10b379-ed2c-7424-1fe7-bef3558c7536"/>
+        <oi_hud_nav_1_4.tga value="bf8d0be8-2012-1664-3ea5-e69a71c206e9"/>
+        <oi_hud_nav_1_2.tga value="72100f87-18a7-fc4a-4793-de281e8b02cc"/>
+        <oi_hud_nav_1_1.tga value="b048faf3-60ce-c3a2-d034-36613449d377"/>
+        <oi_hud_nav_1_0.tga value="0ad45106-3b26-6448-0b90-feae8bd46c38"/>
+        <oi_hud_mov_4_5.tga value="7c4a45c2-37dd-312c-c6ab-20896dd0a5a6"/>
+        <oi_hud_mov_4_3.tga value="8a88da1c-3735-c71e-d48a-016df0798de4"/>
+        <oi_hud_mov_4_2.tga value="f55ae4d3-7d6a-e6ac-4cf7-03014ce14390"/>
+        <oi_hud_mov_4_1.tga value="1cc3fcf1-35c0-e222-27d2-6905cf5c4cee"/>
+        <oi_hud_mov_4_0.tga value="1ae592dc-46f4-616e-b7c6-0dff3e6f40e5"/>
+        <oi_hud_mov_3_4.tga value="831b39be-99fc-45bd-ba85-708f9dc93bfd"/>
+        <oi_hud_mov_3_2.tga value="9f7e7373-92a9-d66a-ad5a-afb55ca6ac1f"/>
+        <oi_hud_mov_3_1.tga value="ab37ed0d-7e66-1f77-3acf-b0fe4b74dbe8"/>
+        <oi_hud_mov_3_0.tga value="f5ff1f08-4c92-8606-1854-cc5b9d3e445c"/>
+        <oi_hud_mov_1_2.tga value="1e3abeed-e893-c44e-1f9d-5ecc76d21e5d"/>
+        <oi_hud_mov_1_0.tga value="e300fc95-aa94-8e31-c501-ce903cac8b7c"/>
+</textures>
+
diff --git a/linden/indra/newview/skins/xui/de/floater_account_history.xml b/linden/indra/newview/skins/xui/de/floater_account_history.xml
deleted file mode 100644
index a6c3e32..0000000
--- a/linden/indra/newview/skins/xui/de/floater_account_history.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="money history floater" title="Konto-Verlauf">
-        <button label="Mehr Details..." label_selected="Mehr Details..." name="details_btn" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/panel_account_details.xml b/linden/indra/newview/skins/xui/de/panel_account_details.xml
deleted file mode 100644
index 03c58df..0000000
--- a/linden/indra/newview/skins/xui/de/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Details" name="account_details_panel">
-        <button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_btn"
-             tool_tip="In der Zeit zurückgehen" />
-        <button label="Später &gt;" label_selected="Später &gt;" name="later_btn"
-             tool_tip="In der Zeit vorgehen" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_account_planning.xml b/linden/indra/newview/skins/xui/de/panel_account_planning.xml
deleted file mode 100644
index 1065bae..0000000
--- a/linden/indra/newview/skins/xui/de/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Planung" name="account_planning_panel" />
diff --git a/linden/indra/newview/skins/xui/de/panel_account_transactions.xml b/linden/indra/newview/skins/xui/de/panel_account_transactions.xml
deleted file mode 100644
index d7844ad..0000000
--- a/linden/indra/newview/skins/xui/de/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Verkäufe/Geschenke" name="account_sales_panel">
-        <button label="&lt; Früher" label_selected="&lt; Früher" name="earlier_btn"
-             tool_tip="In der Zeit zurückgehen" />
-        <button label="Später &gt;" label_selected="Später &gt;" name="later_btn"
-             tool_tip="In der Zeit vorgehen" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 0030cfb..aa0f67e 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -346,6 +346,19 @@ Community Standards.
 your name, image, and &apos;About&apos; text on the [SECOND_LIFE] website.
                 </message>
         </alert>
+        <alert modal="true" name="ClickPartnerHelpAvatar">
+                <message name="message">
+You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
+
+Go to the Second Life web site for more information on partnering?
+                </message>
+                <option name="GotoPage">
+                        Go to Page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="ClickWebProfileHelpAvatar">
                 <message name="message">
                         If this resident has a web profile URL set then you can:
@@ -794,6 +807,17 @@ Apply those changes and quit
                         Cache will be cleared after you restart [SECOND_LIFE].
                 </message>
         </alert>
+        <alert modal="true" name="CacheWillBeMoved">
+                <message name="message">
+                        Cache will be moved after you restart [SECOND_LIFE].
+Note: This will clear the cache.
+                </message>
+        </alert>
+        <alert modal="true" name="ChangeConnectionPort">
+                <message name="message">
+                        Port settings take effect after you restart [SECOND_LIFE].
+                </message>
+        </alert>
         <alert modal="true" name="GoToAuctionPage">
                 <message name="message">
                         Go to the [SECOND_LIFE] web page to see auction details
@@ -2736,61 +2760,6 @@ also appear higher when people search for keywords.
                         Cancel
                 </option>
         </alert>
-        <alert modal="true" name="WebLaunchGraphicsDriver">
-                <message name="message">
-                        Your [VENDOR_LABLE] [CARD_NAME] graphics driver on this computer is out of date.
- 
-This is a piece of software that controls your graphics card.
-Old drivers can cause 3D graphics programs like [SECOND_LIFE] to run slowly or crash.
- 
-We strongly recommend upgrading to the &quot;[DRIVER_NAME]&quot; driver, available for free download from [VENDOR_LABLE].
- 
-Would you like to go to the [SECOND_LIFE] drivers web page?
-                </message>
-                <ignore>
-                        When launching web browser to view driver update page
-                </ignore>
-                <option name="Gotopage">
-                        Go to page
-                </option>
-                <option name="Cancel">
-                        Cancel
-                </option>
-        </alert>
-        <alert modal="true" name="WebLaunchGraphicsDriverIntelExtreme">
-                <message name="message">
-                        Your Intel Extreme graphics driver on this computer is out of date.
- 
-This is a piece of software that controls your graphics card.
-Old drivers can cause 3D graphics programs like [SECOND_LIFE] to run slowly or crash.
- 
-We strongly recommend upgrading to the latest driver, available for free download from Intel.
- 
-Would you like to go to the [SECOND_LIFE] drivers web page?
-                </message>
-                <ignore>
-                        When launching web browser to view Intel driver update page
-                </ignore>
-                <option name="Gotopage">
-                        Go to page
-                </option>
-                <option name="Cancel">
-                        Cancel
-                </option>
-        </alert>
-        <alert modal="true" name="RunningInPCI">
-                <message name="message">
-                        GL indicates that the graphic driver on this system is running in PCI
-mode, a slower method of drawing graphics.  If you&apos;re using a PCI video card,
-you can ignore this message.  If you are using an AGP video card, you should
-update your motherboard drivers for improved performance in this and other
-3D applications.  If you are using a PCI Express graphics card you can enable
-AGP Graphics Acceleration from the Options panel in Preferences in [SECOND_LIFE].
-                </message>
-                <ignore>
-                        When running in PCI mode
-                </ignore>
-        </alert>
         <alert modal="true" name="WebLaunchJoinNow">
                 <message name="message">
                         Go to www.secondlife.com to manage your account?
@@ -2863,10 +2832,10 @@ AGP Graphics Acceleration from the Options panel in Preferences in [SECOND_LIFE]
         </alert>
         <alert modal="true" name="WebLaunchLSLWiki">
                 <message name="message">
-                        Go to the LSL Wiki for scripting help?
+                        Go to the LSL Portal for scripting help?
                 </message>
                 <ignore>
-                        When launching web browser to view the LSL Wiki
+                        When launching web browser to view the LSL Portal
                 </ignore>
                 <option name="Gotopage">
                         Go to page
@@ -4067,16 +4036,15 @@ will react somehow when money is payed into them.
                         There are no items in this object that you are allowed to copy.
                 </message>
         </alert>
-        <alert modal="true" name="LoadAccountTransactions">
+        <alert modal="true" name="WebLaunchAccountHistory">
                 <message name="message">
-                        Go to [URL] 
-to see transaction details?
+                        Go to the Second Life web site to see your account history?
                 </message>
                 <ignore>
-                        When loading transactions web page
+                        When loading account history web page
                 </ignore>
-                <option name="OK">
-                        OK
+                <option name="Gotopage">
+                        Go to page
                 </option>
                 <option name="Cancel">
                         Cancel
@@ -4263,6 +4231,21 @@ the contents of your Trash folder?
                         No
                 </option>
         </alert>
+        <alert modal="true" name="ConfirmEmptyLostAndFound">
+                <message name="message">
+                        Are you sure you want to permanently remove
+the contents of your Lost And Found folder?
+                </message>
+                <ignore>
+                        When emptying your inventory Lost And Found folder
+                </ignore>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
         <alert modal="true" name="CopySLURL">
                 <message name="message">
                         The following SLURL has been copied to your clipboard:
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index f03df0f..24b9ce3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -8,9 +8,9 @@
              max_length="65536" mouse_opaque="true" name="credits_editor"
              text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
              word_wrap="true">
-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, JillS, Yool, Jane and many others.
+                Second Life is brought to you by a2, Aaron, Abishai, adrian, Alberto, Alex, Alexei, Alfred, Alice, Altruima, Amber, Anastasia, Andrea, Andrew, Andy, Annette, Anthony, Aura, Avi, Babbage, Beast, beez, Belinda, Ben, Benjamin, Benny, Betsy, Bill, Blue, Bo, Bob, Brad, Branka, Brent, Brian, Bruce, Bub, Bucky, Bunny, Burgess, Buttercup, Callum, Casino, Cat, Catherine, Chadrick, Char, Charity, Charlie, Chiyo, Chris, Christopher, Civic, Claudia, Cleopetra, Cole, ColeD, Colin, Colleen, Cornelius, Cory, Cube, Cupid, Cyan, Cyn, Dan, DanceStar, Daniel, Data, Dave, David, David2, Deana, Debra, Dee, Dek, Del, Dez, Don, Donovan, Dore, Doug, drunkensufi, Dummy, dustin, Eddie, Eileen, Elena, Elle, Emily, Eric, erika, Erin, Ethan, Evan, Eve, Everett, Firefly, Flashpoint, Fordak, Frank, Fred, Fritz, Frontier, Garry, George, Gia, Ginsu, Glenn, Gulliver, Guy, Hamlet, Haney, Harmony, Harry, Helen, Hello, Henrik, Heretic, Hermia, Holly, Hungry, Hunter, Ian, Icculus, Irfan, Iris, Isaac, Isabel, IsThat, Ivy, Izzy, Jack, Jacqui, Jake, James, Jane, Janet, Jaron, Jay, Jean, Jed, Jeff, Jennifer, Jeremy, Jeska, JeskaTest, Jesse, Jill, Jim, Jimbo, Joe, John, Jon, Jonathan, Joon, Jose, Joshua, Jp, June, Justin, Karen, Kari, Karinelson, Kelly, Kelvin, Ken, Kenny, Kent, Kevin, Kona, Kyle, LaughingMan, Lauren, Lawrence, Lee, Leopard, Leprechaun, Leviathania, Lexie, Leyla, Liana, Libby, Lightfoot, Lizzie, Lock, Logan, Loki, Louie, Lucy, Luke, Madhavi, Magellan, Magenta, Makiko, Marius, Mark, Martin, Matthew, Maurice, Mayor, Melanie, Meta, Mia, Michael, MichaelFrancis, Mick, Migyeong, Mikeb, MikeT, Milo, Mitch, Mogura, Monkey, Monroe, Morpheus, Natria, Neo, Nicolas, Nicole, Nigel, Noel, Nora, Nova, Otakon, Page, Pathfinder, Patsy, Paul, Peter, Philip, Phoenix, PierreLuc, Pilouk, Pony, Professor, Qarl, Rachelle, Ramzi, Ray, Realestate, Red, Rejean, Reuben, Rheya, Richard, Rika, Rob, Robin, Roosevelt, Ross, Runitai, Ruth, Ryan, Sabin, Sally, Sam, Sarah, Satoko, Sean, Secret, Sejong, Senator, Seth, Showme, Siobhan, Sky, Sleepy, Spike, Stefan, Stephanie, Stephany, Stephen, Steve, Stryfe, sturm, Sudhi, Sunil, Swiss, Sylvain, Tanya, Tbone, Teeny, Teeple, Teresa, Tesla, Tess, Tessa, Thomas, Thrax, Thumper, Tim, Tobin, Todd, Tofu, Tom, Torley, Tracy, Uncle, Varas, Vasudha, Vektor, Ventrella, Video, Viola, Walker, Warren, Wendy, Which, Xan, Xander, Xenon, Xtreme, Yedwab, Yohan, Yool, Yoz, Yuko, Zach, Zee, Zero and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: Atte Aderdeen, Alise Altman, Doomby Arrow, Rox Arten, Jesse Barnett, Smiley Barry, SuezanneC Baskerville, Glitch Braess, Dorian Caldwell, JuiceBox132 Castro, Aden Christensen, Fremont Cunningham, Zirnitra Demar, Errafel Eccleston, Cory Edo, Kitto Flora, Ashrilyn Hayashida, Elektra Hesse, Friar Jeffries, Samuel Jordan, DeLisa Junot, Howie Lament, Candide LeMay, Michi Lumin, Ikani Mahana, SignpostMarv Martin, Ksathra Mason, Console Mission, Haravikk Mistral, Usagi Musashi, Lex Neva, Jamma Newt, Blaze Nielsen, Destiny Niles, Tateru Nino, Harald Nomad, Nerk Noonan, Stumbelina Ophelia, Fledhyris Proudhon, Londyn Reatequi, Zi Ree, Hank Rucker, BamBam Sachertorte, kai Sachertorte, Sean Sao, Funk Schnook, Magnum Serpentine, Nekosune Smails, Rhyph Somme, Al Sonic, Oz Spade, Wesley Spengler, Steve Steed, Gearsawe Stonecutter, Dirk Talamasca, Dolmere Talamasca, John Taylor, Raymond Tuxing, Churchill Tweak, Huns Valen, windozer Vargas, Sabby Whiplash, Raven Wombat, Beatfox Xevious, Yiffy Yaffle, Alpha Zaius, Hewee Zetkin, Jai Zucker and many others.
+Thank you to the following residents for helping to ensure that this is the best version yet: AlexandriaS Aabye, devilite Aabye, Dynamqting Aabye, hellebore Aabye, Maddog Aabye, Urru Aabye, mabare Abattoir, Didi Abdallah, Elwood Abernathy, Jake Abramovich, Schort Achterbahn, Divily Ackland, JadeCharlet Ackland, Kevin Acorn, Binvis Acronym, Robert Adelaide, Atte Aderdeen, KiVanyel Adria, Krillian Adria, Mandi Adria, Butch Adzebills, Beccaboo Aero, Akasha Aferdita, Nicole Aferdita, Nero Agnomen, Hay Ah, Oxoc Ah, Sironl Ah, evokue Ahn, nycbadboy Ahn, Taan Ahn, Cyres Aida, TalNova Aji, Illusion Akula, Xen Akula, Jessa Alba, Alba Albert, kernowed Albert, Blaine Albion, AnneMarie Alcott, Bo Alcott, Cindie Alcott, Cunundrum Alcott, fighter Alcott, Jarad Alcott, Marcello Aldwych, Xenia Alemany, CellMaster Alexander, Molly Alexander, Aerotisma Alexandre, Ghostofgoat Alexandre, Took Alexandre, Ty Alexandre, Christophe Perrin / Krisp Alexandre, Adec Alexandria, Kiwi Alfa, Rowr Aliev, aivlys Allen, asclepius Allen, Aveyond06 Allen, Calvin Allen, gayfrench Allen, gender Allen, Grayson Allen, Jak Allen, Jerdog Allen, MariahMarie Allen, Metzyn Allen, Misty26 Allen, moshetzi Allen, nayara Allen, NH Allen, Pegi Allen, Ponesco Allen, Rap4rag Allen, Safer Allen, sobroke Allen, Bethann Allstar, Sloan Almendros, Ogro Almodovar, Raymondo Alonzo, Rebeca Alonzo, Omega Alphabeta, Elirien Alturas, Rick Alvarado, Golam Amadeus, Kea Amarula, Ariella Amat, Popas Amat, xxjojxx Amat, Jamie Amdahl, Helyos Ames, julies Ames, Keisha Ames, Javz Amsterdam, Kathy Amsterdam, Twistaspliff Amsterdam, darian Anabuki, Dnali Anabuki, Wes Anaconda, Serra Anansi, Britney Anatine, pax Anatine, Ranya Anatine, sientaya Anatine, Siowen Anatine, Padu Andalso, Chanel Anderson, Donna Andrews, Trixie Angel, Macphisto Angelus, meQal Anna, Aznxer Antfarm, Karlo Antonelli, Maksimilian Antonelli, Vala Antonelli, Athoni Antonioni, klement Antwerp, lildeadgirl Antwerp, GeordieJohn Anubis, KatanaBlade Anubis, Diag Anzac, Lunarlie Anzac, Picker Apogee, Azuby Apparatchik, brianica Appin, SwedenArtSheepdogs Aquacade, CaSimone Aquitaine, Dexter Aquitaine, Pericat Aquitaine, Sunshine Araw, Bino Arbuckle, Evangeline Arcadia, Niles Argus, pe Argus, BenneDJezzerette Ariantho, Karmaticdragon Ariantho, Teren Aridian, Garcia Ariel, Ina Arkin, alva Arliss, Noriyoko Arliss, Harle Armistice, Avi Arrow, Ming Arrow, Rox Arten, Razitra Artizar, Mandy Asano, Ty Asano, Kristoff Asbrink, Skye Asbrink, Threasher Asbrink, Daniel Ash, Dion Ashby, Eva Ashby, Ravenal Ashby, TOPDIME Ashby, danielluh Ashton, Deb Ashton, ach Asp, cokeser Asp, lastping Asp, Posrednik Asp, Notypewell Astro, Nargus Asturias, SiRiS Asturias, yol Asturias, ZATZAi Asturias, Animus Asylum, Sang Asylum, SomethingReal Atkey, Dakota Atlanta, Irie Atlantis, Matt Attenborough, Nirva Attenborough, CaptJosh Au, Goren Auer, Jackamo Auer, Jonathan Auer, Tisdi Auer, Chris Auk, Raven Axon, Shawn Ay, TJ Ay, ares Ayres, Cazz Ayres, Eon Ayres, Laura Ayres, zoeba Ayres, Naomi Babcock, Eldrich Babeli, Adrianna Babenco, She Babenco, sterick Babenco, corto Babii, Dia Babii, EvilCutz Babii, Flooxx Babii, Girl Babii, Imraanos Babii, Iv Babii, Lizthebabe Babii, Torrence Babii, Chrystal Babii, Sara Bachman, dzb0 Bade, Doug Bagration, Hobbit Bagration, Abert Bailey, Bambi Bailey, EveNice Bailey, Kaliya Bailey, Kriz Bailey, Leen Bailey, Leonine Bailey, Minke Bailey, Nightjaxs Bailey, Peyton Bailey, Shan Bailey, Stevo Bailey, Tariv Bailey, cream Bailly, Ezekiel Bailly, Gianna Bailly, Hells Bain, Briauna Bainbridge, AnaSofia Bakalava, Jonas Bakalava, Micki Baker, Anita Balczo, Naomi Balczo, Nathan Balder, Bibi Balhaus, Sponz Balhaus, Ainsleigh Ballinger, Dimitry Ballinger, Miriam Ballinger, Rik Ballinger, Trey Ballinger, Zagor Ballinger, Zek Ballinger, Kilara Balnarring, Maya Balut, Franz Bamaisin, Manolo Bamboo, Yuki Bamboo, Oliver Bandit, Pirate Bandit, Outy Banjo, winkler Banjo, SabreWulf Banshee, Akeela Banting, Elke Banting, Arkesh Baral, Barber Barbarossa, Samantha Barbee, Aruk Barbosa, Ayahuasca Barbosa, Bastill Barbosa, Corleone Barbosa, Padrig Barbosa, Samakh Barbosa, seat Barbosa, Topper Barbosa, Thery Bardeen, Bridgitte Bardot, Nici Barley, Annie Barnard, Josse Barnard, DB Barnes, Kitty Barnett, Threshin Barnett, Amy Barnett, Scott Baron, Jeremy Barracuda, Verbuda Barragar, Daphne Barrett, Fenleab Barrett, Lindsey Barrett, Smiley Barry, Denise Barrymore, Manuela Barrymore, Nell Barrymore, Sensation Barrymore, BraadWorst Barth, XxRevelationxX Barthelmess, Fleur Bartlett, Marina Bartlett, Lucius Bartz, Mack Bartz, Astley Bascom, dolomite Bascom, Dags Basevi, Lena Basevi, crystal Basiat, SuezanneC Baskerville, Sweetheart Baskerville, Demi Bates, Demon Bates, kane Bates, Will Bates, ShadixBear Bathgate, Carlotta Batra, Bruce Batz, Silentborn Batz, Dominik Bauer, Logan Bauer, Boz Baxter, Camryn Baxter, diesus Baxter, Drett Baxter, Gazmanjones Baxter, Kiley Baxter, Schwenny Baxter, Shimboo Baxter, Stoffe Baxter, Diamond Baxter, Gruntos Baxter, BC Bayliss, Bibi Bayliss, Backly Beam, BigFoot Beam, JuJu Beam, nati Beam, Pelgrim Beam, ELLiebob Bean, LeatherElf1 Beat, Nikky Beat, Carl Beattie, Fe Beattie, sonoma Beatty, Henri Beauchamp, TimTam Beauchamp, Conrad Beaumont, Dieudonnee Beaumont, Kitten Beaumont, Lucilla Beaumont, Odina Beaumont, PCBRANDY Beaumont, PLASTOK Beaumont, Sheree Beaumont, Sweet Beaumont, Olivier Beaumont, Busybee Beaver, Chiheb Bechir, Caspian Beck, GoldenGamer Beck, icar Beck, Jigoes Beck, Matsumoto Beck, Millie Beck, Rhino Beck, Ronor Beck, ropland Beck, wai Beck, laurionna Beckenbauer, Jeffery Beckersted, Dominick Beckham, Druu Becloud, Holger Becloud, Duce Bedlam, Beach Beebe, Manicexpression Beebe, Nicolette Beebe, Feril Beeks, BillyJoe Beerbaum, Lola Beerbaum, Pimppdog Beerbaum, Baylee Beery, DrathnotT Behemoth, Malarthi Behemoth, phoenix Behemoth, Trinity Bekkers, Dioana Bellah, KissesRhawt Bellambi, Bream Bellman, Hazel Bellow, Milo Bellow, Corvette Beltran, Lefty Belvedere, Jaden Benavente, Bianca Bender, Jeremy Bender, Mercedes Benedek, Albert Benelli, Dodi Benelli, Emili Benelli, laurette Benelli, ninake Benelli, Evazion Benelli, Elaine Bennett, Izabella Bentham, Carol Bentley, Deedrick Benton, Joel Berblinger, Lord Berchot, Pele Berchot, Marimar Berchot, Melody Beresford, Brielle Bergbahn, chrissie Bergson, Kody Bergson, Bit Berjis, Kevin Bernal, Dorie Bernstein, mystic Berry, Razza Berry, Bella Bertone, Taylor Berzin, liz Bessie, Kekken Biberman, Nicolas Biddle, Halbert Bienenstich, terrycrow Bigwig, Jasmine Bijoux, Kala Bijoux, Dano Bikcin, enzo Bikcin, Angle Binder, Cuffs Binder, Roxtor Binder, Tom Binder, Agamemnon Bing, Chalander Bing, Gigi Bing, runeking3007 Bing, Monsieur Bingyi, Angelica Biondetti, Melissa Birge, reeneebob Birmingham, Anubis Bishop, Danica Bishop, Mowesy Bisiani, Marteas Biziou, Karla Bjornson, Roxie Bjornson, Travis Bjornson, Atlwolf Blabbermouth, Rice Black, Nathan Black, Amanda Blackmountain, Disstraction Blackthorne, Miriya Blackthorne, Teagan Blackthorne, Orko Blanchard, Neural Blankes, Random Blankes, Shaura Blazer, Nethermind Bliss, dayanne Boa, Denideny Boa, lecosutre Boa, naholc Boa, NITR0US Boa, Prana Boa, RS Boa, penelope Bobak, Bad Bobbysocks, Ryuujin Boccara, Joey Bock, Elkissa Bode, Annika Boehm, Babyblues Boffin, Snodude101101 Bogan, Dirk Bogart, Jily Bogart, Pompo Bombacci, Ascanio Bonetto, Bony Bonetto, Casanova Bonetto, Cuncittina Bonetto, Frede Bonetto, Ervee Bonne, Jolanda Bonne, Poppy Bonne, Becky Book, Bibi Book, Barney Boomslang, Sam Boomslang, Steeven Boorman, Rogue Borgnine, Summer Borgnine, Rafe Borrelly, Equitus Bosch, Peter van den Bosch, tessa Bosshart, Hermione Bossy, Mr Bossy, Rhiannon Bossy, Aspen Bossy, Marisela Bouchard, Tony Bouchard, Annita Boucher, Aster Boucher, Katy Boucher, Lisae Boucher, Router Boucher, Sneaky1 Boucher, Varak Boucher, DarkAlpha Bourne, Hastings Bournemouth, bend Bowie, Lucy Bowie, Casper Box, coolbimbo Box, Kittenna Box, Metaphor Box, Nemesis Box, Bell Boyd, Kelley Boyd, Sylar Boyd, WendyCat Boyd, Denis Boyle, Jennifer Boyle, melmuse Boyle, Alycia Bradley, jayne Bradley, Airie Braendle, Glitch Braess, Su Brando, Tybalt Brando, IntLibber Brautigan, Dante Breck, Carbon Breed, WitchFire Breed, Bella Brennan, erika Brenner, gaby Brenner, Talthybius Brevity, KitKat Brewster, Lindsey Breyer, Artemis Bright, Brigitte Bright, Donnie Bright, Lucas Bright, Oya Bright, Prentice Bright, Risa Bright, Starfire Bright, Beebo Brink, Marcus Brink, Emi Brissot, Ice Brodie, Luth Brodie, Sam Brodie, Chromal Brodsky, Tydomus Brodsky, Cage Brody, Darling Brody, Kurston Brody, Mike1A Brody, UserJesse Brody, Reese Brody, Faith Broek, Happy Broek, ShadowHunter Brokken, Jacey Brooks, Shake Brooks, Shary Brooks, Sigurd Brooks, Tate Brooks, Vanleen Brooks, BruTuS Broome, PastorD Broome, Sarita Broome, October Brotherhood, Elroy Brouwer, Neophyte Brouwer, Jebediah Brown, linda Brown, Schwartz Bruder, lupu Brule, Joshua Brynner, Linda Brynner, Southy Buckenburger, drifterr Bugaboo, Michelle Bumbo, Trixie Bumbo, Paul Bumi, Jitar Bunin, Kerian Bunin, Crystalmom Bunnyhug, Embrace Bunnyhug, Zues Burali, GiGi Burgess, Keith Burgess, Shawna Burgess, Bain Buridan, Sean Buridan, Chiccorosso Burke, Count Burks, Hinamori Burleigh, Atom Burma, Jasper Burma, Aleshanee Burnett, Dottie Burns, Ebro Burns, Skipper Burns, John Burns, Haroldthe Burrel, Big Burt, dubureau Burt, Keisha Burt, phill Burt, Janloo Burton, Madd Burton, Bowlalot Bury, Dreklore Bury, Jarek Bury, Jenni Bury, Lou Bury, Orlando Bury, Angel Butuzova, dodi Byrd, Enchtris Byrd, Tleva Caballero, Gayle Cabaret, Monique Cabaret, Adele Cagney, Cralyn Cagney, Caribbean Cahill, Darien Caldwell, Lily Caldwell, CFire Caldwell, Ciara Calhern, Karl Calhern, Cecil Calhoun, Tizzy Calliope, Hypatia Callisto, Raven Callisto, Fred Cameron, Meliana Cameron, Antonius Camus, Maddie Camus, Raskella Canadeo, Exotica Canadeo, Vessus Candour, Alexis Canetti, Silvio Canetti, Talia Canetti, bragan Canning, Charenthia Canning, Reeda Canning, Vannesh Cannoli, Changurr Cao, Chilli Cao, Dorian Cao, RosyLee Cao, steve319 Cao, Contamina Capalini, Cougard Capalini, Kirsti Capalini, Lindichka Capalini, Lyla Capalini, JohnMAC Carbenell, snake Carbenell, Capri Carbetta, Sophia Carducci, Kid Cardway, Icould Careless, Aurore Carlberg, Brumia Carlberg, Bruni Carlberg, Brandie Carlos, Jenny Carlos, Avalon Carmona, Moana Carmona, Ashelia Carnell, Rain Carnell, CJ Carnot, Madison Carnot, Julie Carpathea, HALOCAT Carr, coolmaria Carroll, karyme Carroll, Leila Carroll, Crisii Carter, cyrielle Carter, isidore Carter, Missi Carter, Shatara Carter, Tristan Carthage, Aemilia Case, Baby Case, Jenn Cassady, Kittygloom Cassady, Charlotte Cassavetes, Holly Cassavetes, Anthony Cassini, Supertell Cassini, Wietse Cassini, Just Cattaneo, Mandy Cattaneo, Aleicester Catteneo, arthuraleksandravicius Cavan, Maximus Cazalet, Quellin Ceawlin, dMetria Cela, Spidey Cela, Arcadia Ceres, wanderer Cerveau, Aaron Cerveau, Marky Chaffe, Stefani Chaffe, The Chaffe, Becca Chambers, Lexis Chambers, Inigo Chamerberlin, Shion Chandrayaan, Ibrisse Chantilly, MaryAnne Chantilly, Cool Chaparral, guy2 Chaplin, Iadwen Chaplin, Lillyann Chaplin, wllmn Chaplin, Marsha Chapman, Caspar Chapman, Dominique Charles, Chilly Charlton, Pammie Charming, Total Chastity, Arohee Chatnoir, Papillon Chatnoir, Barry Cheeky, coldFuSion Cheeky, Nyla Cheeky, Ryan Cheeky, Aggressor Cheetah, Ronald Cheevers, Michelle Chernov, Maggy Chestnut, Cam Chevalier, Eleonore Chevalier, Kelly Chevalier, Mauries Chevalier, Ozzy Chevalier, Rayvendell Chevalier, Swampy Chevalier, Cheesemuncher Chickenwing, Kaltezar Chickenwing, milespeed Chihuly, Coolkama Childs, Michelle Childs, Nicole Childs, SimonRaven Chippewa, Albert Choche, Annetha Christensen, Jennifer Christensen, Zell Christensen, Herman Christiansen, Haifeng Chu, Francis Chung, tyana Chung, Sundance Churchill, Anubis Cioc, Corpierro Cioc, Dwayne Cioc, Knibbel Cioc, Slowhand Citylights, PonygirlSarah Clapper, Jim Clark, Jacob Clark, Jo A Clark, Angelos Clary, Biffle Clary, lilly733 Clary, Rui Clary, William Clary, Otto Clave, Arahan Claveau, Neil Claxton, Mimi Claymore, Pete Claymore, Sam Clayton, Blank Cleanslate, Deckheard Cleanslate, Electron Cleanslate, Spirit Cleanslate, Willow Cleanslate, Kovu Cleaver, Bell Clellon, Covisha Clift, EBCY Clift, Iumi Cline, pizzaguy Clutterbuck, knightrider Clymer, Exia Coage, Brenda Coakes, Lindsay Coakes, Lyndka Cochrane, Ceinwen Coen, Oneil Coen, Mahogony Coffee, Mark Coffee, Lisbeth Cohen, Melayna Colasanti, holly Coldstream, Moon Cole, Shiden Coledale, Castalia Collingwood, JUNKIE Colman, Silver Colman, Stahi Columbia, SweetAbe Columbia, CC Columbo, Charity Colville, Isabeau Conacher, Deb Cone, emili0 Congrejo, MarioDaniel Congrejo, Jazzy Connell, Jenika Connolly, Cooper Conover, Garn Conover, Mara Conover, Myles Cooper, Angelina Coorara, Valentine Coppens, psyco Coppola, Tremleh Coppola, Venus Coppola, Chiana Cordeaux, Sensuality Cordeaux, Clarissa Cordoso, Methos Corinthian, Tylerferland Cork, Caleb Corleone, Montana Corleone, Sparkey Corleone, Zoey Corleone, Achtai Coronet, Count Coronet, Dweedle Coronet, jjccc Coronet, Ron Coronet, Caterina Cortes, Letitia Cortes, Marcella Cortes, Martinelli Cortes, Raven Cortes, Soopafly Cortes, Grazel Cosmo, Athena Cosmos, Cally Cosmos, Annyssa Cosmos, Bunny Costello, Zelitor Costello, Lionel Cournoyer, Sasha Cowen, Carl Crabe, Lyssa Craig, micke Craig, Mel Cramer, Tee Cramer, Avil Creeggan, Bunch Creeggan, CronoCloud Creeggan, NewYorkCityDJ Cremorne, Shalori Cremorne, Artik Crimson, Bliss Crimson, Daffodil Crimson, Raul Crimson, Shaoti Crimson, Trevor Crimson, Rex Cronon, Ace Crosby, Linnrenate Crosby, DaRealNeo Crossing, Wark Cruyff, Silver Csak, Eulalia Cuddihy, Lauralynne Cuddihy, Rammstig Cummings, Rita Cummings, Fremont Cunningham, Jinger Curie, RICX Curie, Betty Curry, Marissa Curtis, Mercurion Curtiss, Juan Cusack, Sanderman Cyclone, Marek Czervik, Alreania DaSilva, Dnel DaSilva, Seph DaSilva, Kelly Dabney, dorothyann07 Dae, Frax Dae, Frost Dae, Syryne Dae, Oddy Dae, 1Time Daehlie, Sinead Daehlie, TRACI Daehlie, Dante Daffodil, Limey Daffodil, stripey Daffodil, Atomik Dagger, Bloodsoaked Dagger, Coca Dagger, Colera Dagger, J4ck Dagger, Jaune Dagger, leigha Dagger, Silver1 Dagger, Alexander Dagmar, Simeon Dagmar, Dweezle Dagostino, Ginoo7 Dagostino, Joka Dagostino, Rachid Dagostino, Sinatra Dagostino, DR Dahlgren, Alexandra Daikon, Devious Dailey, Natalie Dailey, Sukit Dailey, Zoya Dailey, Nad Dal, Rudra Dal, Robert Dale, Coventina Dalgleish, Salvador Dalgleish, Anya Daligdig, Nyterious Daligdig, yvette Daligdig, Kylie Dallin, Angel Damask, Phantom Damask, QatanI Damdin, Bekka Damone, Pashin Damone, Vaekraun Damone, Zoraya Damone, elmoono Dana, Mary Dana, ml Dana, Rezzer Dancer, Shrug Dangle, Guttstein, Daniel, Bubba Daniels, Dinky Daniels, Kiana Daniels, marcel Daniels, Rosey Daniels, Sara Daniels, VictoriaRose Daniels, Ignacio Dannunzio, SlimD Dannunzio, williamae Dannunzio, Chriss Darkes, Digit Darkes, Tanooki Darkes, Bree Darling, Chasity Darling, Darra Darling, Val Darracq, Diana Darragh, Ryan Darragh, Bane Darrow, Bree Darrow, Ivy Darrow, cuddles Dassin, Leeloo Dassin, Dachine Daviau, Gyllian Daviau, Leben Daviau, Serioto Daviau, Willow Daviau, Allison David, JamieZel David, Todd David, Casey Davidson, LaNikki Davis, Whispering Dawn, Lady Dawson, Helen Dayton, Ryan Dayton, Ooh Dazy, Woopsy Dazy, Brighid DeCuir, eZekiel DeCuir, Link DeCuir, nath DeCuir, Rhys DeCuir, siliconegirl DeCuir, spring DeCuir, Iron DeCuir, Escort DeFarge, Archangelo DeSantis, Aubrey DeSantis, Gustav DeSantis, Hippy DeSantis, Ilana DeSantis, Sutara DeSantis, Undina DeSantis, Axienne DeVaux, Dana DeVaux, Kitty DeVaux, Mindy DeVaux, Krystal DeVinna, Krystalynn DeVinna, Magenta DeVinna, Manuela DeVinna, Spike Deakins, Debbes Dean, Korben Dean, Dogbert Debevec, Savannah Debs, emily Decatur, Heiko Decatur, Zorena Deckard, Andrea Decosta, Dolly Decosta, Esperenza Decosta, Kruppen Decosta, larrykin Decosta, PhoenixRose Decosta, Sophy Decosta, Twinsen Decosta, Vladimir Decosta, Duxster Deere, Maxim Deharo, Summerbreeze Deharo, Matti Deigan, DeeAnn Dejavu, Gina Dejavu, Shai Delacroix, alexis Delcon, Ashly Delcon, Kane Delcon, Dante Deledda, Lady Deledda, Jega Delgado, Alicia Delphin, Darek Deluca, Lestat Demain, Nuka Demain, Allissa Demar, Lilyanah Demar, Aeleen Demina, Blowing Demina, Kalm Demina, Sarias Demina, Skeddles Demina, Sweet Demina, Alida Demontrond, Redux Dengaku, J. Derby, Cristell Deschanel, Ivey Deschanel, SinaMaria Deschanel, Elisabeth Desideri, Monique Desideri, Bartiloux Desmoulins, Hazel Desmoulins, Isis Desmoulins, Phoenix Desmoulins, Jon Desmoulins, Dino Despres, Samantha Despres, Snowflake Despres, Bones Detritus, Neo Devoix, Bre Dharma, Showshawna Dharma, Mike DiPrima, Winter DiPrima, Gongree Diage, Azure Diamond, Styles Diamond, Maike Dibou, Klaus Dieffenbach, Xavier Dieffenbach, Lordfly Digeridoo, Selkit Diller, Tari Dilley, Kelly Dilweg, Werewolf Dingo, Darkharmony Dingson, Knud Dingson, Jewel Dinkin, Mecha Dinosaur, Savonna Dinova, Amina Diplomat, FuZzY Diqui, Crimson Divine, Lizbeth Divine, Cryptid Divisadero, Destiny Divisadero, Montsho Division, Gryphon Dix, Kittybird Dix, Hope Dixon, CadiWolf Dobbs, Darling Doboy, Nicole Docherty, Ralph Doctorow, Odo Dod, nik385 Doesburg, sam Doigts, Elea Dollinger, Miche Dollinger, Severina Dollinger, Eric Domela, Krysta Domela, Franky Donaldo, Duntroon Donburi, Tricia Donovan, Sabrina Doolittle, DeDe Doowangle, Dinghy Doowangle, Phoebe Doowangle, Ratzfatz Dorado, Jessalicious Dorance, RJaNator Dorance, Kalemika Dougall, Fi Douglas, Norelyn Douglas, Aerrett Dovgal, Wendy Dovgal, Alex Drago, MAGWolf Drago, Lupo Drake, Palanth Drake, Aryanna Draken, Drinkin Draken, Kaylan Draken, Maddy Draken, nixkuroi Draken, Thornpaw Draken, Sinjo Drakes, James001 Dryke, Nameless Dryke, Roberta Ducatillon, Helke Duettmann, Moni Duettmann, Kyla Duke, Esence Dulce, Manuella Dulce, Ric Dulce, Shannel Dulce, Xander Dumont, Lionna Dumouriez, Marko Duncan, Duncan, Lyre Dunia, Cyndari Dunn, Garth Dunn, Sugababe Duport, Taylorholic Durant, Vixie Durant, Julie Durant, Drew Dwi, Ribbon Dye, Michelle Dzieciol, shngy Dzieciol, Jeffrey Earp, Umbrella Ebi, Adi Eccleston, Bazzerbill Eccleston, Dragon Eccleston, chawna Eclipse, Minolin Eclipse, Valkyrie Eclipse, Joi Edelman, Alx Edman, Daniella Edman, Saskia Edman, Storm Edman, Cory Edo, Tommy Ehrler, Stephe Ehrler, Edred Einarmige, Hope Eldrich, Kai Eldrich, Winter Eldrich, Thunder Electric, Ezmerelda Electricteeth, Hostile Electricteeth, Kris Electricteeth, Loki Eliot, rudy2zday Eliot, Shaydin Eliot, Iris Ellison, Enigma Elswit, Tim Ely, Darkling Elytis, Delu Elytis, Happy Elytis, Jessica Elytis, Bernd Emmons, Kellie Emmons, Robbert Emmons, Bean Emoto, dick Encore, Andy Enfield, Fuzionor Engawa, Hethr Engel, RH Engel, Digital Enigma, Kahlest Enoch, Lex Enoch, Oran Enoch, Ryal Enoch, Wobmongle Enoch, Wyatt Enoch, Pea Enzyme, Antony Epin, Sapphire Epin, DBDigital Epsilon, Shoshana Epsilon, FallenAngel Erato, Renton Eretz, Mo Eriksen, 64Y80Y Eros, tommy Eros, Nicola Escher, Zak Escher, Salvatore Esposito, Quinevere Essex, Zed Essex, Fabian Etchegaray, Psyche Etoile, Byanex Etzel, CrimsonWings Eun, Deckard Eun, Arwen Eusebio, Anastacia Evans, buttonlynn Evans, Rose Evans, Romeo Evelyn, Sephiroth Everidge, Patriiick Ewing, Trey Ewing, Vivian Ewing, Xwing Ewing, Zha Ewry, SirZarath Excelsior, Zorrita Express, Hierophant Extraordinaire, Blanche Fabre, Annie Fackler, Wolfgang Fackler, Amy Faddoul, Shukran Fahid, Garth FairChang, Brooke Fairplay, TOmmy Fairplay, Vixen Fairplay, Bobby Fairweather, Darlean Fairymeadow, Gotobug Fairymeadow, Heathie Fairymeadow, Meleni Fairymeadow, Moon Fairymeadow, Odysseus Fairymeadow, rob Fairymeadow, Taylkusha Fairymeadow, Crystal Falcon, WhiteAngel Falcon, VetteMan Falken, Evilpony Fallon, Fernand Fapp, Sasuke Fapp, Roen Fardel, Dariush Fargis, Jenn Fargis, Mandy Farina, Kokoro Fasching, Madison Fasching, Ben Fassbinder, Leo Fastback, Rikky Faulds, STEEL Faulds, Equino Faulkland, Flynn Faulkland, High Faulkland, Arda Fauna, Elvis Faust, Benelli Federal, Forest Federko, Belle Fegte, Danny Feingold, Luc Feingold, Bing Fell, Darky Fellini, Jaze Fellini, Sacha Fellini, paulie Femto, Ynot Fenua, Fau Ferdinand, Soren Ferlinghetti, Meri Fermi, Boxter Ferraris, Danamea Ferraris, Duilho Ferraris, Fred33 Ferraris, LeekySean Ferraris, Letizia Ferraris, Marlowe Ferraris, Wanted Ferraris, Xavier Ferraris, Feff Ferrer, Thomas Ferris, Nakala Fetisov, Astrin Few, Chosen Few, Ahh Fiddlesticks, Chantal Fielding, Caleb Fierrens, Patrice Fierrens, sam Fieseler, NutZ Figaro, summer Figaro, Leumia Figgis, Mae Figtree, Maldavius Figtree, Ravovich Figtree, Morgana Fillion, Brett Finsbury, sofia Finsbury, Jazmina Firefly, sasha Fischer, william Fish, Nadia Fisher, StevenSDF Fisher, Carol A . Fisher, Dimitri Fisseux, Manni Fitzgerald, Freddie Fitzroy, Phineas Flagstaff, Ante Flan, Braden Flanagan, BrettEbay Flanagan, Echo Flanagan, Knute Flanagan, Kristjan Flanagan, LilyRose Flanagan, Meril Flanagan, Lulu Flasheart, Jolie Fleury, Clitoria Flint, Fifi Flintlock, Frostie Flora, Kitto Flora, Chriss Florio, Arlen Flossberg, Angel Fluffy, Emilyuk Fluffy, Frurry Fluno, Faedra Flytrap, Brieg Foden, Annette Fonda, Katina Fonda, Raymond Fonda, Marcos Fonzarelli, Yuri Fonzarelli, CrystalShard Foo, etoile16 Food, Kim Food, Kode Forager, Vodka Forager, Wendy Forager, Lucien Forcella, Maela Forcella, Olli Forcella, Violet Forcella, Clarissa Forder, darkdog Forder, Hans Forder, Jango3234 Forder, Olli Forder, Naryu Forester, FaustTiger Forte, Richie Forte, BMFC Forwzy, Erick Forwzy, SusNy Foss, Sanford Foulon, Iwana Fouquet, Kae Fox, Raudf Fox, Wolfie Fox, Phli Foxchase, Kityn Foxley, MollyBrown Foxley, Qua Frampton, Ice Franchini, Nicolas Franchini, Soizie Franciosa, Samson Francis, Nequam Frangilli, Andreas Frankfurter, PreWired Frankfurter, Diane Franklin, Cappy Frantisek, Romano Frascati, DeMits Frederix, Mel Fredriksson, Sune Fredriksson, Tina Fredriksson, Fastfreddy Freeloader, Sammar Freeman, Kitty Freund, Jorgen Friis, Zorin Frobozz, mdbobbitt Frobozz, Chris Frontenac, Foolish Frost, Asriazh Frye, Patti Frye, Phish Frye, Nobody Fugazi, Simba Fuhr, Snugglebunny Fuhr, fallendream Furse, Jamie Furst, Cherise Gagliano, Laura Gagliano, Gammy Gainey, Gazz Galatea, Govindira Galatea, Rizpah Galatea, Amber Galbraith, Mandy Galileo, william Galileo, David Gall, LoLa Galland, Zach Ganache, Casey Gandini, Edgar Gantenbein, Jonx Gao, Soso Gao, Madison Gardner, Silver Garfield, Michelle Garrigus, Nerdmaster Garrigus, Jarik Garsztka, Svoboda Garsztka, Salkin Gascoigne, Roger Gaspara, Buttlock Gasser, Pud Gasser, Zina Gasser, Prince Gausman, livingdead Ge, Josh Geesink, Tolly Geest, Georgina Geewhiz, Chris Geiger, Sabine Geiger, Samuel Geiger, Tristessa Geiger, Joe Gemini, Mielle Gemini, Misty Gentil, Sanna Georgette, Phoenix Gerhadsen, Mic Ghia, Salores Ghia, Loskobosko Giacomin, Susanne Giffen, Lazarus Giha, Micah Giha, Merry Gildea, Summer Gildea, Brittany Giles, Rayy Giles, sevron Giles, Gattz Gilman, Rori Gilmour, SunQueen Ginsberg, Rockwell Ginsberg, Intolerable Ginsburg, Junie Ginsburg, Enrico Giove, Krystal Giove, Annie Giovinazzo, Cat Gisel, Constantine Giugiaro, Io Giugiaro, Persimmon Gjellerup, Lorna Gladstone, Toby Gladstone, Dale Glass, Gellan Glenelg, EmmaBella Glimmer, louise Glimmer, Gianna Glitter, Melyissa Glitterbuck, Victoria Glushenko, Wolf Goalpost, Chris Gobo, Xerses Goff, Sturdus Goldblatt, Nigel Goldflake, Major Golding, Master Goldkey, Zho Golem, Stylez Gomez, Carlos Gomez, Alecydoss Gontermann, Skyler Goode, Valentine Goode, Odd Goodfellow, Dragyn Goodliffe, Hank Goodliffe, Livinda Goodliffe, Robertt Goodliffe, Daphne Goodnight, Sean Gorham, Ledje Gorky, Emma Gould, Amaze Grace, Lagerstone Graff, Harper Grainger, Andy Grant, Carrie Grant, LauraLOral Granville, AlphaOmega Graves, Ebon Graves, Kyrii Graves, Leeloo Graves, Bosco Gray, Dez Gray, Renegade Gray, Summer Gray, Aries Graysmark, Edian Graysmark, Scotty Grayson, Mantis Grebe, Kelly Green, cara Greene, Kimber Greene, Mystical Greene, Raven Greene, Soilent Greene, Matthew Greene, Soilent Greene, Roberta Greenfield, ShayLee Greenspan, Dax Greer, Angel Gregg, Kyleigh Gregg, Sophie Greggan, Deanna Gregoire, StylynProfylyn Gretzky, Farallon Greyskin, Kraal Griffith, Xavier Griffith, Jacomo Grigg, Sylvie Grizot, bodyman72 Grot, Damian Grot, MarieCaroline Grumiaux, Mozo Grumiaux, Oceane Grumiaux, Jadem Gruppman, Gracie Grut, Jennie Grut, Mhaijik Guillaume, Frog Gulick, RacerX Gullwing, Enktan Gully, Gilly Gully, Woozie Gumshoe, Teddy Gumsing, Stephane Gunawan, Alienbear Gupte, Boroondas Gupte, mcgeeb Gupte, Elise Guyot, Jamal Guyot, Lawyer Guyot, Thiago Guyot, Arwen Gymnast, denniswo1993 Gymnast, Lukes Gymnast, Miki Gymnast, Sizoark Gynoid, Markiss Haas, Pepper Haas, Arkanys Hadlee, Apollo Haight, Lord Haight, Fawn Hailey, Kaelin Hailey, Gaelle Halasy, ISIS Halberd, Meg Halberd, Zander Halberd, Arnold Halderman, Malarwen Hall, Ken Hall, Jonah2cd Hallard, Saii Hallard, Trixie Hallard, Doris Haller, Destina Halley, Susiee Hamilton, IBMTapeGuy Hammerer, Lighten Hammerer, VEVER Hammerer, Alison Hamsun, Fawn Hana, leah Hana, Darknite Hand, Emperors Hand, nefertiti71 Handrick, Rodney Handrick, Delerium Hannibal, leanhaumshee Hannya, jingle Hansen, Mattie Hansen, Terry Hansen, Vox Hansen, Filo Hapmouche, Gustavus Hapmouche, Nounouch Hapmouche, Adrian Harbinger, Kami Harbinger, StormCrow Harbinger, CherryBomb Hare, Den Hare, Omegasun Harford, ricky Harford, ricky Harford, Harley, Jenna Harley, Kristina Harley, Natasha Harlow, Hummer Harmison, Allen Harrington, Tessa Harrington, Joker Harris, Shanti Harris, Dagon Harrison, J0NATHAN Harrop, Kerinauu Hartunian, Kyentay Hartunian, Rav Hartunian, Ski Harvey, Tuesday Harvey, Xylo Hasp, Betina Hatfield, Gina Hatfield, Calamity Hathaway, Dorian Hathaway, Duncan Hathaway, Xavier Hathaway, Jack Hathor, Kamilah Hauptmann, Pam Havercamp, swift Havercamp, Griselda Hawes, kwanita Hawks, Ravenis Hawks, BenG Hax, el33t Hax, Juicy Hax, Macx Hax, Meta Hax, Mikka Hax, Mokona512 Hax, Mr8ball Hax, Prophet Hax, Rina Hax, Slober Hax, Starbuck Hax, Takehiro4 Hax, Kyle Hayashi, Ashrilyn Hayashida, Eriko Hayashida, August Hayek, Milton Hayek, Ronnie Hayes, Max Hazlehurst, Sorsaran Hazlehurst, Grath Hazlitt, Violet Hazlitt, April Heaney, Aquela Hearn, jefferey Heart, Kalyrra Heart, Marissa Heart, Taina Heart, TLC Heart, Tori Heart, Dana Hebert, Trimzi Hedges, AmazedBlue Hegel, Dagmar Heideman, r0bin Helsinki, Moira Henley, Ursa Henley, Joharr Hennah, Daviana Hennesy, GJ Hennesy, jens Hennesy, Karl Herber, mistydawn Herbst, Donatella Hermano, Robins Hermano, Ekib Hern, Greves Heron, Jagged Heron, Christel Herzbrun, le Herzog, Reverend Herzog, Elektra Hesse, SweetDesire Heston, Cotton Hicks, Zack Hicks, Kevyn Hienke, Tristan Hienzman, Devin Hill, Wendy Hill, Tensai Hilra, Valek Hin, Adolph Hinkle, Timothy Hinkle, YoCo Hird, Amber Hirvi, Dagon Hitchcock, Heather Hitchcock, Noah Hitchcock, Sianna Hock, Dominique Hofmann, Holly Hofmann, Ganador Holgado, Brookston Holiday, Davidd Holmer, Sam Holyoke, Alexander Homewood, atory Homewood, dabadguy Homewood, Ed Homewood, Huge Homewood, Meesha Homewood, tilstad Homewood, Cremi Honey, Laura Honey, Sandling Honey, Honey, Haos Honua, Vudu Hoodoo, Dallas Horsefly, Lucy Horton, SJ Horton, Homer Horwitz, naty Hotaling, Traceysvideos Hotger, DaQueenB Houston, Natasha Houston, Tia Houston, Hughes Howard, Meg Howe, Edward Howton, Falllen Howton, Pepto Hoyer, Sabrina Hoyer, LadyAbigail Hubbard, Kristopher Hudson, Nikita Hudson, Titus Hudson, XLR8RRICK Hudson, Holly Huffhines, Bella Hugo, Haole Hula, Sard Huldschinsky, Neran Hull, Anastasia Humphrey, October Hush, Silent Hush, Ctarr Huszar, ac14 Hutson, Dex Hutton, Fox Hwasung, Johanna Hyacinth, White Hyacinth, Adrianna Hyde, DJ Hyde, Ty Hyland, Adeline Hynes, Cathy Hynes, DeepSweet Hynes, Psykeeper Hynes, Sexy Hynes, Ares Hyun, Emperor Hyun, melodie Hyun, slayer Hyun, Puck Ida, Weary Ida, Anne Idler, Ruby Idora, Bryan Idziak, Six Igaly, elfi Independent, Spike Independent, Veilofunknown Independent, Bryndi Ingersoll, Ingrid Ingersoll, Noelyci Ingmann, Andrew Ingrassia, Dale Innis, Foxy Innis, Vern Innis, 111Mc Innis, Cloud Insoo, MEtoo Insoo, Quinn Iredell, Rebekah Iredell, Lucien Ireton, Maggie Ireton, Austin Ironclad, DavidJames Irwin, Roy Irwin, Xavier Irwin, Esmee Isbell, Miyu Ishii, Billy Islander, Misa Itamae, Magnum Iuga, Akasha Ivory, Juliana Ivory, WHITEMAGIC Ivory, Gazometr Ivory, Indigo Izumi, Kami Izumi, Salazar Jack, Gunslinger Jackalope, Sutton Jacks, Casandra Jackson, Dernard Jackson, Dougal Jacobs, Lone Jacobs, Sydney Jacobs, jefftlse Jacobus, jose007 Jacobus, justine Jacobus, LampLighter Jacobus, Micha Jacobus, Jadge Jacobus, Enchant Jacques, Victoria Jacques, Dreamweaver Jae, Gregoire James, Kizza James, Vienna James, Barry Jannings, Bianca Jannings, Gwen Jannings, Juappa Jannings, Paisley Jannings, Coos Jansma, Fernandinho Jansma, Griffioen Jansma, Jiire Jansma, IsisLynn Janus, Theobaise Janus, Conway Jarrico, DylanJr Jarrico, Quest Jarrico, erba Jarvis, Jeagerman Javelin, Alan Jay, Lopp Jay, harpo Jedburgh, Craig Jeffries, Alexis Jenns, Bimbie Jenns, XanXan Jervil, Alexander Jessop, Gelenas Jessop, RodneyLee Jessop, Tataniya Jessop, Amethyst Jetaime, Kooky Jetaime, Sapphire Jetaime, Tempest Jewel, Vampirella Jewel, Elia Jewell, Josey Jewell, Shaolin Jewell, Sheeba Jewell, Stefu Jewell, Uma Jewell, Rosslin Jiang, alex Jimenez, Forest Joffe, John Jogiches, Dyani Johin, Musashi Johin, Major Johnson, Dean Johnson, Peter Johnson, Thomas Carson Johnson, Janet Jones, Jason Jones, Bedo Jonze, Elaine Jorgensen, Osiloa Jorgensen, Mariah Jubilee, Sam Jubilee, Ada Jun, Chenak Jun, Ferris Jun, kelyane Jun, Takeshi Jun, Tommi Jun, Phoebe Juneau, Grace Juniper, icandi Juno, Kimo Junot, isha Juran, Orchid Juran, Torsten Juran, Krzywol Kaczmarek, Sakura Kagekiyo, Meni Kaiousei, Fritz Kakapo, Esdrael Kamachi, Kathy Kamenev, Darsuky Kaminski, Rebecca Kaminski, Digital Kaos, Kappa Kappa, Leah Kappa, Gapple Kappler, Cristalle Karami, Toledo Karas, Tina Karlfeldt, Angelina Karura, Samara Kasshiki, Kitty Katscher, Lonetree Katscher, Goldie Katsu, Shamir Katsu, Lacey Kavanagh, Scrooge Kavanagh, Faye Kawabata, Ninja Kawabata, Onimusho Kawaguichi, Brad Kazakov, Ida Keen, Jeff Kelley, Kyle Kelley, An Kellner, Cindy Kellner, Kean Kelly, Tony Kembla, KaliCat Kennedy, Fred Kenorland, Sharon Kent, Nils Kenzo, Rase Kenzo, Tammy Kenzo, Tyci Kenzo, chica Keon, Benja Kepler, Gust Kepler, KittyKatt Kerensky, anton Keynes, Ipenda Keynes, Malevolyn Keynes, Ayumi Khorana, Hoshi Kiama, Nekorina Kiama, Aurillius Kidd, Bare Kidd, Billboard Kidd, Blurple Kidd, Cade Kidd, Ekerilar Kidd, FFS Kidd, Lazarus Kidd, Lea Kidd, MidnightRush Kidd, Mittens Kidd, Morliona Kidd, Neilly Kidd, Kim Kienzle, RJ Kikuchiyo, Gail Kilara, Fish Kilby, zeelee Kindley, Montez King, Dax Kirkorian, Myoukitsune Kirkorian, Szandor Kirkorian, Cmtccmoi Kish, Kia Kish, DaQbet Kish, Coca Kit, Developer Kit, pronto Kit, Sunshine Kit, ssjkriccolo Kitchensink, Reisuki Kitsune, Tengu Kitsune, AngelEyes Kittinger, Devilish Kitty, Kitty, Panther Kitty, Daaneth Kivioq, Praseodymium Kivioq, Sonya Kivioq, Emily Kleene, Buejien Klees, Princess Klees, SaltySugar Klees, Parrish Kline, ProfessorKindly Kline, Chelsay Knibber, Victoria Knight, Raspitomaru Knopfli, Cocoanut Koala, Akiko Koba, Bryan Koba, dawood Koba, Izen Koba, Nebur Koba, Taran Koba, Pamela Koenig, Neo Koga, BlackOut Kohime, Jazzie Kohime, Naa Kohime, Seriuskid Kohime, Wandale Kohime, Zana Kohime, Zerosix Kohime, Maucat Koi, Dagmar Kojishi, Chroma Kolache, Icey Kolache, Kornscope Komachi, Bri Koolhaas, KamaSutra Koolhaas, Katya Koolhaas, Trylle Korda, Corrine Korobase, Navajo Korvin, Pasha Korvin, David Kostolany, quintin Kostolany, Tasha Kostolany, Amy Kotobide, Zaphod Kotobide, KYWLDCT Kovacs, LillyEliska Kralomoc, Joseph Krams, Fumon Kubo, LudwigVan Kubrick, Anagras Kuhn, Selina Kuhn, Tal Kuhn, Finora Kuncoro, Maya Kupferberg, Jana Kurelek, Shika Kuri, Yo0gy Kuri, Endo Kurosawa, Tatsuki Kurosawa, MrBill Kurri, Albert Kwak, Kwakkelde Kwak, Duckling Kwak, Kasey Kyger, Kaimi Kyomoon, Stelard Kyomoon, Kyo Kyong, Emm Laa, Keera Laasonen, Delvendez Laborde, Raban Laborde, Amodeus Labrada, Louisa Labrada, Sweeten Lacey, Fiachra Lach, Eliv Lachman, Flykiwi Lachman, Charlie Laffer, LarryS Laffer, Sasha Lafleur, OxLukexO Lagan, Shadow Lagan, Tilianna Lagan, Jaye Lahtoh, Davoid Lake, Fairlight Lake, Thomas Lake, Veronique Lalonde, Leticia Lambeau, Maleia Lambeau, Cross Lament, Drakon Lameth, Misch Lameth, Caeleigh Lamington, Nedrick Lamont, essayn Lamont, Dwayne Lancaster, Hiram Lancaster, Carlton Lane, Christo83 Lane, DOO Lane, Niket Lane, Roughtoe Lane, Taylor Lane, Ami Lang, Emily Lang, Ruadh Langwarrin, Sasha Lapointe, Garrett Laramide, TBA Lardner, Beverly Larkin, Marcoh Larsen, Vanessa Larsen, bjf25 Larsson, curL Larsson, Garsson Larsson, Jondolarr Larsson, Justicar Larsson, Quinn Larsson, redshoedave Larsson, Tod Larsson, lea Laryukov, Renate Laryukov, Benny Lassally, Khristen Lassard, Josh Latrell, Lacey Latrell, Shari Latrell, Casper Laughton, Kory Laughton, Lisa Launay, Sasha Launay, Areyn Laurasia, Crystaleen Laval, Moirae Laval, Sascha Laval, Slasha Laval, Tiberius Laval, Shadow Laviolette, Velarissa Laviolette, Zeus Laws, Snaptick Laxness, wtf Laxness, Carrie Laysan, Norton Lazarno, Candide LeMay, Dustin LeMay, Shelly LeMay, Antionette LeShelle, Hayden LeShelle, Kristian LeShelle, Monika LeShelle, Mysti LeShelle, Shaklin LeShelle, Shavaii LeShelle, Lord Leafblower, Kinjry Legend, UniqueRose Legend, Jonny Legien, Lillia Lehane, Renae Leigh, KeiAira Leigh, Casper Leinhardt, MiaLily Lelouch, Adriana Lemieux, Keiki Lemieux, Ginger Lemmon, Heather Lemmon, JohnnyMac Lemmon, Lenni Lemuria, Bubba Leonard, Spyder Leroy, Aral Levitt, DarionMonkee Levitt, Quiana Levitt, Angharad Lewellen, AngelEyes Lewis, Cookie Lewis, JonnyImpala Lewis, Ekka Li, Jesa Li, Anark Liebknecht, KUieTSToRm Lightcloud, Lincoln Lightfoot, Nicola Lightfoot, Shaman Lightstone, Nika Lightworker, April Lilliehook, Joi Lilliehook, Kimi Lilliehook, LAPDHOLLYWOOD2000 Lilliehook, Lindy Lilliehook, Shayne Lilliehook, Skywil Lilliehook, Neo Linden, Amber Linden, Guy Linden, Teeple Linden, Marck Lindman, NoSpy Lindman, Rahduhlac Lineker, Evangeline Ling, Kailani Ling, Karyll Ling, Lexus Ling, moon Ling, Wai Ling, Samantha Lingiuan, CyberonX Link, Laynie Link, SLurl Link, Aphrodisiack Lisle, Petunia Liveoak, Eithnie Llanfair, Jennifer Llanfair, Pami Llewelyn, Gwyneth Llewelyn, Kiten Lobo, Paul Lobo, Khrome Lock, Brett Logan, Dragger Lok, Pavig Lok, Sera Lok, May Loll, Lola Lollipop, SweetTasting Lollipop, Nikee London, Trinity London, Dogan Lonergan, Rod Longcloth, Excalibur Longstaff, Apolonique Loon, Austyn Loon, Danyhael Loon, Goreki Loon, Huligo Loon, Jaffred Loon, LouisS Loon, Luke Loon, mahee Loon, Ruthless Loon, Melina Loonie, rasta Lopez, Lydiah Lorentz, Stellar Losangeles, Blackie Lotus, Misha Lotus, Alysia Loudon, Grace Loudon, grumble Loudon, Kate Loudon, kimmie Loveless, LadyMacbrat Loveless, Ally Lovell, Dixii Lovell, Darb2rad Lowe, Lozzie Lowe, Trip Lowe, Andrek Lowell, Jaraziah Lowell, Lissa Lowell, Stryfe Lowell, Leland Lowell, Leonardo Lowey, Stagger Lowey, Strabo Lowey, Raen Lu, Laurie Lubezki, MissJean Lubezki, Lucia Lucero, Lee Ludd, Franchises Lulu, Jayden Lulu, Kitten Lulu, mona Lumet, Alienor Lumiere, Michi Lumin, Wolf Lumin, Grumpy Lumley, Sian Lumley, HamSuiJe Lumpen, Laguna Luna, Starbella Luna, Ashley Lundquist, Theosta Lunt, Cliothe Luo, Lincoln Lupino, Bronwyn Lurra, Mineki Lurra, MYMistress Lusch, Linnae Lusso, Natalie Lustre, Rose Luxemburg, Helena Lycia, AG Lykin, Lhlilith Lykin, Niko Lykin, Logan Lyne, Jacques Lytton, Kianeira MacDiarmid, Apple MacKay, Melissa MacKay, Bailey Mackenzie, Maxx Mackenzie, Rose Mackie, Ee Maculate, Gaetan Maculate, Ravarian Maculate, Adrian Maddaloni, yearning Maddaloni, Ava Maddux, Flezix Maddux, Karamel Madison, Allure Madonna, Mannie Madonna, Sitearm Madonna, Mario Madsen, Mitzy Madsen, Ben Maersk, Lillian Maertens, Turk Maertens, Stephanie Magnolia, Lonique Magojiro, WarKirby Magojiro, Loki Mahana, Vinny Mahana, Semiramis Mahina, Shadow Mahoney, Rissa Maidstone, Tynana Maidstone, Angel Majestic, Jeremy Majestic, StarFire Majestic, Tiara Majestic, One Maktoum, Lana Maladay, Marzipan Maladay, Missy Malaprop, Ordinal Malaprop, Void Malaprop, Natasha Malibu, Rygel Malick, Ali Maltz, Leena Maltz, Cage Mandala, Synthalor Mandelbrot, Zeppelin Mandelbrot, Esteban Manen, Kawaii Manga, Mailee Manga, Nathalie Manga, Yinato Manga, Mya Mantis, Madame Maracas, Maisa Maracas, Domino Marama, Panama Marama, Charm March, SallyWoelfin March, Markel Marchionne, AdriAnne Margulis, Edgware Marker, Tika Market, AiSenshi Market, Lizbeth Marlowe, Queue Marlowe, Joana Maroon, Grey Marquette, Adrianna Marquez, Jeremy Marquez, Shirley Marquez, Christian Marquez, Dax Mars, Dnate Mars, Xandi Mars, Sarah Marsi, Garmon Martin, Sean Martin, SignpostMarv Martin, Brittany Martinek, Sweet Martini, ElDraque Martov, Aminom Marvin, Edwin Marvin, Meatnik Marvin, Zanza Marx, bollit Masala, Nguai Masala, Satya Masala, team23 Mascot, Tyler Mason, NAM Massey, Minasojo Massiel, Gatto Mastroianni, Checho Masukami, SlavegirlPaula Masukami, Hellsing Matador, Femina Matahari, Leoki Matahari, Rosa Mathieson, Violet Mathieson, MikVik Mathilde, Jonathan Mathy, Ernesto Matova, Selenia Matova, Meltharas Matsukaze, lordneg Matzerath, Memnoch Matzerath, Dedric Mauriac, Kezz Mauriac, Wolruf Mauvaise, coyote Maverick, Martin Maxwell, jericka May, Jeza May, Mellony May, Lauri Mayfair, EnCore Mayne, revochen Mayne, amaya Mayo, Hellmanns Mayo, Jima Mayo, Kion Mayo, Kisho Mayo, Mo9a7i Mayo, Neobe Mayo, Salazar Mayo, Sat Mayo, Scotto Mayo, William Mayo, Gino McAllister, Masion McAllister, Wallace McAllister, DarlinNikki McAlpine, Hawk McAlpine, Inga McAlpine, Lex McArdle, Maggie McArdle, Joshua McCallister, Keegan McCallister, Bradford McCann, Ella McCann, Flox McCarey, Jezzie McCellan, David E . McClure, Cash McConachie, Cathal McConachie, Tad McConachie, Aodhan McDunnough, Drew McDunnough, Artie McFly, Minnie McGann, Sabine McGettigan, Poppet McGimsie, Carole McGuire, Tegwenn McKenna, Shaemus McLaglen, ShirleyM McLaglen, Dirty McLean, HoseQueen McLean, Billibob McLeod, Cari McLeod, Innes McLeod, Jaenae McLeod, Slate McLeod, Troy McLuhan, Anya McMahon, DoGGo McMahon, Hutch McMahon, Iras McMahon, Jian McMahon, Jimama McMahon, Kouki McMahon, Sioban McMahon, Akie McMillan, laika McMillan, Lauris McMillan, Marteze McMillan, Maye McMillan, Nicholas McMillan, Radikal McMillan, Tammi McMillan, Jax McNally, Arwyn Meadowbrook, Waterflower Meadowbrook, Ima Mechanique, Nber Medici, Chandra Meehan, Geo Meek, Earane Meiji, Jessica Meiklejohn, Emiko Meili, penelope Meili, Luz Melbourne, Marti Melnik, MenuBar Memorial, Aitor Mendes, Mona Mendes, Jay Menges, Kimmie Menges, Lennart Menges, Margaret Menges, Mikel Menjou, VzNevada Menoptra, Merselus Mensing, Leia Mercy, SAPPHIRE Mercy, Sofie Mercy, ozadakan Meriman, Sandycd Meriman, Washington1985 Meriman, Infiniview Merit, Nanashe Merkur, Ayahuasca Merlin, Craischen Merlin, devillover Merlin, Faer Merlin, Jarros Merlin, Jolie Merlin, Kejo Merlin, Mario4 Merlin, Sarah Merlin, Silas Merlin, Wizard01 Merlin, Telitha Merlin, Vrrgo Merlin, Rocky Merosi, Luxe Merrienboer, Lance Mertel, Angus Mesmer, MysElf Messmer, Lonny Miasma, Utopar Michinaga, MTC Mielziner, Enysy Mikita, Celeste Miles, Giovani Miles, Guli Miles, Mars Miles, Noah Miles, RobWest Miles, Subzero Miles, DALLAS Milestone, Jane Milev, Jesper Milev, MMz Milev, YumYum Milk, Belle Milland, Berri Milland, Joanne Milland, Vicky Miller, Samantha Miller, Calvin Millions, Envy Millions, Lusty Millions, Versu Millionsofus, AsteroidS Mills, Emixam Mills, Goodstuff Mills, Guntrinkyt Mills, Isabella Mills, Landen Mills, Noelle Mills, Sand Mills, Djarno Mills, Mandee Milner, Haika Milo, Mankud Milo, Slobodan Milosz, Eliezer Mimistrobell, Amoret Mineff, Little Ming, Mako Minogue, Mandee Minogue, Milena Minogue, Sylfie Minogue, Manon Mirabeau, Tygeria Mirabeau, leliel Mirihi, Cmdr Misfit, disisme Misfit, fangy Misfit, Grim Misfit, RedWolf Misfit, Michal Mishin, Robby Mission, Shawn Mission, Haravikk Mistral, Thom Mistral, Sertories Mitchell, Temporal Mitra, Bphero Mizser, Stolar Mohr, DarkWulf Mokeev, Nemo Mokeev, sharon Mokeev, Sech Molinari, lara Molinaro, MARIOS Molinaro, James Mommsen, Sierra Monnett, Joan Monstre, Cattra Montagne, Galadhriel Montagne, AnnaMarie Montgomery, Christine Montgomery, Mariah Montgomery, Shawna Montgomery, Jemima Moo, Jihashi Moo, Moonie Moo, Wiske Moo, Borgie Moody, DOA Moody, Makinzie Moody, Preciousse Moody, Bit Moody, Luna Moody, ziphren Moonflower, Axl Moonlight, FxyLdy Moonlight, Stormy Moonlight, Lichtje Moonsoo, Astryd Moore, Haze Moore, Walker Moore, wiseman Moore, Zak Moore, Mordechai Moose, JMM Morahan, Kayleigh Morahan, Cyndi Moran, Marcus Moreau, Kathy Morellet, Violet Morellet, Heather Morenz, Maggie Morgan, Newbie1canobe Morgan, Sumar Morgan, Bella Morico, Ornella Morigi, Eagle Morris, Amanda Morrison, Maeyanie Mosienko, Svetlana Mosienko, Trinity Mostel, Risa Mosuke, Falcon Mountain, NEWB Mountain, Windy Mountain, KittenAnne Mousehold, Minky Mousehold, Lawna Mower, Pure Moxie, webeagle Moy, Buckaroo Mu, Nye Mu, Kara Muir, Robert Muir, Criscad Muni, Jean Munro, Pranay Munro, Nobu Murakami, Shar Murakami, Yumi Murakami, Arrekusu Muromachi, Sasameyuki Muromachi, Usagi Musashi, Spiritfire Musketeer, Questyn Myhre, Myst Mysterio, Vincent Nacon, Fox Nadir, Morgana Nagorski, Sari Naheed, Yasmin Nakamichi, Aibyou Nakamura, Aluviel Nakamura, Kyriani Nakamura, Madeea Nakamura, Masao Nakamura, Misao Nakamura, Tammi Nakamura, Tanabata Nakamura, Nawtakune Nakatani, rich Nasu, Lev Nedkov, Coal Nelson, Shiharizad Nelson, Laurah Nemeth, Beladonna Nephilim, Lianna Nephilim, Seraph Nephilim, Sari Neruda, Tiberious Neruda, otakup0pe Neumann, Wilhelm Neumann, Chet Neurocam, Draconis Neurocam, Cenji Neutra, Lex Neva, Prokofy Neva, BC Nevadan, Seagel Neville, Judi Newall, Killian Newall, Si Newall, Roenik Newell, Jos Newman, Lynda Newman, MadCat Newman, Weaver Newman, Ian Newt, Ribblet Newt, ninjafoo Ng, Raideur Ng, William Niangao, Gao Niangao, Lori Nicholas, Pravda Nicholas, Evangeline Nichols, Joella Nico, Morpheus Nieder, Titzalina Nieder, Blaze Nielsen, Angelus Nielson, Lazaros Nikolaidis, lincoln Nikolaidis, Tiruviel Nikolaidis, Kenn Nilsson, Lib Nilsson, Jokyr Nimbus, Tateru Nino, Jyotsna Nishi, lloll Nishi, Roxas Nishi, Tuote Nishi, Katlene Niven, Kari Niven, Thegamer Nixdorf, May Noarlunga, Jo Noe, DesrAw Noel, Jacindia Noel, Jaz Noel, MelodyRose Noel, Mi Noel, Paden Noel, Ricky Noel, Sunno Noel, Ono Noh, Tuach Noh, Feras Nolan, Jane Nolan, Harald Nomad, Helen Nomura, Lolita Nomura, Richard Noonan, Aenea Nori, Aulin Normandy, Kat Normandy, Zebra North, Stephen Northport, Galare Novi, KittyMarie Novi, Soo Novi, Elia Nozaki, lynsey Nozaki, Rini Nozaki, Kinzo Nurmi, Yasmin Nurmi, Kyran Nyak, Lauren Nykvist, Karma Oates, Alice Obscure, Honeymoon Obscure, Mikhail Obscure, Origin Obscure, Dementia Obviate, Lucius Obviate, Mootly Obviate, TripleXXXTex Obviate, Vanessa Obviate, Vitis Obviate, Sieben Ochs, Avery Oddfellow, Clinton Oddfellow, Maczter Oddfellow, Sempervirens Oddfellow, Tashie Oddfellow, Wagahai Oddfellow, CarlinRae Odell, Johnny Odell, Liny Odell, Lucifer Odell, vanler Odets, Foxb Oe, Kiwini Oe, Natalie Oe, Eddy Ofarrel, Mylinn Ofeq, Roundabout Ogee, Bannock Ogg, Behemoth Ogre, Anju Oh, BlackCinders Oh, Canoe Oh, Crippy Oh, Dakotah Oh, Day Oh, Doo Oh, Feander Oh, Heady Oh, Job Oh, kyushudan Oh, Lila Oh, Luxura Oh, MrSim Oh, OHYES Oh, Oury Oh, Qyty Oh, Santa Oh, Svn Oh, Volta Oh, xepadd Oh, isla Oh, Angelina Ohara, Troy Oherlihy, Yasuragi Okame, Rephaim Okina, Sven Okonomi, benyamin Olaria, EvlDesire Oliver, Brightly Olivier, Renton Olivier, Gary Olson, Christopher Omega, Hamncheese Omlet, Joseph Omlet, Libuse Ondricek, luminye Onizuka, Miyuki Onmura, Toshiro Onmura, Hotaru Onomatopoeia, Isis Ophelia, Orchid Ophelia, Stumbelina Ophelia, Roberto Oppewall, Anthony Opus, Spaceman Opus, Vakis Oranos, Koop Orbit, Sammy Ormsby, Cal Orr, Usra Ostrich, Nikki Osumi, Ariel Otafuku, kevin Oto, CJ Oto, Ann Otoole, Patrice Otoole, Abyssin Otoro, Omega Otsuzum, Teravus Ousley, Straitjacket Overlord, Szegey Oxberger, LemonYellow Oxide, Tabitha Oxide, Rianne Ozsvar, Coyote Pace, Hare Pace, Dargon Pacer, Piero Padar, Zasha Padar, Chav Paderborn, Edison Paderborn, Otenth Paderborn, RC Paderborn, Sylvia Paderborn, Chandra Page, Lili Page, Raven Page, Web Page, AnneJoy Paine, DravenLee Paine, Isobella Paine, Larva Paine, Lushious Paine, Thomas42 Paine, Cesar Pakula, Federico Palen, Monica Palen, Diana Palmer, sense Palmer, Crazy Pangaea, Sacha Pangaea, Upinthe Panhandle, Simbiant Paperclip, Drea Paperdoll, Pannie Paperdoll, raymon Paperdoll, jaesung Papp, JohnJ Papp, Alec Paragon, Cliff Paris, Vertigo Paris, Blue Parisi, serena Parisi, JR Parker, Kora Parker, Prawnyloks Parker, Etheria Parrott, Tommy Parrott, Selaras Partridge, Sexy Partridge, Maegen Parvenu, Francie Pasternak, Mr Pasternak, Eloise Pasteur, sandhya2 Patel, Bruce Patton, Penny Patton, Dave Patton, Haole Pau, Andy Paul, LanNoire Paul, Nolte, Paul, Nicholi Pavlova, shadow Pawpaw, Cuffman Payne, Deseri Payne, Gypsy Paz, LupineFox Paz, Shy Peart, Tamara Peart, Pontias Peck, Robin Peel, Elum Pegler, Kotek Pekli, Pulp Pekli, Reaser Pencer, Caliandris Pendragon, Hiro Pendragon, Jopsy Pendragon, Darren Pennell, Mideon Pennell, Powell Pera, Stanley Pera, Tajma Pera, FlipperPA Peregrine, Jennyfur Peregrine, Alana Perenti, MaxPerfect Perenti, Revolution Perenti, MoonGazer Perhaps, Brooklyn Perinal, Shawk Pertwee, Drakior Perun, Charm Perway, Jubilee Pessoa, Riley Pessoa, Tristram Petion, Aline Petrov, Larry Petrov, PantzerHamzter Petshop, scott Petshop, Foxy Petunia, Inara Pey, Tony Pey, Brathak Pfeffer, Henrick Pfeffer, Jack Pfeffer, Marlo Pfeffer, Resi Pfeffer, Lum Pfohl, TACK Pfohl, rren Pfohl, Psyke Phaeton, Sangi Phaeton, Don Pharaoh, Topdog Pharaoh, Anderson Philbin, Philb Philbin, Ridge Phillips, Maximus Phlox, Careltje Phoenix, Winter Phoenix, Ummm Pickles, Piper Picnic, Loki Pico, Hawk Pidgeon, followmeimthe Piedpiper, Alin Piek, Ricky Piek, angelwithahintoflife Pierterson, Elsibeth Pierterson, Marod Pierterson, Noshi Pierterson, Shanel Pierterson, Natasha Pike, Joshua Pilote, Adeline Pinion, Miguel Pinion, Quinn Pinion, Peach Pink, Tisha Pink, Lulu Pink, alice Pinkerton, Getty Pinkerton, Apple Pinkney, Becky Pippen, Tam Pippen, sandra Pitney, Trish Pitney, Max Pitre, Hawk Pitts, Spritely Pixel, Chel Pixie, HotBuns Pixie, Mina Pixie, Mcplane Planer, simon Planer, Guy Plasma, Halogen Plasma, Mathias Plasma, Phill Plasma, White Platini, Phoenix Platthy, Gallia Plubeau, Corki Plunkett, PollyD Plunkett, Asalynda Pluto, Evgeniy Podolsky, OTTONE Pogelmann, Henry Poindexter, Phoebe Poitier, Rowan Poitier, Rigorus Poitier, Stephen Pollock, Mishka Pomeray, Kuatum Poole, Karina Popinjay, Francesca Poppy, Hot Poppy, Shelly Portello, Anthony Portsmouth, Ian Portsmouth, HackPatooey Posthorn, JohnnyD Posthorn, Madison Posthorn, Antitese Poulot, Uccello Poultry, Tanarus Pow, Frederic Prevost, Bill Priestly, Dit Priestly, Phil Priestman, Rachelle Priestman, Sage Priestman, Simone Prieto, Wundur Primbee, Jacob Primeau, Twilight Primeau, Beautifull Princess, Creamyyy Princess, Graciella Princess, Lyna Princess, Theo Prinz, Krono Pro, Don Proost, Games Prototype, Melissa Prunes, Pie Psaltery, Danger Pugilist, Lily Pussycat, LoL Pye, PITTACOS Pye, Prize Pyle, Reese Qian, Ash Qin, Jen Qinan, milesmess Qinan, Quino Quaggy, Starsitter Quality, Algeard Quamar, Flack Quartermass, Marcus Quartermass, Shaggy Quimby, Laura Quimby, Memir Quinn, Amy Quirk, Edge Qunhua, HeinzJoachim Qunhua, Tsing Qunhua, brooke Ra, Dael Ra, Knightsof Ra, Mayo Ra, Roger Raabe, Sharven Raabe, Sail Racer, Supra Racer, Ada Radius, Rob Raffke, Rayne Ragowski, Starfoxtj4 Rail, mantitaur2 Rainbow, Sparkly Rainbow, Andromeda Raine, musicteacher Rampal, Hoyle Rang, Hermione Ranger, jurnal Ranger, Horgus Rasmuson, Trend Rasmuson, Whoosh Rasmuson, Rascal Ratelle, Eriss Rau, Morugai Rau, Ozhika Rau, slave Rau, Awsoonn Rawley, Marie Rawley, Guy Raymaker, JAC Raymaker, PlanetThoughts Raymaker, Rogier Raymaker, Trident Raymaker, Xoren Raymaker, Ranaa Raymond, Rowena Rearwin, Londyn Reatequi, Neo Rebus, Bekka Redgrave, Etude Redgrave, Lyn Redgrave, Publicist Redgrave, Wingless Redgrave, Allie Ree, Jon Ree, Thyna Ree, Zi Ree, Todd Reed, RhaRha Rees, Alex Regent, Alexander Regent, Cat Rehula, Timoteo Reifsnider, Sirus Reiner, Trilobite Reisman, ali Reiter, Ruben Reiter, Fenrir Reitveld, EmpressNever Rejected, Maya Remblai, Kapu Ren, Atticus Renoir, catsrounds Renoir, Cedric Renoir, Julion Renoir, karman Renoir, Sim Renoir, Isabela Repine, MysticalCeCe Repine, Sissimaid Resistance, Tom Reuven, Beagle Revolution, Xin Revolution, Keex Rexroth, Ordos Reymont, Roz Reynolds, CJ Rezillo, Rena Rhea, Hiroaki Rhino, Curious Rhode, Lexy Rhode, Natriumcitrate Rhode, Toshi Rhode, Pam Ribble, Gia Richard, Gigly Richez, Hutton Richez, Renae Richez, Ronald Richez, Roxi Richez, Jimbo Richez, Josh Rident, Finncaev Riederer, Aeryn Riel, INK Rinkitink, Puck Rinkitink, Riki Rinkitink, Edoardo Ritt, Bibi Riva, Eche Riverview, helloau Riverview, Liam Roark, Angela Robertson, Jay Robson, Brooks Rocco, Marth Rocco, Mo Rocco, Wolf Rocco, dartagnan29 Rockett, marco Rockett, Monida Rockett, ortaga Rockett, Raziel Rockett, Anastasia Roelofs, Stormy Roentgen, Hector Roffo, Ricci Roffo, Tonio Roffo, Picaro Roffo, IvanTwin Rogers, Chrisje100 Rojyo, Rowana Rolland, Shine Rolls, Iris Ronmark, Jacques Ronmark, Phil Ronzoni, Keishii Roo, MattyMcHatton Roo, Kimika Rookwood, Prego Rosca, Rayne Rosca, Uber Rosca, Felix Rosenberg, Amethyst Rosencrans, Alejandro Rosenthal, Davian Rosenthal, Edgar Rosenthal, Seth Rosetta, Alustriel Rosewood, Arenae Rosewood, Fury Rosewood, Gwendelyn Rosewood, Kira Rosewood, liz Rosewood, Oriene Rosewood, Lashelle Rosse, Roodvosje Rosse, Rose Rosse, Rico Rosse, Jonah Rossini, Milordino Rossini, Sparrow Rossini, Yira Rossini, Zanah Rossini, zina Rossini, Francaldo Rotunno, Reckless Rotunno, Excel Rousselot, mica Rousselot, Lexie Rovio, Alexandra Rucker, Lilith Ruff, Stina Ruff, Aragorn Runo, Kragelund Runo, Rinziq Runo, ViRi Runo, Distilled1 Rush, Jordann Russell, Kryton Russell, Miyaki, Russell, Brent Russell, Revons Rutabaga, Rocky Rutabaga, FEZ Rutherford, Darcy Rutledge, Jo Ruttenberg, Odo Ruttenberg, Theodorrick Ruttenberg, Artix Ruxton, Armand Ryan, Zakeir Rydell, Cathy Ryder, McCall Ryder, Inarra Saarinen, Kai Sabena, Sarie Sabena, Alissa Sabre, Arcticfire Sabre, BamBam Sachertorte, kai Sachertorte, Umphrey Sachs, Mila Sadovnycha, Proxima Saenz, Lynne Sage, Cheloxchile2006 Saiman, Milo Saintlouis, Natasia Saintlouis, Trinity Saintlouis, Rollergirl Saiz, Nyoko Salome, Scandinavian Salomon, Agarash Salsman, Rayne Saltair, Horus Salubrius, Solta Salyut, Nicola Samiam, Aleg Sandell, angeltf Sands, Balkan Sands, Charmaign Sands, Check Sands, Damien Sands, Orika Sands, Other Sands, Padraic Sands, Sotos Sands, Taira Sands, Cloudia Sani, Carinthia Sansome, Allasandra Santos, Rosell Santos, Solanghe Sarlo, Ishara Sartre, Charles Sassoon, Damian Saule, Jesse Sautereau, Natalia Sawley, Billie Scaggs, Mordecai Scaggs, Roz Scaggs, Socaliwag Scaggs, Johannason Scarborough, Jim Schack, Norm Schack, Fatz Scheflo, MissKitten Schildhauer, Nelson Schmo, Werner Schnabel, Tammye Schneider, Frank Schneider, Funk Schnook, cleopatras Schnyder, mylife Schnyder, ScOrPiOn Schnyder, Count Schridde, Kircheis Schroeder, Julia Schulze, Anita Schwartzman, Cornelious Schwartzman, Etrius Schwartzman, Dr Scofield, Joe Scofield, RyanAva Scofield, Kira Scott, Six Seale, Sterremare Seale, Dallas Seaton, Star Seaton, Spurs Seattle, Elio Seelowe, Jaden Seelowe, Moira Seelowe, Teleio Seferis, Artemus Seifert, Gouranga Seiling, Alyrae Seitan, Grace Selene, Maureen Selene, amandaelisabeth Sellers, Chelsey Sellers, Fashion Sellers, Novellium Sellers, Kerutsen Sellery, Semolina Semaphore, ice Semple, Daisy Semyorka, Roxy Semyorka, DarkStar Senior, River Senyurt, Singular Seoul, James Seraph, Jesrad Seraph, Liv Serf, Tears Serf, Neon Serge, Magnum Serpentine, Jazzy Serra, Aiyana Serrurier, Coelacanth Seurat, Jean Severine, Landreu Severine, Gitana Sevier, Elizabell Sewell, johni Seymour, nayeli Shabazz, Talena Shabazz, Princess Shalala, Robbie Shamroy, Dimas Shan, Lancer Shan, Nae Shan, onlyyou Shan, Shango Shan, Spirit Shan, Jumpda Shark, DigiKatt Shaw, Steffi Shenlin, Afon Shepherd, Clair Shepherd, Eastern Shepherd, LadyLeah Shepherd, Lexis Shepherd, Siddhartha Shepherd, Taran Shepherd, Valentin Shepherd, Jieux Shepherd, Delicious Sheridan, LauraAnne Sheridan, Remco Sheridan, Aki Shichiroji, Todedoz Shichiroji, BlckCobra Shikami, Mary Shikami, Seven Shikami, Thomas Shikami, Szia Shilova, lisalove Shimada, Yoyo Shinobu, Tarrant Shipman, Kitsuribami Shirabyoshi, Amber Shirakawa, AmySue Shirakawa, Kanna Shirakawa, Shelectra Shirakawa, CJ Shojo, Felix Sholokhov, VonFoxFire Sholokhov, Renegade Shriner, Alexandra Shu, Bung Shu, Ddevine Shuftan, emmakael Shuftan, Skipper Shutt, Jaime Sicling, Ko Sicling, Lucien Sidek, Ulrich Sidran, Darlene Sieyes, Darling Sieyes, sparkles Sieyes, Mjren Silvera, Apotheus Silverman, HVX Silverstar, Nirven Silverstar, Rocco Silverstar, Tamar Silverstar, Rosie Simca, Drvid Simoni, Dragos Simons, barnowlgirl Sinatra, Cheyanne Sinatra, marilsdb Sinatra, Nanceee Sinatra, Quiet Sinatra, Vent Sinatra, Frosty Sinatra, Misty Singer, Katie Singh, Sydney Singh, Philo Sion, followingwaves Sirbu, Saya Sirbu, Don Sivocci, Danielle Skall, Hegemon Skall, JASMINE Skall, Mykal Skall, Dovryn Skall, Arathorn Slade, Artakan Slade, djsunz Slade, Eleana Slade, Erica Slade, Jupiter Slade, Kronikz Slade, Methosmv Slade, piro Slade, Snapeslove Slade, Sys Slade, TylerSnk Slade, Wylee Slade, ZirQ Slade, Xabax Slade, Malik Slapstick, Coug Sleeper, Kenny Sleeper, Lucia Slippery, Adrian Sloane, Alistair Sloane, Rysz Sloane, Angel Slocombe, PrinceDK Slunce, Flo Slunce, Tatiana Smagulov, badboy1331 Smalls, Brat Smalls, EDhardy Smalls, Lomgren Smalls, DonAmon Smirnov, Andrew Smith, Elliott Smith, Mikal Snakeankle, Esch Snoats, Eian Snook, Pavee Snook, floe Snookums, kramer Snookums, Rach Snookums, Jonboy Snye, fionn Soderstrom, miguel Soderstrom, Bellisima Sodwind, Dafydd Sodwind, Scott69 Sodwind, Shipper Sodwind, Ilianexsi Sojourner, Shirokuro Sojourner, The Sojourner, Wiccan Sojourner, Elijah Sol, Lara Sola, Vanilla Sola, Silvari Soleil, David23 Something, DolphPun Somme, Rhyph Somme, aewyn Sondergaard, Kali Sonic, Packard Sonic, Jayman Sonnenblume, Pippen Sonnenblume, Esichs Sonnerstein, Sylvia Sonoda, ASCLEPIUS Soon, Tecumseh Soon, Julia Soothsayer, Shadowspawn Soothsayer, Tindallia Soothsayer, RJ Source, Akemi Soy, Aln Soy, Aaron Soyer, Tsuno Soyinka, Oz Spade, Ellen Spark, karlynn Sparkle, Kaylie Sparkle, TruHeart Sparkle, Dave Sparrow, slyflower Sparrow, Flapjack Spatula, Cheyenne Spearmann, Jester Spearmann, JewelKicker Spearmann, Data Spectre, Rai Speculaas, Sin Speculaas, Thornne Speculaas, Ehdward Spengler, mo Spengler, Wesley Spengler, Datentyp Sperber, Niko Sperber, Giuseppe Spicoli, Snakeye Spicoli, Marcus Spire, Setori Spire, Crackervelli Spitteler, Naughty Spitteler, Studders101 Spitteler, Yojne Spitteler, ScaryMary Spitz, Geezer Spoonhammer, GutterBlood Spoonhammer, Tour Spoonhammer, Sheet Spotter, tree Sprawl, Kitty Sprocket, Alan Standish, Fox Standish, Clive Stanwell, Alexis Stapovic, Hippyjim Starbrook, Missy Starbrook, Thunder Starbrook, Babydoll Stardust, Birdy Stardust, Johannes Starostin, Ariana Starr, Funk Starr, eltee Statosky, Hanako Stawberry, Micheal Steadham, Blueman Steele, sugar Steele, Jennifer Steele, Golda Stein, Tyler Stein, Uber Stein, Bernd Steinhardt, Whisper Stella, Hjoerdis Stenvaag, Timmy Stepford, LaserFingers Steptoe, Athena Sterling, Selvina Sterling, Hunter Stern, Ocmer Sternberg, Jabath Steuart, Sylvia Steuben, Bracin Stevenson, Sammmy Stewart, Skeeter Stiglitz, Lily Stilman, Nisaa Stilman, Quick Stilman, Spaydar Stine, Unger Stine, Sherrade Stirling, Till Stirling, Juggernaut Stoklitsky, Meret Stonebender, Argent Stonecutter, Gearsawe Stonecutter, Kayla Stonecutter, Liquids Stonewall, Nevera Stooge, Matthew Stork, Sam Stork, Neotoy Story, AllieKat Stovall, Krystal Straaf, Kyrus Straaf, Laars Straaf, Niccia Straaf, Aloe Stradling, egbert Stradling, Lotus Stradling, SlyFox Stradling, Eristic Strangelove, Thaumata Strangelove, Valiant Strangelove, Salome Strangelove, Erica Strauss, Zinger Strauss, Gabrielle Street, Artistniko Streeter, Bruce82 Streeter, Builder Streeter, dast Streeter, Hans Streeter, Stilette Streeter, Darzus Strutt, Bluto Stubbs, Olivier Sturges, Kharie Su, Rexx Su, Vudu Suavage, Silverrain Sucettes, Siyu Suen, Zack Suen, Linnian Sugar, Sierra Sugar, Stacey Sugar, Jodie Suisei, Koto Sukra, Takira Sukra, Ravanne Sullivan, Rik Sullivan, Sofi Sullivan, Joffi Sumbula, BrightAngel Summers, Kiyana Summers, Eclipsed Sun, Shinshinto Sungsoo, Angel Sunset, Warord Suntzu, DalE Supply, ivan Supply, Frictionless Surface, Brightwing Surtees, David Surtees, Georges Susa, Caterina Susanti, Fatima Susanti, Owen Susanto, Caliburn Susanto, Kevin Susenko, Forseti Svarog, Kinga Svarog, Batman Swenholt, Flame Swenholt, Shyressa Swenholt, Earle Swenson, Harvey Swenson, Kevin Swenson, Anastasia Swindlehurst, Liz Swindlehurst, Swein Swindlehurst, Verrenus Swindlehurst, Christain Switchblade, Guy Szondi, Nonlucid Szondi, Sagmumu Szondi, XVenomX Szymborska, CaelThunderwing Tackleberry, Mitzi Tackleberry, Ayla Tae, Maya Tae, Princess Tae, Carsten Taft, Gigs Taggart, Aphrodite Tagore, Lynn Tagore, Jenna Taira, Zephora Taiyou, Rusmi Taka, Kaimen Takahe, Akina Takakura, Sabina Takakura, Tao Takashi, Cornelius Tal, Dolmere Talamasca, Kelindra Talamasca, Sabane Talamasca, Tod69 Talamasca, Bad Tamale, Kitchkinet Tamale, Dany Tammas, kym Tammas, Phoming Tammas, sasha Tammas, Alina Tamura, Janu Tamura, Karetta Tamura, Melli Tamura, Morina Tamura, Snake Tamura, Valentina Tamura, Rutain Tandino, Tracy Tani, Jolt Tank, Rachel Tapioca, Ilyara Tardis, Jaxx Tardis, Aaron Tardis, Sim Tatham, Tobi Taurog, Joey Tavoularis, John Taylor, Jeffrey Temin, Enabran Templar, Crymzon Tempura, Jehan Tendaze, Angel Tengu, Arctic Tenk, Ginevro Tenk, OolBatar Tenk, Sally Tenk, Storchi Tenk, Bloodsong Termagant, Cubey Terra, Lynn Terra, Niles Theas, Sterre Theas, Lost Thereian, Osprey Therian, Lukas Thetan, Larson Thibaud, Redd Thielt, Tana Thielt, Thongshaman Thirroul, Millie Thompson, Brooke Thurston, Lisa Thyben, Bengal Tiger, RavenAnn Tiger, Terrigo Tiger, Sable Till, Soraya Till, Zayn Till, Trixie Timtam, immortal Tiramisu, Matthew Todd, Watermelon Tokyo, Amily Toland, Prijian Toland, Wigger Toland, Wym Toland, Shaia Toll, harathoi Toman, EH Tomcat, Pawz Tomcat, nicky Tomsen, Olyntchen Tomsen, Siul Tomsen, Zukini Tomsen, Darkover Tone, JazzySweet Tone, Tea Tone, Shelly Toonie, Tristan Torgeson, Katie Tornado, manufr Torok, Drew Torres, Xavier Tosung, Benjamin Tower, TJ Tower, Coquine Tracy, Fintaya Tracy, Herman Tracy, killer Tracy, Marcel Tran, Cabal Trautman, Nadja Travanti, Steve Trenchard, Grimm Trenchmouth, Neogrinch Trenchmouth, Scarlet Trenton, input Trilam, Debbie Trilling, Dahlia Trimble, TrainingDay Trimble, Candy Tripp, FeelGood Tripp, Nate Tripp, Skalligrim Tripp, stimpy Tripp, Michael Tripsa, Orion Tristan, Sam Troell, Celebrity Trollop, MaidHeather Trollop, Roberto Trotter, Tipsey Troughton, Lucille Trudeau, Paul Trudeau, arthus Truffaut, Chambord Truffaut, Siss Truss, Boshiken Tsuki, Sindy Tsure, Dante Tucker, ImAOzGrl Tucker, Scott Tucker, BabyAlice Tulip, Bryce Tully, Pixie Tungl, Lyr Tuppakaka, Hawthorn Tuque, Omei Turnbull, Victor Tuxing, Cloe Twang, Twill Tymets, Andrew Tyson, Lyndyn Tzara, Ilyushin Tzedek, Echo Uba, francois Uba, James Udal, Jman Udet, Sara Udet, Koola Uggla, Rocky Uggla, Barry Ultsch, Didro Ultsch, Ianbob Ultsch, Jacki Ultsch, Tchize Umarov, Pepper Underall, Silky Underall, MadameThespian Underhill, Archanox Underthorn, Muzicole Undertone, Chance Unknown, Luthien Unsung, Random Unsung, Sammael Unsung, Totally Unsustainable, Withershins Unsworth, Alison Upshaw, daniel27 Upshaw, Downs Upshaw, Wookie Upshaw, Mr Ur, dlen Uriza, olivia Uriza, tamzi Uriza, clashman Usher, Egelion Usher, dragonboy Utorid, Shade Vacano, Tali Vacano, VanDelay Vacano, Waters Vacano, Gisela Vale, Suena Vale, Anna Valeeva, Caelestaeia Valeeva, Jrhueving Valeeva, Keela Valeeva, Sue Valeeva, Huns Valen, Belle Valentine, LaTaina Valentine, Nenilai Valentine, Sweet Valentine, Lightwave Valkyrie, SexyEyes Valkyrie, Shucks Valkyrie, Cherie Vallely, Charlie Vanalten, Dina Vanalten, Jonash Vanalten, WindyWeather Vanalten, Anousjka Vanbeeck, Joseph Vandeperck, Annabelle Vandeverre, Cyn Vandeverre, Maia Vandeverre, Starlight Vandeverre, Gunter Vandyke, Sascha Vandyke, Savage Vanguard, Trinity Vanmoer, Blucool Vanness, Janey Vansant, Reva Vanvleck, Bunnee Varmint, Priest Varun, Zermit Vasilopita, Hornern Vaughan, Marie Vaughan, Marleen Vaughan, Tiffany Vaughan, Cinthya Vavoom, Mithik Vavoom, Speeder Vavoom, QuietlyCharmes Vega, Aleksy Vella, Delsara Vella, Falcon Vella, Gippy Vella, Loftvoker Vella, marivy Vella, mikky Vella, PrincessRainbow Vella, Ramiro Vella, Charla Vellhi, Dave Vellhi, Holly Venera, havelock Venkman, Dark Ventura, Psyche Vertes, Rhianna Vertes, Nyteshade Vesperia, Dahlia Vezina, Danielle Vidor, Darucain Vieria, Dytska Vieria, Heidi Vieria, ThaRi Vieria, Yora Vig, Tryme Viking, Peri Villota, Violetta Villota, Steve Vinson, Eva Virgo, Camille Virtanen, Giada Visconti, Seraphim Vixen, Robin Vogel, Troy Vogel, Ebony Voight, Heather Voight, Lexie Voight, Roy Voight, Rutger Voight, Cary Volare, Constanza Volare, Dick Volare, FleetingJoy Volitant, Isara Vollmar, Sasha Vollmar, Scarlett Vollmar, Aagaard Voom, Aliens Voom, Duchess Voom, Plenty Voom, Pope Voom, quewan Voom, Selina Voom, Theresa Voom, Yes Voom, Yolanda Voom, Ki Voss, Fatima Vuckovic, Noone Vuckovic, Viana Vuckovic, NARUTO Wade, Warren Wade, Wizardesssss Wade, esclava Wakawaka, Squeebee Wakawaka, Brian Wellman aka Bribo Wakawaka, Pandora Wake, Hosic Wakmann, Greenfield Walcott, Gillian Waldman, Hiram Walker, Tiffany Walsh, Piers Warf, Xenon Warf, Relkin Warrigal, JK Warrior, Shan Warrior, Eowyn Watanabe, Hatibei Watanabe, JimmyC Watanabe, Poemi Watanabe, Toru Watanabe, Tsukasa Watanabe, Gen Watson, Harley Watts, Keeley Waverley, Misterblue Waves, Nimrodina Wayne, Bill Weaver, Nitram Wei, Sistagrlro Wei, Scully Weir, Adrina Welders, Escape Welles, Ivy Welles, Tracy Welles, Vanity Welles, XaMaD Welles, breemman Wellman, Spyder Werribee, Angela Wertmuller, Ronny Wertmuller, Mike Westerburg, Sofia Westwick, Lea Weyland, Darryl Wheeler, lily Whetmore, Lola Whetmore, Sabby Whiplash, SteveR Whiplash, Trader1 Whiplash, Wynx Whiplash, Chalky White, Les White, Sid White, Juicefroma Whitehead, Garrett Whitfield, Jewelia Whitfield, NaomiG6159 Whitfield, Asher Whitman, GoldEagle Whitman, Lizziey Whittenton, Athena Whizenhunt, GreenGate Widdershins, EmCee Widget, edwin Wijaya, Yamtx Wijaya, Aunnia Wilberg, Corwin Wilberg, Elric Wilberg, Johann Wilberg, Brittany Wildcat, MISGREENCHRONIC Wildcat, Bcreative Wilde, Midnight Wilde, Stormy Wilde, DJMantega Wilder, KJ Wilder, Nikki Wilder, Rebel Wilder, Terra Wilder, Infalle Wildung, Streak Wildung, Hed Williams, Michael B. Williams, Erica Williams, Benson Willis, Explorer Willis, Kithin Willis, Isandra Willunga, Kamots Wind, Merum Wind, Mystra Wind, Jaxom Winger, Alex2007 Winkler, Christopher Winkler, Frauke Winkler, Genny Winkler, Mwayne Winkler, Ridgie Winkler, Wolli Winkler, Janice Winnfield, Firefly Winx, Magus Winx, Cricket Wise, Marios Wise, AzurAA Wise, CountD Wishbringer, Heart Wishbringer, Missy Wishbringer, Caemlyn Witherspoon, Celeste Witherspoon, Kalia Withnail, Kami Woebegone, Ochi Wolfe, Salina Wolfe, kirkmegna Wombat, Luna Wood, Steve Wood, Eremia Woodbury, MeForest Woodget, Widgy Woodget, York Woodget, Patchouli Woollahra, Ronco Woolley, Kevin Woolley, Noah Woori, BiGSiN Wormser, Jaime Wormser, Dave Wormser, Joseph Worthington, Vitafit Wottitz, Keera Woyseck, Donnie Wrangler, Brandy Wright, Arian Writer, Bat Writer, Brina Writer, Dwayne Writer, FearToAll Writer, Grog Writer, Head Writer, Mne Writer, nathaniel Writer, Quixotic Writer, Riddley Writer, Two Writer, ZZ Writer, Zoya Writer, Faith Wunderland, Tommy3141 Wunderland, Evalyn Wunderlich, RainbowChef Wunderlich, Raistlin Wunderlich, Terrano Wunderlich, Wallyneumonic Wunderlich, Phil Wuyts, Carrie Wyler, London Wyler, sypher Wyler, TiTiNe Wyler, Tyron Wyler, Alaxandra Xeno, polo Xeno, Roz Xeno, Beatfox Xevious, Kamael Xevious, Leraje Xevious, eXPLORATRIX Xi, Ganesha Xi, groudon185p Xi, Kiyotei Xi, norritt Xi, Sadonya Xi, Aimee Xia, pixiedust Xia, Silky Xia, nimrod Yaffle, Yiffy Yaffle, icegirl Yalin, Jak Yalin, Kile Yamabushi, Naamah Yamabushi, OnnaYokai Yamabushi, Tengu Yamabushi, Tenshiko Yamabushi, Horseplay Yamauba, Enricob Yamdev, Lucian Yamdev, Darth Yao, Haaru Yao, Hex Yao, Milena Yao, Nyarlanathotep Yao, pescerosso Yao, Saigon Yao, TuTsi Yao, dima88 Yap, yuki Yaseotoko, Galea Yates, Originalman2000 Yates, Pumpy Yates, Sherry Yates, Tyrone Yates, Samar Yaud, Griffin Yeats, Kingsbury Yeats, Coos Yellowknife, Easy Yering, AlexYu Yifu, Jessmay Yifu, JoYoung Yifu, Lili Yifu, Snippy Yifu, Evolving Yin, Tzop Yip, Usus Yip, Moshiach Yohkoh, SolZephyr Yohkoh, Terish Yohkoh, Vicky Yongbo, Adp Yongho, Shizn Yongho, DrinkChocolate Yoshikawa, Grecco Yoshikawa, Julianus Yoshikawa, Yonagigai Yoshikawa, Yondaime Yoshikawa, Leto Yoshiro, Minako Yoshiyuki, Zindorf Yossarian, Mistral Yost, FoxSan Yosuke, Blythe Young, oiuy Young, Martyn Young, Briana Yue, cleo Yue, Dakotah Yue, Gumby Yue, Himeno Yue, nkoder Yue, Su2ndLife Yue, Seeker Yuequi, Judy Yun, Li Yun, Pielewop Zabelin, TinaDee Zabibha, Saressa Zadeh, Deathmare Zadoq, Krazzora Zaftig, Zud Zaftig, Lady Euterpe Zagoskin, Adam Zaius, Winston Zaius, Mysterious Zamboni, Dane Zander, TheDragonMaster Zander, Vallek Zander, AustinTodd Zanetti, Ianbra Zapedzki, Jill Zapedzki, skyzo Zapedzki, Supershine Zapedzki, Tristan Zapedzki, Zankoku Zapedzki, Joyce Zapedzki, Paul Zapotocky, seissab Zarf, xlene Zarf, Zyzzy Zarf, Freedom Zeami, Mala Zeami, ArbaJayba Zebaki, ToKizzable Zeddmore, Tocaelpito Zeffirelli, Nite Zelmanov, Zogborf Zelmanov, Suzanne Zeluco, Benton Zemach, Theo Zemach, Dee Zemlja, Xellessanova Zenith, Keji Zeno, Qat Zeno, Shekina Zeno, HotFoxy Zenovka, kazuku Zenovka, Lilly Zenovka, Susanne Zenovka, Talltenor Zenovka, Zola Zenovka, Hewee Zetkin, BeauZeau Zhao, malee Zhaoying, Takea Zhaoying, Maximilian Zhichao, Ricky Zhichao, Samael Zhichao, WildHeart Zhichao, Zflat Zhongyuan, Luthander Zhou, Silvanne Ziemia, Vocianna Ziemia, kankano Zinnemann, Enki Zinner, Omnephilite Zinner, Marios Ziskey, Jai Zucker, scott Zucker, Suzie Zucker, Daphnie Zuhrah, Mathoni Zuhrah, Ravi Zuma, Junkfooddog Zwiers, Aargle Zymurgy, Me Zymurgy and many others.
 
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -32,7 +32,7 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 All rights reserved.  See licenses.txt for details.
 
 
-Don&apos;t hassle the hoff.
+Steve, just think of a snappy quote. It's not *that* hard, is it?
         </text_editor>
         <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_account_history.xml b/linden/indra/newview/skins/xui/en-us/floater_account_history.xml
deleted file mode 100644
index d215089..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_account_history.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="350" min_height="100" min_width="100" name="money history floater"
-     title="Account History" width="500">
-        <tab_container bottom="-346" follows="left|top|right|bottom" height="326" left="4"
-             mouse_opaque="false" name="tab" tab_position="left" width="492" />
-        <button bottom="-346" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="More Details..." label_selected="More Details..."
-             left="4" mouse_opaque="true" name="details_btn" width="100" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/xui/en-us/floater_build_options.xml
index 18c0fbc..807caa0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_build_options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="right" height="130" left="298" min_height="130"
+     can_resize="false" follows="right" height="151" left="298" min_height="151"
      min_width="272" mouse_opaque="true" name="build options floater"
      rect_control="FloaterBuildOptionsRect" title="Grid Options" width="272">
         <spinner bottom="-53" control_name="GridResolution" decimal_digits="3"
@@ -15,6 +15,10 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Enable Sub-Unit Snapping" left="14" mouse_opaque="true"
              name="GridSubUnit" width="200" />
+        <check_box bottom_delta="-21" control_name="GridCrossSections" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show Cross Sections" left="14" mouse_opaque="true"
+             name="GridCrossSection" width="200" />
         <slider bottom_delta="-21" can_edit_text="false" control_name="GridOpacity"
              decimal_digits="3" follows="left" height="16" increment="0.05"
              initial_val="0.7" label="Grid Opacity" left="14" max_val="1" min_val="0"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index 2568e73..31ae55c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -5,7 +5,7 @@
      can_close="true"
      can_drag_on_left="false"
      can_minimize="false"
-     can_resize="false"
+     can_resize="true"
      enabled="true"
      follows="left|top|right|bottom"
      height="297"
@@ -35,10 +35,10 @@
         <button bottom="-295" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="20" hidden="false" label="Profile..."
              label_selected="Profile..." left="355" mouse_opaque="true"
-             name="profile_btn" scale_image="true" width="75" />
+             name="profile_btn" scale_image="true" width="70" />
         <button bottom="-295" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="20" hidden="false" label="Close"
-             label_selected="Close" left="435" mouse_opaque="true" name="close_btn"
+             label_selected="Close" left="430" mouse_opaque="true" name="close_btn"
              scale_image="true" width="60" />
         <text hidden="true" name="live_help_dialog" wordwrap="false">
                 *** Welcome to Help Request *** 
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
index a9771a3..7d7d435 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" enabled="true" height="90" hidden="false" left="242"
-     min_height="0" min_width="0" mouse_opaque="true"
+     min_height="90" min_width="300" mouse_opaque="true"
      name="existing_landmark_preview" width="300">
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43"
              enabled="true" follows="left|top|right" font="SansSerif"
@@ -17,9 +17,10 @@
         <icon bottom="-21" color="1 1 1 1" enabled="true" follows="left|top" height="16"
              hidden="false" image_name="inv_item_landmark_visited.tga" left="5"
              mouse_opaque="true" name="icon_landmark" width="16" />
-        <button bottom="-77" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Teleport" label_selected="" left="13"
-             mouse_opaque="true" name="Teleport btn" width="100" />
+        <button bottom="-77" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="20" hidden="false" label="Teleport"
+             label_selected="" left="13" mouse_opaque="true" name="Teleport btn"
+             width="100" />
         <button bottom="-77" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="20" hidden="false" label="Show on Map"
              label_selected="" left="126" mouse_opaque="true" name="Show on Map btn"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
index c90c8ad..16d0dcd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-97" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" enabled="true" height="90" hidden="false" left="201"
-     min_height="0" min_width="0" mouse_opaque="true" name="landmark_preview"
+     min_height="370" min_width="90" mouse_opaque="true" name="landmark_preview"
      width="370">
         <button bottom="-77" enabled="true" font="SansSerif" halign="center" height="20"
              hidden="false" label="Teleport" label_selected="" left="13"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml b/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
index f38e63b..609c964 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
@@ -16,8 +16,8 @@ and appear higher in searches.
              name="price_text" width="100">
                 Price for Ad (L$):
         </text>
-        <line_editor bottom_delta="2" follows="top|left" height="20" left="120" max_length="5"
-             name="price_edit" width="50" />
+        <line_editor bottom_delta="2" follows="top|left" height="20" left="120" max_length="6"
+             name="price_edit" width="60" />
         <button bottom="10" follows="top|left" height="20" label="Set Price" left="110"
              name="set_price_btn" width="80" />
         <button bottom_delta="0" follows="top|left" height="20" label="Cancel" left="200"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
index 611b728..994aa70 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
@@ -1,5 +1,5 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="190" name="settings_debug"
+     can_resize="false" height="215" name="settings_debug"
      title="Debug Settings" width="350">
         <combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
              height="20" left="15" max_chars="255" name="settings_combo" />
@@ -15,7 +15,7 @@
                 </combo_item>
         </combo_box>
         <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
-        <color_swatch bottom="5" can_apply_immediately="true" height="55" label="Color"
+        <color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
              name="color_swatch" visible="true" width="37" />
         <spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
              name="val_spinner_1" visible="false" width="120" />
@@ -25,4 +25,5 @@
              max_val="10000000" name="val_spinner_3" visible="false" width="120" />
         <spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
              max_val="10000000" name="val_spinner_4" visible="false" width="120" />
+        <button bottom="5" left="15" height="20" width="150" name="default_btn" label="Reset to default"/>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index 1e4ce8a..72de4ec 100755
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -29,6 +29,10 @@
              mouse_opaque="true" name="Empty Trash" width="128">
                 <on_click filter="" function="Inventory.EmptyTrash" userdata="rename" />
         </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Empty Lost And Found"
+             left="0" mouse_opaque="true" name="Empty Lost And Found" width="128">
+                <on_click filter="" function="Inventory.EmptyLostAndFound" userdata="rename" />
+        </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="New Folder" left="0"
              mouse_opaque="true" name="New Folder" width="128">
                 <on_click filter="" function="Inventory.DoCreate" userdata="category" />
@@ -172,11 +176,11 @@
         <menu_item_call bottom_delta="-18" height="18" hidden="false"
              label="IM Online Contacts In Folder" left="0" mouse_opaque="true"
              name="IM Online Contacts In Folder" width="128">
-                <on_click filter="" function="Inventory.BeginIMSession" userdata="everyone" />
+                <on_click filter="" function="Inventory.BeginIMSession" userdata="online" />
         </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="IM All Contacts In Folder"
              left="0" mouse_opaque="true" name="IM All Contacts In Folder" width="128">
-                <on_click filter="" function="Inventory.BeginIMSession" userdata="online" />
+                <on_click filter="" function="Inventory.BeginIMSession" userdata="everyone" />
         </menu_item_call>
         <menu_item_separator name="Sound Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Play" left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index d7f9809..2c45a4e 100755
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" color="0.501961 0 0 1" drop_shadow="true" enabled="true"
+<menu_bar bottom="-18" color="0.501961 0 0 1" drop_shadow="false" enabled="true"
      follows="left|top|right" height="18" hidden="false" left="0"
      mouse_opaque="true" name="Main Menu" opaque="true" tear_off="false"
      width="802">
@@ -37,6 +37,7 @@
                      left="0" mouse_opaque="true" name="Close Window" shortcut="control|W"
                      width="243">
                         <on_click function="File.CloseWindow" userdata="" />
+                        <on_enable function="File.EnableCloseWindow" userdata="" />
                 </menu_item_call>
                 <menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator2" width="243" />
@@ -509,6 +510,7 @@
                      left="0" mouse_opaque="true" name="Teleport Home"
                      shortcut="control|shift|H" width="185">
                         <on_click function="World.TeleportHome" userdata="" />
+                        <on_enable function="World.EnableTeleportHome" userdata="" />
                 </menu_item_call>
                 <menu_item_separator bottom="-167" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator3" width="185" />
@@ -525,7 +527,8 @@
                 <menu_item_call bottom="-232" enabled="true" height="19" hidden="false"
                      label="Account History..." left="0" mouse_opaque="true"
                      name="Account History..." width="185">
-                        <on_click function="ShowFloater" userdata="account history" />
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
                 </menu_item_call>
                 <menu_item_call bottom="-267" enabled="true" height="19" hidden="false"
                      label="Manage My Account..." left="0" mouse_opaque="true"
@@ -811,10 +814,10 @@
                         <on_click function="PromptShowFile" userdata="WebLaunchLSLGuide,lsl_guide.html" />
                 </menu_item_call>
                 <menu_item_call bottom="-140" enabled="true" height="19" hidden="false"
-                     label="Scripting Wiki..." left="0" mouse_opaque="true"
-                     name="Scripting Wiki..." width="166">
+                     label="Scripting Portal..." left="0" mouse_opaque="true"
+                     name="Scripting Portal..." width="166">
                         <on_click function="PromptShowURL"
-                             userdata="WebLaunchLSLWiki,http://secondlife.com/app/lsldoc/" />
+                             userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
                 </menu_item_call>
                 <menu_item_separator bottom="-148" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator3" width="166" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_account_details.xml b/linden/indra/newview/skins/xui/en-us/panel_account_details.xml
deleted file mode 100644
index 350b5ed..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_account_details.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-325" follows="left|top|right|bottom" height="324"
-     label="Details" left="103" mouse_opaque="true" name="account_details_panel"
-     width="388">
-        <text_editor bottom="-288" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="Monospace" height="280" left="8"
-             max_length="65536" mouse_opaque="true" name="editor" width="372"
-             word_wrap="false" />
-        <button bottom="-316" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="&lt; Earlier" label_selected="&lt; Earlier" left="24"
-             mouse_opaque="true" name="earlier_btn" tool_tip="Go back in time"
-             width="80" />
-        <button bottom="-316" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Later &gt;" label_selected="Later &gt;" left_delta="260"
-             mouse_opaque="true" name="later_btn" tool_tip="Go forward in time"
-             width="80" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_account_planning.xml b/linden/indra/newview/skins/xui/en-us/panel_account_planning.xml
deleted file mode 100644
index 02e9aaf..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_account_planning.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-325" follows="left|top|right|bottom" height="324"
-     label="Planning" left="103" mouse_opaque="true"
-     name="account_planning_panel" width="388">
-        <text_editor bottom="-316" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="Monospace" height="308" left="8"
-             max_length="65536" mouse_opaque="true" name="editor" width="372"
-             word_wrap="false" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_account_transactions.xml b/linden/indra/newview/skins/xui/en-us/panel_account_transactions.xml
deleted file mode 100644
index 8521625..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_account_transactions.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-325" follows="left|top|right|bottom" height="324"
-     label="Sales/Gifts" left="103" mouse_opaque="true"
-     name="account_sales_panel" width="388">
-        <text_editor bottom="-288" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="Monospace" height="280" left="8"
-             max_length="65536" mouse_opaque="true" name="editor" width="372"
-             word_wrap="false" />
-        <button bottom="-316" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="&lt; Earlier" label_selected="&lt; Earlier" left="24"
-             mouse_opaque="true" name="earlier_btn" tool_tip="Go back in time"
-             width="80" />
-        <button bottom="-316" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Later &gt;" label_selected="Later &gt;" left_delta="260"
-             mouse_opaque="true" name="later_btn" tool_tip="Go forward in time"
-             width="80" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index 1cc6f54..d8b415a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
         <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
              tab_min_width="50" tab_position="top" width="420">
@@ -77,6 +76,9 @@
                              v_pad="0" width="130">
                                 Partner:
                         </text>
+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             height="18" label="?" label_selected="?" left_delta="43"
+                             mouse_opaque="true" name="partner_help" width="18" />
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="270"
@@ -205,7 +207,8 @@
                              max_length="254" mouse_opaque="true" name="url_edit"
                              text_readonly_color="1, 1, 1, 1" width="400" />
                         <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
-                             left="10" name="profile_html" start_url="" width="400" />
+                             ignore_ui_scale="false" left="10" name="profile_html" start_url=""
+                             width="400" />
                         <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
                              top="25">
                                 Done
@@ -307,6 +310,12 @@
                              mouse_opaque="true" name="Delete..." width="75" />
                         <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
                              name="picks tab" tab_position="left" width="412" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-70" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerif" h_pad="0" halign="left" height="20" left="114"
+                             mouse_opaque="false" name="loading_text" v_pad="0" width="302">
+                             Loading...
+                        </text>
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Classified" left="1" mouse_opaque="true" name="Classified"
@@ -328,9 +337,11 @@
                         <tab_container bottom="-463" follows="left|top" height="415" left="4" mouse_opaque="false"
                              name="classified tab" tab_position="left" width="412" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-463" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerif" h_pad="0" halign="left" height="355" left="114"
-                             mouse_opaque="false" name="help_text" v_pad="0" width="302" />
+                             bottom="-70" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerif" h_pad="0" halign="left" height="20" left="114"
+                             mouse_opaque="false" name="loading_text" v_pad="0" width="302">
+                             Loading...
+                        </text>
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group.xml b/linden/indra/newview/skins/xui/en-us/panel_group.xml
index ee1f3c6..dbe37c6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group.xml
@@ -26,6 +26,6 @@
              label_selected="OK" left_delta="-65" mouse_opaque="true" name="btn_ok"
              width="60" />
         <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-             label="Refresh from server" label_selected="Refresh from server" left="10"
-             mouse_opaque="true" name="btn_refresh" width="130" />
+             label="Refresh" label_selected="Refresh from server" left="10"
+             mouse_opaque="true" name="btn_refresh" width="90" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
index 65ac0b5..09ea84e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
@@ -25,15 +25,15 @@ the General tab.
              h_pad="0" halign="left" height="16" left_delta="0" mouse_opaque="true"
              name="lbl2" v_pad="0" width="436">
                 Notices are kept for 30 days. Click the notice below you wish to view.
-Click the &apos;Refresh List&apos; button if new notices have been received.
+Click the &apos;Refresh&apos; button to check if new notices have been received.
         </text>
-        <scroll_list background_visible="false" bottom_delta="-130" column_padding="5"
+        <scroll_list background_visible="false" bottom_delta="-130" column_padding="0"
              draw_border="true" draw_heading="true" enabled="true"
              fg_unselected_color="200,200,200,255" heading_font="SansSerifSmall"
              heading_height="14" height="116" left="7" mouse_opaque="true"
              multi_select="false" name="notice_list" width="404">
                 <column label="" name="icon" width="16" />
-                <column label="Subject" name="subject" width="155" />
+                <column label="Subject" name="subject" width="171" />
                 <column label="From" name="from" width="125" />
                 <column label="Date" name="date" width="85" />
                 <column name="sort" width="-1" />
@@ -45,8 +45,8 @@ Click the &apos;Refresh List&apos; button if new notices have been received.
              label="Create New Notice" label_selected="Create New Notice" left_delta="0"
              mouse_opaque="true" name="create_new_notice" width="150" />
         <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-             label="Refresh List" label_selected="Refresh List" left="282"
-             mouse_opaque="true" name="refresh_notices" width="130" />
+             label="Refresh" label_selected="Refresh List" left="321"
+             mouse_opaque="true" name="refresh_notices" width="90" />
         <panel border="false" bottom="0" follows="all" height="275" label="Create New Notice"
              left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -141,8 +141,8 @@ and you can&apos;t send a folder.
                      name="lbl4" v_pad="0" visible="false" width="55">
                         Message:
                 </text>
-                <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-145" embedded_items="false"
-                     enabled="false" font="SansSerifSmall" height="175" hide_scrollbar="true"
+                <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-148" embedded_items="false"
+                     enabled="false" font="SansSerifSmall" height="206" hide_scrollbar="true"
                      is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
                      name="view_message" text_readonly_color="200,200,200, 255" width="404"
                      word_wrap="true" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
index 96363ac..3f6acf8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
@@ -89,9 +89,9 @@ execute the Ability.
                         <button bottom_delta="0" font="SansSerif" halign="center" height="19"
                              label="Eject From Group" left="-153" name="member_eject" width="146" />
                         <text name="help_text">
-                                You can add or remove Roles assigned to members 
-or select multiple Members by holding the Control
-key and clicking on their names.
+                                You can add or remove Roles assigned to Members. 
+                                Select multiple Members by holding the Ctrl key and
+                                clicking on their names.
                         </text>
                         <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
                 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index 43bee81..7df2151 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -10,7 +10,7 @@
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="20" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
              left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
                 First Name:
         </text>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
index 4b8a647..adf6db2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
@@ -38,15 +38,15 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-79" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="AGP Graphics Card:" v_pad="0"
+             left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0"
              width="128">
-                AGP Graphics Card:
+                Enable VBO:
         </text>
-        <check_box bottom="-83" control_name="RenderUseAGP" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-             label="Enable AGP (faster if using an AGP graphics card)" left="148"
-             mouse_opaque="true" name="agp" radio_style="false"
-             tool_tip="Enabling this may lower performance and use more memory if using a standard PCI graphics card."
+        <check_box bottom="-83" control_name="RenderVBOEnable" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+             label="Enable OpenGL Vertex Buffer Objects" left="148"
+             mouse_opaque="true" name="vbo" radio_style="false"
+             tool_tip="Enabling this may cause some OpenGL drivers to crash."
              width="315" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-98" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
index ff25343..5e1ea32 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
@@ -12,41 +12,53 @@
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              hidden="false" increment="10" initial_val="50" left="148" max_val="1500"
              min_val="50" mouse_opaque="true" name="max_bandwidth" show_text="true"
-             value="500" width="200" />
+             value="500" width="180" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="355" mouse_opaque="false" name="text_box2" v_pad="0" width="140">
+             left="335" mouse_opaque="false" name="text_box2" v_pad="0" width="140">
                 kbps (kilobits per second)
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box3" v_pad="0" width="128">
-                Disk Cache Size:
+             left="12" mouse_opaque="false" name="cache_size_label_l" v_pad="0" width="128">
+                Disk Cache Size (MB):
         </text>
-        <radio_group bottom="-115" control_name="VFSSize" draw_border="true" enabled="true"
-             follows="left|top" height="80" hidden="false" left="148"
-             mouse_opaque="true" name="disk cache" width="128">
-                <radio_item type="string" length="1" bottom="-20" enabled="true" height="16" hidden="false" left="0"
-                     mouse_opaque="true" name="radio" width="98">
-                        50 MB
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-40" enabled="true" height="16" hidden="false" left="0"
-                     mouse_opaque="true" name="radio2" width="98">
-                        200 MB
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-60" enabled="true" height="16" hidden="false" left="0"
-                     mouse_opaque="true" name="radio3" width="98">
-                        500 MB
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-80" enabled="true" height="16" hidden="false" left="0"
-                     mouse_opaque="true" name="radio4" width="98">
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button bottom="-143" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Clear Cache"
-             label_selected="Clear Cache" left="148" mouse_opaque="true"
-             name="clear_cache" scale_image="true" width="100" />
+        <slider bottom="-50" can_edit_text="true" control_name="CacheSize" decimal_digits="0"
+             enabled="true" follows="left|top" height="15" hidden="false" increment="10"
+             initial_val="50" left="148" max_val="1000" min_val="10" mouse_opaque="true"
+             name="cache_size" show_text="true" width="180" />
+        <button bottom="-55" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Clear Cache" left="340" mouse_opaque="true"
+             name="clear_cache" scale_image="true" width="85" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-70" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="cache_location_label" v_pad="0" width="128">
+                Disk Cache Location:
+        </text>
+        <button bottom="-80" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Set" label_selected="Set" left="140" mouse_opaque="true"
+             name="set_cache" scale_image="true" width="50" />
+        <button bottom="-105" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Reset" label_selected="Set" left="140" mouse_opaque="true"
+             name="reset_cache" scale_image="true" width="50" />
+        <text_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-105"
+             enabled="false" follows="left|top" font="SansSerif" handle_edit_keys_directly="true"
+             height="45" hidden="false" hide_scrollbar="true" left="200" max_length="4096" mouse_opaque="true"
+             name="cache_location" select_all_on_focus_received="false" width="270" word_wrap="false"/>
+        <check_box bottom="-173" control_name="ConnectionPortEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" hidden="false" initial_value="false" label="Custom Port Connection"
+             left="148" mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+             width="256" /> 
+        <spinner bottom="-193" control_name="ConnectionPort" decimal_digits="0"
+             enabled="true" follows="left|top" height="16" hidden="false"
+             increment="1" initial_val="13000" label="Port Number:"
+             label_width="75" left="168" max_val="13050" min_val="13000" mouse_opaque="true"
+             name="connection_port" width="150" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 6e246da..2ee26d1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="0" enabled="true" follows="top|left|right" height="18" hidden="false"
-     left="0" mouse_opaque="false" name="status" width="1000">
+     left="0" mouse_opaque="false" name="status" width="1000" background_opaque="true"
+     background_visible="true"
+     bg_opaque_color="0.25 0.25 0.25 1.0">
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-22" drop_shadow_visible="true" enabled="true"
              follows="left|right|bottom" font="SansSerifSmall" h_pad="0" halign="left"
@@ -8,7 +10,7 @@
              name="ParcelNameText"
              tool_tip="Name of land parcel on which you are standing. Click for About Land."
              v_pad="2" width="1039">
-                parcel name goes herre
+                parcel name goes here
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" disabled_color="0 1 0 1" drop_shadow_visible="true"
diff --git a/linden/indra/newview/skins/xui/en-us/role_actions.xml b/linden/indra/newview/skins/xui/en-us/role_actions.xml
index 42ee0ca..8475b3d 100644
--- a/linden/indra/newview/skins/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/xui/en-us/role_actions.xml
@@ -27,7 +27,7 @@
                      longdescription="Change Role names, titles, and descriptions at the bottom of the the Members &amp; Roles tab &gt; Roles sub-tab after selecting a Role."
                      name="role properties" value="6" />
                 <action description="Assign Members to Assigner&apos;s Roles"
-                     longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A member with this power can only add members to a role the assigner is already in."
+                     longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A Member with this Ability can only add Members to a Role the assigner is already in."
                      name="role assign member limited" value="7" />
                 <action description="Assign Members to Any Role"
                      longdescription="Assign Members to Any Role in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
diff --git a/linden/indra/newview/skins/xui/es/floater_account_history.xml b/linden/indra/newview/skins/xui/es/floater_account_history.xml
deleted file mode 100644
index 745b62a..0000000
--- a/linden/indra/newview/skins/xui/es/floater_account_history.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="money history floater" title="Historial de cuenta">

-        <button label="Más detalles..." label_selected="Más detalles..." name="details_btn" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/es/panel_account_details.xml b/linden/indra/newview/skins/xui/es/panel_account_details.xml
deleted file mode 100644
index d0bb698..0000000
--- a/linden/indra/newview/skins/xui/es/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Detalles" name="account_details_panel">

-        <button label="&lt; Primero" label_selected="&lt; Primero" name="earlier_btn"

-             tool_tip="Volver en el tiempo" />

-        <button label="Último &gt;" label_selected="Último &gt;" name="later_btn"

-             tool_tip="Avanzar en el tiempo" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_account_planning.xml b/linden/indra/newview/skins/xui/es/panel_account_planning.xml
deleted file mode 100644
index c2d8246..0000000
--- a/linden/indra/newview/skins/xui/es/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Planeamiento" name="account_planning_panel" />

diff --git a/linden/indra/newview/skins/xui/es/panel_account_transactions.xml b/linden/indra/newview/skins/xui/es/panel_account_transactions.xml
deleted file mode 100644
index 91b1371..0000000
--- a/linden/indra/newview/skins/xui/es/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Ventas/Regalos" name="account_sales_panel">

-        <button label="&lt; Primero" label_selected="&lt; Primero" name="earlier_btn"

-             tool_tip="Volver en el tiempo" />

-        <button label="Último &gt;" label_selected="Último &gt;" name="later_btn"

-             tool_tip="Avanzar en el tiempo" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/floater_account_history.xml b/linden/indra/newview/skins/xui/fr/floater_account_history.xml
deleted file mode 100644
index 6fb6dd9..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_account_history.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="money history floater" title="Historique du Compte">

-        <button label="Plus de détails..." label_selected="Plus de détails..."

-             name="details_btn" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/fr/panel_account_details.xml b/linden/indra/newview/skins/xui/fr/panel_account_details.xml
deleted file mode 100644
index 744acb9..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Détails" name="account_details_panel">

-        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_btn"

-             tool_tip="Reculer dans le temps" />

-        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_btn"

-             tool_tip="Avancer dans le temps" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_account_planning.xml b/linden/indra/newview/skins/xui/fr/panel_account_planning.xml
deleted file mode 100644
index 9fb19a3..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Planning" name="account_planning_panel" />

diff --git a/linden/indra/newview/skins/xui/fr/panel_account_transactions.xml b/linden/indra/newview/skins/xui/fr/panel_account_transactions.xml
deleted file mode 100644
index 084f9fc..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Ventes/Cadeaux" name="account_sales_panel">

-        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_btn"

-             tool_tip="Reculer dans le temps" />

-        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_btn"

-             tool_tip="Avancer dans le temps" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/ja/floater_account_history.xml b/linden/indra/newview/skins/xui/ja/floater_account_history.xml
deleted file mode 100644
index c272a87..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_account_history.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="money history floater" title="アカウント履歴">
-        <button label="より詳��情報..." label_selected="より詳��情報..."
-             name="details_btn" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/panel_account_details.xml b/linden/indra/newview/skins/xui/ja/panel_account_details.xml
deleted file mode 100644
index 5235cc2..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="詳細" name="account_details_panel">
-        <button label="&lt;以��" label_selected="&lt;以��" name="earlier_btn"
-             tool_tip="時間を戻�" />
-        <button label="後�&gt;" label_selected="後�&gt;" name="later_btn"
-             tool_tip="時間を進�る" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_account_planning.xml b/linden/indra/newview/skins/xui/ja/panel_account_planning.xml
deleted file mode 100644
index f55a998..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="設計" name="account_planning_panel" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_account_transactions.xml b/linden/indra/newview/skins/xui/ja/panel_account_transactions.xml
deleted file mode 100644
index 3eaf2af..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="売り上�/ギフト" name="account_sales_panel">
-        <button label="&lt;以��" label_selected="&lt;以��" name="earlier_btn"
-             tool_tip="時間を戻�" />
-        <button label="後�&gt;" label_selected="後�&gt;" name="later_btn"
-             tool_tip="時間を進�る" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_account_history.xml b/linden/indra/newview/skins/xui/ko/floater_account_history.xml
deleted file mode 100644
index 4e04845..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_account_history.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="money history floater" title="계정 기�">
-        <button label="�세한 내용..." label_selected="�세한 내용..."
-             name="details_btn" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/panel_account_details.xml b/linden/indra/newview/skins/xui/ko/panel_account_details.xml
deleted file mode 100644
index 6f4b693..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="세부사항" name="account_details_panel">
-        <button label="&lt; �전" label_selected="&lt; �전" name="earlier_btn"
-             tool_tip="시간� 거슬러 갑니다" />
-        <button label="나중� &gt;" label_selected="나중� &gt;" name="later_btn"
-             tool_tip="시간� 앞서 갑니다" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_account_planning.xml b/linden/indra/newview/skins/xui/ko/panel_account_planning.xml
deleted file mode 100644
index f8c1a9e..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Planning" name="account_planning_panel" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_account_transactions.xml b/linden/indra/newview/skins/xui/ko/panel_account_transactions.xml
deleted file mode 100644
index 37bf87c..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�매/선물" name="account_sales_panel">
-        <button label="&lt; �전" label_selected="&lt; �전" name="earlier_btn"
-             tool_tip="시간� 거슬러 갑니다" />
-        <button label="나중� &gt;" label_selected="나중� &gt;" name="later_btn"
-             tool_tip="시간� 앞서 갑니다" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/pt/floater_account_history.xml b/linden/indra/newview/skins/xui/pt/floater_account_history.xml
deleted file mode 100644
index 795b290..0000000
--- a/linden/indra/newview/skins/xui/pt/floater_account_history.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="money history floater" title="Histórico de conta">

-        <button label="Mais detalhes..." label_selected="Mais detalhes..." name="details_btn" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/pt/panel_account_details.xml b/linden/indra/newview/skins/xui/pt/panel_account_details.xml
deleted file mode 100644
index de92f73..0000000
--- a/linden/indra/newview/skins/xui/pt/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Detalhes" name="account_details_panel">

-        <button label="&lt; Primeiro" label_selected="&lt; Primeiro" name="earlier_btn"

-             tool_tip="Voltar no tempo" />

-        <button label="Último &gt;" label_selected="Último &gt;" name="later_btn"

-             tool_tip="Avançar no tempo" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/pt/panel_account_planning.xml b/linden/indra/newview/skins/xui/pt/panel_account_planning.xml
deleted file mode 100644
index 5700400..0000000
--- a/linden/indra/newview/skins/xui/pt/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Planejamento" name="account_planning_panel" />

diff --git a/linden/indra/newview/skins/xui/pt/panel_account_transactions.xml b/linden/indra/newview/skins/xui/pt/panel_account_transactions.xml
deleted file mode 100644
index 1a1be07..0000000
--- a/linden/indra/newview/skins/xui/pt/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Vendas/Presentes" name="account_sales_panel">

-        <button label="&lt; Primeiro" label_selected="&lt; Primeiro" name="earlier_btn"

-             tool_tip="Voltar no tempo" />

-        <button label="Último &gt;" label_selected="Último &gt;" name="later_btn"

-             tool_tip="Avançar no tempo" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/zh/floater_account_history.xml b/linden/indra/newview/skins/xui/zh/floater_account_history.xml
deleted file mode 100644
index 21c845f..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_account_history.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="money history floater" title="账户历�记录">
-        <button label="更多细节..." label_selected="更多细节..." name="details_btn" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_god_tools.xml b/linden/indra/newview/skins/xui/zh/floater_god_tools.xml
deleted file mode 100644
index 3725560..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_god_tools.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="ゴッド・ツール">
-        <tab_container name="GodTools Tabs">
-                <panel label="Grid" name="grid">
-                        <button label="全��ユーザを追�出�"
-                             label_selected="全��ユーザを追�出�" name="Kick all users" />
-                        <button label="本地域�地図�公示性キャッシュを削除"
-                             label_selected="本地域�地図�公示性キャッシュを削除"
-                             name="Flush This Region&apos;s Map Visibility Caches" />
-                </panel>
-                <panel label="区域" name="region">
-                        <text name="Sim Name:">
-                                シム�：
-                        </text>
-                        <check_box label="準備" name="check prelude"
-                             tool_tip="��設定�より���地域�準備を���。" />
-                        <check_box label="太阳固定" name="check fixed sun"
-                             tool_tip="太陽�置を固定（地域��動産＞領域�よ��" />
-                        <check_box label="テレ�ート�ホームをリセット" name="check reset home"
-                             tool_tip="居�者テレ�ート�際��居�者�ホームを目的地�置�リセット������。" />
-                        <check_box label="�視" name="check visible"
-                             tool_tip="��設定�より���地域をゴッド・モード以外�も�視����。" />
-                        <check_box label="ダメージ" name="check damage"
-                             tool_tip="��設定�より�地域内��ダメージを有効����。" />
-                        <check_box label="トラフィック・トラッキングをブロック"
-                             name="block dwell"
-                             tool_tip="��設定�より�地域内��トラフィックを計算���よ�����。" />
-                        <check_box label="�定外形" name="block terraform"
-                             tool_tip="��設定�より�地域内��土地整備を無効����。" />
-                        <check_box label="サンドボックス" name="is sandbox"
-                             tool_tip="���サンドボックス地域�����トグル���。" />
-                        <button label="硬地" label_selected="硬地" name="Bake Terrain"
-                             tool_tip="�在�領域をデフォルト����存���。" />
-                        <button label="領域を復帰" label_selected="領域を復帰" name="Revert Terrain"
-                             tool_tip="�在�領域をデフォルト�入れ替�る。" />
-                        <button label="領域を交����" label_selected="領域を交����"
-                             name="Swap Terrain"
-                             tool_tip="�在�領域をデフォルト�入れ替���。" />
-                        <text name="estate id">
-                                �動産ＩＤ：
-                        </text>
-                        <text name="parent id">
-                                親ID：
-                        </text>
-                        <line_editor name="parentestate" tool_tip="�れ����地域�親�動産��。" />
-                        <text name="Grid Pos: ">
-                                グリッド�置：
-                        </text>
-                        <line_editor name="gridposx"
-                             tool_tip="�れ����地域�グリッドx��置��。" />
-                        <line_editor name="gridposy"
-                             tool_tip="�れ����地域�グリッドy��置��。" />
-                        <text name="Redirect to Grid: ">
-                                グリッド��案内�る：
-                        </text>
-                        <text name="billable factor text">
-                                請求��る�因：
-                        </text>
-                        <text name="land cost text">
-                                平方メートル当�りL＄：
-                        </text>
-                        <button label="æ›´æ–°" label_selected="æ›´æ–°" name="Refresh"
-                             tool_tip="��をクリック���上記�情報をリフレッシュ������。" />
-                        <button label="应用" label_selected="应用" name="Apply"
-                             tool_tip="��をクリック���上記�変更を�用������。" />
-                        <button label="地域を�択" label_selected="地域を�択" name="Select Region"
-                             tool_tip="土地ツール�全体地域を�択������。" />
-                        <button label="����自動�存�る"
-                             label_selected="����自動�存�る" name="Autosave now"
-                             tool_tip="Gzip状態を自動�存ディレクトリー��存������。" />
-                </panel>
-                <panel label="东东" name="objects">
-                        <text name="Sim Name:">
-                                シム�：
-                        </text>
-                        <text name="region name">
-                                ウェールズ語
-                        </text>
-                        <check_box label="无效脚本" name="disable scripts"
-                             tool_tip="��設定�より�地域内�全��スクリプトを無効����。" />
-                        <check_box label="无效冲�" name="disable collisions"
-                             tool_tip="��設定�より�地域内��エージェント���を無効����。" />
-                        <check_box label="无效物�" name="disable physics"
-                             tool_tip="��設定�より�地域内�全��物�的作用を無効����。" />
-                        <button label="应用" label_selected="应用" name="Apply"
-                             tool_tip="��をクリック���上記�変更を�用������。" />
-                        <button label="対象�設定" label_selected="対象�設定" name="Set Target"
-                             tool_tip="オブジェクト削除�対象��るア�ターを設定������。" />
-                        <text name="target_avatar_name">
-                                （対象無�）
-                        </text>
-                        <button
-                             label="他�土地���る対象�スクリプトを�むオブジェクトを削除"
-                             label_selected="他�土地���る対象�スクリプトを�むオブジェクトを削除"
-                             name="Delete Target&apos;s Scripted Objects On Others Land"
-                             tool_tip="本地域����対象�所有�����全��スクリプトを�むオブジェクトを削除������。（コピー�止）オブジェクト�返��れ��。" />
-                        <button
-                             label="『全���土地���る対象�スクリプトを�むオブジェクトを削除"
-                             label_selected="『全���土地���る対象�スクリプトを�むオブジェクトを削除"
-                             name="Delete Target&apos;s Scripted Objects On *Any* Land"
-                             tool_tip="本地域����対象�所有���る全��スクリプトを�むオブジェクトを削除������。（コピー�止）オブジェクト�戻�れ��。" />
-                        <button label="対象オブジェクト�『全��を削除"
-                             label_selected="対象オブジェクト�『全��を削除"
-                             name="Delete *ALL* Of Target&apos;s Objects"
-                             tool_tip="本地域����対象�所有���る全��オブジェクトを削除������。（コピー�止）オブジェクト�返��れ��。" />
-                        <button label="上部コライダーを得る"
-                             label_selected="上部コライダーを得る" name="Get Top Colliders"
-                             tool_tip="も��も�相�狭�コール�ックを経験���るオブジェクト�リストを入手���。" />
-                        <button label="上部スクリプトを得る"
-                             label_selected="上部スクリプトを得る" name="Get Top Scripts"
-                             tool_tip="スクリプト�起動�一番時間を費や���るオブジェクト�リストを入手���。" />
-                        <button label="スクリプト・ダイジェスト"
-                             label_selected="スクリプト・ダイジェスト" name="Scripts digest"
-                             tool_tip="全��スクリプト��よ�利用頻度�リストを入手���。" />
-                </panel>
-                <panel label="Request" name="request">
-                        <text name="Destination:">
-                                目的地：
-                        </text>
-                        <combo_box name="destination">
-                                <combo_item name="Selection">
-                                        �択
-                                </combo_item>
-                                <combo_item name="AgentRegion">
-                                        エージェント地域
-                                </combo_item>
-                        </combo_box>
-                        <text name="Request:">
-                                �求：
-                        </text>
-                        <combo_box name="request">
-                                <combo_item name="colliders&lt;steps&gt;">
-                                        コライダー＜ステップ＞
-                                </combo_item>
-                                <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-                                        スクリプト＜回数＞�＜オプション・パターン＞
-                                </combo_item>
-                                <combo_item name="objects&lt;pattern&gt;">
-                                        オブジェクト＜模様＞
-                                </combo_item>
-                                <combo_item name="rez&lt;asset_id&gt;">
-                                        ＜asset_id＞を表示
-                                </combo_item>
-                        </combo_box>
-                        <text name="Parameter:">
-                                パラメーター：
-                        </text>
-                        <button label="リクエスト�る" label_selected="リクエスト�る"
-                             name="Make Request" />
-                </panel>
-        </tab_container>
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_inventory_view_finder.xml b/linden/indra/newview/skins/xui/zh/floater_inventory_view_finder.xml
deleted file mode 100644
index 7a0bba2..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_inventory_view_finder.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory Finder" title="��物_最近�アイテム">
-        <check_box label="アニメーション" name="check_animation" />
-        <check_box label="�刺" name="check_calling_card" />
-        <check_box label="衣物" name="check_clothing" />
-        <check_box label="ジェス�ャー" name="check_gesture" />
-        <check_box label="ランドマーク" name="check_landmark" />
-        <check_box label="ノートカード" name="check_notecard" />
-        <check_box label="东东" name="check_object" />
-        <check_box label="スクリプト" name="check_script" />
-        <check_box label="サウンド" name="check_sound" />
-        <check_box label="�质" name="check_texture" />
-        <check_box label="スナップショット" name="check_snapshot" />
-        <button label="全部" label_selected="全部" name="All" />
-        <button label="都�" label_selected="都�" name="None" />
-        <check_box label="常�フォルダーを表示" name="check_show_empty" />
-        <check_box label="ログオフ以�" name="check_since_logoff" />
-        <text type="string" length="1" name="- OR -">
-                �����
-        </text>
-        <spinner label="時間�" name="spin_hours_ago" />
-        <spinner label="日�" name="spin_days_ago" />
-        <button label="关闭" label_selected="关闭" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_preferences.xml b/linden/indra/newview/skins/xui/zh/floater_preferences.xml
deleted file mode 100644
index 3a3fa9f..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_preferences.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="嗜好">
-        <button label="…�関��" label_selected="…�関��" name="About..." />
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="�消" label_selected="�消" name="Cancel" />
-        <button label="应用" label_selected="应用" name="Apply" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_rate.xml b/linden/indra/newview/skins/xui/zh/floater_rate.xml
deleted file mode 100644
index 49b9c00..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="����Jeska Linden��評価">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="�消" label_selected="�消" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                全体的�態度：
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                容姿�スキル （��装飾�）：
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                建造物�スキル：
-        </text>
-        <text type="string" length="1" name="Message:">
-                信�:
-        </text>
-        <text type="string" length="1" name="cost">
-                費用：�評価を変更�る��L＄[COST]　全体費用：L＄[TOTAL]
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_sell_land.xml b/linden/indra/newview/skins/xui/zh/floater_sell_land.xml
deleted file mode 100644
index e2e62db..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_sell_land.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="sell land" title="土地を販売">
-        <text name="info_parcel_label">
-                区画：
-        </text>
-        <text name="info_parcel">
-                区画�
-        </text>
-        <text name="info_size_label">
-                �模：
-        </text>
-        <text name="info_size">
-                [AREA]平方メートル
-        </text>
-        <text name="info_action">
-                本区画を販売�る��：
-        </text>
-        <text name="price_label">
-                価格を決定：
-        </text>
-        <text name="price_text">
-                ��土地�対�る�切�価格を�択������。
-        </text>
-        <text name="price_ld">
-                L＄
-        </text>
-        <text name="price_per_m">
-                （一平方メートル当�りL＄[PER_METER]）
-        </text>
-        <text name="sell_to_label">
-                土地販売先：
-        </text>
-        <text name="sell_to_text">
-                誰��も販売�る���特定�購入者�販売�る���択������。
-        </text>
-        <combo_box name="sell_to">
-                <combo_item name="--selectone--">
-                        ��一�を�択��
-                </combo_item>
-                <combo_item name="Anyone">
-                        誰�も
-                </combo_item>
-                <combo_item name="Specificuser:">
-                        特定ユーザー：
-                </combo_item>
-        </combo_box>
-        <button label="�択" name="sell_to_select_agent" />
-        <text name="sell_objects_label">
-                土地�一緒�オブジェクトも売り���？
-        </text>
-        <text name="sell_objects_text">
-                Land owner&apos;s transferable objects on parcel will change ownership.
-        </text>
-        <radio_group name="sell_objects">
-                <radio_item name="no">
-                        No, keep ownership of objects
-                </radio_item>
-                <radio_item name="yes">
-                        Yes, sell objects with land
-                </radio_item>
-        </radio_group>
-        <button label="オブジェクトを表示" name="show_objects" />
-        <text name="nag_message_label">
-                一言メモ：返�･交��出���ん。
-        </text>
-        <button label="売り地�設定" name="sell_btn" />
-        <button label="�消" name="cancel_btn" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_settings_debug.xml b/linden/indra/newview/skins/xui/zh/floater_settings_debug.xml
deleted file mode 100644
index 30ef985..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_settings_debug.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="デ�ッグ設定">
-        <combo_box name="boolean_combo">
-                <combo_item name="TRUE">
-                        正解
-                </combo_item>
-                <combo_item name="FALSE">
-                        誤り
-                </combo_item>
-        </combo_box>
-        <spinner label="x" name="val_spinner_1" />
-        <spinner label="x" name="val_spinner_2" />
-        <spinner label="x" name="val_spinner_3" />
-        <spinner label="x" name="val_spinner_4" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_attachment.xml b/linden/indra/newview/skins/xui/zh/menu_pie_attachment.xml
deleted file mode 100644
index 2669d04..0000000
--- a/linden/indra/newview/skins/xui/zh/menu_pie_attachment.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Attachment Pie">
-        <menu_item_call label="ドロップ" name="Drop" />
-        <menu_item_call label="�り外�" name="Detach" />
-        <menu_item_call label="编辑" name="Edit" />
-</pie_menu>
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/zh/menu_pie_avatar.xml
deleted file mode 100644
index 3d31680..0000000
--- a/linden/indra/newview/skins/xui/zh/menu_pie_avatar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Avatar Pie">
-        <menu_item_call label="档案..." name="Profile..." />
-        <menu_item_call label="�蔽" name="Avatar Mute" />
-        <menu_item_call label="行�" name="Go To" />
-        <menu_item_call label="評価" name="Rate" />
-        <menu_item_call label="フレンドを追加" name="Add Friend" />
-        <menu_item_call label="付款..." name="Pay..." />
-        <pie_menu label="�ら�＞" name="More &gt;">
-                <menu_item_call label="��" name="Freeze..." />
-                <menu_item_call label="カードを��る" name="Give Card" />
-                <menu_item_call label="追放�る" name="Eject..." />
-                <menu_item_call label="Debug..." name="Debug..." />
-        </pie_menu>
-        <menu_item_call label="IMを�信" name="Send IM..." />
-</pie_menu>
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_land.xml b/linden/indra/newview/skins/xui/zh/menu_pie_land.xml
deleted file mode 100644
index e1b866a..0000000
--- a/linden/indra/newview/skins/xui/zh/menu_pie_land.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Land Pie">
-        <menu_item_call label="土地情報" name="About Land..." />
-        <menu_item_call label="创造" name="Create" />
-        <menu_item_call label="���行�" name="Go Here" />
-        <menu_item_call label="���座る" name="Sit Here" />
-        <menu_item_call label="通过…购买" name="Land Buy Pass" />
-        <menu_item_call label="土地を編集" name="Edit Terrain" />
-        <menu_item_call label="购买土地..." name="Land Buy" />
-</pie_menu>
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_object.xml b/linden/indra/newview/skins/xui/zh/menu_pie_object.xml
deleted file mode 100644
index d12380a..0000000
--- a/linden/indra/newview/skins/xui/zh/menu_pie_object.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Object Pie">
-        <menu_item_call label="開�" name="Open" />
-        <menu_item_call label="创造" name="Create" />
-        <menu_item_call label="触る" name="Object Touch" />
-        <menu_item_call label="���座る" name="Object Sit" />
-        <menu_item_call label="�る" name="Pie Object Take" />
-        <menu_item_call label="付款..." name="Pay..." />
-        <pie_menu label="�ら�＞" name="More &gt;">
-                <menu_item_call label="删除" name="Delete" />
-                <menu_item_call label="穿上" name="Wear" />
-                <menu_item_call label="コピーを�る" name="Take Copy" />
-                <pie_menu label="HUDを添付＞" name="Object Attach HUD" />
-                <pie_menu label="添付＞" name="Object Attach" />
-                <menu_item_call label="归还..." name="Return..." />
-                <pie_menu label="�ら�＞" name="Rate Menu">
-                        <menu_item_call label="所有者を評価" name="Rate Owner..." />
-                        <menu_item_call label="嫌�ら��報告" name="Report Abuse..." />
-                        <menu_item_call label="クリエーターを評価" name="Rate Creator..." />
-                        <menu_item_call label="�蔽" name="Object Mute" />
-                </pie_menu>
-                <menu_item_call label="購入" name="Buy..." />
-        </pie_menu>
-        <menu_item_call label="編集" name="Edit..." />
-</pie_menu>
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_self.xml b/linden/indra/newview/skins/xui/zh/menu_pie_self.xml
deleted file mode 100644
index 8687808..0000000
--- a/linden/indra/newview/skins/xui/zh/menu_pie_self.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Self Pie">
-        <menu_item_call label="档案..." name="Profile..." />
-        <menu_item_call label="グループ" name="Groups..." />
-        <menu_item_call label="行�" name="Go..." />
-        <menu_item_call label="立�上�る" name="Stand Up" />
-        <menu_item_call label="フレンド" name="Friends..." />
-        <menu_item_call label="ジェス�ャー…" name="Gestures..." />
-        <pie_menu label="�り外�" name="Take Off &gt;">
-                <pie_menu label="�＞" name="Clothes &gt;">
-                        <menu_item_call label="シャツ" name="Shirt" />
-                        <menu_item_call label="ズボン" name="Pants" />
-                        <menu_item_call label="�" name="Shoes" />
-                        <menu_item_call label="�下" name="Socks" />
-                        <menu_item_call label="ジャケット" name="Jacket" />
-                        <menu_item_call label="手袋" name="Gloves" />
-                        <pie_menu label="�ら�＞" name="More &gt;">
-                                <menu_item_call label="下�" name="Self Undershirt" />
-                                <menu_item_call label="全���" name="All Clothes" />
-                                <menu_item_call label="パンツ" name="Self Underpants" />
-                        </pie_menu>
-                        <menu_item_call label="スカート" name="Skirt" />
-                </pie_menu>
-                <pie_menu label="HUD＞" name="Object Detach HUD" />
-                <pie_menu label="�り外�＞" name="Object Detach" />
-                <menu_item_call label="全�を�り外�" name="Detach All" />
-        </pie_menu>
-        <menu_item_call label="容姿" name="Appearance..." />
-</pie_menu>
diff --git a/linden/indra/newview/skins/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/xui/zh/menu_viewer.xml
deleted file mode 100644
index 367e19e..0000000
--- a/linden/indra/newview/skins/xui/zh/menu_viewer.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Main Menu">
-        <menu label="File" name="File">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="画�をアップロード（L＄[COST]）" name="Upload Image" />
-                <menu_item_call label="サウンドをアップロード（L＄[COST]）" name="Upload Sound" />
-                <menu_item_call label="アニメーションをアップロード（L＄[COST]）"
-                     name="Upload Animation" />
-                <menu_item_call label="大�アップロード（L＄[COST]�ファイル）…"
-                     name="Bulk Upload" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="ウィンドウを閉�る" name="Close Window" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="テクス�ャーを�存" name="Save Texture As..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="スナップショットを�る" name="Take Snapshot" />
-                <menu_item_call label="スナップショットをディスク��存"
-                     name="Snapshot to Disk" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="ディスク�動画を開始��止" name="Start/Stop Movie to Disk" />
-                <menu label="Set Window Size" name="Set Window Size">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="320x240" name="320x240" />
-                        <menu_item_call label="640x480" name="640x480" />
-                        <menu_item_call label="800x600" name="800x600" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="720 x 480（NTSC）" name="720x480 (NTSC)" />
-                        <menu_item_call label="768 x 576（PAL）" name="768x576 (PAL)" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="退出" name="Quit" />
-        </menu>
-        <menu label="编辑" name="Edit">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="元�戻�" name="Undo" />
-                <menu_item_call label="やり直�" name="Redo" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="カット" name="Cut" />
-                <menu_item_call label="�制" name="Copy" />
-                <menu_item_call label="貼り付�" name="Paste" />
-                <menu_item_call label="删除" name="Delete" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="�索..." name="Search..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="全�を�択" name="Select All" />
-                <menu_item_call label="�定���" name="Deselect" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="複製" name="Duplicate" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu label="Attach Object" name="Attach Object" />
-                <menu label="Detach Object" name="Detach Object" />
-                <menu label="Take Off Clothing" name="Take Off Clothing">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="シャツ" name="Shirt" />
-                        <menu_item_call label="ズボン" name="Pants" />
-                        <menu_item_call label="�" name="Shoes" />
-                        <menu_item_call label="�下" name="Socks" />
-                        <menu_item_call label="ジャケット" name="Jacket" />
-                        <menu_item_call label="手袋" name="Gloves" />
-                        <menu_item_call label="下�" name="Menu Undershirt" />
-                        <menu_item_call label="パンツ" name="Menu Underpants" />
-                        <menu_item_call label="スカート" name="Skirt" />
-                        <menu_item_call label="全���" name="All Clothes" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="ジェス�ャー…" name="Gestures..." />
-                <menu_item_call label="档案..." name="Profile..." />
-                <menu_item_call label="容姿" name="Appearance..." />
-                <menu_item_separator label="-----------" name="separator7" />
-                <menu_item_check label="フレンド" name="Friends..." />
-                <menu_item_call label="グループ" name="Groups..." />
-                <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="�数选择..." name="Preferences..." />
-        </menu>
-        <menu label="View" name="View">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="マウスルック" name="Mouselook" />
-                <menu_item_check label="建造" name="Build" />
-                <menu_item_call label="表示をリセット" name="Reset View" />
-                <menu_item_call label="最後��ャット�閲覧" name="Look at Last Chatter" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="ツール�ー" name="Toolbar" />
-                <menu_item_check label="�天记录" name="Chat History" />
-                <menu_item_check label="インスタント・メッセージ" name="Instant Message" />
-                <menu_item_call label="库存" name="Inventory" />
-                <menu_item_check label="リストをミュート" name="Mute List" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="カメラ制御" name="Camera Controls" />
-                <menu_item_check label="移動制御" name="Movement Controls" />
-                <menu_item_check label="全部地图" name="World Map" />
-                <menu_item_check label="迷你地图" name="Mini-Map" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="統計�ー" name="Statistics Bar" />
-                <menu_item_check label="土地境界線" name="Property Lines" />
-                <menu_item_check label="土地所有者" name="Land Owners" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu label="Hover Tips" name="Hover Tips">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="ヒントを表示" name="Show Tips" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="土地情報" name="Land Tips" />
-                        <menu_item_check label="全��オブジェクト�関�る情報"
-                             name="Tips On All Objects" />
-                </menu>
-                <menu_item_check label="Alt��物�を表示" name="Alt Shows Physical" />
-                <menu_item_check label="トランスパレントを�イライト" name="Highlight Transparent" />
-                <menu label="Beacons" name="Beacons">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="スクリプトを�むオブジェクト" name="Scripted Objects" />
-                        <menu_item_check label="物�的オブジェクト" name="Physical Objects" />
-                        <menu_item_check label="音�" name="Sound Sources" />
-                        <menu_item_check label="パーティクル�" name="Particle Sources" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="パーティクルを隠�" name="Hide Particles" />
-                </menu>
-                <menu_item_check label="HUD添付物を表示�る" name="Show HUD Attachments" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="拡大" name="Zoom In" />
-                <menu_item_call label="デフォルト�拡大" name="Zoom Default" />
-                <menu_item_call label="縮�" name="Zoom Out" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="More" name="More">
-                        <menu_item_call label="フル画�をトグル�る" name="Toggle Fullscreen" />
-                        <menu_item_call label="UI�模をデフォルト�設定" name="Set UI Size to Default" />
-                </menu>
-        </menu>
-        <menu label="世界" name="World">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="�天" name="Chat" />
-                <menu_item_call label="ジェス�ャー�開始" name="Start Gesture" />
-                <menu_item_check label="常�走る" name="Always Run" />
-                <menu_item_check label="飞翔" name="Fly" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="���ランドマークを作�" name="Create Landmark Here" />
-                <menu_item_call label="ホームを���設定" name="Set Home to Here" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="ホーム�テレ�ート" name="Teleport Home" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="退席中�設定" name="Set Away" />
-                <menu_item_call label="�り込�中�設定" name="Set Busy" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="�座履歴" name="Account History..." />
-                <menu_item_call label="自分��座�管�" name="Manage My Account..." />
-                <menu_item_call label="Buy L$..." name="Buy and Sell L$..." />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="自分�土地" name="My Land..." />
-                <menu_item_call label="土地情報" name="About Land..." />
-                <menu_item_call label="购买土地..." name="Buy Land..." />
-                <menu_item_call label="地域��動産" name="Region/Estate..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="Force Sun" name="Force Sun">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="日�出" name="Sunrise" />
-                        <menu_item_call label="正�" name="Noon" />
-                        <menu_item_call label="日没" name="Sunset" />
-                        <menu_item_call label="深夜" name="Midnight" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="地域デフォルト�戻�" name="Revert to Region Default" />
-                </menu>
-        </menu>
-        <menu label="Tools" name="Tools">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu label="Select Tool" name="Select Tool">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="フォーカス" name="Focus" />
-                        <menu_item_call label="移动" name="Move" />
-                        <menu_item_call label="编辑" name="Edit" />
-                        <menu_item_call label="创造" name="Create" />
-                        <menu_item_call label="土地" name="Land" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="自分�オブジェクト���択" name="Select Only My Objects" />
-                <menu_item_check label="移動�能�オブジェクト���択"
-                     name="Select Only Movable Objects" />
-                <menu_item_check label="環境��択" name="Select By Surrounding" />
-                <menu_item_check label="�表示��択を表示" name="Show Hidden Selection" />
-                <menu_item_check label="ライト�径一覧を表示" name="Show Light Radius for Selection" />
-                <menu_item_check label="�択ビームを表示" name="Show Selection Beam" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="グリッド�スナップ�る" name="Snap to Grid" />
-                <menu_item_call label="オブジェクトXYをグリッド�スナップ�る"
-                     name="Snap Object XY to Grid" />
-                <menu_item_call label="グリッド用��択を使用" name="Use Selection for Grid" />
-                <menu_item_call label="グリッド�オプション" name="Grid Options..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="リンク" name="Link" />
-                <menu_item_call label="リンク���" name="Unlink" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="全��アニメーション��止" name="Stop All Animations" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="�択をフォーカス" name="Focus on Selection" />
-                <menu_item_call label="�択範囲をズーム" name="Zoom to Selection" />
-                <menu_item_call label="オブジェクトを購入" name="Menu Object Take" />
-                <menu_item_call label="コピーを�る" name="Take Copy" />
-                <menu_item_call label="��物�オブジェクトを戻���存"
-                     name="Save Object Back to My Inventory" />
-                <menu_item_call
-                     label="オブジェクト・コンテンツ�オブジェクトを戻���存"
-                     name="Save Object Back to Object Contents" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="スクリプト警告�エラー・ウィンドウ�表示"
-                     name="Show Script Warning/Error Window" />
-                <menu_item_call label="�択�れ�スクリプトを�編集"
-                     name="Recompile Scripts in Selection" />
-                <menu_item_call label="�択�れ�スクリプトをリセット"
-                     name="Reset Scripts in Selection" />
-                <menu_item_call label="�択�れ�スクリプトを起動�る"
-                     name="Set Scripts to Running in Selection" />
-                <menu_item_call label="�択�れ�スクリプトを起動���"
-                     name="Set Scripts to Not Running in Selection" />
-        </menu>
-        <menu label="帮助" name="Help">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="第二人生帮助" name="Second Life Help" />
-                <menu_item_call label="知識ベース" name="Knowledge Base..." />
-                <menu_item_call label="ライブ・ヘルプ" name="Live Help..." />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="オフィシャルLindenブログ" name="Official Linden Blog..." />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="スクリプト・ガイド" name="Scripting Guide..." />
-                <menu_item_call label="スクリプトWiki" name="Scripting Wiki..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="今日�メッセージ" name="Message of the Day..." />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="嫌�ら��報告" name="Report Abuse..." />
-                <menu_item_call label="���る�押���よ�当�る"
-                     name="Bumps, Pushes &amp;amp; Hits..." />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="�グ�報告" name="Report Bug..." />
-                <menu_item_call label="ノートをリリース" name="Release Notes..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Second Life�関��" name="About Second Life..." />
-        </menu>
-</menu_bar>
diff --git a/linden/indra/newview/skins/xui/zh/panel_account_details.xml b/linden/indra/newview/skins/xui/zh/panel_account_details.xml
deleted file mode 100644
index a7eab8f..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_account_details.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Details" name="account_details_panel">
-        <button label="&lt;较早" label_selected="&lt;较早" name="earlier_btn"
-             tool_tip="時間を戻�" />
-        <button label="延迟 &gt;" label_selected="延迟 &gt;" name="later_btn"
-             tool_tip="時間を進�る" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_account_planning.xml b/linden/indra/newview/skins/xui/zh/panel_account_planning.xml
deleted file mode 100644
index f8c1a9e..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_account_planning.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Planning" name="account_planning_panel" />
diff --git a/linden/indra/newview/skins/xui/zh/panel_account_transactions.xml b/linden/indra/newview/skins/xui/zh/panel_account_transactions.xml
deleted file mode 100644
index e75689f..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_account_transactions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Sales/Gifts" name="account_sales_panel">
-        <button label="&lt;较早" label_selected="&lt;较早" name="earlier_btn"
-             tool_tip="時間を戻�" />
-        <button label="延迟 &gt;" label_selected="延迟 &gt;" name="later_btn"
-             tool_tip="時間を進�る" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_avatar.xml b/linden/indra/newview/skins/xui/zh/panel_avatar.xml
deleted file mode 100644
index e9c1753..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_avatar.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Panel Avatar">
-        <tab_container name="tab">
-                <panel label="2nd Life" name="2nd Life">
-                        <text name="CaptionTextAcctInfo">
-                                [ACCTTYPE]
-[PAYMENTINFO]
-                        </text>
-                        <text name="AcctTypeResident">
-                                居�者
-                        </text>
-                        <text name="AcctTypeTrial">
-                                トライアル
-                        </text>
-                        <text name="AcctTypeCharterMember">
-                                特権メン�ー
-                        </text>
-                        <text name="AcctTypeEmployee">
-                                Linden Lab 従業員
-                        </text>
-                        <text name="PaymentInfoUsed">
-                                支払�情報�使用�れ��る
-                        </text>
-                        <text name="PaymentInfoOnFile">
-                                支払�情報�登録��る
-                        </text>
-                        <text name="NoPaymentInfoOnFile">
-                                支払�情報�登録���
-                        </text>
-                        <text name="Name:">
-                                �字:
-                        </text>
-                        <text name="online_yes">
-                                オンライン：��
-                        </text>
-                        <text name="online_no">
-                                オンライン：���
-                        </text>
-                        <text name="online_unknown">
-                                オンライン：�明
-                        </text>
-                        <text name="label">
-                                天生的:
-                        </text>
-                        <text name="label2">
-                                账户:
-                        </text>
-                        <text name="partner_label"
-                             tool_tip="Second Lifeパートナー��。設定�����詳細��www.secondlife.com/partnerを�照������。">
-                                �档:
-                        </text>
-                        <line_editor name="partner_edit"
-                             tool_tip="Second Lifeパートナー��。設定�����詳細��www.secondlife.com/partnerを�照������。">
-                                [FIRST][LAST]
-                        </line_editor>
-                        <text name="Photo:">
-                                照片：
-                        </text>
-                        <texture_picker label="" name="img"
-                             tool_tip="クリック��写真を�択������。" />
-                        <text name="Ratings:">
-                                级别:
-                        </text>
-                        <text name="Groups:">
-                                社团:
-                        </text>
-                        <text name="About:">
-                                关于:
-                        </text>
-                        <text name="(500 chars)">
-                                (500 个字)
-                        </text>
-                        <text name="Give item:">
-                                �供项目:
-                        </text>
-                        <text name="Give inventory"
-                             tool_tip="アイテムを��る場��������物�らドロップ���。">
-                                放置目录内容于此.
-                        </text>
-                        <check_box label="在网上公布" name="allow_publish"
-                             tool_tip="自分�プロファイル情報をWeb上�公開���。" />
-                        <button label="?" label_selected="?" name="?" />
-                        <button label="在地图中显示" label_selected="在地图中显示"
-                             name="Show on Map" />
-                        <button label="�供闪电传�..." label_selected="�供闪电传�..."
-                             name="Offer Teleport..." />
-                        <button label="比率..." label_selected="比率..." name="Rate..." />
-                        <button label="付款..." label_selected="付款..." name="Pay..." />
-                        <button label="�时消�..." label_selected="�时消�..."
-                             name="Instant Message..." />
-                        <button label="�蔽" label_selected="�蔽" name="Mute" />
-                </panel>
-                <panel label="网络" name="WebProfile">
-                        <button label="家" label_selected="家" name="home" />
-                        <button label="Load" label_selected="Load" name="load"
-                             tool_tip="Load this profile page with embedded web browser." />
-                        <button label="Open..." label_selected="Open..." name="open"
-                             tool_tip="Open this profile page in your default external web browser." />
-                        <button label="?" label_selected="?" name="web_profile_help" />
-                        <check_box label="Automatically load web profiles" name="auto_load"
-                             tool_tip="Automatically load ALL profile webpages without asking first." />
-                        <text name="status_text">
-                                完�
-                        </text>
-                </panel>
-                <panel label="Interests" name="Interests">
-                        <text name="I Want To:">
-                                我想�:
-                        </text>
-                        <check_box label="建造" name="chk0" />
-                        <check_box label="开�" name="chk1" />
-                        <check_box label="相会" name="chk2" />
-                        <check_box label="�雇" name="chk6" />
-                        <check_box label="社团&quot;" name="chk3" />
-                        <check_box label="è´­ä¹°" name="chk4" />
-                        <check_box label="出售" name="chk5" />
-                        <check_box label="雇佣" name="chk7" />
-                        <text name="Skills:">
-                                技能：
-                        </text>
-                        <check_box label="�质" name="schk0" />
-                        <check_box label="建筑" name="schk1" />
-                        <check_box label="事件计划" name="schk2" />
-                        <check_box label="建模" name="schk3" />
-                        <check_box label="编辑脚本" name="schk4" />
-                        <check_box label="习惯的特性" name="schk5" />
-                        <text name="Languages:">
-                                Languages:
-                        </text>
-                </panel>
-                <panel label="Picks" name="Picks">
-                        <text name="Tell everyone about your favorite places in Second Life.">
-                                告诉�个人你在第二人生中最喜欢的地点
-                        </text>
-                        <button label="æ–°çš„..." label_selected="æ–°çš„..." name="New..." />
-                        <button label="删除..." label_selected="删除..." name="Delete..." />
-                </panel>
-                <panel label="分类的" name="Classified">
-                        <text name="Place an ad in Second Life&apos;s classified listings.">
-                                在第二人生的分类�中刊登广告。
-                        </text>
-                        <button label="æ–°çš„..." label_selected="æ–°çš„..." name="New..." />
-                        <button label="删除..." label_selected="删除..." name="Delete..." />
-                </panel>
-                <panel label="1st Life" name="1st Life">
-                        <text name="Photo:">
-                                照片：
-                        </text>
-                        <texture_picker label="" name="img"
-                             tool_tip="クリック��写真を�択������。" />
-                        <text name="Info:">
-                                消�:
-                        </text>
-                        <text name="(250 chars)">
-                                (250个字)
-                        </text>
-                </panel>
-                <panel label="My Notes" name="My Notes">
-                        <text name="label">
-                                使用这�空间�记录你关于这个人的笔迹。 继续追踪
-交易过程, �作的项目,等等。�有你�以看�这些笔记。
-你观察的人看��，其他人也看��。
-                        </text>
-                </panel>
-        </tab_container>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="�消" label_selected="�消" name="Cancel" />
-        <button label="踢人" label_selected="踢人" name="Kick" />
-        <button label="�定" label_selected="�定" name="Freeze"
-             tool_tip="��居�者�動��よ�会話を�止���。" />
-        <button label="解�定" label_selected="解�定" name="Unfreeze"
-             tool_tip="居�者を解�" />
-        <button label="CSR" label_selected="CSR" name="csr_btn"
-             tool_tip="��居�者�カスタマーサービスツールを開���。" />
-        <text name="ShowOnMapNonFriend">
-                地図上�ロケーションを表示���。
-����相手�フレンド登録を行�������表示����ん。
-        </text>
-        <text name="ShowOnMapFriendOffline">
-                地図上�ロケーションを表示���。
-相手�オンライン�������表示����ん。
-        </text>
-        <text name="ShowOnMapFriendOnline">
-                地図上�ロケーションを表示���。
-        </text>
-        <text name="TeleportGod">
-                ����ロケーション�強制テレ�ート
-        </text>
-        <text name="TeleportPrelude">
-                ����ロケーション�テレ�ートを申�出��。オリエンテーション・アイランドを去る���無効��。
-        </text>
-        <text name="TeleportNormal">
-                ����ロケーション�テレ�ートを申�出��。
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group.xml b/linden/indra/newview/skins/xui/zh/panel_group.xml
deleted file mode 100644
index 4ac853e..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="GroupInfo" title="グループ情報">
-        <text name="default_needs_apply_text">
-                �在�タブ���る未�用�変更��り��。
-        </text>
-        <text name="want_apply_text">
-                �れら�変更を�用����？
-        </text>
-        <button label="应用" label_selected="应用" name="btn_apply" />
-        <button label="�消" label_selected="�消" name="btn_cancel" />
-        <button label="OK" label_selected="OK" name="btn_ok" />
-        <button label="サー��らリフレッシュ�る"
-             label_selected="サー��らリフレッシュ�る" name="btn_refresh" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_finder.xml b/linden/indra/newview/skins/xui/zh/panel_group_finder.xml
deleted file mode 100644
index f3b4f39..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_finder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="GroupInfoFinder" title="グループ情報ファインダー">
-        <text name="default_needs_apply_text">
-                �在�タブ���る未�用�変更��り��。
-        </text>
-        <text name="want_apply_text">
-                �れら�変更を�用����？
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_general.xml b/linden/indra/newview/skins/xui/zh/panel_group_general.xml
deleted file mode 100644
index bf641bc..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_general.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="General" name="general_tab">
-        <text name="help_text">
-                『一般タブ������グループ�関�る一般情報�オーナーや�視メン�ー�リスト�一般的�グループ嗜好��よ�メン�ー�オプション���れ��。
-オプション上�マウスを動�����ら�ヘルプ�得られ��。
-        </text>
-        <button label="?" label_selected="?" name="help_button" />
-        <line_editor name="group_name_editor">
-                ����新��グループ�を記入������
-        </line_editor>
-        <text name="group_name">
-                ����新��グループ�を記入������
-        </text>
-        <text name="prepend_founded_by">
-                創設者
-        </text>
-        <text name="founder_name">
-                （待機中）
-        </text>
-        <text name="group_charter_label">
-                グループ特権
-        </text>
-        <texture_picker label="グループ記章" name="insignia"
-             tool_tip="クリック��写真を�択������。" />
-        <text_editor name="charter">
-                グループ特権
-        </text_editor>
-        <button label="�加�る（L＄0）" label_selected="�加�る（L＄0）"
-             name="join_button" />
-        <button label="詳細表示" label_selected="詳細表示" name="info_button" />
-        <text>
-                オーナー��視メン�ー
-        </text>
-        <text>
-                （オーナー�太字�表示�れ����）
-        </text>
-        <name_list name="visible_members">
-                <column label="Member Name" name="name" />
-                <column label="Title" name="title" />
-                <column label="Last Login" name="online" />
-        </name_list>
-        <text name="incomplete_member_data_str">
-                メン�ーデータを検索
-        </text>
-        <text name="confirm_group_create_str">
-                ��グループを形��る��L＄100��り��。本当��本当��本当�L＄100を費や�����グループを作り���？
-        </text>
-        <text>
-                グループ嗜好
-        </text>
-        <panel name="preferences_container">
-                <check_box label="在社团��中显示" name="show_in_group_list"
-                     tool_tip="Sets whether this group shows up in the Search Groups   window and in member profiles." />
-                <check_box label="在网上公布" name="publish_on_web"
-                     tool_tip="��グループ�情報�ウェブ上�公開�れる�����設定を���。" />
-                <check_box label="公開登録" name="open_enrollement"
-                     tool_tip="Sets whether this group allows new members to join   without being invited." />
-                <check_box label="入会費：L＄" name="check_enrollment_fee"
-                     tool_tip="グループ�加�入会費�必������設定を���。" />
-                <spinner name="spin_enrollment_fee"
-                     tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked." />
-                <check_box label="�人" name="mature"
-                     tool_tip="����グループ情報��人������を設定���。" />
-                <panel name="title_container">
-                        <text name="active_title_label">
-                                自分�アクティブ・タイトル
-                        </text>
-                        <combo_box name="active_title"
-                             tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
-                </panel>
-                <check_box label="グループ通知を�信" name="receive_notices"
-                     tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you." />
-        </panel>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_invite.xml b/linden/indra/newview/skins/xui/zh/panel_group_invite.xml
deleted file mode 100644
index da9ea00..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_invite.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Invite a Member" name="invite_panel">
-        <text>
-                ����グループ��一度�複数�人を招待�る�������。『リスト�ら人を���をクリック���作業を始���。
-        </text>
-        <button label="�考者を公開" name="add_button" tool_tip="" />
-        <name_list name="invitee_list"
-             tool_tip="Hold the Ctrl key and click resident names  to multi-select." />
-        <button label="リスト�ら�択�れ�も�を除外" name="remove_button"
-             tool_tip="上記��択�れ�居�者を招待リスト�ら外���。" />
-        <text>
-                割り当�る役割を�択������：
-        </text>
-        <combo_box name="role_name"
-             tool_tip="Choose from the list of Roles you  are allowed to assign members to." />
-        <button label="招待を�信" name="ok_button" />
-        <button label="�消" name="cancel_button" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_land_money.xml b/linden/indra/newview/skins/xui/zh/panel_group_land_money.xml
deleted file mode 100644
index b7be9d7..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_land_money.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Land &amp; L$" name="land_money_tab">
-        <text name="help_text">
-                グループ�所有���る土地��資金�助詳細��も�一覧化�れ��。土地利用��計��全体�資金�助��等���以下��る�警告��れ��。プランニング�詳細�販売タブ��グループ財政�関�る情報を�供���。
-        </text>
-        <button label="?" name="help_button" />
-        <text name="cant_view_group_land_text">
-                �����グループ所有�土地を閲覧�る権���り��ん。
-        </text>
-        <text name="cant_view_group_accounting_text">
-                �����グループ会計情報を閲覧�る権���り��ん。
-        </text>
-        <text name="group_land_heading">
-                社团所有土地
-        </text>
-        <scroll_list name="group_parcel_list">
-                <column label="Parcel Name" name="name" />
-                <column label="Region" name="location" />
-                <column label="Area" name="area" />
-                <column label="" name="hidden" />
-        </scroll_list>
-        <button label="在地图中显示" label_selected="在地图中显示"
-             name="map_button" />
-        <text name="total_contributed_land_label">
-                資金�供�計：
-        </text>
-        <text name="total_contributed_land_value">
-                0 平方米
-        </text>
-        <text name="total_land_in_use_label">
-                使用中的全部土地:
-        </text>
-        <text name="total_land_in_use_value">
-                0 平方米
-        </text>
-        <text name="land_available_label">
-                �售土地:
-        </text>
-        <text name="land_available_value">
-                0 平方米
-        </text>
-        <text name="your_contribution_label">
-                ����貢献：
-        </text>
-        <text name="your_contribution_max_value_append">
-                平方メートル
-        </text>
-        <text name="your_contribution_max_value">
-                （待機中）
-        </text>
-        <text name="group_over_limit_text">
-                使用�れ��る土地をサ�ート�る����グループ�メン�ー���ら�る土地�クレジットを貢献�る必���り��。
-        </text>
-        <text name="group_money_heading">
-                グループL＄
-        </text>
-        <tab_container name="group_money_tab_container">
-                <panel label="Planning" name="group_money_planning_tab">
-                        <text_editor name="group_money_planning_text">
-                                計算中…
-                        </text_editor>
-                </panel>
-                <panel label="Details" name="group_money_details_tab">
-                        <text_editor name="group_money_details_text">
-                                計算中…
-                        </text_editor>
-                        <button label="&lt;较早" label_selected="&lt;较早" name="earlier_details_button"
-                             tool_tip="時間を戻�" />
-                        <button label="延迟 &gt;" label_selected="延迟 &gt;" name="later_details_button"
-                             tool_tip="時間を進�る" />
-                </panel>
-                <panel label="Sales" name="group_money_sales_tab">
-                        <text_editor name="group_money_sales_text">
-                                計算中…
-                        </text_editor>
-                        <button label="&lt;较早" label_selected="&lt;较早" name="earlier_sales_button"
-                             tool_tip="時間を戻�" />
-                        <button label="延迟 &gt;" label_selected="延迟 &gt;" name="later_sales_button"
-                             tool_tip="時間を進�る" />
-                </panel>
-        </tab_container>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_notices.xml b/linden/indra/newview/skins/xui/zh/panel_group_notices.xml
deleted file mode 100644
index 162423e..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_notices.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Notices" name="notices_tab">
-        <text name="help_text">
-                通知��メッセージや添付アイテムを�信��グループ内�����を早�行�る手段��。通知��信アビリティ��る役割�グループメン�ー���発信�れ��。一般タブ�通知をオフ�設定����。
-        </text>
-        <text name="no_notices_text">
-                �去�通知��り��ん。
-        </text>
-        <button label="?" label_selected="?" name="help_button" />
-        <text name="lbl">
-                グループ通知アーカイブ
-        </text>
-        <text name="lbl2">
-                通知�30日間�存�れ��。閲覧���通知をクリック������。
-『リストをリフレッシュ��ボタンをクリック���新��通知を�信������。
-        </text>
-        <scroll_list name="notice_list">
-                <column label="" name="icon" />
-                <column label="Subject" name="subject" />
-                <column label="From" name="from" />
-                <column label="Date" name="date" />
-        </scroll_list>
-        <text name="notice_list_none_found">
-                何も見��り��ん���
-        </text>
-        <button label="新��通知を作�" label_selected="新��通知を作�"
-             name="create_new_notice" />
-        <button label="更新��" label_selected="更新��" name="refresh_notices" />
-        <panel label="新��通知を作�" name="panel_create_new_notice">
-                <text name="lbl">
-                        通知を作�
-                </text>
-                <text name="lbl2">
-                        通知を�信�る���題�を入力������。
-������物�らパ�ル�ドラッグ�る���より���通知�アイテムを一�付加�る�������。添付�れ�アイテム��コピー�よ�譲渡�能���れ��り��ん。���フォルダーを�信�る�������ん。
-                </text>
-                <text name="lbl3">
-                        主题:
-                </text>
-                <text name="lbl4">
-                        信�:
-                </text>
-                <text name="lbl5">
-                        添付：
-                </text>
-                <button label="添付物�削除" label_selected="添付物�削除"
-                     name="remove_attachment" />
-                <button label="通知を�信" label_selected="通知を�信" name="send_notice" />
-                <panel name="drop_target2"
-                     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
-        </panel>
-        <panel label="View Past Notice" name="panel_view_past_notice">
-                <text name="lbl">
-                        アーカイブ通知
-                </text>
-                <text name="lbl2">
-                        新��通知を�信�る���上�『新��通知を作��ボタンをクリック���。
-                </text>
-                <text name="lbl3">
-                        主题:
-                </text>
-                <text name="lbl4">
-                        信�:
-                </text>
-                <button label="添付物を開�" label_selected="添付物を開�"
-                     name="open_attachment" />
-        </panel>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_roles.xml b/linden/indra/newview/skins/xui/zh/panel_group_roles.xml
deleted file mode 100644
index 1983222..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_roles.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="メン�ー�役割" name="roles_tab">
-        <text name="default_needs_apply_text">
-                �在�サブ･タブ���る未�用�変更��り��。
-        </text>
-        <text name="want_apply_text">
-                �れら�変更を�用����？
-        </text>
-        <text name="cant_delete_role">
-                『全員��『オーナー��役割��特別���削除�る�������ん。
-        </text>
-        <button label="?" name="help_button" />
-        <panel name="members_header">
-                <text name="static">
-                        メン�ー�役割
-                </text>
-                <text name="static2">
-                        グループメン�ー��アビリティ��も�役割�割り当�られ��。�れら�設定���ら�大��組織����柔軟性をも���簡��カスタマイズ�る��も����。
-                </text>
-        </panel>
-        <panel name="roles_header">
-                <text name="static">
-                        役割
-                </text>
-                <text name="role_properties_modifiable">
-                        下記�役割を�択������。���説明�メン�ー�タイトルを修正�る�������。
-                </text>
-                <text name="role_properties_not_modifiable">
-                        �動産�メン�ー��よ�許��れ�アビリティを見る���下記�役割を�択������
-                </text>
-                <text name="role_actions_modifiable">
-                        役割�アビリティを割り当�る��も����。
-                </text>
-                <text name="role_actions_not_modifiable">
-                        割り当�られ�アビリティ�閲覧��能����修正�����ん。
-                </text>
-        </panel>
-        <panel name="actions_header">
-                <text name="static">
-                        アビリティ
-                </text>
-                <text name="static2">
-                        アビリティ�説明������役割�よ�メン�ー���アビリティを実行��る�を閲覧�る�������。
-                </text>
-        </panel>
-        <tab_container name="roles_tab_container">
-                <panel label="Members" name="members_sub_tab" tool_tip="Members">
-                        <button label="�索" name="search_button" />
-                        <button label="全�を表示" name="show_all_button" />
-                        <name_list name="member_list">
-                                <column label="Member Name" name="name" />
-                                <column label="Donated Tier" name="donated" />
-                                <column label="Last Login" name="online" />
-                        </name_list>
-                        <button label="新��人を招待" name="member_invite" />
-                        <button label="グループ�ら追放" name="member_eject" />
-                        <text name="help_text">
-                                コントロールキーを押������をクリック�る���より�メン�ー�割り当��役割を追加��り�外��り�����複数�メン�ーを�択�る�������。
-                        </text>
-                </panel>
-                <panel label="役割" name="roles_sub_tab">
-                        <button label="�索" name="search_button" />
-                        <button label="全�を表示" name="show_all_button" />
-                        <scroll_list name="role_list">
-                                <column label="Role Name" name="name" />
-                                <column label="Title" name="title" />
-                                <column label="Members" name="members" />
-                        </scroll_list>
-                        <button label="新��役割�作�" name="role_create" />
-                        <button label="役割を削除" name="role_delete" />
-                        <text name="help_text">
-                                役割���タイトル�行使��るアビリティ�リスト��り��。メン�ー��一�以上�役割�属�る�������。一��グループ��『全員��『オーナー��役割を�ん�10�役割を���������。
-                        </text>
-                </panel>
-                <panel label="アビリティ" name="actions_sub_tab">
-                        <button label="�索" name="search_button" />
-                        <button label="全�を表示" name="show_all_button" />
-                        <scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
-                                <column label="" name="icon" />
-                                <column label="" name="action" />
-                        </scroll_list>
-                        <text name="help_text">
-                                アビリティ��グループ内�役割��るメン�ー��特定��作を�能����。幅広��ラエティ�アビリティ�用��れ����。
-                        </text>
-                </panel>
-        </tab_container>
-        <panel name="members_footer">
-                <text name="static">
-                        割り当�られ�役割
-                </text>
-                <text name="static2">
-                        許��れ�アビリティ
-                </text>
-                <scroll_list name="member_assigned_roles">
-                        <column label="" name="checkbox" />
-                        <column label="" name="role" />
-                </scroll_list>
-                <scroll_list name="member_allowed_actions"
-                     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
-                        <column label="" name="icon" />
-                        <column label="" name="action" />
-                </scroll_list>
-        </panel>
-        <panel name="roles_footer">
-                <text name="static">
-                        �称
-                </text>
-                <text name="static2">
-                        説明：
-                </text>
-                <line_editor name="role_name">
-                        従業員
-                </line_editor>
-                <text name="static3">
-                        タイトル
-                </text>
-                <line_editor name="role_title">
-                        （待機中）
-                </line_editor>
-                <text_editor name="role_description">
-                        （待機中）
-                </text_editor>
-                <text name="static4">
-                        任命�れ�メン�ー
-                </text>
-                <text name="static5"
-                     tool_tip="�在�択�れ��る役割��行�る�能�アビリティ�リスト">
-                        許��れ�アビリティ
-                </text>
-                <check_box label="メン�ー��視状態" name="role_visible_in_list"
-                     tool_tip="Sets whether members of this role are visible in the General tab   to people outside of the group." />
-                <scroll_list name="role_allowed_actions"
-                     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
-                        <column label="" name="icon" />
-                        <column label="" name="checkbox" />
-                        <column label="" name="action" />
-                </scroll_list>
-        </panel>
-        <panel name="actions_footer">
-                <text name="static">
-                        説明：
-                </text>
-                <text_editor name="action_description">
-                        �れ�『グループ�らメン�ーを追放��アビリティ��。オーナー���他�オーナーを追放����。
-                </text_editor>
-                <text name="static2">
-                        アビリティを伴�役割
-                </text>
-                <text name="static3">
-                        アビリティ��るメン�ー
-                </text>
-        </panel>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_voting.xml b/linden/indra/newview/skins/xui/zh/panel_group_voting.xml
deleted file mode 100644
index 9257302..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_group_voting.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Proposals" name="voting_tab">
-        <text name="help_text">
-                グループ�案��グループ�何を���������������識調査����使用�る�������。�����切�権���れ���案を作���り�有効��案�対�投票��り����案を閲覧��り�る�������。
-        </text>
-        <button label="?" name="help_button" />
-        <text name="proposal_header">
-                グループ�案を開�
-        </text>
-        <text name="proposals_header_view_txt">
-                グループ�案を開�
-        </text>
-        <text name="proposals_header_create_txt">
-                创造�议
-        </text>
-        <text name="proposals_header_vote_txt">
-                �案投票
-        </text>
-        <text name="empty_proposal_txt">
-                ����作��よ�����る�案�空白��。作����案を記入������。
-        </text>
-        <text name="proposal_instructions">
-                投票����案をダブルクリック���。新���案を作��る��作�ボタンを押���。
-        </text>
-        <text name="proposal_lbl">
-                建议:
-        </text>
-        <button label="创造�议" label_selected="创造�议" name="btn_proposal" />
-        <button label="�案�閲覧" label_selected="�案�閲覧"
-             name="btn_view_proposal_item" />
-        <button label="查看��" label_selected="查看��"
-             name="btn_view_proposal_list" />
-        <text name="quorum_lbl">
-                法定人数:
-        </text>
-        <spinner name="quorum"
-             tool_tip="�挙�果�り����必��全投票者メン�ー数#" />
-        <text name="quorum_text">
-                X��グループメン�ー�内
-        </text>
-        <text name="duration_lbl">
-                �续时间:
-        </text>
-        <spinner name="duration" tool_tip="残り��挙日数#" />
-        <text name="duration_text">
-                天
-        </text>
-        <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
-                简�多数
-                2/3 多数
-                全票通过
-        </radio_group>
-        <text name="start_lbl">
-                选举开始:
-        </text>
-        <text name="end_lbl">
-                选举结� :
-        </text>
-        <button label="�案��出" label_selected="�案��出" name="btn_submit" />
-        <button label="�消" label_selected="�消" name="btn_cancel" />
-        <button label="是" label_selected="是" name="btn_yes" />
-        <button label="�" label_selected="�" name="btn_no" />
-        <button label="放弃" label_selected="放弃" name="btn_abstain" />
-        <text name="txt">
-                社团选举�
-        </text>
-        <text name="instructions">
-                �果を閲覧�る����去�投票や�在�一�を�択��ダブルクリック��アイテムを閲覧を開���。
-        </text>
-        <text name="history_list_lbl">
-                �去�投票                                                         投票終了
-        </text>
-        <button label="查看物��" label_selected="查看物��"
-             name="btn_view_history_item" />
-        <text name="vote_text_lbl">
-                选举结果:
-        </text>
-        <button label="查看��" label_selected="查看��" name="btn_view_history_list" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_land_covenant.xml b/linden/indra/newview/skins/xui/zh/panel_land_covenant.xml
deleted file mode 100644
index 1b8f4a2..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_land_covenant.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Covenant" title="特権">
-        <text name="region_name_lbl">
-                区域:
-        </text>
-        <text name="region_name_text">
-                (未知)
-        </text>
-        <text name="estate_name_lbl">
-                �人领地:
-        </text>
-        <text name="estate_name_text">
-                (未知)
-        </text>
-        <text name="estate_owner_lbl">
-                �動産オーナー：
-        </text>
-        <text name="estate_owner_text">
-                (未知)
-        </text>
-        <text name="resellable_clause">
-                ��地域�購入��土地���販��る������り��ん。
-        </text>
-        <text name="changeable_clause">
-                ��地域�購入��土地��統���分割���る������り��ん。
-        </text>
-        <text name="can_resell">
-                ��地域�購入��土地���販�����。
-        </text>
-        <text name="can_not_resell">
-                ��地域�購入��土地���販������能性��り��。
-        </text>
-        <text name="can_change">
-                ��地域�購入��土地��統������分割�����。
-        </text>
-        <text name="can_not_change">
-                ��地域�購入��土地��統������分割������能性��り��。
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_audio.xml
deleted file mode 100644
index b3a2c69..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_audio.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Audio &amp; Video" name="Media panel">
-        <text type="string" length="1" name="muting_text">
-                ミューティング：
-        </text>
-        <check_box label="オーディオをミュート" name="disable audio" />
-        <check_box
-             label="ウインドウ�最�化�れ�時�オーデイオをミュート"
-             name="mute_when_minimized" />
-        <text type="string" length="1" name="streaming_text">
-                ストリーミング：
-        </text>
-        <check_box
-             label="ストリーミング・ミュージック�有効�場���生。 （�ら�る�ンド幅を使用）"
-             name="streaming_music" />
-        <check_box
-             label="ストリーミングビデオ�有効�場�を�生。 （�ら�る�ンド幅を使用）"
-             name="streaming_video" />
-        <text type="string" length="1" name="system_volume_text">
-                サウンドエフェクト：
-        </text>
-        <text type="string" length="1" name="wind_volume_text">
-                風�：
-        </text>
-        <text type="string" length="1" name="footsteps_volume_text">
-                歩幅�：
-        </text>
-        <text type="string" length="1" name="ui_volume_text">
-                UI�：
-        </text>
-        <spinner label="L＄変更基準点" name="L$ Change Threshold" />
-        <spinner label="�康変化基準点" name="Health Change Threshold" />
-        <text type="string" length="1" name="doppler_effect_text">
-                ドップラー効果：
-        </text>
-        <text type="string" length="1" name="distance_factor_text">
-                �隔�因：
-        </text>
-        <text type="string" length="1" name="rolloff_factor_text">
-                脱線�因：
-        </text>
-        <text type="string" length="1" name="default_upload_bitrate_text">
-                Bitrateをデフォルトアップロード：
-        </text>
-        <radio_group name="bitrate">
-                <radio_item type="string" length="1" name="32kbps">
-                        32 kbps
-                </radio_item>
-                <radio_item type="string" length="1" name="64kbps">
-                        64 kbps
-                </radio_item>
-                <radio_item type="string" length="1" name="96kbps">
-                        96 kbps
-                </radio_item>
-                <radio_item type="string" length="1" name="128kbps">
-                        128 kbps
-                </radio_item>
-        </radio_group>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_chat.xml
deleted file mode 100644
index b3769e9..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_chat.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�天" name="chat">
-        <text type="string" length="1" name="text_box">
-                �天字体大�:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item type="string" length="1" name="radio">
-                        å°�
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        中間
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        大
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="text_box2">
-                �天颜色:
-        </text>
-        <color_swatch label="系统" name="system" />
-        <color_swatch label="用户" name="users" />
-        <color_swatch label="东东" name="objects" />
-        <color_swatch label="泡沫" name="background" />
-        <color_swatch label="URLs" name="links" />
-        <text type="string" length="1" name="text_box3">
-                �天控制�:
-        </text>
-        <spinner label="�天结��淡出" name="fade_chat_time" />
-        <text type="string" length="1" name="text_box4">
-                (秒)
-        </text>
-        <text type="string" length="1" name="text_box5">
-                (#行)
-        </text>
-        <slider label="��明" name="console_opacity" />
-        <text type="string" length="1" name="text_box6">
-                �天选项:
-        </text>
-        <check_box label="用全�宽度�天 (需��)" name="chat_full_width_check" />
-        <check_box label="点击返回�关闭�天窗�" name="close_chat_on_return_check" />
-        <check_box label="；�天时�用箭头键移动你的化身"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="在�天时显示时间" name="show_timestamps_check" />
-        <text type="string" length="1" name="text_box7">
-                泡泡�:
-        </text>
-        <check_box label="显示�天窗�" name="bubble_text_chat" />
-        <slider label="��明" name="bubble_chat_opacity" />
-        <text type="string" length="1" name="text_box8">
-                脚本出错:
-        </text>
-        <check_box label="以�天形�显示脚本错误和警告" name="script_errors_as_chat" />
-        <color_swatch label="颜色" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_im.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_im.xml
deleted file mode 100644
index be70f53..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_im.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�时通" name="im">
-        <text type="string" length="1" name="text_box">
-                �时通选项:
-        </text>
-        <text name="log_in_to_change">
-                変更�る��ログイン�る
-        </text>
-        <check_box label="IMを電�メール��信（[EMAIL]）" name="send_im_to_email" />
-        <check_box label="�天记录中包��时通信�" name="include_im_in_chat_history" />
-        <check_box label="在�时消�中显示时间" name="show_timestamps_check" />
-        <check_box label="Log Instant Messages" name="log_instant_messages" />
-        <check_box label="Log Chat" name="log_chat" />
-        <check_box label="Show end of last IM conversation" name="log_show_history" />
-        <button label="Change Path" label_selected="Change Path" name="log_path_button" />
-        <text type="string" length="1" name="text_box2">
-                忙碌模�的自动回�:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_popups.xml
deleted file mode 100644
index a1cf51c..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_popups.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="弹出程�" name="popups">
-        <text type="string" length="1" name="text_box">
-                �显示弹出程�:
-        </text>
-        <button label="Enable this popup" label_selected="Enable this popup"
-             name="enable_popup" />
-        <text type="string" length="1" name="text_box2">
-                显示弹出程�:
-        </text>
-        <button label="�置 &apos;下次显示&apos;对�..."
-             label_selected="�置 &apos;下次显示&apos;对�..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_covenant.xml b/linden/indra/newview/skins/xui/zh/panel_region_covenant.xml
deleted file mode 100644
index b16f694..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_region_covenant.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="特権" name="Covenant">
-        <text name="covenant_help_text">
-                �動産�全��区画����約款情報�対�る変更�表示�れ��
-        </text>
-        <text name="region_name_lbl">
-                区域:
-        </text>
-        <text name="region_name_text">
-                (未知)
-        </text>
-        <text name="estate_name_lbl">
-                �人领地:
-        </text>
-        <text name="estate_name_text">
-                (未知)
-        </text>
-        <text name="covenent_instructions">
-                �動産約款を変更�る���ノートカードをドラッグ�ドロップ������。
-        </text>
-        <button label="?" name="covenant_help" />
-        <button label="リセット" name="reset_covenant" />
-        <text name="estate_owner_lbl">
-                �動産オーナー：
-        </text>
-        <text name="estate_owner_text">
-                (未知)
-        </text>
-        <text name="resellable_clause">
-                ��地域�購入��土地���販��る������り��ん。
-        </text>
-        <text name="changeable_clause">
-                ��地域�購入��土地��統���分割���る������り��ん。
-        </text>
-        <text_editor name="covenant_editor">
-                请等待...
-        </text_editor>
-        <text name="can_resell">
-                ��地域�購入��土地���販�����。
-        </text>
-        <text name="can_not_resell">
-                ��地域�購入��土地���販������能性��り��。
-        </text>
-        <text name="can_change">
-                ��地域�購入��土地��統������分割�����。
-        </text>
-        <text name="can_not_change">
-                ��地域�購入��土地��統������分割������能性��り��。
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_scrolling_param.xml b/linden/indra/newview/skins/xui/zh/panel_scrolling_param.xml
deleted file mode 100644
index def7f56..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_scrolling_param.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="LLScrollingPanelParam">
-        <text type="string" length="1" name="Loading...">
-                请等待...
-        </text>
-        <text type="string" length="1" name="Loading...2">
-                请等待...
-        </text>
-        <button label="" label_selected="" name="less" />
-        <button label="" label_selected="" name="more" />
-        <slider label="[DESC]" name="param slider" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/role_actions.xml b/linden/indra/newview/skins/xui/zh/role_actions.xml
deleted file mode 100644
index c5fe1b7..0000000
--- a/linden/indra/newview/skins/xui/zh/role_actions.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<role_actions>
-        <action_set
-             description="�れら�アビリティ���グループメン�ー�追加�排除��よ�招待無��新メン�ーを�加��る権����れ��。"
-             name="Membership">
-                <action description="グループ�人を招待"
-                     longdescription="Invite People to this Group using the &apos;Invite New Person...&apos; button in the Members &amp; Roles tab &gt; Members sub-tab."
-                     name="member invite" />
-                <action description="グループ�らメン�ーを追放"
-                     longdescription="Eject Members from this Group using the &apos;Eject From Group&apos; button in the Members &amp; Roles tab &gt; Members sub-tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
-                     name="member eject" />
-                <action
-                     description="『自由�入会��切り替��『�加費用�を変更"
-                     longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change &apos;Signup Fee&apos; in the Group Preferences section of the General tab."
-                     name="member options" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���グループ役割を追加�排除�変更����役割��メン�ー�追加�排除�更�役割�アビリティを割り当�る権����れ��。"
-             name="Roles">
-                <action description="新��役割を作�"
-                     longdescription="Create new Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
-                     name="role create" />
-                <action description="役割�削除"
-                     longdescription="Delete Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
-                     name="role delete" />
-                <action description="役割��タイトル�説明を変更"
-                     longdescription="Change Role names, titles, and descriptions at the bottom of the the Members &amp; Roles tab &gt; Roles sub-tab after selecting a Role."
-                     name="role properties" />
-                <action description="割り当�人�役割�メン�ーを割り当�る"
-                     longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A member with this power can only add members to a role the assigner is already in."
-                     name="role assign member limited" />
-                <action description="��れ��役割�メン�ーを割り当�る"
-                     longdescription="Assign Members to Any Role in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
-                     name="role assign member" />
-                <action description="役割�らメン�ーを除外"
-                     longdescription="Remove Members from Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. Owners can&apos;t be removed."
-                     name="role remove member" />
-                <action
-                     description="役割���るアビリティ�割り当��排除を行�"
-                     longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
-                     name="role change actions" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���公開性�特権�記章等�本グループ�特徴を修正�る権����れ��。"
-             name="Group Identity">
-                <action
-                     description="特権�記章�『Web上�公開���よ�グループ情報内��視�メン�ーを変更"
-                     longdescription="Change Charter, Insignia, &apos;Publish on the Web&apos;, and which members are publicly visible in Group Information. This is done in the General tab."
-                     name="group change identity" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ�����ブループ�所有�る土地�譲渡�修正�販売�る権����れ��。土地�関�る情報��地�を�クリック��『土地情報�を�択�る��メニュー�ー�『区画情報�をクリック���。"
-             name="Parcel Management">
-                <action description="グループ�土地譲渡�購入を行�"
-                     longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
-                     name="land deed" />
-                <action description="Governor Linden�土地を��渡�"
-                     longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
-                     name="land release" />
-                <action description="売り地情報�設定"
-                     longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
-                     name="land set sale info" />
-                <action description="区画��分割��よ�統�"
-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
-                     name="land divide join" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���区画��公開設定�検索ディレクトリ��登録��陸地点�よ�TPルート�オプションを変更�る権����れ��。"
-             name="Parcel Identity">
-                <action
-                     description="『場所検索�表示��切り替��カテゴリを設定"
-                     longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
-                     name="land find places" />
-                <action description="区画��説明�『Web上�公開��設定を変更"
-                     longdescription="Change parcel name, description, and &apos;Publish on the Web&apos; settings. This is done in About Land &gt; Options tab."
-                     name="land change identity" />
-                <action description="�陸地点�テレ�ート・ルートを設定"
-                     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
-                     name="land set landing point" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���『オブジェクト�作��『土地編集��よ�音楽�メディア�設定等�区画オプション�関�る権����れ��。"
-             name="Parcel Settings">
-                <action description="音楽�メディア設定を変更"
-                     longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
-                     name="land change media" />
-                <action description="『土地編集��切り替�る"
-                     longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
-                     name="land edit" />
-                <action
-                     description="土地�関�る色々＞オプション設定�切り替�る"
-                     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
-                     name="land options" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���メン�ー��グループ所有区画�関�る制�を通��る�����る権����れ��。"
-             name="Parcel Powers">
-                <action description="常�『土地�エディット�を許�"
-                     longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
-                     name="land allow edit land" />
-                <action description="常�『飛行�を許�"
-                     longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
-                     name="land allow fly" />
-                <action description="常�『オブジェクト作��を許�"
-                     longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
-                     name="land allow create" />
-                <action description="常�『ランドマーク作��を許�"
-                     longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
-                     name="land allow landmark" />
-                <action description="グループ�土地�『ホーム設定�を許�"
-                     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a group parcel (either land set or deeded to this group)."
-                     name="land allow set home" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���居�者����追放を�む�グループ所有区画��アクセス�許�や制��権����れ��。"
-             name="Parcel Access">
-                <action description="区画アクセスリスト�管�"
-                     longdescription="Manage parcel Access lists in About Land &gt; Access tab."
-                     name="land manage allowed" />
-                <action description="区画�止リスト�管�"
-                     longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."
-                     name="land manage banned" />
-                <action description="区画�『許�証販売��設定を変更"
-                     longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."
-                     name="land manage passes" />
-                <action description="区画上�居�者を���追放"
-                     longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."
-                     name="land admin" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���メン�ー��オブジェクト�返��Linden製�物�設置�移動�権����れ��。�れ�メン�ー�ゴミ処�や景観造りを行�際�便利����返���オブジェクト�元�戻���為�充分�注��必���。"
-             name="Parcel Content">
-                <action description="グループ所有オブジェクト�返還"
-                     longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
-                     name="land return group owned" />
-                <action description="グループ�設置��オブジェクトを返還"
-                     longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab."
-                     name="land return group set" />
-                <action description="�グループ・オブジェクト�返還"
-                     longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
-                     name="land return non group" />
-                <action description="Linden製��物を使用��景観作製"
-                     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
-                     name="land gardening" />
-        </action_set>
-        <action_set
-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
-             name="Object Management">
-                <action description="グループ�オブジェクトを譲渡"
-                     longdescription="Deed objects to group in the Edit Tools &gt; General Tab."
-                     name="object deed" />
-                <action
-                     description="グループ所有オブジェクト��作（移動�コピー�修正）"
-                     longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."
-                     name="object manipulate" />
-                <action description="グループ所有オブジェクトを販売�能�設定"
-                     longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."
-                     name="object set sale" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���メン�ー�グループ負債�支払�やグループ�当��領を行��る権�を����。グループ�座履歴��アクセスを制��る��も����。"
-             name="Accounting">
-                <action description="グループ負債�返済�グループ�当��領"
-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
-                     name="accounting accountable" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���メン�ー�グループ通知を�信����り�閲覧���る権����れ��。"
-             name="Notices">
-                <action description="通知を�信"
-                     longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."
-                     name="notices send" />
-                <action description="通知��去�通知�閲覧"
-                     longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."
-                     name="notices receive" />
-        </action_set>
-        <action_set
-             description="�れら�アビリティ���メン�ー���案�作��投票����投票履歴を閲覧���る権����れ��。"
-             name="Proposals">
-                <action description="�案を作�"
-                     longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information &gt; Proposals tab."
-                     name="proposal start" />
-                <action description="�案�投票"
-                     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
-                     name="proposal vote" />
-        </action_set>
-</role_actions>
diff --git a/linden/indra/newview/skins/xui/zh/xui_version.xml b/linden/indra/newview/skins/xui/zh/xui_version.xml
deleted file mode 100644
index 0e77775..0000000
--- a/linden/indra/newview/skins/xui/zh/xui_version.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
-        1.0
-</xui_version>
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index 19b5260..181e446 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -56,7 +56,12 @@
 #include <process.h>    // _spawnl()
 #include <tchar.h>              // For TCHAR support
 
+#if LL_WINDOWS && _MSC_VER < 1400
 //#define LL_USE_SMARTHEAP 0
+#else
+#define LL_USE_SMARTHEAP 0
+#endif
+
 #if LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP
 #include "smrtheap/smrtheap.h"
 #endif // LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP
@@ -103,19 +108,23 @@
 // Linden library headers
 //
 
+#include "audioengine.h" 
 #include "llcommon.h" 
 #include "llapr.h" 
-#include "audioengine.h" 
 #include "llcachename.h"
-#include "llviewercontrol.h"
+#include "llcurl.h"
 #include "llcriticaldamp.h"
 #include "lldir.h"
 #include "lleconomy.h"
+#include "llerrorcontrol.h"
 #include "llflexibleobject.h"
 #include "llfasttimer.h"
 #include "llfocusmgr.h"
 #include "llgroupmgr.h"
+#include "llimage.h"
+#include "llimageworker.h"
 #include "lllfsthread.h"
+#include "llmemtype.h"
 #include "llmd5.h"
 #include "llsecondlifeurls.h"
 #include "llversion.h"
@@ -180,12 +189,15 @@
 #include "llstatusbar.h"
 #include "llsurface.h"
 #include "lltexlayer.h"
+#include "lltexturecache.h"
+#include "lltexturefetch.h"
 #include "lltoolbar.h"
 #include "lltoolmgr.h"
 #include "lltracker.h"
 #include "llurlwhitelist.h"
 #include "llviewerbuild.h"
 #include "llviewercamera.h"
+#include "llviewercontrol.h"
 #include "llviewerimagelist.h"
 #include "llviewerkeyboard.h"
 #include "llviewermenu.h"
@@ -202,7 +214,6 @@
 #include "llvoavatar.h"
 #include "llvograss.h"
 #include "llvotree.h"
-#include "llvotreenew.h"
 #include "llvovolume.h"         // To set a static member.
 #include "llvowater.h"
 #include "llvolume.h"
@@ -236,11 +247,15 @@
 #endif
 
 #include "llmediaengine.h"
-#include "llmozlib.h"
 
-extern LLErrorBuffer gErrorBuffer;
+#if LL_LIBXUL_ENABLED
+#include "llmozlib.h"
+#endif // LL_LIBXUL_ENABLED
 
+/////////////////////////////////////////////////////////////////////////////////
 // Support for crash handling.
+/////////////////////////////////////////////////////////////////////////////////
+
 void errorCallback(const std::string &error_string);
 S32 gCrashBehavior = CRASH_BEHAVIOR_ASK;
 void (*gCrashCallback)(void) = NULL;
@@ -253,9 +268,10 @@ BOOL gHandleKeysAsync = FALSE;
 BOOL gProbeHardware = TRUE;
 std::string gSerialNumber;
 
-//
+/////////////////////////////////////////////////////////////////////////////////
 // Application constants
-//
+/////////////////////////////////////////////////////////////////////////////////
+
 S32 gStartupState = STATE_FIRST;
 
 BOOL gHaveSavedSnapshot = FALSE;
@@ -270,7 +286,6 @@ const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user fl
 
 const char *VFS_DATA_FILE_BASE                  = "data.db2.x.";
 const char *VFS_INDEX_FILE_BASE                 = "index.db2.x.";
-const U32   VFS_SIZE_MAP[4]                     = {52428800, 209715200, 524288000, 1048576000};
 
 const F32 MAX_USER_FOG_RATIO = 4.f;
 const F32 MIN_USER_FOG_RATIO = 0.5f;
@@ -333,6 +348,7 @@ BOOL				gDisconnected = FALSE;
 
 // Tells us to clean up the cache directory in the case of network corruption
 BOOL                            gPurgeOnExit = FALSE;
+BOOL                            gPurgeCache = FALSE;
 
 // Allow multiple viewers in ReleaseForDownload
 #if LL_RELEASE_FOR_DOWNLOAD
@@ -340,6 +356,7 @@ BOOL				gMultipleViewersOK = FALSE;
 #else
 BOOL                            gMultipleViewersOK = TRUE;
 #endif
+BOOL                            gSecondInstance = FALSE;
 
 LLString                        gArgs;
 
@@ -356,7 +373,6 @@ LLString			gOldSettingsFileName;
 BOOL                            gPrintMessagesThisFrame = FALSE;
 const char*                     DEFAULT_SETTINGS_FILE = "settings.xml";
 const char*                     LEGACY_DEFAULT_SETTINGS_FILE = "settings.ini";
-BOOL                            gRenderLightGlows = FALSE;                      // off by default for speed
 BOOL                            gUseWireframe = FALSE;
 BOOL                            gRunLocal = FALSE;
 LLUUID                          gViewerDigest;  // MD5 digest of the viewer's executable file.
@@ -374,14 +390,8 @@ const F32			LOGOUT_REQUEST_TIME = 6.f;  // this will be cut short by the LogoutR
 F32                                     gLogoutMaxTime = LOGOUT_REQUEST_TIME;
 
 // Map scale in pixels per region
-F32 gMapScale = 128.f;
-F32 gMiniMapScale = 128.f;
-
-// User interface/rendering globals
-
-extern LLPointer<LLImageGL> gStartImageGL;
-extern BOOL                     gDebugWindowProc;
-extern BOOL                     gAvatarBacklight;
+F32                             gMapScale = 128.f;
+F32                             gMiniMapScale = 128.f;
 
 // Sky object, globals
 LLSky                           gSky;
@@ -401,7 +411,12 @@ BOOL			gRestoreGL = FALSE;
 LLGlobalEconomy *gGlobalEconomy = NULL;
 
 // VFS globals - see viewer.h
-LLVFS   *gStaticVFS = NULL;
+LLVFS* gStaticVFS = NULL;
+
+// Threads
+LLTextureCache* gTextureCache = NULL;
+LLWorkerThread* gImageDecodeThread = NULL;
+LLTextureFetch* gTextureFetch = NULL;
 
 // Debugging
 FILE *gDebugFile = NULL;        // File pointer used by the function which writes debug data.
@@ -481,13 +496,6 @@ static const char USAGE[] = "\n"
 #if !LL_RELEASE_FOR_DOWNLOAD
 " -sim <simulator_ip>                  specify the simulator ip address\n"
 " -local                               run without simulator\n"
-" -debugst <value>                     debug mask |= 1<<value (e.g. 1=LLERR_IMAGE, 2=LLERR_MESSAGE)\n"
-" -errmask <mask>                      32 bit bitmask for error type mask\n"
-" -logcontrol <control> <level> <mask> specify admin logging control\n"
-"             <time> <location>          control: 0=replace, 1=merge\n"
-"                                        level: 0=debug, 1=inf, 2=wrn, 3=err\n"
-"                                        mask: 32 bit bitmask\n"
-"                                        time,location: 0=no, 1=yes\n"
 #endif
 " -god                                     log in as god if you have god access\n"
 " -purge                               delete files in cache\n"
@@ -516,7 +524,6 @@ BOOL gUseAudio = TRUE;
 BOOL gUseFMOD = TRUE;
 BOOL gConnectToSomething = TRUE;
 BOOL gLogMessages = FALSE;
-BOOL gLogUTC = TRUE;
 BOOL gRequestInventoryLibrary = TRUE;
 BOOL gAcceptTOS = FALSE;
 BOOL gAcceptCriticalMessage = FALSE;
@@ -558,12 +565,13 @@ protected:
 // Application initialization and cleanup
 //
 void init_marker_file();
-void init_crash_logging();
+void init_crash_handler();
+void init_logging();
 void create_console();
 void write_system_info();
 int parse_args(int argc, char **argv);
 void saved_settings_to_globals();
-BOOL init_vfs_viewer();
+BOOL init_cache();
 void purge_cache();
 void cleanup_app();
 void disconnect_viewer(void *); // Don't use directly - use do_disconnect()
@@ -609,10 +617,6 @@ OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *
 OSStatus DisplayReleaseNotes(void);
 #endif // LL_DARWIN
 
-#ifdef LL_WINDOWS
-extern LPWSTR gIconResource;
-#endif
-
 void ui_audio_callback(const LLUUID& uuid, F32 volume)
 {
         if (gAudiop)
@@ -624,7 +628,7 @@ void ui_audio_callback(const LLUUID& uuid, F32 volume)
 #if LL_WINDOWS
 BOOL CALLBACK login_dialog_func(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lparam)
 {
-        char buffer[MAX_STRING];
+        char buffer[MAX_STRING];                /* Flawfinder: ignore */
         switch(msg)
         {
     case WM_INITDIALOG:
@@ -755,7 +759,7 @@ MEM_BOOL MEM_CALLBACK first_mem_error_handler(MEM_ERROR_INFO *errorInfo)
 MEM_BOOL MEM_CALLBACK second_mem_error_handler(MEM_ERROR_INFO *errorInfo)
 {
         // Just in case "llerrs" and "llendl" cause another out-of-memory.
-        _llcrash_and_loop();
+        LLError::crashAndLoop("");
         // NOTREACHED better not be!
         return 0;
 }
@@ -778,10 +782,18 @@ int main( int argc, char **argv )
         // This will eventually be done in LLApp
         LLCommon::initClass();
         // This should eventually be done in LLAppViewer
-        LLWorkerThread::initClass();
-        LLVFSThread::initClass(true, true);
-        LLLFSThread::initClass(true, true);
-        LLImageFormatted::initClass(true, true);
+# if MEM_TRACK_MEM
+        static const bool enable_threads = false;
+# else
+        static const bool enable_threads = true;
+# endif
+        LLVFSThread::initClass(enable_threads && true);
+        LLLFSThread::initClass(enable_threads && true);
+        // Image decoding
+        gImageDecodeThread = new LLWorkerThread("ImageDecode", enable_threads && true);
+        gTextureCache = new LLTextureCache(enable_threads && true);
+        gTextureFetch = new LLTextureFetch(gTextureCache, enable_threads && false);
+        LLImageWorker::initClass(gImageDecodeThread);
         LLImageJ2C::openDSO();
 #endif
 
@@ -798,7 +810,7 @@ int main( int argc, char **argv )
 
         const S32       MAX_ARGS = 100;
         int argc = 0;
-        char *argv[MAX_ARGS];
+        char* argv[MAX_ARGS];           /* Flawfinder: ignore */
 
         char *token = NULL;
         if( cmd_line_including_exe_name[0] == '\"' )
@@ -818,7 +830,7 @@ int main( int argc, char **argv )
         {
                 argv[argc++] = token;
                 /* Get next token: */
-                if (*(token + strlen(token) + 1) == '\"')
+                if (*(token + strlen(token) + 1) == '\"')               /* Flawfinder: ignore*/
                 {
                         token = strtok( NULL, "\"");
                 }
@@ -836,25 +848,25 @@ int main( int argc, char **argv )
         // the gUserServerName (which gets passed to the crash reporter).
         // We're assuming that they're trying to log into the same grid as last
         // time, which seems fairly reasonable.
-        sprintf(gUserServerName,"%s", gUserServerDomainName[UserServerDefaultChoice].mName);
+        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[UserServerDefaultChoice].mName);              /* Flawfinder: ignore */
         S32 j;
         for (j = 1; j < argc; j++) 
         {
                 if (!strcmp(argv[j], "--aditi"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_ADITI].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_ADITI].mName);             /* Flawfinder: ignore */
                 }
                 else if (!strcmp(argv[j], "--agni"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_AGNI].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_AGNI].mName);              /* Flawfinder: ignore */
                 }
                 else if (!strcmp(argv[j], "--dmz"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_DMZ].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_DMZ].mName);               /* Flawfinder: ignore */
                 }
                 else if (!strcmp(argv[j], "--siva"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_SIVA].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_SIVA].mName);              /* Flawfinder: ignore */
                 }
                 else if (!strcmp(argv[j], "--shakti"))
                 {
@@ -862,15 +874,19 @@ int main( int argc, char **argv )
                 }
                 else if (!strcmp(argv[j], "--durga"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_DURGA].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_DURGA].mName);             /* Flawfinder: ignore */
                 }
                 else if (!strcmp(argv[j], "--soma"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_SOMA].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_SOMA].mName);              /* Flawfinder: ignore */
                 }
                 else if (!strcmp(argv[j], "--ganga"))
                 {
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_GANGA].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[USERSERVER_GANGA].mName);             /* Flawfinder: ignore */
+                }
+                else if (!strcmp(argv[j], "--vaak"))
+                {
+                        sprintf(gUserServerName,"%s", gUserServerDomainName[USERSERVER_VAAK].mName);
                 }
                 else if (!strcmp(argv[j], "--uma"))
                 {
@@ -880,11 +896,11 @@ int main( int argc, char **argv )
                 {
                         if (!strcmp(argv[j], "-"))
                         {
-                                sprintf(gUserServerName,"%s", LOOPBACK_ADDRESS_STRING);
+                                snprintf(gUserServerName, MAX_STRING, "%s", LOOPBACK_ADDRESS_STRING);           /* Flawfinder: ignore */
                         }
                         else
                         {
-                                snprintf(gUserServerName, MAX_STRING, "%s", argv[j]);
+                                snprintf(gUserServerName, MAX_STRING, "%s", argv[j]);           /* Flawfinder: ignore */
                         }
                 }
                 else if (!strcmp(argv[j], "-multiple"))
@@ -911,15 +927,24 @@ int main( int argc, char **argv )
         // that touches files should really go through the lldir API
         gDirUtilp->initAppDirs("SecondLife");
 
+        //
+        // Set up logging defaults for the viewer
+        //
+        LLError::initForApplication(
+                                gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+        LLError::setFatalFunction(errorCallback);
+
+
 #if LL_RELEASE_FOR_DOWNLOAD && LL_SEND_CRASH_REPORTS
         //
         // Crash log if we hard crashed.
         // Initialize crash logging
-        // Set up SecondLife.log
         //
-        init_crash_logging();
+        init_crash_handler();
 #endif
-
+        // Set up SecondLife.log
+        init_logging();
+        
         //
         // OK to write stuff to logs now, we've now crash reported if necessary
         //
@@ -939,7 +964,7 @@ int main( int argc, char **argv )
         {
                 // On the Mac, read in arguments.txt (if it exists) and process it for additional arguments.
                 LLString args;
-                if(LLString::read(args, "arguments.txt"))
+                if(LLString::read(args, "arguments.txt"))               /* Flawfinder: ignore*/
                 {
                         // The arguments file exists.  
                         // It should consist of command line arguments separated by newlines.
@@ -1051,35 +1076,6 @@ int main( int argc, char **argv )
         gStartTime = totalTime();
 
 
-        //
-        // Set up logging defaults for the viewer
-        //
-#if 0 // This is bad... it disables lldebugs... if some spam is annoying, use lldebugst or comment it out.
-        // Reduced spam diet for the viewer
-        gErrorStream.setLevel( LLErrorStream::INFO );
-#endif
-        //gErrorStream.setLevel( LLErrorStream::WARN );
-        gErrorStream.setTime(FALSE);
-        gErrorStream.setPrintLocation(FALSE);
-        gErrorStream.setErrorCallback(errorCallback);
-
-#if LL_DARWIN || LL_LINUX
-        // Disable syslogging - the viewer shouldn't spam there
-        gErrorBuffer.enableSyslog(FALSE);
-#endif
-
-#if LL_DARWIN
-        // On Mac OS X, stderr from apps launched from the Finder goes to the console log.
-        // It's generally considered bad form to spam too much there.
-        
-        // If stdin is a tty, assume the user launched from the command line and therefore wants to see stderr.
-        // Otherwise, assume we've been launched from the finder and shouldn't spam stderr.
-        if(!isatty(0))
-        {
-                gErrorBuffer.enableError(FALSE);
-        }
-#endif
-
         ////////////////////////////////////////
         //
         // Process ini files
@@ -1119,7 +1115,10 @@ int main( int argc, char **argv )
                         // successfully handed off URL to existing instance, exit
                         return 1;
                 }
-                else if (another_instance_running())
+                
+                gSecondInstance = another_instance_running();
+                
+                if (gSecondInstance)
                 {
                         std::ostringstream msg;
                         msg << 
@@ -1178,7 +1177,7 @@ int main( int argc, char **argv )
                                 command_str += gUserServerName;
                                 // XXX -- We need to exit fullscreen mode for this to work.
                                 // XXX -- system() also doesn't wait for completion.  Hmm...
-                                system(command_str.c_str());
+                                system(command_str.c_str());            /* Flawfinder: Ignore */
 #elif LL_LINUX
                                 std::string cmd =gDirUtilp->getAppRODataDir();
                                 cmd += gDirUtilp->getDirDelimiter();
@@ -1194,7 +1193,7 @@ int main( int argc, char **argv )
                                 pid_t pid = fork();
                                 if (pid == 0)
                                 { // child
-                                        execv(cmd.c_str(), cmdargv);
+                                        execv(cmd.c_str(), cmdargv);            /* Flawfinder: Ignore */
                                         llwarns << "execv failure when trying to start " << cmd << llendl;
                                         _exit(1); // avoid atexit()
                                 } else {
@@ -1218,8 +1217,10 @@ int main( int argc, char **argv )
         }
         else
         {
+                gSecondInstance = another_instance_running();
+                
                 /* Don't start another instance if using -multiple
-                if (another_instance_running())
+                if (gSecondInstance)
                 {
                         //RN: if we received a URL, hand it off to the existing instance
                     if (LLURLSimString::parse())
@@ -1262,6 +1263,13 @@ int main( int argc, char **argv )
         // Merge with the command line overrides
         gSavedSettings.applyOverrides(gCommandLineSettings);
 
+        // Need to do this before calling parseAlerts
+        gUICtrlFactory = new LLViewerUICtrlFactory();
+        
+        // Pre-load alerts.xml to define the warnings settings (always loads from skins/xui/en-us/)
+        // Do this *before* loading the settings file
+        LLAlertDialog::parseAlerts("alerts.xml", &gSavedSettings, TRUE);
+        
         // Overwrite default settings with user settings
         llinfos << "Loading configuration file " << gSettingsFileName << llendl;
         if (0 == gSavedSettings.loadFromFile(gSettingsFileName))
@@ -1283,19 +1291,13 @@ int main( int argc, char **argv )
         gSavedSettings.applyOverrides(gCommandLineForcedSettings);
 
         gLastRunVersion = gSavedSettings.getString("LastRunVersion");
+
+        settings_version_fixup();
         
         // Get the single value from the crash settings file, if it exists
         std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
         gCrashSettings.loadFromFile(crash_settings_filename.c_str());
 
-        // Purge cache if user requested it
-        if (gSavedSettings.getBOOL("PurgeCacheOnStartup") ||
-                gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
-        {
-                gSavedSettings.setBOOL("PurgeCacheOnNextStartup", FALSE);
-                purge_cache();
-        }
-
         /////////////////////////////////////////////////
         // OS-specific login dialogs
         /////////////////////////////////////////////////
@@ -1328,7 +1330,7 @@ int main( int argc, char **argv )
 
         if (gSavedSettings.getBOOL("VerboseLogs"))
         {
-                gErrorStream.setPrintLocation(TRUE);
+                LLError::setPrintLocation(true);
         }
 
 #if !LL_RELEASE_FOR_DOWNLOAD
@@ -1345,11 +1347,11 @@ int main( int argc, char **argv )
                                 LLString custom_server = gSavedSettings.getString("CustomServer");
                                 if (custom_server.empty())
                                 {
-                                        sprintf(gUserServerName,"none");
+                                        snprintf(gUserServerName, MAX_STRING, "none");          /* Flawfinder: ignore */
                                 }
                                 else
                                 {
-                                        sprintf(gUserServerName,"%s", custom_server.c_str());
+                                        snprintf(gUserServerName, MAX_STRING, "%s", custom_server.c_str());             /* Flawfinder: ignore */
                                 }
                         }
                 }
@@ -1365,6 +1367,9 @@ int main( int argc, char **argv )
         LLString viewer_art_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"viewerart.xml");
         llinfos << "Loading art table from " << viewer_art_filename << llendl;
         gViewerArt.loadFromFile(viewer_art_filename.c_str(), FALSE);
+        LLString textures_filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", "textures.xml");
+        llinfos << "Loading art table from " << textures_filename << llendl;
+        gViewerArt.loadFromFile(textures_filename.c_str(), FALSE);
 
         LLString colors_base_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors_base.xml");
         llinfos << "Loading base colors from " << colors_base_filename << llendl;
@@ -1388,19 +1393,14 @@ int main( int argc, char **argv )
                                         &gImageList,
                                         ui_audio_callback,
                                         &LLUI::sGLScaleFactor);
-        
-        gUICtrlFactory = new LLViewerUICtrlFactory();
 
+        gUICtrlFactory->setupPaths(); // update paths with correct language set
         
         /////////////////////////////////////////////////
         //
         // Load settings files
         //
         //
-        // XUI:translate? Should be OK to get the controldef first
-        // Pre-load alerts.xml to define the warnings settings (always loads from skins/xui/en-us/)
-        LLAlertDialog::parseAlerts("alerts.xml", &gSavedSettings, TRUE);
-
         LLGroupMgr::parseRoleActions("role_actions.xml");
 
         // Move certain saved settings into global variables for speed
@@ -1500,11 +1500,6 @@ int main( int argc, char **argv )
                 llwarns << " Someone took over my exception handler (post hardware probe)!" << llendl;
         }
 
-        if (gFeatureManagerp->initPCIFeatureMasks())
-    {
-                // User is looking at "bad device" web pages, exit
-                return 0;
-    }
         gGLManager.mVRAM = gDXHardware.getVRAM();
         llinfos << "Detected VRAM: " << gGLManager.mVRAM << llendl;
 #endif
@@ -1524,7 +1519,8 @@ int main( int argc, char **argv )
         //
         // Initialize the VFS, and gracefully handle initialization errors
         //
-        if (!init_vfs_viewer())
+
+        if (!init_cache())
         {
                 std::ostringstream msg;
                 msg <<
@@ -1541,7 +1537,7 @@ int main( int argc, char **argv )
                         OSMB_OK);
                 return 1;
         }
-
+        
 #if LL_DARWIN
         // Display the release notes for the current version
         if(!gHideLinks && gCurrentVersion != gLastRunVersion)
@@ -1572,8 +1568,9 @@ int main( int argc, char **argv )
         LLSplashScreen::hide();
 
         // HACK: Need a non-const char * for stupid window name (propagated deep down)
-        char window_title_str[256];
-        strcpy(window_title_str, gWindowTitle.c_str());
+        char window_title_str[256];             /* Flawfinder: ignore */
+        strncpy(window_title_str, gWindowTitle.c_str(), sizeof(window_title_str) - 1);          /* Flawfinder: ignore */
+        window_title_str[sizeof(window_title_str) - 1] = '\0';
 
         // always start windowed
         gViewerWindow = new LLViewerWindow(window_title_str, "Second Life",
@@ -1618,10 +1615,6 @@ int main( int argc, char **argv )
         write_debug(gGLManager.getGLInfoString());
         llinfos << gGLManager.getGLInfoString() << llendl;
 
-        char tmp_str[256];
-        sprintf(tmp_str, "Allocated %d bytes of AGP memory\n", gPipeline.getAGPMemUsage());
-        write_debug(tmp_str);
-
         //load key settings
         bind_keyboard_functions();
 
@@ -1634,7 +1627,7 @@ int main( int argc, char **argv )
         gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini").c_str());
 
         // Calculate the digest for the executable (takes < 90ms on a fast machine).
-        FILE* app_file = LLFile::fopen( gDirUtilp->getExecutablePathAndName().c_str(), "rb" );
+        FILE* app_file = LLFile::fopen( gDirUtilp->getExecutablePathAndName().c_str(), "rb" );          /* Flawfinder: ignore */
         if( app_file )
         {
                 LLMD5 app_md5;
@@ -1711,12 +1704,12 @@ BOOL another_instance_running()
 
         // If file doesn't exist, we create it
         // If file does exist, try to get writing privilages
-        FILE *fMarker = LLFile::fopen(marker_file.c_str(), "rb");
+        FILE* fMarker = LLFile::fopen(marker_file.c_str(), "rb");               /* Flawfinder: ignore */
         if (fMarker != NULL)
         {
                 // File exists, try opening with write permissions
                 fclose(fMarker);
-                fMarker = LLFile::fopen(marker_file.c_str(), "wb");
+                fMarker = LLFile::fopen(marker_file.c_str(), "wb");             /* Flawfinder: ignore */
                 if (fMarker == NULL)
                 {
                         llinfos << "Marker file is locked." << llendl;
@@ -1780,7 +1773,6 @@ void main_loop()
                         // once per second debug info
                         if (debugTime.getElapsedTimeF32() > 1.f)
                         {
-//                              llinfos << "AGP Byte mem: " << LLAGPArray<U8>::sBytesPad << llendl;
                                 debugTime.reset();
                         }
 #endif
@@ -1803,6 +1795,7 @@ void main_loop()
                                 {
                                         LLFastTimer t3(LLFastTimer::FTM_IDLE);
                                         idle();
+                                        LLCurl::process();
                                         io_pump->pump();
                                         io_pump->callback();
                                 }
@@ -1831,18 +1824,24 @@ void main_loop()
                         // Sleep and run background threads
                         {
                                 LLFastTimer t2(LLFastTimer::FTM_SLEEP);
-
+                                bool run_multiple_threads = gSavedSettings.getBOOL("RunMultipleThreads");
+                                
                                 const F64 min_frame_time = 0.0; //(.0333 - .0010); // max video frame rate = 30 fps
                                 const F64 min_idle_time = 0.0; //(.0010); // min idle time = 1 ms
+                                const F64 max_idle_time = run_multiple_threads ? min_idle_time : .005; // 5 ms
                                 idleTimer.reset();
                                 while(1)
                                 {
-                                        LLWorkerThread::updateClass(0); // unpauses the worker threads
-                                        S32 vfs_pending = LLVFSThread::updateClass(0);
-                                        S32 lfs_pending = LLLFSThread::updateClass(0);
-                                        if (vfs_pending > 1000 || lfs_pending > 100)
+                                        S32 work_pending = 0;
+                                        S32 io_pending = 0;
+                                        work_pending += gTextureCache->update(1); // unpauses the texture cache thread
+                                        work_pending += gImageDecodeThread->update(1); // unpauses the image thread
+                                        work_pending += gTextureFetch->update(1); // unpauses the texture fetch thread
+                                        io_pending += LLVFSThread::updateClass(1);
+                                        io_pending += LLLFSThread::updateClass(1);
+                                        if (io_pending > 1000)
                                         {
-                                                ms_sleep(llmin(vfs_pending/100,100)); // give the vfs some time to catch up
+                                                ms_sleep(llmin(io_pending/100,100)); // give the vfs some time to catch up
                                         }
                                         if (   gNoRender
                                                    || !gViewerWindow->mWindow->getVisible()
@@ -1871,15 +1870,23 @@ void main_loop()
 
                                         F64 frame_time = frameTimer.getElapsedTimeF64();
                                         F64 idle_time = idleTimer.getElapsedTimeF64();
-                                        if (frame_time >= min_frame_time && idle_time >= min_idle_time)
+                                        if (frame_time >= min_frame_time &&
+                                                idle_time >= min_idle_time &&
+                                                (!work_pending || idle_time >= max_idle_time))
                                         {
                                                 break;
                                         }
                                 }
                                 frameTimer.reset();
 
-                                // if (LLWorkerThread::threadCount()==1) //pauseALl() should only be required when on a single threaded client...
-                                LLWorkerThread::pauseAll(); // Prevent the worker thread from running while rendering.
+                                 // Prevent the worker threads from running while rendering.
+                                // if (LLThread::processorCount()==1) //pause() should only be required when on a single processor client...
+                                if (run_multiple_threads == FALSE)
+                                {
+                                        gTextureCache->pause();
+                                        gImageDecodeThread->pause();
+                                        // gTextureFetch->pause(); // Don't pause the fetch (IO) thread
+                                }
                                 //LLVFSThread::sLocal->pause(); // Prevent the VFS thread from running while rendering.
                                 //LLLFSThread::sLocal->pause(); // Prevent the LFS thread from running while rendering.
                         }
@@ -1970,12 +1977,12 @@ void init_marker_file()
         std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
         llinfos << "Checking marker file for lock..." << llendl;
 
-        FILE *fMarker = LLFile::fopen(marker_file.c_str(), "rb");
+        FILE* fMarker = LLFile::fopen(marker_file.c_str(), "rb");               /* Flawfinder: ignore */
         if (fMarker != NULL)
         {
                 // File exists, try opening with write permissions
                 fclose(fMarker);
-                fMarker = LLFile::fopen(marker_file.c_str(), "wb");
+                fMarker = LLFile::fopen(marker_file.c_str(), "wb");             /* Flawfinder: ignore */
                 if (fMarker == NULL)
                 {
                         // Another instance is running. Skip the rest of these operations.
@@ -2004,7 +2011,7 @@ void init_marker_file()
 #if LL_WINDOWS
         gMarkerFile = LLFile::_fsopen(marker_file.c_str(), "w", _SH_DENYWR);
 #else
-        gMarkerFile = LLFile::fopen(marker_file.c_str(), "w");
+        gMarkerFile = LLFile::fopen(marker_file.c_str(), "w");          /* Flawfinder: ignore */
         if (gMarkerFile)
         {
                 int fd = fileno(gMarkerFile);
@@ -2040,7 +2047,7 @@ void init_marker_file()
         llinfos << "Exiting init_marker_file()." << llendl;
 }
 
-void init_crash_logging()
+void init_crash_handler()
 {
         //////////////////////////////////////////
         //
@@ -2052,7 +2059,10 @@ void init_crash_logging()
 
         // Set the crash callback for the viewer
         gCrashCallback = viewer_crash_callback;
+}
 
+void init_logging()
+{
         // Remove the last ".old" log file.
         std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,
                                                              "SecondLife.old");
@@ -2072,16 +2082,13 @@ void init_crash_logging()
 
         // Set the log file to SecondLife.log
 
-        if (!gErrorStream.setFile(log_file.c_str()))
-        {
-                llinfos << "Error setting log file to " << log_file << llendl;
-        }
+        LLError::logToFile(log_file);
 }
 
 void write_system_info()
 {
         write_debug("SL Log: ");
-        write_debug(gErrorStream.getFilename());
+        write_debug(LLError::logFileName());
         write_debug("\n");
 
         std::string tmp_str = gSecondLife
@@ -2108,7 +2115,7 @@ void write_system_info()
         // Dump the local time and time zone
         time_t now;
         time(&now);
-        char tbuffer[256];
+        char tbuffer[256];              /* Flawfinder: ignore */
         strftime(tbuffer, 256, "%Y-%m-%dT%H:%M:%S %Z", localtime(&now));
         llinfos << "Local time: " << tbuffer << llendl;
 
@@ -2122,12 +2129,12 @@ void write_system_info()
 void disable_win_error_reporting()
 {
         const char win_xp_string[] = "Microsoft Windows XP";
-        BOOL is_win_xp = ( gSysOS.getOSString().substr(0, strlen(win_xp_string) ) == win_xp_string );
+        BOOL is_win_xp = ( gSysOS.getOSString().substr(0, strlen(win_xp_string) ) == win_xp_string );           /* Flawfinder: ignore*/
         if( is_win_xp )
         {
                 // Note: we need to use run-time dynamic linking, because load-time dynamic linking will fail
                 // on systems that don't have the library installed (all non-Windows XP systems)
-                HINSTANCE fault_rep_dll_handle = LoadLibrary(L"faultrep.dll");
+                HINSTANCE fault_rep_dll_handle = LoadLibrary(L"faultrep.dll");          /* Flawfinder: ignore */
                 if( fault_rep_dll_handle )
                 {
                         pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA  = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
@@ -2157,7 +2164,7 @@ void disable_win_error_reporting()
 // On Mac, return the hardware serial number.
 std::string get_serial_number()
 {
-        char serial_md5[MD5HEX_STR_SIZE];
+        char serial_md5[MD5HEX_STR_SIZE];               /* Flawfinder: ignore */
         serial_md5[0] = 0;
 
 #if LL_WINDOWS
@@ -2199,7 +2206,7 @@ std::string get_serial_number()
         
         if (serialNumber)
         {
-                char buffer[MAX_STRING];
+                char buffer[MAX_STRING];                /* Flawfinder: ignore */
                 if (CFStringGetCString(serialNumber, buffer, MAX_STRING, kCFStringEncodingASCII))
                 {
                         LLMD5 md5( (unsigned char*)buffer );
@@ -2234,7 +2241,7 @@ static inline BOOL do_basic_glibc_backtrace()
 
         std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
         llinfos << "Opening stack trace file " << strace_filename << llendl;
-        FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");
+        FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");         /* Flawfinder: ignore */
         if (!StraceFile)
         {
                 llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
@@ -2272,7 +2279,7 @@ static inline BOOL do_elfio_glibc_backtrace()
 
         std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
         llinfos << "Opening stack trace file " << strace_filename << llendl;
-        FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");
+        FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w");         /* Flawfinder: ignore */
         if (!StraceFile)
         {
                 llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
@@ -2423,7 +2430,7 @@ void viewer_crash_callback()
 
         // Close the debug file
         close_debug();
-        gErrorBuffer.closeFile();
+        LLError::logToFile("");
 
         // Close the SecondLife.log
 
@@ -2461,7 +2468,7 @@ void viewer_crash_callback()
         command_str += "-user ";
         command_str += gUserServerName;
         command_str += " &";    // This backgrounds the command so system() doesn't block until the crashreporter exits.
-        system(command_str.c_str());
+        system(command_str.c_str());            /* Flawfinder: ignore */
                 
         // Sometimes signals don't seem to quit the viewer.  
         // Make sure we exit so as to not totally confuse the user.
@@ -2495,7 +2502,7 @@ void viewer_crash_callback()
                 pid_t pid = fork();
                 if (pid == 0)
                 { // child
-                        execv(cmd.c_str(), cmdargv);
+                        execv(cmd.c_str(), cmdargv);            /* Flawfinder: ignore */
                         llwarns << "execv failure when trying to start " << cmd << llendl;
                         _exit(1); // avoid atexit()
                 } else {
@@ -2523,19 +2530,89 @@ void viewer_crash_callback()
 
 
 
-BOOL init_vfs_viewer()
+BOOL init_cache()
 {
+        gPurgeCache = FALSE;
+        // Purge cache if user requested it
+        if (gSavedSettings.getBOOL("PurgeCacheOnStartup") ||
+                gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
+        {
+                gSavedSettings.setBOOL("PurgeCacheOnNextStartup", FALSE);
+                gPurgeCache = TRUE;
+        }
+        // Purge cache if it belongs to an old version
+        else
+        {
+                static const S32 cache_version = 5;
+                if (gSavedSettings.getS32("LocalCacheVersion") != cache_version)
+                {
+                        gPurgeCache = TRUE;
+                        gSavedSettings.setS32("LocalCacheVersion", cache_version);
+                }
+        }
+        
+        // Setup and verify the cache location
+        LLString cache_location = gSavedSettings.getString("CacheLocation");
+        LLString new_cache_location = gSavedSettings.getString("NewCacheLocation");
+        if (new_cache_location != cache_location)
+        {
+                gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
+                purge_cache(); // purge old cache
+                gSavedSettings.setString("CacheLocation", new_cache_location);
+        }
+        
+        if (!gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")))
+        {
+                llwarns << "Unable to set cache location" << llendl;
+                gSavedSettings.setString("CacheLocation", "");
+        }
+        
+        if (gPurgeCache)
+        {
+                LLSplashScreen::update("Clearing cache...");
+                purge_cache();
+        }
+
+        LLSplashScreen::update("Initializing Texture Cache...");
+        
+        // Init the texture cache
+        // Allocate 80% of the cache size for textures
+        BOOL read_only = gSecondInstance ? TRUE : FALSE;
+        const S32 MB = 1024*1024;
+        S64 cache_size = (S64)(gSavedSettings.getU32("CacheSize")) * MB;
+        const S64 MAX_CACHE_SIZE = 1024*MB;
+        cache_size = llmin(cache_size, MAX_CACHE_SIZE);
+        S64 texture_cache_size = ((cache_size * 8)/10);
+        S64 extra = gTextureCache->initCache(LL_PATH_CACHE, texture_cache_size, read_only);
+        texture_cache_size -= extra;
+
+        LLSplashScreen::update("Initializing VFS...");
+        
+        // Init the VFS
+        S64 vfs_size = cache_size - texture_cache_size;
+        const S64 MAX_VFS_SIZE = 1024 * MB; // 1 GB
+        vfs_size = llmin(vfs_size, MAX_VFS_SIZE);
+        vfs_size = (vfs_size / MB) * MB; // make sure it is MB aligned
+        U32 vfs_size_u32 = (U32)vfs_size;
+        U32 old_vfs_size = gSavedSettings.getU32("VFSOldSize") * MB;
+        bool resize_vfs = (vfs_size_u32 != old_vfs_size);
+        if (resize_vfs)
+        {
+                gSavedSettings.setU32("VFSOldSize", vfs_size_u32/MB);
+        }
+        llinfos << "VFS CACHE SIZE: " << vfs_size/(1024*1024) << " MB" << llendl;
+        
         // This has to happen BEFORE starting the vfs
         //time_t        ltime;
-        srand(time(NULL));
+        srand(time(NULL));              /* Flawfinder: ignore */
         U32 old_salt = gSavedSettings.getU32("VFSSalt");
         U32 new_salt;
-        char old_vfs_data_file[LL_MAX_PATH];
-        char old_vfs_index_file[LL_MAX_PATH];
-        char new_vfs_data_file[LL_MAX_PATH];
-        char new_vfs_index_file[LL_MAX_PATH];
-        char static_vfs_index_file[LL_MAX_PATH];
-        char static_vfs_data_file[LL_MAX_PATH];
+        char old_vfs_data_file[LL_MAX_PATH];            /* Flawfinder: ignore */
+        char old_vfs_index_file[LL_MAX_PATH];   /* Flawfinder: ignore */                
+        char new_vfs_data_file[LL_MAX_PATH];            /* Flawfinder: ignore */
+        char new_vfs_index_file[LL_MAX_PATH];   /* Flawfinder: ignore */
+        char static_vfs_index_file[LL_MAX_PATH];        /* Flawfinder: ignore */
+        char static_vfs_data_file[LL_MAX_PATH]; /* Flawfinder: ignore */
 
         if (gMultipleViewersOK)
         {
@@ -2550,7 +2627,7 @@ BOOL init_vfs_viewer()
                 } while( new_salt == old_salt );
         }
 
-        sprintf(old_vfs_data_file,  "%s%u",
+        snprintf(old_vfs_data_file,  LL_MAX_PATH, "%s%u",               /* Flawfinder: ignore */
                 gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_DATA_FILE_BASE).c_str(),
                 old_salt);
 
@@ -2571,10 +2648,10 @@ BOOL init_vfs_viewer()
                 std::string found_file;
                 if (gDirUtilp->getNextFileInDir(dir, mask, found_file, FALSE))
                 {
-                        sprintf(old_vfs_data_file, "%s%s%s", dir.c_str(), gDirUtilp->getDirDelimiter().c_str(), found_file.c_str());
+                        snprintf(old_vfs_data_file, LL_MAX_PATH, "%s%s%s", dir.c_str(), gDirUtilp->getDirDelimiter().c_str(), found_file.c_str());              /* Flawfinder: ignore */
 
                         S32 start_pos;
-                        S32 length = strlen(found_file.c_str());
+                        S32 length = strlen(found_file.c_str());                /* Flawfinder: ignore*/
                         for (start_pos = length - 1; start_pos >= 0; start_pos--)
                         {
                                 if (found_file[start_pos] == '.')
@@ -2592,7 +2669,7 @@ BOOL init_vfs_viewer()
                 }
         }
 
-        sprintf(old_vfs_index_file,  "%s%u",
+        snprintf(old_vfs_index_file, LL_MAX_PATH, "%s%u",               /* Flawfinder: ignore */
                         gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_INDEX_FILE_BASE).c_str(),
                         old_salt);
 
@@ -2623,32 +2700,25 @@ BOOL init_vfs_viewer()
                 gDirUtilp->deleteFilesInDir(dir, mask);
         }
 
-        sprintf(new_vfs_data_file,  "%s%u",
+        snprintf(new_vfs_data_file, LL_MAX_PATH, "%s%u",                /* Flawfinder: ignore */
                 gDirUtilp->getExpandedFilename(LL_PATH_CACHE,VFS_DATA_FILE_BASE).c_str(),
                 new_salt);
 
-        sprintf(new_vfs_index_file, "%s%u", gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_INDEX_FILE_BASE).c_str(),
+        snprintf(new_vfs_index_file, LL_MAX_PATH, "%s%u", gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_INDEX_FILE_BASE).c_str(),           /* Flawfinder: ignore */
                 new_salt);
 
 
-        strcpy(static_vfs_data_file, gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_data.db2").c_str());
-        strcpy(static_vfs_index_file, gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_index.db2").c_str());
-
-        U32 vfs_size = gSavedSettings.getU32("VFSSize");
-        if (vfs_size > 4)
-        {
-                llwarns << "Invalid VFS size" << llendl;
-                gSavedSettings.setU32("VFSSize", 2);
-                vfs_size = 2;
-        }
+        strncpy(static_vfs_data_file, gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_data.db2").c_str(), LL_MAX_PATH -1);          /* Flawfinder: ignore */
+        static_vfs_data_file[LL_MAX_PATH -1] = '\0';
+        strncpy(static_vfs_index_file, gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"static_index.db2").c_str(), LL_MAX_PATH -1);                /* Flawfinder: ignore */
+        static_vfs_index_file[LL_MAX_PATH -1] = '\0';
 
-        if (gSavedSettings.getU32("VFSOldSize") != vfs_size)
+        if (resize_vfs)
         {
                 llinfos << "Removing old vfs and re-sizing" << llendl;
                 
                 LLFile::remove(old_vfs_data_file);
                 LLFile::remove(old_vfs_index_file);
-                gSavedSettings.setU32("VFSOldSize", vfs_size);
         }
         else if (old_salt != new_salt)
         {
@@ -2662,16 +2732,15 @@ BOOL init_vfs_viewer()
         // Startup the VFS...
         gSavedSettings.setU32("VFSSalt", new_salt);
 
-        U32 presize = VFS_SIZE_MAP[gSavedSettings.getU32("VFSSize")];
         // Don't remove VFS after viewer crashes.  If user has corrupt data, they can reinstall. JC
-        gVFS = new LLVFS(new_vfs_index_file, new_vfs_data_file, FALSE, presize, FALSE);
+        gVFS = new LLVFS(new_vfs_index_file, new_vfs_data_file, FALSE, vfs_size_u32, FALSE);
         if( VFSVALID_BAD_CORRUPT == gVFS->getValidState() )
         {
                 // Try again with fresh files 
                 // (The constructor deletes corrupt files when it finds them.)
                 llwarns << "VFS corrupt, deleted.  Making new VFS." << llendl;
                 delete gVFS;
-                gVFS = new LLVFS(new_vfs_index_file, new_vfs_data_file, FALSE, presize, FALSE);
+                gVFS = new LLVFS(new_vfs_index_file, new_vfs_data_file, FALSE, vfs_size_u32, FALSE);
         }
 
         gStaticVFS = new LLVFS(static_vfs_index_file, static_vfs_data_file, TRUE, 0, FALSE);
@@ -2694,7 +2763,7 @@ OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn)
 {
         OSErr result = noErr;
         DescType actualType;
-        char buffer[1024];
+        char buffer[1024];              /* Flawfinder: ignore */
         Size size;
         
         result = AEGetParamPtr (
@@ -2797,7 +2866,7 @@ OSStatus DisplayReleaseNotes(void)
 
                 LLString releaseNotesText;
                 
-                LLString::read(releaseNotesText, "releasenotes.txt");
+                LLString::read(releaseNotesText, "releasenotes.txt");           /* Flawfinder: ignore*/
 
                 err = HIViewFindByID(HIViewGetRoot(window), id, &textView);
                 
@@ -2982,10 +3051,11 @@ void save_final_snapshot(void*)
                 gAgent.changeCameraToThirdPerson( FALSE );      // don't animate, need immediate switch
                 gSavedSettings.setBOOL("ShowParcelOwners", FALSE);
                 idle();
-                char temp_str[MAX_PATH];
-                strcpy (temp_str,gDirUtilp->getLindenUserDir().c_str());
-                strcat (temp_str,"/");
-                strcat (temp_str,SCREEN_LAST_FILENAME);
+                char temp_str[MAX_PATH];                /* Flawfinder: ignore */
+                strncpy (temp_str,gDirUtilp->getLindenUserDir().c_str(), MAX_PATH -1);          /* Flawfinder: ignore */
+                temp_str[MAX_PATH -1] = '\0';
+                strcat (temp_str,"/");          /* Flawfinder: ignore */
+                strcat (temp_str,SCREEN_LAST_FILENAME);         /* Flawfinder: ignore */
                 gViewerWindow->saveSnapshot(temp_str, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, TRUE);
                 gHaveSavedSnapshot = TRUE;
         }
@@ -3089,8 +3159,8 @@ void idle_shutdown()
                 S32 finished_uploads = total_uploads - pending_uploads;
                 F32 percent = 100.f * finished_uploads / total_uploads;
                 gViewerWindow->setProgressPercent(percent);
-                char buffer[MAX_STRING];
-                sprintf(buffer, "Saving final data...");
+                char buffer[MAX_STRING];                /* Flawfinder: ignore */
+                snprintf(buffer, MAX_STRING, "Saving final data...");           /* Flawfinder: ignore */
                 gViewerWindow->setProgressString(buffer);
                 return;
         }
@@ -3164,6 +3234,7 @@ void update_statistics(U32 frame_count)
                         gViewerStats->incStat(LLViewerStats::ST_TOOLBOX_SECONDS, gFrameIntervalSeconds);
                 }
         }
+        gViewerStats->setStat(LLViewerStats::ST_ENABLE_VBO, (F64)gSavedSettings.getBOOL("RenderVBOEnable"));
         gViewerStats->setStat(LLViewerStats::ST_LIGHTING_DETAIL, (F64)gSavedSettings.getS32("RenderLightingDetail"));
         gViewerStats->setStat(LLViewerStats::ST_DRAW_DIST, (F64)gSavedSettings.getF32("RenderFarClip"));
         gViewerStats->setStat(LLViewerStats::ST_CHAT_BUBBLES, (F64)gSavedSettings.getBOOL("UseChatBubbles"));
@@ -3193,10 +3264,7 @@ void update_statistics(U32 frame_count)
                 gViewerStats->mSimPingStat.addValue(10000);
         }
 
-        if (!gViewerWindow->renderingFastFrame())
-        {
-                gViewerStats->mFPSStat.addValue(1);
-        }
+        gViewerStats->mFPSStat.addValue(1);
         F32 layer_bits = (F32)(gVLManager.getLandBits() + gVLManager.getWindBits() + gVLManager.getCloudBits());
         gViewerStats->mLayersKBitStat.addValue(layer_bits/1024.f);
         gViewerStats->mObjectKBitStat.addValue(gObjectBits/1024.f);
@@ -3249,11 +3317,11 @@ void update_statistics(U32 frame_count)
 
         // Argh!  Shouldn't be doing the rendering here, it should be in a UI class!
         
-        static char wind_vel_text[MAX_TEXT_LENGTH];
-        static char wind_vector_text[MAX_TEXT_LENGTH];
-        static char rwind_vel_text[MAX_TEXT_LENGTH];
-        static char rwind_vector_text[MAX_TEXT_LENGTH];
-        static char audio_text[MAX_TEXT_LENGTH];
+        static char wind_vel_text[MAX_TEXT_LENGTH];             /* Flawfinder: ignore */
+        static char wind_vector_text[MAX_TEXT_LENGTH];          /* Flawfinder: ignore */
+        static char rwind_vel_text[MAX_TEXT_LENGTH];            /* Flawfinder: ignore */
+        static char rwind_vector_text[MAX_TEXT_LENGTH];         /* Flawfinder: ignore */
+        static char audio_text[MAX_TEXT_LENGTH];                /* Flawfinder: ignore */
 
         // Now draw the text
         LLGLSUIDefault gls_ui;
@@ -3269,46 +3337,46 @@ void update_statistics(U32 frame_count)
 
         if (gDisplayCameraPos)
         {
-                char camera_view_text[MAX_TEXT_LENGTH];
-                char camera_center_text[MAX_TEXT_LENGTH];
-                char agent_view_text[MAX_TEXT_LENGTH];
-                char agent_left_text[MAX_TEXT_LENGTH];
-                char agent_center_text[MAX_TEXT_LENGTH];
-                char agent_root_center_text[MAX_TEXT_LENGTH];
+                char camera_view_text[MAX_TEXT_LENGTH];         /* Flawfinder: ignore */
+                char camera_center_text[MAX_TEXT_LENGTH];       /* Flawfinder: ignore */
+                char agent_view_text[MAX_TEXT_LENGTH];          /* Flawfinder: ignore */
+                char agent_left_text[MAX_TEXT_LENGTH];          /* Flawfinder: ignore */
+                char agent_center_text[MAX_TEXT_LENGTH];        /* Flawfinder: ignore */
+                char agent_root_center_text[MAX_TEXT_LENGTH];   /* Flawfinder: ignore */
 
                 LLVector3d tvector; // Temporary vector to hold data for printing.
 
                 // Update camera center, camera view, wind info every other frame
                 tvector = gAgent.getPositionGlobal();
-                sprintf(agent_center_text, "AgentCenter  %f %f %f", 
+                snprintf(agent_center_text, MAX_TEXT_LENGTH, "AgentCenter  %f %f %f",           /* Flawfinder: ignore */
                         (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
 
                 if (gAgent.getAvatarObject())
                 {
                         tvector = gAgent.getPosGlobalFromAgent(gAgent.getAvatarObject()->mRoot.getWorldPosition());
-                        sprintf(agent_root_center_text, "AgentRootCenter %f %f %f", 
+                        snprintf(agent_root_center_text, MAX_TEXT_LENGTH, "AgentRootCenter %f %f %f",           /* Flawfinder: ignore */
                                 (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
                 }
                 else
                 {
-                        sprintf(agent_root_center_text, "---");
+                        snprintf(agent_root_center_text, MAX_TEXT_LENGTH, "---");               /* Flawfinder: ignore */
                 }
 
 
                 tvector = LLVector4(gAgent.getFrameAgent().getAtAxis());
-                sprintf(agent_view_text, "AgentAtAxis  %f %f %f", 
+                snprintf(agent_view_text, MAX_TEXT_LENGTH, "AgentAtAxis  %f %f %f",             /* Flawfinder: ignore */
                         (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
 
                 tvector = LLVector4(gAgent.getFrameAgent().getLeftAxis());
-                sprintf(agent_left_text, "AgentLeftAxis  %f %f %f", 
+                snprintf(agent_left_text, MAX_TEXT_LENGTH, "AgentLeftAxis  %f %f %f",           /* Flawfinder: ignore */
                         (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
 
                 tvector = gAgent.getCameraPositionGlobal();
-                sprintf(camera_center_text, "CameraCenter %f %f %f",
+                snprintf(camera_center_text, MAX_TEXT_LENGTH, "CameraCenter %f %f %f",          /* Flawfinder: ignore */
                         (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
 
                 tvector = LLVector4(gCamera->getAtAxis());
-                sprintf(camera_view_text, "CameraAtAxis    %f %f %f", 
+                snprintf(camera_view_text, MAX_TEXT_LENGTH, "CameraAtAxis    %f %f %f",                 /* Flawfinder: ignore */
                         (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
                 
                 add_text(xpos, ypos, agent_center_text);  ypos += y_inc;
@@ -3321,10 +3389,10 @@ void update_statistics(U32 frame_count)
 
         if (gDisplayWindInfo)
         {
-                sprintf(wind_vel_text, "Wind velocity %.2f m/s", gWindVec.magVec());
-                sprintf(wind_vector_text, "Wind vector   %.2f %.2f %.2f", gWindVec.mV[0], gWindVec.mV[1], gWindVec.mV[2]);
-                sprintf(rwind_vel_text, "RWind vel %.2f m/s", gRelativeWindVec.magVec());
-                sprintf(rwind_vector_text, "RWind vec   %.2f %.2f %.2f", gRelativeWindVec.mV[0], gRelativeWindVec.mV[1], gRelativeWindVec.mV[2]);
+                snprintf(wind_vel_text, MAX_TEXT_LENGTH, "Wind velocity %.2f m/s", gWindVec.magVec());                                                                                                          /* Flawfinder: ignore */
+                snprintf(wind_vector_text, MAX_TEXT_LENGTH, "Wind vector   %.2f %.2f %.2f", gWindVec.mV[0], gWindVec.mV[1], gWindVec.mV[2]);                                                            /* Flawfinder: ignore */
+                snprintf(rwind_vel_text, MAX_TEXT_LENGTH, "RWind vel %.2f m/s", gRelativeWindVec.magVec());                                                                                                     /* Flawfinder: ignore */
+                snprintf(rwind_vector_text, MAX_TEXT_LENGTH, "RWind vec   %.2f %.2f %.2f", gRelativeWindVec.mV[0], gRelativeWindVec.mV[1], gRelativeWindVec.mV[2]);                             /* Flawfinder: ignore */
 
                 add_text(xpos, ypos, wind_vel_text);  ypos += y_inc;
                 add_text(xpos, ypos, wind_vector_text);  ypos += y_inc;
@@ -3335,14 +3403,14 @@ void update_statistics(U32 frame_count)
         {
                 if (gAudiop)
                 {
-                        sprintf(audio_text, "Audio for wind: %d", gAudiop->isWindEnabled());
+                        snprintf(audio_text, MAX_TEXT_LENGTH, "Audio for wind: %d", gAudiop->isWindEnabled());          /* Flawfinder: ignore */
                 }
                 add_text(xpos, ypos, audio_text);  ypos += y_inc;
         }
         if (gDisplayFOV)
         {
-                char fov_string[MAX_TEXT_LENGTH];
-                sprintf(fov_string, "FOV: %2.1f deg", RAD_TO_DEG * gCamera->getView());
+                char fov_string[MAX_TEXT_LENGTH];               /* Flawfinder: ignore */
+                snprintf(fov_string, MAX_TEXT_LENGTH, "FOV: %2.1f deg", RAD_TO_DEG * gCamera->getView());               /* Flawfinder: ignore */
                 add_text(xpos, ypos, fov_string);
                 ypos += y_inc;
         }
@@ -3352,6 +3420,14 @@ void update_statistics(U32 frame_count)
                 add_text(xpos, ypos, "Shaders Disabled");
                 ypos += y_inc;
         }
+        add_text(xpos, ypos, (char*) llformat("%d MB Vertex Data", LLVertexBuffer::sAllocatedBytes/(1024*1024)).c_str());
+        ypos += y_inc;
+
+        add_text(xpos, ypos, (char*) llformat("%d Pending Lock", LLVertexBuffer::sLockedList.size()).c_str());
+        ypos += y_inc;
+
+        add_text(xpos, ypos, (char*) llformat("%d Vertex Buffers", LLVertexBuffer::sGLCount).c_str());
+        ypos += y_inc;
 #endif
         if (LLPipeline::getRenderParticleBeacons(NULL))
         {
@@ -3471,8 +3547,7 @@ void idle_network()
 
                 if (gPrintMessagesThisFrame)
                 {
-                        llinfos << "Decoded " << total_decoded
-                                << " msgs this frame!" << llendl;
+                        llinfos << "Decoded " << total_decoded << " msgs this frame!" << llendl;
                         gPrintMessagesThisFrame = FALSE;
                 }
         }
@@ -3530,9 +3605,9 @@ void idle()
         LLControlBase::updateAllListeners();
 
         LLFrameTimer::updateFrameTime();
+        LLEventTimer::updateClass();
         LLCriticalDamp::updateInterpolants();
         LLMortician::updateClass();
-
         F32 dt_raw = idle_timer.getElapsedTimeAndResetF32();
 
         // Cap out-of-control frame times
@@ -3693,7 +3768,6 @@ void idle()
         {
 //              LLFastTimer t(LLFastTimer::FTM_IDLE_CB);
 
-                LLEventTimer::updateClass();
                 // Do event notifications if necessary.  Yes, we may want to move this elsewhere.
                 gEventNotifier.update();
                 
@@ -3737,8 +3811,6 @@ void idle()
                 gPipeline.resetDrawOrders();
         }
         {
-                //LLFastTimer t(LLFastTimer::FTM_TEMP1);
-        
                 // Handle pending gesture processing
                 gGestureManager.update();
 
@@ -3749,8 +3821,6 @@ void idle()
                 LLFastTimer t(LLFastTimer::FTM_OBJECTLIST_UPDATE); // Actually "object update"
                 gFrameStats.start(LLFrameStats::OBJECT_UPDATE);
                 
-                LLVolumeImplFlexible::resetUpdateBins();
-        
                 if (!(gLogoutRequestSent && gHaveSavedSnapshot))
                 {
                         gObjectList.update(gAgent, *gWorldp);
@@ -3816,8 +3886,9 @@ void idle()
 
         gWorldp->updateVisibilities();
         {
+                const F32 max_region_update_time = .001f; // 1ms
                 LLFastTimer t(LLFastTimer::FTM_REGION_UPDATE);
-                gWorldp->updateRegions();
+                gWorldp->updateRegions(max_region_update_time);
         }
         
         /////////////////////////
@@ -3827,8 +3898,6 @@ void idle()
 
         if (!gNoRender)
         {
-                gSky.updateFog(gCamera->getFar());
-
                 gWorldp->updateClouds(gFrameDTClamped);
                 gSky.propagateHeavenlyBodies(gFrameDTClamped);                          // moves sun, moon, and planets
 
@@ -3866,31 +3935,22 @@ void idle()
         //
         gFrameStats.start(LLFrameStats::IMAGE_UPDATE);
 
-        if (!gViewerWindow->renderingFastFrame())
-        {
-                LLFastTimer t(LLFastTimer::FTM_IMAGE_UPDATE);
-                
-                LLViewerImage::updateClass(gCamera->getVelocityStat()->getMean(),
-                                                                   gCamera->getAngularVelocityStat()->getMean());
+        LLFastTimer t(LLFastTimer::FTM_IMAGE_UPDATE);
+        
+        LLViewerImage::updateClass(gCamera->getVelocityStat()->getMean(),
+                                                                gCamera->getAngularVelocityStat()->getMean());
 
-                gBumpImageList.updateImages();  // must be called before gImageList version so that it's textures are thrown out first.
+        gBumpImageList.updateImages();  // must be called before gImageList version so that it's textures are thrown out first.
 
-                const F32 max_image_decode_time = 0.005f; // 5 ms decode time
-                gImageList.updateImages(max_image_decode_time);
-                stop_glerror();
-        }
+        const F32 max_image_decode_time = 0.005f; // 5 ms decode time
+        gImageList.updateImages(max_image_decode_time);
+        stop_glerror();
 
         //////////////////////////////////////
         //
         // Sort and cull in the new renderer are moved to pipeline.cpp
         // Here, particles are updated and drawables are moved.
         //
-        if (gViewerWindow->renderingFastFrame() || gViewerWindow->firstFastFrame())
-        {
-                gFrameStats.start(LLFrameStats::UPDATE_MOVE);
-                gFrameStats.start(LLFrameStats::UPDATE_CULL);
-                gFrameStats.start(LLFrameStats::UPDATE_GEOM);
-        }
         
         if (!gNoRender)
         {
@@ -3899,9 +3959,6 @@ void idle()
 
                 gFrameStats.start(LLFrameStats::UPDATE_PARTICLES);
                 gWorldp->updateParticles();
-                
-                //now that transforms are updated, update flexible objects
-                LLVolumeImplFlexible::doFlexibleUpdateBins();
         }
         stop_glerror();
 
@@ -3909,7 +3966,6 @@ void idle()
 
         // objects and camera should be in sync, do LOD calculations now
         {
-//              LLFastTimer t(LLFastTimer::FTM_OBJECTLIST_UPDATE); // Actually "object update"
                 LLFastTimer t(LLFastTimer::FTM_LOD_UPDATE);
                 gObjectList.updateApparentAngles(gAgent);
         }
@@ -4018,6 +4074,35 @@ F32 mouse_y_from_center(S32 y)
 
 /////////////////////////////////////////////////////////
 
+class AudioSettingsListener: public LLSimpleListener
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                // Note: Ignore the specific event value, look up the ones we want
+                if (!gAudiop) return true;
+                gAudiop->setDopplerFactor(gSavedSettings.getF32("AudioLevelDoppler"));
+                gAudiop->setDistanceFactor(gSavedSettings.getF32("AudioLevelDistance")); 
+#ifdef kAUDIO_ENABLE_WIND
+                // Wind Gain
+                gAudiop->mMaxWindGain = gSavedSettings.getF32("AudioLevelWind");
+                // Rolloff
+                LLVector3 camera_pos = gAgent.getCameraPositionAgent();
+                LLViewerRegion* region = gAgent.getRegion();
+                F32 camera_water_height = region ? camera_pos.mV[VZ] - region->getWaterHeight() : 0.f;
+                if (camera_water_height < 0.f)
+                {
+                        gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff") * LL_ROLLOFF_MULTIPLIER_UNDER_WATER);
+                }
+                else 
+                {
+                        gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
+                }
+#endif
+                return true;
+        }
+};
+static AudioSettingsListener audio_settings_listener;
+
 void init_audio() 
 {
         if (!gAudiop) 
@@ -4086,6 +4171,8 @@ void init_audio()
 #ifdef kAUDIO_ENABLE_WIND
         gAudiop->enableWind(!mute_audio);
         gAudiop->mMaxWindGain = gSavedSettings.getF32("AudioLevelWind");
+        gSavedSettings.getControl("AudioLevelWind")->addListener(&audio_settings_listener);
+        gSavedSettings.getControl("AudioLevelRolloff")->addListener(&audio_settings_listener);
         // don't use the setter setMaxWindGain() because we don't
         // want to screw up the fade-in on startup by setting actual source gain
         // outside the fade-in.
@@ -4094,8 +4181,10 @@ void init_audio()
         gAudiop->setMasterGain ( gSavedSettings.getF32 ( "AudioLevelMaster" ) );
 
         gAudiop->setDopplerFactor(gSavedSettings.getF32("AudioLevelDoppler"));
-        gAudiop->setDistanceFactor(gSavedSettings.getF32("AudioLevelDistance"));
-        gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
+        gSavedSettings.getControl("AudioLevelDoppler")->addListener(&audio_settings_listener);
+        gAudiop->setDistanceFactor(gSavedSettings.getF32("AudioLevelDistance")); 
+        gSavedSettings.getControl("AudioLevelDistance")->addListener(&audio_settings_listener);
+        gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
         gAudiop->setMuted(mute_audio);
 }
 
@@ -4647,16 +4736,6 @@ class LLNightBrightnessListener: public LLSimpleListener
 };
 static LLNightBrightnessListener night_brightness_listener;
 
-class LLUseAGPListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gPipeline.setUseAGP(event->getValue().asBoolean() && gGLManager.mHasAnyAGP);                            
-                return true;
-        }
-};
-static LLUseAGPListener use_agp_listener;
-
 class LLFogRatioListener: public LLSimpleListener
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -4858,6 +4937,16 @@ class LLAudioMuteListener: public LLSimpleListener
 
 static LLAudioMuteListener audio_mute_listener;
 
+class LLUseOcclusionListener: public LLSimpleListener
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLPipeline::sUseOcclusion = (event->getValue().asBoolean() && gGLManager.mHasOcclusionQuery &&
+                        !gUseWireframe);
+                return true;
+        }
+};
+static LLUseOcclusionListener use_occlusion_listener;
 
 class LLNumpadControlListener: public LLSimpleListener
 {
@@ -4873,6 +4962,26 @@ class LLNumpadControlListener: public LLSimpleListener
 
 static LLNumpadControlListener numpad_control_listener;
 
+class LLRenderUseVBOListener: public LLSimpleListener
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gPipeline.setUseVBO(event->getValue().asBoolean());
+                return true;
+        }
+};
+static LLRenderUseVBOListener render_use_vbo_listener;
+
+class LLRenderLightingDetailListener: public LLSimpleListener
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gPipeline.setLightingDetail(event->getValue().asInteger());
+                return true;
+        }
+};
+static LLRenderLightingDetailListener render_lighting_detail_listener;
+
 // Use these strictly for things that are constructed at startup,
 // or for things that are performance critical.  JC
 void saved_settings_to_globals()
@@ -4894,7 +5003,6 @@ void saved_settings_to_globals()
         LLVOSky::sNighttimeBrightness           = gSavedSettings.getF32("RenderNightBrightness");
         
         LLImageGL::sGlobalUseAnisotropic        = gSavedSettings.getBOOL("RenderAnisotropic");
-        gRenderLightGlows                                       = gSavedSettings.getBOOL("RenderLightGlows");
         LLVOVolume::sLODFactor                          = gSavedSettings.getF32("RenderVolumeLODFactor");
         LLVOVolume::sDistanceFactor                     = 1.f-LLVOVolume::sLODFactor * 0.1f;
         LLVolumeImplFlexible::sUpdateFactor = gSavedSettings.getF32("RenderFlexTimeFactor");
@@ -4908,9 +5016,6 @@ void saved_settings_to_globals()
         LLSelectMgr::sRectSelectInclusive       = gSavedSettings.getBOOL("RectangleSelectInclusive");
         LLSelectMgr::sRenderHiddenSelections = gSavedSettings.getBOOL("RenderHiddenSelections");
         LLSelectMgr::sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius");
-//      LLViewerObject::sUseSharedDrawables = gSavedSettings.getBOOL("RenderUseSharedDrawables");
-        BOOL use_occlusion = gSavedSettings.getBOOL("UseOcclusion");
-        gPipeline.setUseOcclusionCulling( use_occlusion );
 
         gFrameStats.setTrackStats(gSavedSettings.getBOOL("StatsSessionTrackFrameStats"));
         gAgentPilot.mNumRuns            = gSavedSettings.getS32("StatsNumRuns");
@@ -4922,7 +5027,6 @@ void saved_settings_to_globals()
         gAFKTimeout = gSavedSettings.getF32("AFKTimeout");
         gMouseSensitivity = gSavedSettings.getF32("MouseSensitivity");
         gInvertMouse = gSavedSettings.getBOOL("InvertMouse");
-        gAvatarBacklight = gSavedSettings.getBOOL("AvatarBacklight");
         gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
         gMapScale = gSavedSettings.getF32("MapScale");
         gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
@@ -4941,6 +5045,7 @@ void saved_settings_to_globals()
         gSavedSettings.getControl("RenderTerrainDetail")->addListener(&terrain_detail_listener);
         gSavedSettings.getControl("RenderRippleWater")->addListener(&set_shader_listener);
         gSavedSettings.getControl("RenderAvatarVP")->addListener(&set_shader_listener);
+        gSavedSettings.getControl("RenderDynamicReflections")->addListener(&set_shader_listener);
         gSavedSettings.getControl("RenderAvatarMode")->addListener(&set_shader_listener);
         gSavedSettings.getControl("RenderVolumeLODFactor")->addListener(&volume_lod_listener);
         gSavedSettings.getControl("RenderAvatarLODFactor")->addListener(&avatar_lod_listener);
@@ -4949,7 +5054,6 @@ void saved_settings_to_globals()
         gSavedSettings.getControl("ThrottleBandwidthKBPS")->addListener(&bandwidth_listener);
         gSavedSettings.getControl("RenderGamma")->addListener(&gamma_listener);
         gSavedSettings.getControl("RenderNightBrightness")->addListener(&night_brightness_listener);
-        gSavedSettings.getControl("RenderUseAGP")->addListener(&use_agp_listener);
         gSavedSettings.getControl("RenderFogRatio")->addListener(&fog_ratio_listener);
         gSavedSettings.getControl("RenderMaxPartCount")->addListener(&max_partCount_listener);
         gSavedSettings.getControl("AvatarCompositeLimit")->addListener(&composite_limit_listener);
@@ -4957,12 +5061,13 @@ void saved_settings_to_globals()
         gSavedSettings.getControl("ChatFontSize")->addListener(&chat_font_size_listener);
         gSavedSettings.getControl("ChatPersistTime")->addListener(&chat_persist_time_listener);
         gSavedSettings.getControl("ConsoleMaxLines")->addListener(&console_max_lines_listener);
-
+        gSavedSettings.getControl("UseOcclusion")->addListener(&use_occlusion_listener);
         gSavedSettings.getControl("AudioLevelMaster")->addListener(&master_audio_listener);
         gSavedSettings.getControl("AudioStreamingMusic")->addListener(&audio_stream_music_listener);
         gSavedSettings.getControl("AudioStreamingVideo")->addListener(&audio_stream_media_listener);
         gSavedSettings.getControl("MuteAudio")->addListener(&audio_mute_listener);
-
+        gSavedSettings.getControl("RenderVBOEnable")->addListener(&render_use_vbo_listener);
+        gSavedSettings.getControl("RenderLightingDetail")->addListener(&render_lighting_detail_listener);
         gSavedSettings.getControl("NumpadControl")->addListener(&numpad_control_listener);
 
         // gAgent.init() also loads from saved settings.
@@ -4970,7 +5075,6 @@ void saved_settings_to_globals()
 
 void cleanup_saved_settings()
 {
-        gSavedSettings.setBOOL("RenderLightGlows", gRenderLightGlows);
         gSavedSettings.setBOOL("MouseSun", FALSE);
 
         gSavedSettings.setBOOL("FlyBtnState", FALSE);
@@ -4985,9 +5089,7 @@ void cleanup_saved_settings()
                 
         gSavedSettings.setBOOL("AllowAFK", gAllowAFK);
         gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates);
-        BOOL use_occlusion = gPipeline.getUseOcclusionCulling();
-        gSavedSettings.setBOOL( "UseOcclusion", use_occlusion );
-
+        
         if (!gNoRender)
         {
                 if (gDebugView)
@@ -5050,7 +5152,7 @@ void write_debug(const char *str)
         {
                 std::string debug_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log");
                 llinfos << "Opening debug file " << debug_filename << llendl;
-                gDebugFile = LLFile::fopen(debug_filename.c_str(), "w");
+                gDebugFile = LLFile::fopen(debug_filename.c_str(), "w");                /* Flawfinder: ignore */
         if (!gDebugFile)
         {
                     llinfos << "Opening debug file " << debug_filename << " failed. Using stderr." << llendl;
@@ -5117,8 +5219,6 @@ void output_statistics(void*)
         llinfos << "Memory Usage:" << llendl;
         llinfos << "--------------------------------" << llendl;
         llinfos << "Pipeline:" << llendl;
-        S32 total_usage = 0;
-        total_usage += gPipeline.getMemUsage(TRUE);
         llinfos << llendl;
 
 #if LL_SMARTHEAP
@@ -5464,8 +5564,10 @@ void release_signals()
 
 void purge_cache()
 {
-        char mask[LL_MAX_PATH];
-        sprintf(mask, "%s*.*", gDirUtilp->getDirDelimiter().c_str());
+        llinfos << "Purging Texture Cache..." << llendl;
+        gTextureCache->purgeCache(LL_PATH_CACHE);
+        llinfos << "Purging Cache..." << llendl;
+        std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
         gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
 }
 
@@ -5506,43 +5608,43 @@ int parse_args(int argc, char **argv)
                 else if (!strcmp(argv[j], "--aditi"))
                 {
                         gUserServerChoice = USERSERVER_ADITI;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--agni"))
                 {
                         gUserServerChoice = USERSERVER_AGNI;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--dmz"))
                 {
                         gUserServerChoice = USERSERVER_DMZ;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--siva"))
                 {
                         gUserServerChoice = USERSERVER_SIVA;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--shakti"))
                 {
                         gUserServerChoice = USERSERVER_SHAKTI;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--durga"))
                 {
                         gUserServerChoice = USERSERVER_DURGA;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--soma"))
                 {
                         gUserServerChoice = USERSERVER_SOMA;
-                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        snprintf(gUserServerName, MAX_STRING, "%s", gUserServerDomainName[gUserServerChoice].mName);            /* Flawfinder: ignore */
                         gConnectToSomething = TRUE;
                 }
                 else if (!strcmp(argv[j], "--ganga"))
@@ -5551,6 +5653,12 @@ int parse_args(int argc, char **argv)
                         sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
                         gConnectToSomething = TRUE;
                 }
+                else if (!strcmp(argv[j], "--vaak"))
+                {
+                        gUserServerChoice = USERSERVER_VAAK;
+                        sprintf(gUserServerName,"%s", gUserServerDomainName[gUserServerChoice].mName);
+                        gConnectToSomething = TRUE;
+                }
                 else if (!strcmp(argv[j], "--uma"))
                 {
                         gUserServerChoice = USERSERVER_UMA;
@@ -5562,7 +5670,7 @@ int parse_args(int argc, char **argv)
                         if (!strcmp(argv[j], "-"))
                         {
                                 gUserServerChoice = USERSERVER_LOCAL;
-                                sprintf(gUserServerName,"%s", LOOPBACK_ADDRESS_STRING);
+                                snprintf(gUserServerName, MAX_STRING, "%s", LOOPBACK_ADDRESS_STRING);           /* Flawfinder: ignore */
                         }
                         else
                         {
@@ -5570,7 +5678,7 @@ int parse_args(int argc, char **argv)
                                 ip_string.assign( argv[j] );
                                 LLString::trim(ip_string);
                                 gUserServer.setHostByName( ip_string.c_str() );
-                                snprintf(gUserServerName, MAX_STRING, "%s", ip_string.c_str());
+                                snprintf(gUserServerName, MAX_STRING, "%s", ip_string.c_str());         /* Flawfinder: ignore */
                         }
                         gConnectToSomething = TRUE;
                 }
@@ -5653,91 +5761,10 @@ int parse_args(int argc, char **argv)
                         gUserServer.invalidate();
                         gRunLocal = TRUE;
                 }
-                else if (!strcmp(argv[j], "-debugst") && (++j < argc)) 
-                {
-                        U32 err_val;
-                        sscanf(argv[j], "%d", &err_val);
-                        llinfos << "Enabling debug mask " << err_val << " (0x" << (1<<err_val) << ")" << llendl;
-                        gErrorStream.setDebugMask( 1<<err_val );
-                        gErrorStream.setLevel( LLErrorStream::DEBUG );
-                }
-                else if (!strcmp(argv[j], "-errmask") && (++j < argc)) 
-                {
-                        U32 err_mask;
-                        sscanf(argv[j], "%d", &err_mask);
-                        llinfos << "Setting error mask to " << err_mask << llendl;
-                        gErrorStream.setDebugMask( err_mask );
-                        gErrorStream.setLevel( LLErrorStream::DEBUG );
-                }
-                else if(!strcmp(argv[j], "-noutc"))
-                {
-                        gLogUTC = FALSE;
-                }
                 else if(!strcmp(argv[j], "-noinvlib"))
                 {
                         gRequestInventoryLibrary = FALSE;
                 }
-#if !LL_RELEASE_FOR_DOWNLOAD
-                else if(!strcmp(argv[j], "-logcontrol"))
-                {
-                        S32 control;
-                        S32 level;
-                        U32 debugmask;
-                        S32 time;
-                        S32 location;
-
-                        if (++j >= argc)
-                        {
-                                llwarns << "Missing <control> after -logcontrol" << llendl;
-                                return 1;
-                        }
-                        sscanf(argv[j], "%d", &control);
-
-                        if (++j >= argc)
-                        {
-                                llwarns << "Missing <level> after -logcontrol" << llendl;
-                                return 1;
-                        }
-                        sscanf(argv[j], "%d", &level);
-
-                        if (++j >= argc)
-                        {
-                                llwarns << "Missing <mask> after -logcontrol" << llendl;
-                                return 1;
-                        }
-                        sscanf(argv[j], "%u", &debugmask);
-
-                        if (++j >= argc)
-                        {
-                                llwarns << "Missing <time> after -logcontrol" << llendl;
-                                return 1;
-                        }
-                        sscanf(argv[j], "%d", &time);
-
-                        if (++j >= argc)
-                        {
-                                llwarns << "Missing <location> after -logcontrol" << llendl;
-                                return 1;
-                        }
-                        sscanf(argv[j], "%d", &location);
-
-                        if (LLErrorStream::MERGE == control)
-                        {
-                                gErrorStream.mergeLevel( LLErrorStream::ELevel(level) );
-                                gErrorStream.mergeDebugMask(debugmask);
-                                gErrorStream.mergeTime( BOOL(time) );
-                                gErrorStream.mergeLocation( BOOL(location) );
-                        }
-                        else
-                        {
-                                gErrorStream.setLevel( LLErrorStream::ELevel(level) );
-                                gErrorStream.setDebugMask(debugmask);
-                                gErrorStream.setTime( BOOL(time) );
-                                gErrorStream.setPrintLocation( BOOL(location) );
-                        }
-                        continue;
-                }
-#endif
                 else if (!strcmp(argv[j], "-log"))
                 {
                         gLogMessages = TRUE;
@@ -5746,14 +5773,11 @@ int parse_args(int argc, char **argv)
                 else if (!strcmp(argv[j], "-logfile") && (++j < argc)) 
                 {
                         // *NOTE: This buffer size is hard coded into scanf() below.
-                        char logfile[256];
-                        sscanf(argv[j], "%255s", logfile);
+                        char logfile[256];      /* Flawfinder: ignore */
+                        sscanf(argv[j], "%255s", logfile);      /* Flawfinder: ignore */
                         llinfos << "Setting log file to " << logfile << llendl;
                         LLFile::remove(logfile);
-                        if (!gErrorStream.setFile(logfile))
-                        {
-                                llinfos << "Error setting log file to " << logfile << llendl;
-                        }
+                        LLError::logToFile(logfile);
                 }
                 else if (!strcmp(argv[j], "-settings") && (++j < argc)) 
                 {
@@ -6022,7 +6046,7 @@ bool LLURLSimString::send_to_other_instance()
                 return false;
         }
 #if LL_WINDOWS
-        wchar_t window_class[256]; // Assume max length < 255 chars.
+        wchar_t window_class[256]; /* Flawfinder: ignore */   // Assume max length < 255 chars.
         mbstowcs(window_class, gWindowName.c_str(), 255);
         window_class[255] = 0;
         // Use the class instead of the window name.
@@ -6031,7 +6055,7 @@ bool LLURLSimString::send_to_other_instance()
         {
                 lldebugs << "Found other window with the name '" << gWindowTitle << "'" << llendl;
                 llurl_data url_data;
-                strncpy(url_data.mSimName, sInstance.mSimName.c_str(), DB_SIM_NAME_BUF_SIZE);
+                strncpy(url_data.mSimName, sInstance.mSimName.c_str(), DB_SIM_NAME_BUF_SIZE);           /* Flawfinder: ignore*/
                 url_data.mSimName[DB_SIM_NAME_BUF_SIZE - 1] = '\0';
                 url_data.mSimX = sInstance.mX;
                 url_data.mSimY = sInstance.mY;
@@ -6059,7 +6083,7 @@ void load_name_cache()
 
         std::string name_cache;
         name_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "name.cache");
-        FILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "r");
+        FILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "r");           /* Flawfinder: ignore*/
         if (name_cache_fp)
         {
                 gCacheName->importFile(name_cache_fp);
@@ -6073,7 +6097,7 @@ void save_name_cache()
 
         std::string name_cache;
         name_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "name.cache");
-        FILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "w");
+        FILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "w");           /* Flawfinder: ignore*/
         if (name_cache_fp)
         {
                 gCacheName->exportFile(name_cache_fp);
@@ -6167,8 +6191,8 @@ void disconnect_viewer(void *)
 // helper function for cleanup_app
 void remove_cache_files(const char* file_mask)
 {
-        char mask[LL_MAX_PATH];
-        sprintf(mask, "%s%s", gDirUtilp->getDirDelimiter().c_str(), file_mask);
+        char mask[LL_MAX_PATH];         /* Flawfinder: ignore */
+        snprintf(mask, LL_MAX_PATH, "%s%s", gDirUtilp->getDirDelimiter().c_str(), file_mask);           /* Flawfinder: ignore */
         gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "").c_str(), mask);
 }
 
@@ -6311,9 +6335,9 @@ void cleanup_app()
         llinfos << "Viewer disconnected" << llendflush;
 
         gDisconnectedImagep = NULL;
-        gStartImageGL = NULL;
+        release_start_screen(); // just in case
 
-        gErrorStream.setFixedBuffer(NULL);
+        LLError::logToFixedBuffer(NULL);
 
         llinfos << "Cleaning Up" << llendflush;
 
@@ -6323,9 +6347,6 @@ void cleanup_app()
         LLHUDObject::cleanupHUDObjects();
         llinfos << "HUD Objects cleaned up" << llendflush;
 
-        LLVOTreeNew::cleanupTextures();
-        llinfos << "Textures cleaned up" << llendflush;
-
         // End TransferManager before deleting systems it depends on (Audio, VFS, AssetStorage)
 #if 0 // this seems to get us stuck in an infinite loop...
         gTransferManager.cleanup();
@@ -6520,8 +6541,8 @@ void cleanup_app()
         if (gPurgeOnExit)
         {
                 llinfos << "Purging all cache files on exit" << llendflush;
-                char mask[LL_MAX_PATH];
-                sprintf(mask, "%s*.*", gDirUtilp->getDirDelimiter().c_str());
+                char mask[LL_MAX_PATH];         /* Flawfinder: ignore */
+                snprintf(mask, LL_MAX_PATH, "%s*.*", gDirUtilp->getDirDelimiter().c_str());             /* Flawfinder: ignore */
                 gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
         }
 
@@ -6529,6 +6550,37 @@ void cleanup_app()
         
         close_debug();
 
+        // Let threads finish
+        LLTimer idleTimer;
+        idleTimer.reset();
+        const F64 max_idle_time = 5.f; // 5 seconds
+        while(1)
+        {
+                S32 pending = 0;
+                pending += gTextureCache->update(1); // unpauses the worker thread
+                pending += gImageDecodeThread->update(1); // unpauses the image thread
+                pending += gTextureFetch->update(1); // unpauses the texture fetch thread
+                pending += LLVFSThread::updateClass(0);
+                pending += LLLFSThread::updateClass(0);
+                F64 idle_time = idleTimer.getElapsedTimeF64();
+                if (!pending || idle_time >= max_idle_time)
+                {
+                        llwarns << "Quitting with pending background tasks." << llendl;
+                        break;
+                }
+        }
+        
+        // Delete workers first
+        // shotdown all worker threads before deleting them in case of co-dependencies
+        gTextureCache->shutdown();
+        gTextureFetch->shutdown();
+        gImageDecodeThread->shutdown();
+        delete gTextureCache;
+        delete gTextureFetch;
+        delete gImageDecodeThread;
+
+        gImageList.shutdown(); // shutdown again in case a callback added something
+        
         // This should eventually be done in LLAppViewer
         LLImageJ2C::closeDSO();
         LLImageFormatted::cleanupClass();
@@ -6549,8 +6601,6 @@ void cleanup_app()
         delete gVFS;
         gVFS = NULL;
         
-        LLWorkerThread::cleanupClass();
-        
         // This will eventually be done in LLApp
         LLCommon::cleanupClass();
 }
@@ -6580,6 +6630,7 @@ void errorCallback(const std::string &error_string)
 #ifndef LL_RELEASE_FOR_DOWNLOAD
         OSMessageBox(error_string.c_str(), "Fatal Error", OSMB_OK);
 #endif
+        LLError::crashAndLoop(error_string);
 }
 // JC - Please don't put code here.  Find the right file, perhaps
 // llviewermessage.cpp, and put it there.  Thanks!
diff --git a/linden/indra/newview/viewer.h b/linden/indra/newview/viewer.h
index 34ca249..125b0ec 100644
--- a/linden/indra/newview/viewer.h
+++ b/linden/indra/newview/viewer.h
@@ -61,6 +61,9 @@ class LLViewerRegion;
 class LLVFS;
 class LLGlobalEconomy;
 class LLPieMenu;
+class LLWorkerThread;
+class LLTextureFetch;
+class LLTextureCache;
 
 //
 // Global Variables
@@ -72,7 +75,6 @@ extern S32 gNumSessions;
 extern BOOL gNoRender;
 extern LLMemoryInfo gSysMemory;
 extern BOOL gLogMessages;
-extern BOOL gLogUTC;
 extern BOOL gUseAudio;
 extern BOOL gConnectToSomething;
 extern BOOL gGodConnect;
@@ -106,6 +108,7 @@ extern BOOL		gQuitRequested;				// User wants to quit, may have modified documen
 extern BOOL             gLogoutRequestSent;                     // Disconnect message sent to simulator, no longer safe to send messages to the sim.
 extern BOOL             gInitializationComplete;        // OK to call display() and idle()
 extern BOOL             gUseWireframe;
+extern BOOL             gPurgeCache;                            // Cache was purged on startup
 extern U32              gSecondsPerDay;
 extern U32              gSecondsPerYear;
 // Is the Pacific time zone (aka server time zone)
@@ -143,6 +146,10 @@ extern LLVFS	*gStaticVFS;
 
 extern LLUUID   gViewerDigest;  // MD5 digest of the viewer's executable file.
 
+extern LLWorkerThread* gImageDecodeThread;
+extern LLTextureFetch* gTextureFetch;
+extern LLTextureCache* gTextureCache;
+
 class LLURLSimString
 {
 public:
@@ -158,7 +165,7 @@ private:
         static S32 parseGridIdx(const LLString& in_string, S32 idx0, S32* res, S32 max);
         struct llurl_data
         {
-                char    mSimName[DB_SIM_NAME_BUF_SIZE];
+                char    mSimName[DB_SIM_NAME_BUF_SIZE];         /*Flawfinder: ignore*/
                 S32             mSimX;
                 S32             mSimY;
                 S32             mSimZ;
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
new file mode 100755
index 0000000..4c422e4
--- /dev/null
+++ b/linden/indra/newview/viewer_manifest.py
@@ -0,0 +1,450 @@
+#!/usr/bin/python
+# @file viewer_manifest.py
+# @author Ryan Williams
+# @brief Description of all installer viewer files, and methods for packaging
+#        them into installers for all supported platforms.
+#
+# Copyright (c) 2006-2007, Linden Research, Inc.
+# 
+# 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.
+import sys
+import os.path
+import re
+import tarfile
+viewer_dir = os.path.dirname(__file__)
+# add llmanifest library to our path so we don't have to muck with PYTHONPATH
+sys.path.append(os.path.join(viewer_dir, '../lib/python/indra'))
+from llmanifest import LLManifest, main, proper_windows_path, path_ancestors
+
+class ViewerManifest(LLManifest):
+        def construct(self):
+                super(ViewerManifest, self).construct()
+                self.exclude("*.svn*")
+                self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
+
+                if self.prefix(src="app_settings"):
+                        self.exclude("logcontrol.xml")
+                        self.exclude("logcontrol-dev.xml")
+                        self.path("*.pem")
+                        self.path("*.ini")
+                        self.path("*.xml")
+                        self.path("*.vp")
+                        self.path("*.db2")
+
+                        # include the entire shaders directory recursively
+                        self.path("shaders")
+                        self.end_prefix("app_settings")
+
+                if self.prefix(src="character"):
+                        self.path("*.llm")
+                        self.path("*.xml")
+                        self.path("*.tga")
+                        self.end_prefix("character")
+
+
+                # Include our fonts
+                if self.prefix(src="fonts"):
+                        self.path("*.ttf")
+                        self.path("*.txt")
+                        self.end_prefix("fonts")
+
+                # XUI
+                if self.prefix(src="skins"):
+                        # include the entire textures directory recursively
+                        self.path("textures")
+                        self.path("paths.xml")
+                        self.path("xui/*/*.xml")
+                        self.path('words.*.txt')
+
+                        # Local HTML files (e.g. loading screen)
+                        if self.prefix("html/*"):
+                                self.path("*.html")
+                                self.path("*.gif")
+                                self.path("*.jpg")
+                                self.path("*.css")
+                                self.end_prefix("html/*")
+                        self.end_prefix("skins")
+
+                self.path("featuretable.txt")
+                self.path("releasenotes.txt")
+                self.path("lsl_guide.html")
+                self.path("gpu_table.txt")
+
+        def flags_list(self):
+                """ Convenience function that returns the command-line flags for the grid"""
+                if(self.args['grid'] == ''):
+                        return ""
+                elif(self.args['grid'] == 'firstlook'):
+                        return '-settings settings_firstlook.xml'
+                else:
+                        return ("-settings settings_beta.xml --%(grid)s -helperuri http://preview-%(grid)s.secondlife.com/helpers/" % {'grid':self.args['grid']})
+
+        def login_url(self):
+                """ Convenience function that returns the appropriate login url for the grid"""
+                if(self.args.get('login_url')):
+                        return self.args['login_url']
+                else:
+                        if(self.args['grid'] == ''):
+                                return 'http://secondlife.com/app/login/'
+                        elif(self.args['grid'] == 'firstlook'):
+                                return 'http://secondlife.com/app/login/firstlook/'
+                        else:
+                                return 'http://secondlife.com/app/login/beta/'
+
+        def replace_login_url(self):
+                # set the login page to point to a url appropriate for the type of client
+                self.replace_in("skins/xui/en-us/panel_login.xml", searchdict={'http://secondlife.com/app/login/':self.login_url()})
+
+
+class WindowsManifest(ViewerManifest):
+        def final_exe(self):
+                # *NOTE: these are the only two executable names that the crash reporter recognizes
+                if self.args['grid'] == '':
+                        return "SecondLife.exe"
+                elif self.args['grid'] == 'firstlook':
+                        return "SecondLifeFirstLook.exe"
+                else:
+                        return "SecondLifePreview.exe"
+                        # return "SecondLifePreview%s.exe" % (self.args['grid'], )
+
+        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
+                self.path(self.find_existing_file('ReleaseForDownload/Secondlife.exe', 'Secondlife.exe', 'ReleaseNoOpt/newview_noopt.exe'), dst=self.final_exe())
+                # need to get the kdu dll from any of the build directories as well
+                self.path(self.find_existing_file('ReleaseForDownload/llkdu.dll', 'llkdu.dll', '../../libraries/i686-win32/lib_release/llkdu.dll'), dst='llkdu.dll')
+                self.path(src="licenses-win32.txt", dst="licenses.txt")
+
+                # For use in crash reporting (generates minidumps)
+                self.path("dbghelp.dll")
+
+                # For using FMOD for sound... DJS
+                self.path("fmod.dll")
+
+                # Mozilla appears to force a dependency on these files so we need to ship it (CP)
+                self.path("msvcr71.dll")
+                self.path("msvcp71.dll")
+
+                # Mozilla runtime DLLs (CP)
+                if self.prefix(src="../../libraries/i686-win32/lib_release", dst=""):
+                        self.path("gksvggdiplus.dll")
+                        self.path("js3250.dll")
+                        self.path("nspr4.dll")
+                        self.path("nss3.dll")
+                        self.path("nssckbi.dll")
+                        self.path("plc4.dll")
+                        self.path("plds4.dll")
+                        self.path("smime3.dll")
+                        self.path("softokn3.dll")
+                        self.path("ssl3.dll")
+                        self.path("xpcom.dll")
+                        self.path("xul.dll")
+                        self.end_prefix()
+
+                # Mozilla runtime misc files (CP)
+                if self.prefix(src="app_settings/mozilla"):
+                        self.path("chrome/*.*")
+                        self.path("components/*.*")
+                        self.path("greprefs/*.*")
+                        self.path("plugins/*.*")
+                        self.path("res/*.*")
+                        self.path("res/*/*")
+                        self.end_prefix()
+
+#                # pull in the crash logger and updater from other projects
+#                self.path(src="../win_crash_logger/win_crash_logger.exe", dst="win_crash_logger.exe")
+                self.path(src="../win_updater/updater.exe", dst="updater.exe")
+                self.replace_login_url()
+
+        def nsi_file_commands(self, install=True):
+                def wpath(path):
+                        if(path.endswith('/') or path.endswith(os.path.sep)):
+                                path = path[:-1]
+                        path = path.replace('/', '\\')
+                        return path
+
+                result = ""
+                dest_files = [pair[1] for pair in self.file_list if pair[0] and os.path.isfile(pair[1])]
+                # sort deepest hierarchy first
+                dest_files.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
+                dest_files.reverse()
+                out_path = None
+                for pkg_file in dest_files:
+                        rel_file = os.path.normpath(pkg_file.replace(self.get_dst_prefix()+os.path.sep,''))
+                        installed_dir = wpath(os.path.join('$INSTDIR', os.path.dirname(rel_file)))
+                        pkg_file = wpath(os.path.normpath(pkg_file))
+                        if installed_dir != out_path:
+                                if(install):
+                                        out_path = installed_dir
+                                        result += 'SetOutPath ' + out_path + '\n'
+                        if(install):
+                                result += 'File ' + pkg_file + '\n'
+                        else:
+                                result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n'
+                # at the end of a delete, just rmdir all the directories
+                if(not install):
+                        deleted_file_dirs = [os.path.dirname(pair[1].replace(self.get_dst_prefix()+os.path.sep,'')) for pair in self.file_list]
+                        # find all ancestors so that we don't skip any dirs that happened to have no non-dir children
+                        deleted_dirs = []
+                        for d in deleted_file_dirs:
+                                deleted_dirs.extend(path_ancestors(d))
+                        # sort deepest hierarchy first
+                        deleted_dirs.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
+                        deleted_dirs.reverse()
+                        prev = None
+                        for d in deleted_dirs:
+                                if d != prev:   # skip duplicates
+                                        result += 'RMDir ' + wpath(os.path.join('$INSTDIR', os.path.normpath(d))) + '\n'
+                                prev = d
+
+                return result
+
+        def package_finish(self):
+                version_vars_template = """
+                !define INSTEXE  "%(final_exe)s"
+                !define VERSION "%(version_short)s"
+                !define VERSION_LONG "%(version)s"
+                !define VERSION_DASHES "%(version_dashes)s"
+                """
+                if(self.args['grid'] == ''):
+                        installer_file = "Second Life %(version_dashes)s Setup.exe"
+                        grid_vars_template = """
+                        OutFile "%(outfile)s"
+                        !define INSTFLAGS "%(flags)s"
+                        !define INSTNAME   "SecondLife"
+                        !define SHORTCUT   "Second Life"
+                        !define URLNAME   "secondlife"
+                        Caption "Second Life ${VERSION}"
+                        """
+                else:
+                        installer_file = "Second Life %(version_dashes)s (%(grid_caps)s) Setup.exe"
+                        grid_vars_template = """
+                        OutFile "%(outfile)s"
+                        !define INSTFLAGS "%(flags)s"
+                        !define INSTNAME   "SecondLife%(grid_caps)s"
+                        !define SHORTCUT   "Second Life (%(grid_caps)s)"
+                        !define URLNAME   "secondlife%(grid)s"
+                        !define UNINSTALL_SETTINGS 1
+                        Caption "Second Life %(grid)s ${VERSION}"
+                        """
+                if(self.args.has_key('installer_name')):
+                        installer_file = self.args['installer_name']
+                else:
+                        installer_file = installer_file % {'version_dashes' : '-'.join(self.args['version']),
+                                                                                           'grid_caps' : self.args['grid'].upper()}
+                tempfile = "../secondlife_setup.nsi"
+                # the following is an odd sort of double-string replacement
+                self.replace_in("installers/windows/installer_template.nsi", tempfile, {
+                        "%%VERSION%%":version_vars_template%{'version_short' : '.'.join(self.args['version'][:-1]),
+                                                                                                 'version' : '.'.join(self.args['version']),
+                                                                                                 'version_dashes' : '-'.join(self.args['version']),
+                                                                                                 'final_exe' : self.final_exe()},
+                        "%%GRID_VARS%%":grid_vars_template%{'grid':self.args['grid'],
+                                                                                                'grid_caps':self.args['grid'].upper(),
+                                                                                                'outfile':installer_file,
+                                                                                                'flags':self.flags_list()},
+                        "%%INSTALL_FILES%%":self.nsi_file_commands(True),
+                        "%%DELETE_FILES%%":self.nsi_file_commands(False)})
+
+                NSIS_path = 'C:\\Program Files\\NSIS\\makensis.exe'
+                self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+                self.remove(self.dst_path_of(tempfile))
+                self.created_path(installer_file)
+
+
+class DarwinManifest(ViewerManifest):
+        def construct(self):
+                # copy over the build result (this is a no-op if run within the xcode script)
+                self.path("build/" + self.args['configuration'] + "/Second Life.app", dst="")
+
+                if self.prefix(src="", dst="Contents"):  # everything goes in Contents
+                        # Expand the tar file containing the assorted mozilla bits into
+                        #  <bundle>/Contents/MacOS/
+                        self.contents_of_tar('mozilla-universal-darwin.tgz', 'MacOS')
+
+                        # replace the default theme with our custom theme (so scrollbars work).
+                        if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
+                                self.path("classic.jar")
+                                self.path("classic.manifest")
+                                self.end_prefix("MacOS/chrome")
+
+                        # most everything goes in the Resources directory
+                        if self.prefix(src="", dst="Resources"):
+                                super(DarwinManifest, self).construct()
+
+                                # the trial directory seems to be not used [rdw]
+                                self.path('trial')
+
+                                if self.prefix("cursors_mac"):
+                                        self.path("*.tif")
+                                        self.end_prefix("cursors_mac")
+
+                                self.path("licenses-mac.txt", dst="licenses.txt")
+                                self.path("featuretable_mac.txt")
+                                self.path("secondlife.icns")
+
+                                # llkdu dynamic library
+#                                self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
+
+                                # command line arguments for connecting to the proper grid
+                                self.put_in_file(self.flags_list(), 'arguments.txt')
+
+                                # set the proper login url
+                                self.replace_login_url()
+
+                                self.end_prefix("Resources")
+
+                        self.end_prefix("Contents")
+                        
+                # NOTE: the -S argument to strip causes it to keep enough info for
+                # annotated backtraces (i.e. function names in the crash log).  'strip' with no
+                # arguments yields a slightly smaller binary but makes crash logs mostly useless.
+                # This may be desirable for the final release.  Or not.
+                if("package" in self.args['actions'] or
+                   "unpacked" in self.args['actions']):
+                    self.run_command('strip -S "%(viewer_binary)s"' %
+                                 { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
+
+
+        def package_finish(self):
+                imagename="SecondLife_" + '_'.join(self.args['version'])
+                if(self.args['grid'] != ''):
+                        imagename = imagename + '_' + self.args['grid'].upper()
+
+                sparsename = imagename + ".sparseimage"
+                finalname = imagename + ".dmg"
+                # make sure we don't have stale files laying about
+                self.remove(sparsename, finalname)
+
+                self.run_command('hdiutil create "%(sparse)s" -volname "Second Life" -fs HFS+ -type SPARSE -megabytes 300' % {'sparse':sparsename})
+
+                # mount the image and get the name of the mount point and device node
+                hdi_output = self.run_command('hdiutil attach -private "' + sparsename + '"')
+                devfile = re.search("/dev/disk([0-9]+)[^s]", hdi_output).group(0).strip()
+                volpath = re.search('HFS\s+(.+)', hdi_output).group(1).strip()
+
+                # Copy everything in to the mounted .dmg
+                # TODO change name of .app once mac_updater can handle it.
+                for s,d in {
+                        self.get_dst_prefix():"Second Life.app",
+                        "lsl_guide.html":"Linden Scripting Language Guide.html",
+                        "releasenotes.txt":"Release Notes.txt",
+                        "installers/darwin/mac_image_hidden":".hidden",
+                        "installers/darwin/mac_image_background.tga":"background.tga",
+                        "installers/darwin/mac_image_DS_Store":".DS_Store"}.items():
+                        
+                        print "Copying to dmg", s, d
+                        self.copy_action(self.src_path_of(s), os.path.join(volpath, d))
+
+                # Unmount the image
+                self.run_command('hdiutil detach "' + devfile + '"')
+
+                print "Converting temp disk image to final disk image"
+                self.run_command('hdiutil convert "%(sparse)s" -format UDZO -imagekey zlib-level=9 -o "%(final)s"' % {'sparse':sparsename, 'final':finalname})
+                # get rid of the temp file
+                self.remove(sparsename)
+
+class LinuxManifest(ViewerManifest):
+        def construct(self):
+                super(LinuxManifest, self).construct()
+                self.path("licenses-linux.txt","licenses.txt")
+                self.path("res/ll_icon.ico","secondlife.ico")
+                if self.prefix("linux_tools", ""):
+                        self.path("client-readme.txt","README-linux.txt")
+                        self.path("wrapper.sh","secondlife")
+                        self.path("unicode.ttf","unicode.ttf")
+                        self.end_prefix("linux_tools")
+
+                # Create an appropriate gridargs.dat for this package, denoting required grid.
+                self.put_in_file(self.flags_list(), 'gridargs.dat')
+                # set proper login url
+                self.replace_login_url()
+
+                # stripping all the libs removes a few megabytes from the end-user package
+                for s,d in self.file_list:
+                        if re.search("lib/lib.+\.so.*", d):
+                                self.run_command('strip -S %s' % d)
+
+
+        def package_finish(self):
+                if(self.args.has_key('installer_name')):
+                        installer_name = self.args['installer_name']
+                else:
+                        installer_name = '_'.join('SecondLife_', self.args.get('arch'), *self.args['version'])
+                        if grid != '':
+                                installer_name += "_" + grid.upper()
+
+                # temporarily move directory tree so that it has the right name in the tarfile
+                self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
+                # --numeric-owner hides the username of the builder for security etc.
+                self.run_command('tar -C %(dir)s --numeric-owner -cjf %(inst_path)s.tar.bz2 %(inst_name)s' % {'dir':self.get_src_prefix(), 'inst_name': installer_name, 'inst_path':self.src_path_of(installer_name)})
+                self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
+
+class Linux_i686Manifest(LinuxManifest):
+        def construct(self):
+                super(Linux_i686Manifest, self).construct()
+                self.path("secondlife-i686-bin-stripped","bin/do-not-directly-run-secondlife-bin")
+#                self.path("../linux_crash_logger/linux-crash-logger-i686-bin-stripped","linux-crash-logger.bin")
+                self.path("linux_tools/launch_url.sh","launch_url.sh")
+                if self.prefix("res-sdl"):
+                        self.path("*")
+                        # recurse
+                        self.end_prefix("res-sdl")
+
+                self.path("app_settings/mozilla-runtime-linux-i686")
+
+                if self.prefix("../../libraries/i686-linux/lib_release_client", "lib"):
+#                        self.path("libkdu_v42R.so")
+                        self.path("libfmod-3.75.so")
+                        self.path("libapr-1.so.0")
+                        self.path("libaprutil-1.so.0")
+                        self.path("libdb-4.2.so")
+                        self.path("libogg.so.0")
+                        self.path("libvorbis.so.0")
+                        self.path("libvorbisfile.so.0")
+                        self.path("libvorbisenc.so.0")
+                        self.path("libcurl.so.4")
+                        self.path("libcrypto.so.0.9.7")
+                        self.path("libssl.so.0.9.7")
+                        self.path("libexpat.so.1")
+#                        self.path("libstdc++.so.6")
+                        self.path("libelfio.so")
+                        self.path("libuuid.so", "libuuid.so.1")
+                        self.path("libSDL-1.2.so.0")
+#                        self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
+                        self.end_prefix("lib")
+
+
+class Linux_x86_64Manifest(LinuxManifest):
+        def construct(self):
+                super(Linux_x86_64Manifest, self).construct()
+                self.path("secondlife-x86_64-bin-stripped","bin/secondlife-bin")
+                # TODO: I get the sense that this isn't fully fleshed out
+                if self.prefix("../../libraries/x86_64-linux/lib_release_client", "lib"):
+#                        self.path("libkdu_v42R.so")
+                        self.path("libxmlrpc.so.0")
+#                        # self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
+                        self.end_prefix("lib")
+
+
+if __name__ == "__main__":
+        main(srctree=viewer_dir, dsttree=os.path.join(viewer_dir, "packaged"))
diff --git a/linden/indra/test/MacTester.xcodeproj/project.pbxproj b/linden/indra/test/MacTester.xcodeproj/project.pbxproj
index 77ba7c2..76bdc0a 100644
--- a/linden/indra/test/MacTester.xcodeproj/project.pbxproj
+++ b/linden/indra/test/MacTester.xcodeproj/project.pbxproj
@@ -45,8 +45,11 @@
                 DA306B580ACD9F3F008D9B2F /* lltiming_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B540ACD9F3F008D9B2F /* lltiming_tut.cpp */; };
                 DA306B590ACD9F3F008D9B2F /* lluri_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B550ACD9F3F008D9B2F /* lluri_tut.cpp */; };
                 DA306B5C0ACD9F6F008D9B2F /* llhttpclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA306B5B0ACD9F6F008D9B2F /* llhttpclient.cpp */; };
+                DA4D18170B567E0D0049C10F /* llformat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA4D18150B567E0D0049C10F /* llformat.cpp */; };
+                DA4D18180B567E0D0049C10F /* llformat.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA4D18160B567E0D0049C10F /* llformat.h */; };
+                DA4D182D0B567ED70049C10F /* llerrorcontrol.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA4D182B0B567ED70049C10F /* llerrorcontrol.h */; };
+                DA9C40480B540D8A00DD6F44 /* lllivefile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DA9C40460B540D8A00DD6F44 /* lllivefile.cpp */; };
                 DAD1C4CC0AE2C78C0054574C /* stats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAD1C4CB0AE2C78C0054574C /* stats.cpp */; };
-                DAD1C4DE0AE2CA0C0054574C /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DAD1C4DD0AE2CA0C0054574C /* llcurl.cpp */; };
                 FD15584D0A06BE2E00DE9AE5 /* io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD15584C0A06BE2E00DE9AE5 /* io.cpp */; };
                 FD15585C0A06BEB000DE9AE5 /* llbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558500A06BEB000DE9AE5 /* llbuffer.cpp */; };
                 FD15585E0A06BEB000DE9AE5 /* llbufferstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558520A06BEB000DE9AE5 /* llbufferstream.cpp */; };
@@ -84,6 +87,11 @@
                 FD155F5D0A08FB5100DE9AE5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD155F480A08FB5100DE9AE5 /* Carbon.framework */; };
                 FD155F610A08FD5900DE9AE5 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */; };
                 FD155F670A08FD9100DE9AE5 /* message_string_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F660A08FD9100DE9AE5 /* message_string_table.cpp */; };
+                FD23FEB90B4340F3007A29CA /* llhttpnode_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEB70B4340F3007A29CA /* llhttpnode_tut.cpp */; };
+                FD23FEBA0B4340F3007A29CA /* lluserrelations_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEB80B4340F3007A29CA /* lluserrelations_tut.cpp */; };
+                FD23FEBE0B43410C007A29CA /* lluserrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEBC0B43410C007A29CA /* lluserrelations.cpp */; };
+                FD23FEBF0B43410C007A29CA /* lluserrelations.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FD23FEBD0B43410C007A29CA /* lluserrelations.h */; };
+                FD23FEC60B4341E2007A29CA /* llerror_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD23FEC50B4341E2007A29CA /* llerror_tut.cpp */; };
                 FD396CDD0A1D37DF005DCB1F /* lltut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD396CDC0A1D37DF005DCB1F /* lltut.cpp */; };
                 FD396D160A1DFB4B005DCB1F /* reflection_tut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 386A940D0A0B5F60001DE10D /* reflection_tut.cpp */; };
                 FD506A0609FEB58900E297C2 /* llsdserialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD506A0409FEB58900E297C2 /* llsdserialize.cpp */; };
@@ -97,8 +105,6 @@
                 FD5DFA9109C1DF3E007E3F78 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */; };
                 FD5DFA9309C1DF4E007E3F78 /* lluuid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9209C1DF4E007E3F78 /* lluuid.cpp */; };
                 FD5DFA9909C1DFB7007E3F78 /* lluri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */; };
-                FD5DFAA009C1DFE2007E3F78 /* llerrorbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9C09C1DFE2007E3F78 /* llerrorbuffer.cpp */; };
-                FD5DFAA209C1DFE2007E3F78 /* llerrorstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9E09C1DFE2007E3F78 /* llerrorstream.cpp */; };
                 FD5DFAA609C1E01D007E3F78 /* llmd5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */; };
                 FD5DFAA909C1E056007E3F78 /* llerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA809C1E056007E3F78 /* llerror.cpp */; };
                 FD5DFAAC09C1E09F007E3F78 /* llrand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAAB09C1E09F007E3F78 /* llrand.cpp */; };
@@ -144,8 +150,6 @@
                 FDBC10740AEEC40F00ED2E62 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD506ADA09FFE09700E297C2 /* libexpat.a */; };
                 FDBC10750AEEC41600ED2E62 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */; };
                 FDBC10760AEEC41B00ED2E62 /* llmd5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */; };
-                FDBC10790AEEC42B00ED2E62 /* llerrorstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9E09C1DFE2007E3F78 /* llerrorstream.cpp */; };
-                FDBC107A0AEEC42C00ED2E62 /* llerrorbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9C09C1DFE2007E3F78 /* llerrorbuffer.cpp */; };
                 FDBC107B0AEEC43200ED2E62 /* lluri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */; };
                 FDBC107E0AEEC45100ED2E62 /* lltimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DFAB209C1E11A007E3F78 /* lltimer.cpp */; };
                 FDBC107F0AEEC45400ED2E62 /* llfasttimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */; };
@@ -171,6 +175,7 @@
                 FDBC10AD0AEEC67700ED2E62 /* llframetimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558910A06C01400DE9AE5 /* llframetimer.cpp */; };
                 FDCB2A670AF80D9000C44EBA /* llprocessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDCB2A650AF80D9000C44EBA /* llprocessor.cpp */; };
                 FDCB2A680AF80D9000C44EBA /* llprocessor.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDCB2A660AF80D9000C44EBA /* llprocessor.h */; };
+                FDE7AD540B7D047700C56FE0 /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDE7AD520B7D047700C56FE0 /* llcurl.cpp */; };
                 FDEC4F5509F7EF7A007BAEEC /* llsd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5DF9BE09C0A68F007E3F78 /* llsd.cpp */; };
                 FDFAD4210AFFFCC30048A0C7 /* llhttpnode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDFAD41F0AFFFCC30048A0C7 /* llhttpnode.cpp */; };
                 FDFAD4220AFFFCC30048A0C7 /* llhttpnode.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = FDFAD4200AFFFCC30048A0C7 /* llhttpnode.h */; };
@@ -216,6 +221,9 @@
                                 FDFAD4220AFFFCC30048A0C7 /* llhttpnode.h in CopyFiles */,
                                 91469E820B4486F20009E8F9 /* llmime.h in CopyFiles */,
                                 91469E8E0B4489420009E8F9 /* llquaternion.h in CopyFiles */,
+                                FD23FEBF0B43410C007A29CA /* lluserrelations.h in CopyFiles */,
+                                DA4D18180B567E0D0049C10F /* llformat.h in CopyFiles */,
+                                DA4D182D0B567ED70049C10F /* llerrorcontrol.h in CopyFiles */,
                         );
                         runOnlyForDeploymentPostprocessing = 1;
                 };
@@ -252,10 +260,13 @@
                 DA306B540ACD9F3F008D9B2F /* lltiming_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lltiming_tut.cpp; sourceTree = "<group>"; };
                 DA306B550ACD9F3F008D9B2F /* lluri_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluri_tut.cpp; sourceTree = "<group>"; };
                 DA306B5B0ACD9F6F008D9B2F /* llhttpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpclient.cpp; sourceTree = "<group>"; };
+                DA4D18150B567E0D0049C10F /* llformat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llformat.cpp; sourceTree = "<group>"; };
+                DA4D18160B567E0D0049C10F /* llformat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llformat.h; sourceTree = "<group>"; };
+                DA4D182B0B567ED70049C10F /* llerrorcontrol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llerrorcontrol.h; sourceTree = "<group>"; };
+                DA9C40460B540D8A00DD6F44 /* lllivefile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lllivefile.cpp; sourceTree = "<group>"; };
+                DA9C40470B540D8A00DD6F44 /* lllivefile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllivefile.h; sourceTree = "<group>"; };
                 DAD1C4CA0AE2C78C0054574C /* stats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stats.h; sourceTree = "<group>"; };
                 DAD1C4CB0AE2C78C0054574C /* stats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stats.cpp; sourceTree = "<group>"; };
-                DAD1C4DC0AE2CA0C0054574C /* llcurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llcurl.h; sourceTree = "<group>"; };
-                DAD1C4DD0AE2CA0C0054574C /* llcurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llcurl.cpp; sourceTree = "<group>"; };
                 FD15584C0A06BE2E00DE9AE5 /* io.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = io.cpp; sourceTree = "<group>"; };
                 FD1558500A06BEB000DE9AE5 /* llbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbuffer.cpp; sourceTree = "<group>"; };
                 FD1558510A06BEB000DE9AE5 /* llbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbuffer.h; sourceTree = "<group>"; };
@@ -322,6 +333,11 @@
                 FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfasttimer.cpp; sourceTree = "<group>"; };
                 FD155F600A08FD5900DE9AE5 /* llfasttimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfasttimer.h; sourceTree = "<group>"; };
                 FD155F660A08FD9100DE9AE5 /* message_string_table.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_string_table.cpp; sourceTree = "<group>"; };
+                FD23FEB70B4340F3007A29CA /* llhttpnode_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpnode_tut.cpp; sourceTree = "<group>"; };
+                FD23FEB80B4340F3007A29CA /* lluserrelations_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserrelations_tut.cpp; sourceTree = "<group>"; };
+                FD23FEBC0B43410C007A29CA /* lluserrelations.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluserrelations.cpp; sourceTree = "<group>"; };
+                FD23FEBD0B43410C007A29CA /* lluserrelations.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluserrelations.h; sourceTree = "<group>"; };
+                FD23FEC50B4341E2007A29CA /* llerror_tut.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerror_tut.cpp; sourceTree = "<group>"; };
                 FD396CD80A1D3768005DCB1F /* lltut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltut.h; sourceTree = "<group>"; };
                 FD396CDC0A1D37DF005DCB1F /* lltut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lltut.cpp; sourceTree = "<group>"; };
                 FD506A0409FEB58900E297C2 /* llsdserialize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsdserialize.cpp; sourceTree = "<group>"; };
@@ -340,8 +356,6 @@
                 FD5DFA9009C1DF3E007E3F78 /* lldate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldate.cpp; sourceTree = "<group>"; };
                 FD5DFA9209C1DF4E007E3F78 /* lluuid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluuid.cpp; sourceTree = "<group>"; };
                 FD5DFA9709C1DFB7007E3F78 /* lluri.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lluri.cpp; sourceTree = "<group>"; };
-                FD5DFA9C09C1DFE2007E3F78 /* llerrorbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerrorbuffer.cpp; sourceTree = "<group>"; };
-                FD5DFA9E09C1DFE2007E3F78 /* llerrorstream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerrorstream.cpp; sourceTree = "<group>"; };
                 FD5DFAA509C1E01D007E3F78 /* llmd5.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmd5.cpp; sourceTree = "<group>"; };
                 FD5DFAA809C1E056007E3F78 /* llerror.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llerror.cpp; sourceTree = "<group>"; };
                 FD5DFAAB09C1E09F007E3F78 /* llrand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrand.cpp; sourceTree = "<group>"; };
@@ -352,7 +366,6 @@
                 FD7325790A0834080072A37B /* llapr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llapr.h; sourceTree = "<group>"; };
                 FD73257A0A0834080072A37B /* lldate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldate.h; sourceTree = "<group>"; };
                 FD73257B0A0834080072A37B /* llerror.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerror.h; sourceTree = "<group>"; };
-                FD73257C0A0834080072A37B /* llerrorbuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llerrorbuffer.h; sourceTree = "<group>"; };
                 FD73257D0A0834080072A37B /* llstring.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstring.h; sourceTree = "<group>"; };
                 FD73257E0A0834080072A37B /* lltimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltimer.h; sourceTree = "<group>"; };
                 FD73257F0A0834080072A37B /* lluri.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lluri.h; sourceTree = "<group>"; };
@@ -425,6 +438,8 @@
                 FDBC10660AEEC3A600ED2E62 /* llpriqueuemap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpriqueuemap.h; sourceTree = "<group>"; };
                 FDCB2A650AF80D9000C44EBA /* llprocessor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llprocessor.cpp; sourceTree = "<group>"; };
                 FDCB2A660AF80D9000C44EBA /* llprocessor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llprocessor.h; sourceTree = "<group>"; };
+                FDE7AD520B7D047700C56FE0 /* llcurl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcurl.cpp; sourceTree = "<group>"; };
+                FDE7AD530B7D047700C56FE0 /* llcurl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcurl.h; sourceTree = "<group>"; };
                 FDF2E4180ADD7B620003B83E /* TestWebServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestWebServer; sourceTree = BUILT_PRODUCTS_DIR; };
                 FDF2E5580ADDBB7F0003B83E /* llhttpdelayeddata.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhttpdelayeddata.cpp; sourceTree = "<group>"; };
                 FDF2E5590ADDBB7F0003B83E /* llhttpdelayeddata.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llhttpdelayeddata.h; sourceTree = "<group>"; };
@@ -492,6 +507,9 @@
                 08FB7795FE84155DC02AAC07 /* test */ = {
                         isa = PBXGroup;
                         children = (
+                                FD23FEC50B4341E2007A29CA /* llerror_tut.cpp */,
+                                FD23FEB70B4340F3007A29CA /* llhttpnode_tut.cpp */,
+                                FD23FEB80B4340F3007A29CA /* lluserrelations_tut.cpp */,
                                 DA01B1F10ADE831200A44198 /* testwebclient */,
                                 FDF2E5600ADDBB900003B83E /* testwebserver */,
                                 91469E830B44870B0009E8F9 /* llmime_tut.cpp */,
@@ -532,8 +550,6 @@
                                 DA01B2040ADE839D00A44198 /* testwebclient.cpp */,
                                 DAD1C4CA0AE2C78C0054574C /* stats.h */,
                                 DAD1C4CB0AE2C78C0054574C /* stats.cpp */,
-                                DAD1C4DC0AE2CA0C0054574C /* llcurl.h */,
-                                DAD1C4DD0AE2CA0C0054574C /* llcurl.cpp */,
                         );
                         path = testwebclient;
                         sourceTree = "<group>";
@@ -541,6 +557,8 @@
                 FD15584F0A06BE4100DE9AE5 /* llmessage */ = {
                         isa = PBXGroup;
                         children = (
+                                FDE7AD520B7D047700C56FE0 /* llcurl.cpp */,
+                                FDE7AD530B7D047700C56FE0 /* llcurl.h */,
                                 91469E7F0B4486F20009E8F9 /* llmime.cpp */,
                                 91469E800B4486F20009E8F9 /* llmime.h */,
                                 FDFAD41F0AFFFCC30048A0C7 /* llhttpnode.cpp */,
@@ -641,6 +659,10 @@
                 FD5DF88009C0A17D007E3F78 /* llcommon */ = {
                         isa = PBXGroup;
                         children = (
+                                DA4D18150B567E0D0049C10F /* llformat.cpp */,
+                                DA4D18160B567E0D0049C10F /* llformat.h */,
+                                DA9C40460B540D8A00DD6F44 /* lllivefile.cpp */,
+                                DA9C40470B540D8A00DD6F44 /* lllivefile.h */,
                                 FDCB2A650AF80D9000C44EBA /* llprocessor.cpp */,
                                 FDCB2A660AF80D9000C44EBA /* llprocessor.h */,
                                 FDBC10660AEEC3A600ED2E62 /* llpriqueuemap.h */,
@@ -663,9 +685,6 @@
                                 FD73257A0A0834080072A37B /* lldate.h */,
                                 FD5DFAA809C1E056007E3F78 /* llerror.cpp */,
                                 FD73257B0A0834080072A37B /* llerror.h */,
-                                FD5DFA9C09C1DFE2007E3F78 /* llerrorbuffer.cpp */,
-                                FD73257C0A0834080072A37B /* llerrorbuffer.h */,
-                                FD5DFA9E09C1DFE2007E3F78 /* llerrorstream.cpp */,
                                 FD155F5F0A08FD5900DE9AE5 /* llfasttimer.cpp */,
                                 FD155F600A08FD5900DE9AE5 /* llfasttimer.h */,
                                 389CFB450A0B69C700EE2094 /* llfile.cpp */,
@@ -702,6 +721,7 @@
                                 38A8BF690A18C38800814862 /* reflective.h */,
                                 FD5DFAB809C1E13A007E3F78 /* u64.cpp */,
                                 FD7325800A0834080072A37B /* u64.h */,
+                                DA4D182B0B567ED70049C10F /* llerrorcontrol.h */,
                         );
                         name = llcommon;
                         path = ../llcommon;
@@ -743,6 +763,8 @@
                 FD73259C0A08E8520072A37B /* llinventory */ = {
                         isa = PBXGroup;
                         children = (
+                                FD23FEBC0B43410C007A29CA /* lluserrelations.cpp */,
+                                FD23FEBD0B43410C007A29CA /* lluserrelations.h */,
                                 FD73259D0A08E8A00072A37B /* llinventory.cpp */,
                                 FD73259E0A08E8A00072A37B /* llinventory.h */,
                                 FD7325AA0A08E9330072A37B /* llpermissions.cpp */,
@@ -894,8 +916,6 @@
                                 FD5DFA9109C1DF3E007E3F78 /* lldate.cpp in Sources */,
                                 FD5DFA9309C1DF4E007E3F78 /* lluuid.cpp in Sources */,
                                 FD5DFA9909C1DFB7007E3F78 /* lluri.cpp in Sources */,
-                                FD5DFAA009C1DFE2007E3F78 /* llerrorbuffer.cpp in Sources */,
-                                FD5DFAA209C1DFE2007E3F78 /* llerrorstream.cpp in Sources */,
                                 FD5DFAA609C1E01D007E3F78 /* llmd5.cpp in Sources */,
                                 FD5DFAA909C1E056007E3F78 /* llerror.cpp in Sources */,
                                 FD5DFAAC09C1E09F007E3F78 /* llrand.cpp in Sources */,
@@ -993,6 +1013,12 @@
                                 91469E810B4486F20009E8F9 /* llmime.cpp in Sources */,
                                 91469E840B44870B0009E8F9 /* llmime_tut.cpp in Sources */,
                                 91469E8D0B4489420009E8F9 /* llquaternion.cpp in Sources */,
+                                FD23FEB90B4340F3007A29CA /* llhttpnode_tut.cpp in Sources */,
+                                FD23FEBA0B4340F3007A29CA /* lluserrelations_tut.cpp in Sources */,
+                                FD23FEBE0B43410C007A29CA /* lluserrelations.cpp in Sources */,
+                                FD23FEC60B4341E2007A29CA /* llerror_tut.cpp in Sources */,
+                                DA9C40480B540D8A00DD6F44 /* lllivefile.cpp in Sources */,
+                                DA4D18170B567E0D0049C10F /* llformat.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -1001,15 +1027,12 @@
                         buildActionMask = 2147483647;
                         files = (
                                 DAD1C4CC0AE2C78C0054574C /* stats.cpp in Sources */,
-                                DAD1C4DE0AE2CA0C0054574C /* llcurl.cpp in Sources */,
                                 FDBC106D0AEEC3DA00ED2E62 /* llsd.cpp in Sources */,
                                 FDBC106F0AEEC3E900ED2E62 /* lluuid.cpp in Sources */,
                                 FDBC10710AEEC3F800ED2E62 /* llsdserialize.cpp in Sources */,
                                 FDBC10720AEEC3F900ED2E62 /* llsdserialize_xml.cpp in Sources */,
                                 FDBC10750AEEC41600ED2E62 /* lldate.cpp in Sources */,
                                 FDBC10760AEEC41B00ED2E62 /* llmd5.cpp in Sources */,
-                                FDBC10790AEEC42B00ED2E62 /* llerrorstream.cpp in Sources */,
-                                FDBC107A0AEEC42C00ED2E62 /* llerrorbuffer.cpp in Sources */,
                                 FDBC107B0AEEC43200ED2E62 /* lluri.cpp in Sources */,
                                 FDBC107E0AEEC45100ED2E62 /* lltimer.cpp in Sources */,
                                 FDBC107F0AEEC45400ED2E62 /* llfasttimer.cpp in Sources */,
@@ -1031,6 +1054,7 @@
                                 FDBC10A90AEEC65700ED2E62 /* llstreamtools.cpp in Sources */,
                                 FDBC10AB0AEEC66100ED2E62 /* testwebclient.cpp in Sources */,
                                 FDBC10AD0AEEC67700ED2E62 /* llframetimer.cpp in Sources */,
+                                FDE7AD540B7D047700C56FE0 /* llcurl.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
diff --git a/linden/indra/test/blowfish.1.bin b/linden/indra/test/blowfish.1.bin
new file mode 100644
index 0000000..61286e4
--- /dev/null
+++ b/linden/indra/test/blowfish.1.bin
@@ -0,0 +1 @@
+.A„Ä3ŒLÜE ``òøÝKÛ@¼ûÇ;M[ÚBë·ø„>ËÊC—'
\ No newline at end of file
diff --git a/linden/indra/test/blowfish.2.bin b/linden/indra/test/blowfish.2.bin
new file mode 100644
index 0000000..ef72d96
--- /dev/null
+++ b/linden/indra/test/blowfish.2.bin
diff --git a/linden/indra/test/blowfish.digits.txt b/linden/indra/test/blowfish.digits.txt
new file mode 100644
index 0000000..fce1fed
--- /dev/null
+++ b/linden/indra/test/blowfish.digits.txt
@@ -0,0 +1 @@
+01234567890123456789012345678901234
diff --git a/linden/indra/test/blowfish.pl b/linden/indra/test/blowfish.pl
new file mode 100755
index 0000000..7940d87
--- /dev/null
+++ b/linden/indra/test/blowfish.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+# *TODO: specify test count here
+use Test::More qw(no_plan);
+
+use Crypt::CBC;
+use MIME::Base64;
+
+my $init_vector = "\x00" x 8;
+# my $key = pack("H*", "ef5a8376eb0c99fe0dafa487d15bec19cae63d1e25fe31d8d92f7ab0398246d70ee733108e47360e16359654571cf5bab6c3375b42cee4fa");
+# my $key = "d263eb8a78034e40";
+         #"8d082918aa369174";
+my $key = "\x00" x 16;
+
+my $cipher = Crypt::CBC->new( { cipher => 'Blowfish',
+                                                                regenerate_key => 0,
+                                                                key => $key,
+                                                                iv => $init_vector,
+                                                                header => 'none',
+                                                                prepend_iv => 0,
+                                                                keysize => 16 } );
+
+#my $blocks = $cipher->blocksize();
+#print "blocksize $blocks\n";
+
+my $len;
+my $input = "01234567890123456789012345678901234\n";
+#my $input = "a whale of a tale I tell you lad, a whale of a tale for me, a whale of a tale and the fiddlers three";
+$len = length($input);
+is ($len, 36, "input length");
+
+$len = length($key);
+is ($len, 16, "key length");
+
+
+my $encrypted = $cipher->encrypt($input);
+is (length($encrypted), 40, "encrypted length");
+
+open(FH, "blowfish.1.bin");
+my $bin = scalar <FH>;
+is ($encrypted, $bin, "matches openssl");
+close(FH);
+
+my $base64 = encode_base64($encrypted);
+is ($base64, "LkGExDOMTNxFIGBg8gP43UvbQLz7xztNWwYF2kLrtwT4hD7LykOXJw==\n",
+        "base64 output");
+
+my $unbase64 = decode_base64($base64);
+is( $encrypted, $unbase64, "reverse base64" );
+
+my $output = $cipher->decrypt($unbase64);
+is ($input, $output, "reverse encrypt");
+
+$key = pack("H[32]", "526a1e07a19dbaed84c4ff08a488d15e");
+$cipher = Crypt::CBC->new( { cipher => 'Blowfish',
+                                                                regenerate_key => 0,
+                                                                key => $key,
+                                                                iv => $init_vector,
+                                                                header => 'none',
+                                                                prepend_iv => 0,
+                                                                keysize => 16 } );
+$encrypted = $cipher->encrypt($input);
+is (length($encrypted), 40, "uuid encrypted length");
+$output = $cipher->decrypt($encrypted);
+is ($input, $output, "uuid reverse encrypt");
+
+open(FH, "blowfish.2.bin");
+$bin = scalar <FH>;
+close(FH);
+is( $encrypted, $bin, "uuid matches openssl" );
+
+print encode_base64($encrypted);
diff --git a/linden/indra/test/common.cpp b/linden/indra/test/common.cpp
index 1be0931..97ff21c 100644
--- a/linden/indra/test/common.cpp
+++ b/linden/indra/test/common.cpp
@@ -109,7 +109,7 @@ namespace tut
                         // gen up a starting point
                         typedef std::vector<U8> buf_t;
                         buf_t source;
-                        srand(i);
+                        srand(i);               /* Flawfinder: ignore */
                         S32 size = rand() % 1000 + 10;
                         std::generate_n(
                                 std::back_insert_iterator<buf_t>(source),
@@ -157,7 +157,7 @@ namespace tut
                         // gen up a starting point
                         typedef std::vector<U8> buf_t;
                         buf_t source;
-                        srand(666 + i);
+                        srand(666 + i);         /* Flawfinder: ignore */
                         S32 size = rand() % 1000 + 10;
                         std::generate_n(
                                 std::back_insert_iterator<buf_t>(source),
@@ -307,7 +307,7 @@ namespace tut
                 {
                         // gen up a starting point
                         std::string expected;
-                        srand(1337 + i);
+                        srand(1337 + i);                /* Flawfinder: ignore */
                         S32 size = rand() % 30 + 5;
                         std::generate_n(
                                 std::back_insert_iterator<std::string>(expected),
@@ -436,7 +436,7 @@ namespace tut
         void mem_object::test<1>()
         {
                 const char HELLO_WORLD[] = "hello world";
-                LLMemoryStream mem((U8*)&HELLO_WORLD[0], strlen(HELLO_WORLD));
+                LLMemoryStream mem((U8*)&HELLO_WORLD[0], strlen(HELLO_WORLD));          /* Flawfinder: ignore */
                 std::string hello;
                 std::string world;
                 mem >> hello >> world;
diff --git a/linden/indra/test/files.lst b/linden/indra/test/files.lst
index 0f99ce9..77ce9f4 100644
--- a/linden/indra/test/files.lst
+++ b/linden/indra/test/files.lst
@@ -2,6 +2,9 @@ test/common.cpp
 test/inventory.cpp
 test/io.cpp
 test/llapp_tut.cpp
+test/llbase64_tut.cpp
+test/llblowfish_tut.cpp
+test/llerror_tut.cpp
 test/llhttpclient_tut.cpp
 test/llhttpnode_tut.cpp
 test/lliohttpserver_tut.cpp
diff --git a/linden/indra/test/io.cpp b/linden/indra/test/io.cpp
index 2f6ba09..a86711a 100644
--- a/linden/indra/test/io.cpp
+++ b/linden/indra/test/io.cpp
@@ -77,7 +77,7 @@ namespace tut
         void buffer_object::test<2>()
         {
                 const char HELLO_WORLD[] = "hello world";
-                const S32 str_len = strlen(HELLO_WORLD);
+                const S32 str_len = strlen(HELLO_WORLD);                /* Flawfinder: ignore */
                 LLChannelDescriptors ch = mBuffer.nextChannel();
                 mBuffer.append(ch.in(), (U8*)HELLO_WORLD, str_len);
                 mBuffer.append(ch.in(), (U8*)HELLO_WORLD, str_len);
@@ -99,7 +99,7 @@ namespace tut
                 LLChannelDescriptors ch = mBuffer.nextChannel();
                 mBuffer.append(ch.in(), (U8*)ONE, 3);
                 mBuffer.append(ch.in(), (U8*)TWO, 3);
-                char buffer[255];
+                char buffer[255];       /* Flawfinder: ignore */
                 S32 len = 6;
                 mBuffer.readAfter(ch.in(), NULL, (U8*)buffer, len);
                 ensure_equals(len, 6);
@@ -118,7 +118,7 @@ namespace tut
                 LLChannelDescriptors ch = mBuffer.nextChannel();
                 mBuffer.append(ch.in(), (U8*)TWO, 3);
                 mBuffer.prepend(ch.in(), (U8*)ONE, 3);
-                char buffer[255];
+                char buffer[255];       /* Flawfinder: ignore */
                 S32 len = 6;
                 mBuffer.readAfter(ch.in(), NULL, (U8*)buffer, len);
                 ensure_equals(len, 6);
@@ -136,7 +136,7 @@ namespace tut
                 LLChannelDescriptors ch = mBuffer.nextChannel();
                 mBuffer.append(ch.in(), (U8*)TWO, 3);
                 mBuffer.prepend(ch.in(), (U8*)ONE, 3);
-                char buffer[255];
+                char buffer[255];       /* Flawfinder: ignore */
                 S32 len = 5;
                 LLBufferArray::segment_iterator_t it = mBuffer.beginSegment();
                 U8* addr = (*it).data();
@@ -163,7 +163,7 @@ namespace tut
                 header << "ContentLength: " << count << "\r\n\r\n";
                 std::string head(header.str());
                 mBuffer.prepend(ch.out(), (U8*)head.c_str(), head.length());
-                char buffer[1024];
+                char buffer[1024];      /* Flawfinder: ignore */
                 S32 len = response.size() + head.length();
                 ensure_equals("same length", len, (S32)expected.str().length());
                 mBuffer.readAfter(ch.out(), NULL, (U8*)buffer, len);
@@ -228,11 +228,11 @@ namespace tut
                 delete[] temp;
         }
 
-/*
+#if 0
         template<> template<>
         void buffer_object::test<9>()
         {
-                char buffer[1024];
+                char buffer[1024];      /* Flawfinder: ignore */
                 S32 size = sprintf(buffer,
                                                 "%d|%d|%s|%s|%s|%s|%s|%x|%x|%x|%x|%x|%s|%s|%d|%d|%x",
                                                 7,
@@ -263,7 +263,7 @@ namespace tut
                 ensure_equals("Buffer sizes",size,(S32)post_size);
                 ensure("Buffer content",!strcmp(buffer,post_buffer));
         }
-*/
+#endif
 
         /*
         template<> template<>
@@ -287,7 +287,7 @@ namespace tut
         void bas_object::test<1>()
         {
                 const char HELLO_WORLD[] = "hello world";
-                const S32 str_len = strlen(HELLO_WORLD);
+                const S32 str_len = strlen(HELLO_WORLD);                /* Flawfinder: ignore */
                 LLChannelDescriptors ch = mBuffer.nextChannel();
                 LLBufferStream str(ch, &mBuffer);
                 mBuffer.append(ch.in(), (U8*)HELLO_WORLD, str_len);
@@ -425,7 +425,7 @@ namespace tut
                 ostr << ") ";
                 bstr.flush();
                 const S32 BUF_LEN = 512;
-                char buf[BUF_LEN];
+                char buf[BUF_LEN];              /* Flawfinder: ignore */
                 S32 actual_len = BUF_LEN;
                 (void) mBuffer.readAfter(ch.out(), NULL, (U8*)buf, actual_len);
                 buf[actual_len] = '\0';
@@ -479,7 +479,7 @@ namespace tut
                                 ++total_size;
                         }
                         need_comma = true;
-                        srand(69 + i);
+                        srand(69 + i);  /* Flawfinder: ignore */
                         S32 size = rand() % 1000 + 1000;
                         std::generate_n(
                                 std::back_insert_iterator<buf_t>(source),
@@ -545,7 +545,7 @@ namespace tut
                         need_comma = true;
                         ostr << "'" << i << "':";
                         total_size += 7;
-                        srand(69 + i);
+                        srand(69 + i);          /* Flawfinder: ignore */
                         S32 size = rand() % 1000 + 1000;
                         std::generate_n(
                                 std::back_insert_iterator<buf_t>(source),
@@ -601,7 +601,7 @@ namespace tut
                                                                                 "'circuit_code': i124,'group_id': '8615c885-9cf0-bf0a-6e40-0c11462aa652','limited_to_estate': i1,'look_at': [ i0, i0, i0],"
                                                                                 "'agent_id': '0e346d8b-4433-4d66-a6b0-fd37083abc4c','first_name': 'Kelly','start': 'url'}]}";
                 LLChannelDescriptors ch = mBuffer.nextChannel();
-                mBuffer.append(ch.out(), (U8*)LOGIN_STREAM, strlen(LOGIN_STREAM));
+                mBuffer.append(ch.out(), (U8*)LOGIN_STREAM, strlen(LOGIN_STREAM));              /* Flawfinder: ignore */
                 ch = mBuffer.nextChannel();
                 LLBufferStream istr(ch, &mBuffer);
                 LLSD data;
@@ -1119,7 +1119,7 @@ namespace tut
                 stream << "{'task_id':ucc706f2d-0b68-68f8-11a4-f1043ff35ca0}\n{\n\tname\tObject|\n\tpermissions 0\n}";
                 std::vector<U8> expected_binary;
                 expected_binary.resize(stream.str().size());
-                memcpy(&expected_binary[0], stream.str().c_str(), stream.str().size());
+                memcpy(&expected_binary[0], stream.str().c_str(), stream.str().size());         /* Flawfinder: ignore */
                 stream.str("");
                 stream << "[{'uri':'" << uri << "'}, {'version':i1}, "
                                   << "{'agent_id':'3c115e51-04f4-523c-9fa6-98aff1034730', 'session_id':'2c585cec-038c-40b0-b42e-a25ebab4d132', 'circuit_code':i1075, 'start':'region', 'limited_to_estate':i1 'first_name':'Phoenix', 'last_name':'Linden', 'group_title':'', 'group_id':u00000000-0000-0000-0000-000000000000, 'position':[r70.9247,r254.378,r38.7304], 'look_at':[r-0.043753,r-0.999042,r0], 'granters':[ua2e76fcd-9360-4f6d-a924-000000000003], 'texture_data':['5e481e8a-58a6-fc34-6e61-c7a36095c07f', 'c39675f5-ca90-a304-bb31-42cdb803a132', '5c989edf-88d1-b2ac-b00b-5ed4bab8e368', '6522e74d-1660-4e7f-b601-6f48c1659a77', '7ca39b4c-bd19-4699-aff7-f93fd03d3e7b', '41c58177-5eb6-5aeb-029d-bc4093f3c130', '97b75473-8b93-9b25-2a11-035b9ae93195', '1c2d8d9b-90eb-89d4-dea8-c1ed83990614', '69ec543f-e27b-c07c-9094-a8be6300f274', 'c9f8b80f-c629-4633-04ee-c566ce9fea4b', '989cddba-7ab6-01ed-67aa-74accd2a2a65', '45e319b2-6a8c-fa5c-895b-1a7149b88aef', '5748decc-f629-461c-9a36-a35a221fe21f', 'c228d1cf-4b5d-4ba8-84f4-899a0796aa97', 'c228d1cf-4b5d-4ba8-84f4-899a0796aa97', '685fbe10-ab40-f065-0aec-726cc6dfd7a1', '406f98fd-9c89-1d52-5f39-e67d508c5ee5', '685fbe10-ab40-f065-0aec-726cc6dfd7a1', 'c228d1cf-4b5d-4ba8-84f4-899a0796aa97', 'c228d1cf-4b5d-4ba8-84f4-899a0796aa97'], "
@@ -1213,7 +1213,7 @@ namespace tut
                 tmp_str << "{'task_id':ucc706f2d-0b68-68f8-11a4-f1043ff35ca0}\n{\n\tname\tObject|\n\tpermissions 0\n}";
                 std::vector<U8> expected_binary;
                 expected_binary.resize(tmp_str.str().size());
-                memcpy(
+                memcpy(         /* Flawfinder: ignore */
                         &expected_binary[0],
                         tmp_str.str().c_str(),
                         tmp_str.str().size());
diff --git a/linden/indra/test/llapp_tut.cpp b/linden/indra/test/llapp_tut.cpp
index a238cb3..3223f91 100644
--- a/linden/indra/test/llapp_tut.cpp
+++ b/linden/indra/test/llapp_tut.cpp
@@ -150,4 +150,17 @@ namespace tut
                 bool ok = mApp->parseCommandOptions(ARGC, ARGV);
                 ensure("command line parse failure", !ok);
         }
+
+
+        template<> template<>
+        void application_object_t::test<5>()
+        {
+                LLSD options;
+                options["boolean-test"] = true;
+                mApp->setOptionData(LLApp::PRIORITY_GENERAL_CONFIGURATION, options);
+                ensure("bool set", mApp->getOption("boolean-test").asBoolean());
+                options["boolean-test"] = false;
+                mApp->setOptionData(LLApp::PRIORITY_RUNTIME_OVERRIDE, options);
+                ensure("bool unset", !mApp->getOption("boolean-test").asBoolean());
+        }
 }
diff --git a/linden/indra/test/llbase64_tut.cpp b/linden/indra/test/llbase64_tut.cpp
new file mode 100644
index 0000000..fe02397
--- /dev/null
+++ b/linden/indra/test/llbase64_tut.cpp
@@ -0,0 +1,77 @@
+/** 
+ * @file llbase64_tut.cpp
+ * @author James Cook
+ * @date 2007-02-04
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+#include "lltut.h"
+
+#include "llbase64.h"
+
+#include <string>
+#include "lluuid.h"
+
+namespace tut
+{
+        struct base64_data
+        {
+        };
+        typedef test_group<base64_data> base64_test;
+        typedef base64_test::object base64_object;
+        tut::base64_test base64("base64");
+
+        template<> template<>
+        void base64_object::test<1>()
+        {
+                std::string result;
+
+                result = LLBase64::encode(NULL, 0);
+                ensure("encode nothing", (result == "") );
+
+                LLUUID nothing;
+                result = LLBase64::encode(&nothing.mData[0], UUID_BYTES);
+                ensure("encode blank uuid",
+                                (result == "AAAAAAAAAAAAAAAAAAAAAA==") );
+
+                LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e");
+                result = LLBase64::encode(&id.mData[0], UUID_BYTES);
+                ensure("encode random uuid",
+                                (result == "UmoeB6Gduu2ExP8IpIjRXg==") );
+
+        }
+
+        template<> template<>
+        void base64_object::test<2>()
+        {
+                std::string result;
+
+                U8 blob[40] = { 115, 223, 172, 255, 140, 70, 49, 125, 236, 155, 45, 199, 101, 17, 164, 131, 230, 19, 80, 64, 112, 53, 135, 98, 237, 12, 26, 72, 126, 14, 145, 143, 118, 196, 11, 177, 132, 169, 195, 134 };
+                result = LLBase64::encode(&blob[0], 40);
+                ensure("encode 40 bytes", 
+                                (result == "c9+s/4xGMX3smy3HZRGkg+YTUEBwNYdi7QwaSH4OkY92xAuxhKnDhg==") );
+        }
+
+}
diff --git a/linden/indra/test/llblowfish_tut.cpp b/linden/indra/test/llblowfish_tut.cpp
new file mode 100644
index 0000000..0d85ade
--- /dev/null
+++ b/linden/indra/test/llblowfish_tut.cpp
@@ -0,0 +1,144 @@
+/** 
+ * @file llblowfish_tut.cpp
+ * @author James Cook, james@lindenlab.com
+ * @date 2007-02-04
+ *
+ * Data files generated with:
+ * openssl enc -bf-cbc -in blowfish.digits.txt -out blowfish.1.bin -K 00000000000000000000000000000000 -iv 0000000000000000 -p
+ * openssl enc -bf-cbc -in blowfish.digits.txt -out blowfish.2.bin -K 526a1e07a19dbaed84c4ff08a488d15e -iv 0000000000000000 -p
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "linden_common.h"
+#include "lltut.h"
+
+#include "llblowfishcipher.h"
+
+#include <string>
+#include <stdio.h>
+#include "lluuid.h"
+
+namespace tut
+{
+        class LLData
+        {
+        public:
+                unsigned char* mInput;
+                int mInputSize;
+
+                LLData()
+                {
+                        // \n to make it easier to create text files
+                        // for testing with command line openssl
+                        mInput = (unsigned char*)"01234567890123456789012345678901234\n";
+                        mInputSize = 36;
+                }
+
+                bool matchFile(const char* filename,
+                                const std::string& data)
+                {
+                        FILE* fp = fopen(filename, "rb");
+                        if (!fp) 
+                        {
+                                // sometimes test is run inside the indra directory
+                                std::string path = "test/";
+                                path += filename;
+                                fp = fopen(path.c_str(), "rb");
+                        }
+                        if (!fp)
+                        {
+                                llwarns << "unabled to open " << filename << llendl;
+                                return false;
+                        }
+
+                        std::string good;
+                        good.resize(256);
+                        size_t got = fread(&good[0], 1, 256, fp);
+                        lldebugs << "matchFile read " << got << llendl;
+                        fclose(fp);
+                        good.resize(got);
+                
+                        return (good == data);
+                }
+        };
+        typedef test_group<LLData> blowfish_test;
+        typedef blowfish_test::object blowfish_object;
+        // Create test with name that can be selected on
+        // command line of test app.
+        tut::blowfish_test blowfish("blowfish");
+
+        template<> template<>
+        void blowfish_object::test<1>()
+        {
+                LLUUID blank;
+                LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
+
+                U32 dst_len = cipher.requiredEncryptionSpace(36);
+                ensure("encryption space 36",
+                                (dst_len == 40) );
+
+                // Blowfish adds an additional 8-byte block if your
+                // input is an exact multiple of 8
+                dst_len = cipher.requiredEncryptionSpace(8);
+                ensure("encryption space 8",
+                                (dst_len == 16)  );
+        }
+
+        template<> template<>
+        void blowfish_object::test<2>()
+        {
+                LLUUID blank;
+                LLBlowfishCipher cipher(&blank.mData[0], UUID_BYTES);
+
+                std::string result;
+                result.resize(256);
+                U32 count = cipher.encrypt(mInput, mInputSize,
+                                (U8*) &result[0], 256);
+
+                ensure("encrypt output count",
+                                (count == 40) );
+                result.resize(count);
+
+                ensure("encrypt null key", matchFile("blowfish.1.bin", result));
+        }
+
+        template<> template<>
+        void blowfish_object::test<3>()
+        {
+                // same as base64 test id
+                LLUUID id("526a1e07-a19d-baed-84c4-ff08a488d15e");
+                LLBlowfishCipher cipher(&id.mData[0], UUID_BYTES);
+
+                std::string result;
+                result.resize(256);
+                U32 count = cipher.encrypt(mInput, mInputSize,
+                                (U8*) &result[0], 256);
+
+                ensure("encrypt output count",
+                                (count == 40) );
+                result.resize(count);
+
+                ensure("encrypt real key", matchFile("blowfish.2.bin", result));
+        }
+}
diff --git a/linden/indra/test/llerror_tut.cpp b/linden/indra/test/llerror_tut.cpp
new file mode 100644
index 0000000..a4b4258
--- /dev/null
+++ b/linden/indra/test/llerror_tut.cpp
@@ -0,0 +1,767 @@
+/** 
+ * @file llerror_tut.cpp
+ * @date   December 2006
+ * @brief error unit tests
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
+ * 
+ * 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.
+ */
+
+#include "llerror.h"
+namespace
+{
+        void test_that_error_h_includes_enough_things_to_compile_a_message()
+        {
+                llinfos << "!" << llendl;
+        }
+}
+
+#include <tut/tut.h>
+#include "lltut.h"
+
+#include <vector>
+
+#include "llerrorcontrol.h"
+#include "llsd.h"
+
+namespace
+{
+        static bool fatalWasCalled;
+        void fatalCall(const std::string&) { fatalWasCalled = true; }
+        
+        class TestRecorder : public LLError::Recorder
+        {
+        public:
+                TestRecorder() : mWantsTime(false) { }
+                ~TestRecorder() { LLError::removeRecorder(this); }
+                
+                void recordMessage(LLError::ELevel level,
+                                                        const std::string& message)
+                {
+                        mMessages.push_back(message);
+                }
+                
+                int countMessages()                     { return (int) mMessages.size(); }
+                void clearMessages()            { mMessages.clear(); }
+                
+                void setWantsTime(bool t)       { mWantsTime = t; }
+                bool wantsTime()                        { return mWantsTime; }
+
+                std::string message(int n)
+                {
+                        std::ostringstream test_name;
+                        test_name << "testing message " << n << ", not enough messages";
+
+                        tut::ensure(test_name.str(), n < countMessages());
+                        return mMessages[n];
+                }
+                
+        private:
+                typedef std::vector<std::string> MessageVector;
+                MessageVector mMessages;
+                
+                bool mWantsTime;
+        };
+}
+        
+namespace tut
+{
+        struct ErrorTestData
+        {
+                TestRecorder mRecorder;
+                LLError::Settings* mPriorErrorSettings;
+                
+                ErrorTestData()
+                {
+                        fatalWasCalled = false;
+                        
+                        mPriorErrorSettings = LLError::saveAndResetSettings();
+                        LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+                        LLError::setFatalFunction(fatalCall);
+                        LLError::addRecorder(&mRecorder);
+                }
+                
+                ~ErrorTestData()
+                {
+                        LLError::removeRecorder(&mRecorder);
+                        LLError::restoreSettings(mPriorErrorSettings);
+                }
+                
+                void ensure_message_count(int expectedCount)
+                {
+                        ensure_equals("message count", mRecorder.countMessages(), expectedCount);
+                }
+
+                void ensure_message_contains(int n, const std::string& expectedText)
+                {
+                        std::ostringstream test_name;
+                        test_name << "testing message " << n;
+
+                        ensure_contains(test_name.str(), mRecorder.message(n), expectedText);
+                }
+
+                void ensure_message_does_not_contain(int n, const std::string& expectedText)
+                {
+                        std::ostringstream test_name;
+                        test_name << "testing message " << n;
+
+                        ensure_does_not_contain(test_name.str(), mRecorder.message(n), expectedText);
+                }
+        };
+        
+        typedef test_group<ErrorTestData>       ErrorTestGroup;
+        typedef ErrorTestGroup::object          ErrorTestObject;
+        
+        ErrorTestGroup errorTestGroup("error");
+        
+        template<> template<>
+        void ErrorTestObject::test<1>()
+                // basic test of output
+        {
+                llinfos << "test" << llendl;
+                llinfos << "bob" << llendl;
+                
+                ensure_message_contains(0, "test");
+                ensure_message_contains(1, "bob");
+        }
+}
+
+namespace
+{
+        void writeSome()
+        {
+                lldebugs << "one" << llendl;
+                llinfos << "two" << llendl;
+                llwarns << "three" << llendl;
+                llerrs << "four" << llendl;
+                        // fatal messages write out and addtional "error" message
+        }
+};
+
+namespace tut
+{       
+        template<> template<>
+        void ErrorTestObject::test<2>()
+                // messages are filtered based on default level
+        {
+                LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+                writeSome();
+                ensure_message_contains(0, "one");
+                ensure_message_contains(1, "two");
+                ensure_message_contains(2, "three");
+                ensure_message_contains(3, "error");
+                ensure_message_contains(4, "four");
+                ensure_message_count(5);
+        
+                LLError::setDefaultLevel(LLError::LEVEL_INFO);
+                writeSome();
+                ensure_message_contains(5, "two");
+                ensure_message_contains(6, "three");
+                ensure_message_contains(7, "error");
+                ensure_message_contains(8, "four");
+                ensure_message_count(9);
+                
+                LLError::setDefaultLevel(LLError::LEVEL_WARN);
+                writeSome();
+                ensure_message_contains(9, "three");
+                ensure_message_contains(10, "error");
+                ensure_message_contains(11, "four");
+                ensure_message_count(12);
+                
+                LLError::setDefaultLevel(LLError::LEVEL_ERROR);
+                writeSome();
+                ensure_message_contains(12, "error");
+                ensure_message_contains(13, "four");
+                ensure_message_count(14);
+                
+                LLError::setDefaultLevel(LLError::LEVEL_NONE);
+                writeSome();
+                ensure_message_count(14);
+        }
+
+        template<> template<>
+        void ErrorTestObject::test<3>()
+                // error type string in output
+        {
+                writeSome();
+                ensure_message_contains(0, "DEBUG: ");
+                ensure_message_contains(1, "INFO: ");
+                ensure_message_contains(2, "WARNING: ");
+                ensure_message_does_not_contain(3, "ERROR");
+                ensure_message_contains(4, "ERROR: ");
+                ensure_message_count(5);
+        }
+
+        template<> template<>
+        void ErrorTestObject::test<4>()
+                // file abbreviation
+        {
+                std::string thisFile = __FILE__;
+                std::string abbreviateFile = LLError::abbreviateFile(thisFile);
+                
+                ensure_ends_with("file name abbreviation",
+                        abbreviateFile,
+                        "test/llerror_tut.cpp"
+                        );
+                ensure_does_not_contain("file name abbreviation",
+                        abbreviateFile, "indra");
+                        
+                std::string someFile =
+#if LL_WINDOWS
+                        "C:/amy/bob/cam.cpp"
+#else
+                        "/amy/bob/cam.cpp"
+#endif
+                        ;
+                std::string someAbbreviation = LLError::abbreviateFile(someFile);
+                
+                ensure_equals("non-indra file abbreviation",
+                        someAbbreviation, someFile);
+        }
+}
+        
+namespace
+{
+        std::string locationString(int line)
+        {
+                std::ostringstream location;
+                location << LLError::abbreviateFile(__FILE__)
+                                 << "(" << line << ") : ";
+                                 
+                return location.str();
+        }
+        
+        std::string writeReturningLocation()
+        {
+                llinfos << "apple" << llendl;   int this_line = __LINE__;
+                return locationString(this_line);
+        }
+        
+        std::string writeReturningLocationAndFunction()
+        {
+                llinfos << "apple" << llendl;   int this_line = __LINE__;
+                return locationString(this_line) + __FUNCTION__;
+        }
+        
+        std::string errorReturningLocation()
+        {
+                llerrs << "die" << llendl;      int this_line = __LINE__;
+                return locationString(this_line);
+        }
+}
+
+namespace tut
+{       
+        template<> template<>
+        void ErrorTestObject::test<5>()
+                // file and line information in log messages
+        {
+                std::string location = writeReturningLocation();
+                        // expecting default to not print location information
+                
+                LLError::setPrintLocation(true);
+                writeReturningLocation();
+                
+                LLError::setPrintLocation(false);
+                writeReturningLocation();
+                
+                ensure_message_does_not_contain(0, location);
+                ensure_message_contains(1, location);
+                ensure_message_does_not_contain(2, location);
+        }
+}
+
+/* The following helper functions and class members all log a simple message
+        from some particular function scope.  Each function takes a bool argument
+        that indicates if it should log its own name or not (in the manner that
+        existing log messages often do.)  The functions all return their C++
+        name so that test can be substantial mechanized.
+ */
+ 
+std::string logFromGlobal(bool id)
+{
+        llinfos << (id ? "logFromGlobal: " : "") << "hi" << llendl;
+        return "logFromGlobal";
+}
+
+static std::string logFromStatic(bool id)
+{
+        llinfos << (id ? "logFromStatic: " : "") << "hi" << llendl;
+        return "logFromStatic";
+}
+
+namespace
+{
+        std::string logFromAnon(bool id)
+        {
+                llinfos << (id ? "logFromAnon: " : "") << "hi" << llendl;
+                return "logFromAnon";
+        }
+}
+
+namespace Foo {
+        std::string logFromNamespace(bool id)
+        {
+                llinfos << (id ? "Foo::logFromNamespace: " : "") << "hi" << llendl;
+                //return "Foo::logFromNamespace";
+                        // there is no standard way to get the namespace name, hence
+                        // we won't be testing for it
+                return "logFromNamespace";
+        }
+}
+
+namespace
+{
+        class ClassWithNoLogType {
+        public:
+                std::string logFromMember(bool id)
+                {
+                        llinfos << (id ? "ClassWithNoLogType::logFromMember: " : "") << "hi" << llendl;
+                        return "ClassWithNoLogType::logFromMember";
+                }
+                static std::string logFromStatic(bool id)
+                {
+                        llinfos << (id ? "ClassWithNoLogType::logFromStatic: " : "") << "hi" << llendl;
+                        return "ClassWithNoLogType::logFromStatic";
+                }
+        };
+        
+        class ClassWithLogType {
+                LOG_CLASS(ClassWithLogType);
+        public:
+                std::string logFromMember(bool id)
+                {
+                        llinfos << (id ? "ClassWithLogType::logFromMember: " : "") << "hi" << llendl;
+                        return "ClassWithLogType::logFromMember";
+                }
+                static std::string logFromStatic(bool id)
+                {
+                        llinfos << (id ? "ClassWithLogType::logFromStatic: " : "") << "hi" << llendl;
+                        return "ClassWithLogType::logFromStatic";
+                }
+        };
+        
+        std::string logFromNamespace(bool id) { return Foo::logFromNamespace(id); }
+        std::string logFromClassWithNoLogTypeMember(bool id) { ClassWithNoLogType c; return c.logFromMember(id); }
+        std::string logFromClassWithNoLogTypeStatic(bool id) { return ClassWithNoLogType::logFromStatic(id); }
+        std::string logFromClassWithLogTypeMember(bool id) { ClassWithLogType c; return c.logFromMember(id); }
+        std::string logFromClassWithLogTypeStatic(bool id) { return ClassWithLogType::logFromStatic(id); }
+        
+        void ensure_has_once(const std::string& message,
+                const std::string& actual, const std::string& expected)
+        {
+                std::string::size_type n1 = actual.find(expected);
+                std::string::size_type n2 = std::string::npos;
+                if (n1 != std::string::npos)
+                {
+                        n2 = std::string(actual, n1 + expected.size()).find(expected);
+                }
+                
+                if (n1 == std::string::npos  ||  n2 != std::string::npos)
+                {
+                        std::stringstream ss;
+                        ss << message << ": " << "expected to find one copy of " << expected
+                                << " in actual " << actual;
+                        throw tut::failure(ss.str().c_str());
+                }
+        }
+        
+        typedef std::string (*LogFromFunction)(bool);
+        void testLogNameOnce(TestRecorder& recorder, LogFromFunction f,
+                const std::string& class_name = "")
+        {
+                recorder.clearMessages();
+                std::string name = f(false);
+                f(true);
+                
+                std::string messageWithoutName = recorder.message(0);
+                std::string messageWithName = recorder.message(1);
+                
+                ensure_has_once(name + " logged without name",
+                        messageWithoutName, name);
+                ensure_has_once(name + " logged with name",
+                        messageWithName, name);
+
+                if (!class_name.empty())
+                {
+                        ensure_has_once(name + "logged without name",
+                                messageWithoutName, class_name);
+                        ensure_has_once(name + "logged with name",
+                                messageWithName, class_name);
+                }
+        }
+}
+
+namespace tut
+{
+        template<> template<>
+                //      class/function information in output
+        void ErrorTestObject::test<6>()
+        {
+                testLogNameOnce(mRecorder, logFromGlobal);
+                testLogNameOnce(mRecorder, logFromStatic);
+                testLogNameOnce(mRecorder, logFromAnon);
+                testLogNameOnce(mRecorder, logFromNamespace);
+                //testLogNameOnce(mRecorder, logFromClassWithNoLogTypeMember, "ClassWithNoLogType");
+                //testLogNameOnce(mRecorder, logFromClassWithNoLogTypeStatic, "ClassWithNoLogType");
+                        // XXX: figure out what the exepcted response is for these
+                testLogNameOnce(mRecorder, logFromClassWithLogTypeMember, "ClassWithLogType");
+                testLogNameOnce(mRecorder, logFromClassWithLogTypeStatic, "ClassWithLogType");
+        }
+}
+
+namespace
+{
+        std::string innerLogger()
+        {
+                llinfos << "inside" << llendl;
+                return "moo";
+        }
+        
+        std::string outerLogger()
+        {
+                llinfos << "outside(" << innerLogger() << ")" << llendl;
+                return "bar";
+        }
+        
+        void uberLogger()
+        {
+                llinfos << "uber(" << outerLogger() << "," << innerLogger() << ")" << llendl;
+        }
+        
+        class LogWhileLogging
+        {
+        public:
+                void print(std::ostream& out) const
+                {
+                        llinfos << "logging" << llendl;
+                        out << "baz";
+                }
+        };
+
+        std::ostream& operator<<(std::ostream& out, const LogWhileLogging& l)
+                { l.print(out); return out; }
+
+        void metaLogger()
+        {
+                LogWhileLogging l;
+                llinfos << "meta(" << l << ")" << llendl;
+        }
+        
+}
+
+namespace tut
+{                       
+        template<> template<>
+                // handle nested logging
+        void ErrorTestObject::test<7>()
+        {
+                outerLogger();
+                ensure_message_contains(0, "inside");
+                ensure_message_contains(1, "outside(moo)");
+                ensure_message_count(2);
+                
+                uberLogger();
+                ensure_message_contains(2, "inside");
+                ensure_message_contains(3, "inside");
+                ensure_message_contains(4, "outside(moo)");
+                ensure_message_contains(5, "uber(bar,moo)");
+                ensure_message_count(6);
+                
+                metaLogger();
+                ensure_message_contains(6, "logging");
+                ensure_message_contains(7, "meta(baz)");
+                ensure_message_count(8);
+        }
+        
+        template<> template<>
+                // special handling of llerrs calls
+        void ErrorTestObject::test<8>()
+        {
+                LLError::setPrintLocation(false);
+                std::string location = errorReturningLocation();
+                
+                ensure_message_contains(0, location + "error");
+                ensure_message_contains(1, "die");
+                ensure_message_count(2);
+                
+                ensure("fatal callback called", fatalWasCalled);
+        }
+}
+
+namespace
+{
+        std::string roswell()
+        {
+                return "1947-07-08T03:04:05Z";
+        }
+        
+        void ufoSighting()
+        {
+                llinfos << "ufo" << llendl;
+        }
+}
+
+namespace tut
+{       
+        template<> template<>
+                // time in output (for recorders that need it)
+        void ErrorTestObject::test<9>()
+        {
+                LLError::setTimeFunction(roswell);
+
+                mRecorder.setWantsTime(false);
+                ufoSighting();
+                ensure_message_contains(0, "ufo");
+                ensure_message_does_not_contain(0, roswell());
+                
+                mRecorder.setWantsTime(true);
+                ufoSighting();
+                ensure_message_contains(1, "ufo");
+                ensure_message_contains(1, roswell());
+        }
+        
+        template<> template<>
+                // output order
+        void ErrorTestObject::test<10>()
+        {
+                LLError::setPrintLocation(true);
+                LLError::setTimeFunction(roswell);
+                mRecorder.setWantsTime(true);
+                std::string locationAndFunction = writeReturningLocationAndFunction();
+                
+                ensure_equals("order is time type location function message",
+                        mRecorder.message(0),
+                        roswell() + " INFO: " + locationAndFunction + ": apple");
+        }
+
+        template<> template<>
+                // multiple recorders
+        void ErrorTestObject::test<11>()
+        {
+                TestRecorder altRecorder;
+                LLError::addRecorder(&altRecorder);
+                
+                llinfos << "boo" << llendl;
+
+                ensure_message_contains(0, "boo");
+                ensure_equals("alt recorder count", altRecorder.countMessages(), 1);
+                ensure_contains("alt recorder message 0", altRecorder.message(0), "boo");
+                
+                LLError::setTimeFunction(roswell);
+
+                TestRecorder anotherRecorder;
+                anotherRecorder.setWantsTime(true);
+                LLError::addRecorder(&anotherRecorder);
+                
+                llinfos << "baz" << llendl;
+
+                std::string when = roswell();
+                
+                ensure_message_does_not_contain(1, when);
+                ensure_equals("alt recorder count", altRecorder.countMessages(), 2);
+                ensure_does_not_contain("alt recorder message 1", altRecorder.message(1), when);
+                ensure_equals("another recorder count", anotherRecorder.countMessages(), 1);
+                ensure_contains("another recorder message 0", anotherRecorder.message(0), when);
+        }
+}
+
+class TestAlpha
+{
+        LOG_CLASS(TestAlpha);
+public:
+        static void doDebug()   { lldebugs << "add dice" << llendl; }
+        static void doInfo()    { llinfos  << "any idea" << llendl; }
+        static void doWarn()    { llwarns  << "aim west" << llendl; }
+        static void doError()   { llerrs   << "ate eels" << llendl; }
+        static void doAll() { doDebug(); doInfo(); doWarn(); doError(); }
+};
+
+class TestBeta
+{
+        LOG_CLASS(TestBeta);
+public:
+        static void doDebug()   { lldebugs << "bed down" << llendl; }
+        static void doInfo()    { llinfos  << "buy iron" << llendl; }
+        static void doWarn()    { llwarns  << "bad word" << llendl; }
+        static void doError()   { llerrs   << "big easy" << llendl; }
+        static void doAll() { doDebug(); doInfo(); doWarn(); doError(); }
+};
+
+namespace tut
+{
+        template<> template<>
+                // filtering by class
+        void ErrorTestObject::test<12>()
+        {
+                LLError::setDefaultLevel(LLError::LEVEL_WARN);
+                LLError::setClassLevel("TestBeta", LLError::LEVEL_INFO);
+                
+                TestAlpha::doAll();
+                TestBeta::doAll();
+                
+                ensure_message_contains(0, "aim west");
+                ensure_message_contains(1, "error");
+                ensure_message_contains(2, "ate eels");
+                ensure_message_contains(3, "buy iron");
+                ensure_message_contains(4, "bad word");
+                ensure_message_contains(5, "error");
+                ensure_message_contains(6, "big easy");
+                ensure_message_count(7);
+        }
+        
+        template<> template<>
+                // filtering by function, and that it will override class filtering
+        void ErrorTestObject::test<13>()
+        {
+                LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+                LLError::setClassLevel("TestBeta", LLError::LEVEL_WARN);
+                LLError::setFunctionLevel("TestBeta::doInfo", LLError::LEVEL_DEBUG);
+                LLError::setFunctionLevel("TestBeta::doError", LLError::LEVEL_NONE);
+                
+                TestBeta::doAll();
+                ensure_message_contains(0, "buy iron");
+                ensure_message_contains(1, "bad word");
+                ensure_message_count(2);
+        }
+        
+        template<> template<>
+                // filtering by file
+                // and that it is overridden by both class and function filtering
+        void ErrorTestObject::test<14>()
+        {
+                LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
+                LLError::setFileLevel(LLError::abbreviateFile(__FILE__),
+                                                                        LLError::LEVEL_WARN);
+                LLError::setClassLevel("TestAlpha", LLError::LEVEL_INFO);
+                LLError::setFunctionLevel("TestAlpha::doError",
+                                                                        LLError::LEVEL_NONE);
+                LLError::setFunctionLevel("TestBeta::doError",
+                                                                        LLError::LEVEL_NONE);
+                
+                TestAlpha::doAll();
+                TestBeta::doAll();
+                ensure_message_contains(0, "any idea");
+                ensure_message_contains(1, "aim west");
+                ensure_message_contains(2, "bad word");
+                ensure_message_count(3);
+        }
+        
+        template<> template<>
+                // proper cached, efficient lookup of filtering
+        void ErrorTestObject::test<15>()
+        {
+                LLError::setDefaultLevel(LLError::LEVEL_NONE);
+
+                TestAlpha::doInfo();
+                ensure_message_count(0);
+                ensure_equals("first check", LLError::shouldLogCallCount(), 1);
+                TestAlpha::doInfo();
+                ensure_message_count(0);
+                ensure_equals("second check", LLError::shouldLogCallCount(), 1);
+
+                LLError::setClassLevel("TestAlpha", LLError::LEVEL_DEBUG);
+                TestAlpha::doInfo();
+                ensure_message_count(1);
+                ensure_equals("third check", LLError::shouldLogCallCount(), 2);
+                TestAlpha::doInfo();
+                ensure_message_count(2);
+                ensure_equals("fourth check", LLError::shouldLogCallCount(), 2);
+
+                LLError::setClassLevel("TestAlpha", LLError::LEVEL_WARN);
+                TestAlpha::doInfo();
+                ensure_message_count(2);
+                ensure_equals("fifth check", LLError::shouldLogCallCount(), 3);
+                TestAlpha::doInfo();
+                ensure_message_count(2);
+                ensure_equals("sixth check", LLError::shouldLogCallCount(), 3);
+        }
+        
+        template<> template<>
+                // configuration from LLSD
+        void ErrorTestObject::test<16>()
+        {
+                std::string this_file = LLError::abbreviateFile(__FILE__);
+                LLSD config;
+                config["print-location"] = true;
+                config["default-level"] = "DEBUG";
+                
+                LLSD set1;
+                set1["level"] = "WARN";
+                set1["files"][0] = this_file;
+                
+                LLSD set2;
+                set2["level"] = "INFO";
+                set2["classes"][0] = "TestAlpha";
+                
+                LLSD set3;
+                set3["level"] = "NONE";
+                set3["functions"][0] = "TestAlpha::doError";
+                set3["functions"][1] = "TestBeta::doError";
+                
+                config["settings"][0] = set1;
+                config["settings"][1] = set2;
+                config["settings"][2] = set3;
+                
+                LLError::configure(config);
+                
+                TestAlpha::doAll();
+                TestBeta::doAll();
+                ensure_message_contains(0, "any idea");
+                ensure_message_contains(0, this_file);
+                ensure_message_contains(1, "aim west");
+                ensure_message_contains(2, "bad word");
+                ensure_message_count(3);
+                
+                // make sure reconfiguring works
+                LLSD config2;
+                config2["default-level"] = "WARN";
+                
+                LLError::configure(config2);
+                
+                TestAlpha::doAll();
+                TestBeta::doAll();
+                ensure_message_contains(3, "aim west");
+                ensure_message_does_not_contain(3, this_file);
+                ensure_message_contains(4, "error");
+                ensure_message_contains(5, "ate eels");
+                ensure_message_contains(6, "bad word");
+                ensure_message_contains(7, "error");
+                ensure_message_contains(8, "big easy");
+                ensure_message_count(9);
+        }
+}       
+
+/* Tests left:
+        handling of classes without LOG_CLASS
+
+        live update of filtering from file      
+        
+        syslog recorder
+        file recorder
+        cerr/stderr recorder
+        fixed buffer recorder
+        windows recorder
+
+        mutex use when logging (?)
+        strange careful about to crash handling (?)
+*/
diff --git a/linden/indra/test/llhttpclient_tut.cpp b/linden/indra/test/llhttpclient_tut.cpp
index c84d34b..ef53e71 100644
--- a/linden/indra/test/llhttpclient_tut.cpp
+++ b/linden/indra/test/llhttpclient_tut.cpp
@@ -32,9 +32,10 @@
  */
 
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
-
 #include "llhttpclient.h"
+#include "llformat.h"
 #include "llpipeutil.h"
 #include "llpumpio.h"
 
@@ -312,4 +313,23 @@ namespace tut
                 ensureStatusError();
                 ensure_equals("reason", mReason, "STATUS_ERROR");
         }
+
+        template<> template<>
+                void HTTPClientTestObject::test<7>()
+        {
+                // Can not use the little mini server.  The blocking request won't ever let it run.
+                // Instead get from a known LLSD source and compare results with the non-blocking get
+                // which is tested against the mini server earlier.
+                LLSD expected;
+
+                LLHTTPClient::get("http://secondlife.com/xmlhttp/homepage.php", newResult());
+                runThePump();
+                ensureStatusOK();
+                expected = getResult();
+
+                LLSD result;
+                result = LLHTTPClient::blockingGet("http://secondlife.com/xmlhttp/homepage.php");
+                LLSD body = result["body"];
+                ensure_equals("echoed result matches", body.size(), expected.size());
+        }
 }
diff --git a/linden/indra/test/llpipeutil.cpp b/linden/indra/test/llpipeutil.cpp
index 53c5991..2857f12 100644
--- a/linden/indra/test/llpipeutil.cpp
+++ b/linden/indra/test/llpipeutil.cpp
@@ -26,11 +26,15 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+
+#include "linden_common.h"
 #include "llpipeutil.h"
 
 #include <stdlib.h>
+#include <sstream>
 
 #include "llbufferstream.h"
+#include "lldefs.h"
 #include "llframetimer.h"
 #include "llpumpio.h"
 #include "llrand.h"
@@ -77,8 +81,8 @@ LLIOPipe::EStatus LLPipeStringExtractor::process_impl(
         std::ostringstream ostr;
         while (istr.good())
         {
-                char buf[1024];
-                istr.read(buf, sizeof(buf));
+                char buf[1024];         /* Flawfinder: ignore */
+                istr.read(buf, sizeof(buf));    /* Flawfinder: ignore */
                 ostr.write(buf, istr.gcount());
         }
         mString = ostr.str();
diff --git a/linden/indra/test/llrandom_tut.cpp b/linden/indra/test/llrandom_tut.cpp
index 1bb795e..a842dfd 100755
--- a/linden/indra/test/llrandom_tut.cpp
+++ b/linden/indra/test/llrandom_tut.cpp
@@ -1,9 +1,9 @@
-/** 

- * @file llrandom_tut.cpp

- * @author Phoenix

- * @date 2007-01-25

- *

- * Copyright (c) 2007-2007, Linden Research, Inc.

+/** 
+ * @file llrandom_tut.cpp
+ * @author Phoenix
+ * @date 2007-01-25
+ *
+ * Copyright (c) 2007-2007, Linden Research, Inc.
  * 
  * 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
@@ -23,47 +23,107 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-#include <tut/tut.h>

-

-#include "linden_common.h"

-#include "llrand.h"

-#include "lltut.h"

-

-

-namespace tut

-{

-        struct random

-        {

-        };

-

-        typedef test_group<random> random_t;

-        typedef random_t::object random_object_t;

-        tut::random_t tut_random("random");

-

-        template<> template<>

-        void random_object_t::test<1>()

-        {

-                F32 number = 0.0f;

-                for(S32 ii = 0; ii < 100000; ++ii)

-                {

-                        number = ll_frand();

-                        ensure("frand >= 0", (number >= 0.0f));

-                        ensure("frand < 1", (number < 1.0f));

-                }

-        }

-

-        template<> template<>

-        void random_object_t::test<2>()

-        {

-                F32 number = 0.0f;

-                for(S32 ii = 0; ii < 100000; ++ii)

-                {

-                        number = ll_frand(2.0f) - 1.0f;

-                        ensure("frand >= 0", (number >= -1.0f));

-                        ensure("frand < 1", (number <= 1.0f));

-                }

-        }

-}

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include <tut/tut.h>
+
+#include "linden_common.h"
+#include "llrand.h"
+#include "lltut.h"
+
+
+namespace tut
+{
+        struct random
+        {
+        };
+
+        typedef test_group<random> random_t;
+        typedef random_t::object random_object_t;
+        tut::random_t tut_random("random");
+
+        template<> template<>
+        void random_object_t::test<1>()
+        {
+                F32 number = 0.0f;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_frand();
+                        ensure("frand >= 0", (number >= 0.0f));
+                        ensure("frand < 1", (number < 1.0f));
+                }
+        }
+
+        template<> template<>
+        void random_object_t::test<2>()
+        {
+                F64 number = 0.0f;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_drand();
+                        ensure("drand >= 0", (number >= 0.0));
+                        ensure("drand < 1", (number < 1.0));
+                }
+        }
+
+        template<> template<>
+        void random_object_t::test<3>()
+        {
+                F32 number = 0.0f;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_frand(2.0f) - 1.0f;
+                        ensure("frand >= 0", (number >= -1.0f));
+                        ensure("frand < 1", (number <= 1.0f));
+                }
+        }
+
+        template<> template<>
+        void random_object_t::test<4>()
+        {
+                F32 number = 0.0f;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_frand(-7.0);
+                        ensure("drand <= 0", (number <= 0.0));
+                        ensure("drand > -7", (number > -7.0));
+                }
+        }
+
+        template<> template<>
+        void random_object_t::test<5>()
+        {
+                F64 number = 0.0f;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_drand(-2.0);
+                        ensure("drand <= 0", (number <= 0.0));
+                        ensure("drand > -2", (number > -2.0));
+                }
+        }
+
+        template<> template<>
+        void random_object_t::test<6>()
+        {
+                S32 number = 0;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_rand(100);
+                        ensure("rand >= 0", (number >= 0));
+                        ensure("rand < 100", (number < 100));
+                }
+        }
+
+        template<> template<>
+        void random_object_t::test<7>()
+        {
+                S32 number = 0;
+                for(S32 ii = 0; ii < 100000; ++ii)
+                {
+                        number = ll_rand(-127);
+                        ensure("rand <= 0", (number <= 0));
+                        ensure("rand > -127", (number > -127));
+                }
+        }
+}
diff --git a/linden/indra/test/llsd_message_system_tut.cpp b/linden/indra/test/llsd_message_system_tut.cpp
index b46701c..9fcc6b5 100644
--- a/linden/indra/test/llsd_message_system_tut.cpp
+++ b/linden/indra/test/llsd_message_system_tut.cpp
@@ -1,8 +1,8 @@
-/** 

- * @file llsd_message_system_tut.cpp

- * @brief Testing the LLSDMessageSystem.

- *

- * Copyright (c) 2006-2007, Linden Research, Inc.

+/** 
+ * @file llsd_message_system_tut.cpp
+ * @brief Testing the LLSDMessageSystem.
+ *
+ * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * 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
@@ -22,121 +22,123 @@
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.

- */

-

-/**

- *

- * These classes test the LLSDMessageSystem.

- *

- */

-

-#include <tut/tut.h>

-#include "llsdmessagesystem.h"

-#include "llsdutil.h"

-

-namespace tut

-{

-        class LLSDMessageSystemTestData

-        {

-        public:

-                LLSDMessageSystemTestData() {;}

-                ~LLSDMessageSystemTestData() {;}

-

-                LLSDMessageSystem mMsgSystem;

-        };

-

-        typedef test_group<LLSDMessageSystemTestData>   LLSDMessageSystemTestGroup;

-        typedef LLSDMessageSystemTestGroup::object              LLSDMessageSystemTestObject;

-        LLSDMessageSystemTestGroup llsdMessageSystemTestGroup("llsd_message_system");

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<1>()

-        {

-                LLSD input;

-                U32 valueIn, valueOut;

-                valueIn = 42;

-                input["Block"]["Var"] = ll_sd_from_U32(valueIn);

-                mMsgSystem.setInput(input);

-                mMsgSystem.getU32Fast("Block", "Var", valueOut);

-                ensure_equals("U32 from message system matches input U32", valueIn, valueOut);

-        }

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<2>()

-        {

-                LLSD input;

-                LLUUID valueIn, valueOut;

-                valueIn.generate();

-                input["Block"]["Var"] = valueIn;

-                mMsgSystem.setInput(input);

-                mMsgSystem.getUUIDFast("Block", "Var", valueOut);

-                ensure_equals("UUID from message system matches input UUID", valueIn, valueOut);

-        }

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<3>()

-        {

-                LLSD input;

-                U32 valueIn, valueOut;

-                LLHost host("127.0.0.1:80");

-                valueIn = host.getAddress();

-                input["Block"]["Var"] = ll_sd_from_U32(valueIn);

-                mMsgSystem.setInput(input);

-                mMsgSystem.getIPAddrFast("Block", "Var", valueOut);

-                ensure_equals("IP from message system matches input IP", valueIn, valueOut);

-        }

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<4>()

-        {

-                LLSD input;

-                U16 valueIn, valueOut;

-                LLHost host("127.0.0.1:80");

-                valueIn = host.getPort();

-                input["Block"]["Var"] = (S32)valueIn;

-                mMsgSystem.setInput(input);

-                mMsgSystem.getIPPortFast("Block", "Var", valueOut);

-                ensure_equals("Port from message system matches input port", valueIn, valueOut);

-        }

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<5>()

-        {

-                LLSD input;

-                U64 valueIn, valueOut;

-                valueIn = 42;

-                input["Block"]["Var"] = ll_sd_from_U64(valueIn);

-                mMsgSystem.setInput(input);

-                mMsgSystem.getU64Fast("Block", "Var", valueOut);

-                ensure_equals("Port from message system matches input port", valueIn, valueOut);

-        }

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<6>()

-        {

-                LLSD input;

-                std::string valueIn = "Value";

-                input["Block"]["Var"] = valueIn;

-                mMsgSystem.setInput(input);

-                const U32 buffLen = 16;

-                char buff[buffLen];

-                mMsgSystem.getStringFast("Block", "Var", buffLen, buff);

-                ensure_equals("string read from message system matches llsd input", std::string(buff), valueIn);

-        }

-

-        template<> template<>

-        void LLSDMessageSystemTestObject::test<7>()

-        {

-                LLSD input;

-                U32 valueIn, valueOut;

-                valueIn = 42;

-                input["Block"][0]["Var"] = ll_sd_from_U32(valueIn);

-                input["Block"][1]["Var"] = ll_sd_from_U32(valueIn + 1);

-                mMsgSystem.setInput(input);

-                mMsgSystem.getU32Fast("Block", "Var", valueOut, 0);

-                ensure_equals("U32 from message system matches input U32", valueIn, valueOut);

-                mMsgSystem.getU32Fast("Block", "Var", valueOut, 1);

-                ensure_equals("U32 from message system matches input U32", (valueIn + 1), valueOut);

-        }

-}

+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+/**
+ *
+ * These classes test the LLSDMessageSystem.
+ *
+ */
+
+#include "linden_common.h"
+
+#include <tut/tut.h>
+#include "llsdmessagesystem.h"
+#include "llsdutil.h"
+
+namespace tut
+{
+        class LLSDMessageSystemTestData
+        {
+        public:
+                LLSDMessageSystemTestData() {;}
+                ~LLSDMessageSystemTestData() {;}
+
+                LLSDMessageSystem mMsgSystem;
+        };
+
+        typedef test_group<LLSDMessageSystemTestData>   LLSDMessageSystemTestGroup;
+        typedef LLSDMessageSystemTestGroup::object              LLSDMessageSystemTestObject;
+        LLSDMessageSystemTestGroup llsdMessageSystemTestGroup("llsd_message_system");
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<1>()
+        {
+                LLSD input;
+                U32 valueIn, valueOut;
+                valueIn = 42;
+                input["Block"]["Var"] = ll_sd_from_U32(valueIn);
+                mMsgSystem.setInput(input);
+                mMsgSystem.getU32Fast("Block", "Var", valueOut);
+                ensure_equals("U32 from message system matches input U32", valueIn, valueOut);
+        }
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<2>()
+        {
+                LLSD input;
+                LLUUID valueIn, valueOut;
+                valueIn.generate();
+                input["Block"]["Var"] = valueIn;
+                mMsgSystem.setInput(input);
+                mMsgSystem.getUUIDFast("Block", "Var", valueOut);
+                ensure_equals("UUID from message system matches input UUID", valueIn, valueOut);
+        }
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<3>()
+        {
+                LLSD input;
+                U32 valueIn, valueOut;
+                LLHost host("127.0.0.1:80");
+                valueIn = host.getAddress();
+                input["Block"]["Var"] = ll_sd_from_U32(valueIn);
+                mMsgSystem.setInput(input);
+                mMsgSystem.getIPAddrFast("Block", "Var", valueOut);
+                ensure_equals("IP from message system matches input IP", valueIn, valueOut);
+        }
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<4>()
+        {
+                LLSD input;
+                U16 valueIn, valueOut;
+                LLHost host("127.0.0.1:80");
+                valueIn = host.getPort();
+                input["Block"]["Var"] = (S32)valueIn;
+                mMsgSystem.setInput(input);
+                mMsgSystem.getIPPortFast("Block", "Var", valueOut);
+                ensure_equals("Port from message system matches input port", valueIn, valueOut);
+        }
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<5>()
+        {
+                LLSD input;
+                U64 valueIn, valueOut;
+                valueIn = 42;
+                input["Block"]["Var"] = ll_sd_from_U64(valueIn);
+                mMsgSystem.setInput(input);
+                mMsgSystem.getU64Fast("Block", "Var", valueOut);
+                ensure_equals("Port from message system matches input port", valueIn, valueOut);
+        }
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<6>()
+        {
+                LLSD input;
+                std::string valueIn = "Value";
+                input["Block"]["Var"] = valueIn;
+                mMsgSystem.setInput(input);
+                const U32 buffLen = 16;
+                char buff[buffLen];
+                mMsgSystem.getStringFast("Block", "Var", buffLen, buff);
+                ensure_equals("string read from message system matches llsd input", std::string(buff), valueIn);
+        }
+
+        template<> template<>
+        void LLSDMessageSystemTestObject::test<7>()
+        {
+                LLSD input;
+                U32 valueIn, valueOut;
+                valueIn = 42;
+                input["Block"][0]["Var"] = ll_sd_from_U32(valueIn);
+                input["Block"][1]["Var"] = ll_sd_from_U32(valueIn + 1);
+                mMsgSystem.setInput(input);
+                mMsgSystem.getU32Fast("Block", "Var", valueOut, 0);
+                ensure_equals("U32 from message system matches input U32", valueIn, valueOut);
+                mMsgSystem.getU32Fast("Block", "Var", valueOut, 1);
+                ensure_equals("U32 from message system matches input U32", (valueIn + 1), valueOut);
+        }
+}
diff --git a/linden/indra/test/llsd_new_tut.cpp b/linden/indra/test/llsd_new_tut.cpp
index e33a28a..d278a78 100644
--- a/linden/indra/test/llsd_new_tut.cpp
+++ b/linden/indra/test/llsd_new_tut.cpp
@@ -28,9 +28,11 @@
 
 #include <math.h>
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 
 #include "llsd.h"
+#include "llstring.h"
 
 namespace tut
 {
diff --git a/linden/indra/test/lltut.cpp b/linden/indra/test/lltut.cpp
index 31b83e6..1127f72 100644
--- a/linden/indra/test/lltut.cpp
+++ b/linden/indra/test/lltut.cpp
@@ -27,7 +27,10 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
 #include "lltut.h"
+
+#include "llformat.h"
 #include "llsd.h"
 
 namespace tut
@@ -154,6 +157,20 @@ namespace tut
                 }
         }
 
+        void ensure_ends_with(const std::string& msg,
+                const std::string& actual, const std::string& expectedEnd)
+        {
+                if( actual.size() < expectedEnd.size()
+                        || actual.rfind(expectedEnd)
+                                != (actual.size() - expectedEnd.size()) )
+                {
+                        std::stringstream ss;
+                        ss << msg << ": " << "expected to find " << expectedEnd
+                                << " at end of actual " << actual;
+                        throw failure(ss.str().c_str());
+                }
+        }
+
         void ensure_contains(const std::string& msg,
                 const std::string& actual, const std::string& expectedSubString)
         {
@@ -165,4 +182,16 @@ namespace tut
                         throw failure(ss.str().c_str());
                 }
         }
+
+        void ensure_does_not_contain(const std::string& msg,
+                const std::string& actual, const std::string& expectedSubString)
+        {
+                if( actual.find(expectedSubString, 0) != std::string::npos )
+                {
+                        std::stringstream ss;
+                        ss << msg << ": " << "expected not to find " << expectedSubString
+                                << " in actual " << actual;
+                        throw failure(ss.str().c_str());
+                }
+        }
 }
diff --git a/linden/indra/test/lltut.h b/linden/indra/test/lltut.h
index ba3df24..c8fb6bc 100644
--- a/linden/indra/test/lltut.h
+++ b/linden/indra/test/lltut.h
@@ -87,8 +87,14 @@ namespace tut
         void ensure_starts_with(const std::string& msg,
                 const std::string& actual, const std::string& expectedStart);
 
+        void ensure_ends_with(const std::string& msg,
+                const std::string& actual, const std::string& expectedEnd);
+
         void ensure_contains(const std::string& msg,
                 const std::string& actual, const std::string& expectedSubString);
+
+        void ensure_does_not_contain(const std::string& msg,
+                const std::string& actual, const std::string& expectedSubString);
 }
 
 
diff --git a/linden/indra/test/lluri_tut.cpp b/linden/indra/test/lluri_tut.cpp
index acd67cf..31ea7d6 100644
--- a/linden/indra/test/lluri_tut.cpp
+++ b/linden/indra/test/lluri_tut.cpp
@@ -36,51 +36,19 @@
 namespace tut
 {
         struct URITestData {
-                void checkParts(const std::string& uriString,
+                void checkParts(const LLURI& u,
                                 const char* expectedScheme,
                                 const char* expectedOpaque,
                                 const char* expectedAuthority,
                                 const char* expectedPath,
-                                const char* expectedQuery)
+                                const char* expectedQuery = "")
                 {
-                        LLURI u(uriString);
-
                         ensure_equals("scheme",         u.scheme(),             expectedScheme);
                         ensure_equals("opaque",         u.opaque(),             expectedOpaque);
                         ensure_equals("authority",      u.authority(),  expectedAuthority);
                         ensure_equals("path",           u.path(),               expectedPath);
                         ensure_equals("query",          u.query(),              expectedQuery);
                 }
-
-                void checkPartsHTTP(const char* host_and_port,
-                                                        const LLSD& path,
-                                                        const char* expectedOpaque,
-                                                        const char* expectedAuthority,
-                                                        const char* expectedPath)
-                {
-                        LLURI u = LLURI::buildHTTP(host_and_port, path);
-                        ensure_equals("scheme",         u.scheme(),             "HTTP");
-                        ensure_equals("opaque",         u.opaque(),             expectedOpaque);
-                        ensure_equals("authority",      u.authority(),  expectedAuthority);
-                        ensure_equals("path",           u.path(),               expectedPath);
-                        ensure_equals("query",          u.query(),              "");
-                }
-
-                void checkPartsHTTP(const char* host_and_port,
-                                                        const LLSD& path,
-                                                        const LLSD& args,
-                                                        const char* expectedOpaque,
-                                                        const char* expectedAuthority,
-                                                        const char* expectedPath,
-                                                        const char* expectedQuery)
-                {
-                        LLURI u = LLURI::buildHTTP(host_and_port, path, args);
-                        ensure_equals("scheme",         u.scheme(),             "HTTP");
-                        ensure_equals("opaque",         u.opaque(),             expectedOpaque);
-                        ensure_equals("authority",      u.authority(),  expectedAuthority);
-                        ensure_equals("path",           u.path(),               expectedPath);
-                        ensure_equals("query",          u.query(),              expectedQuery);
-                }
         };
         
         typedef test_group<URITestData> URITestGroup;
@@ -114,59 +82,73 @@ namespace tut
         void URITestObject::test<2>()
         {
                 // empty string
-                checkParts("", "", "", "", "", "");
+                checkParts(LLURI(""), "", "", "", "");
         }
         
         template<> template<>
         void URITestObject::test<3>()
         {
                 // no scheme
-                checkParts("foo", "", "foo", "", "", "");
-                checkParts("foo%3A", "", "foo:", "", "", "");
+                checkParts(LLURI("foo"), "", "foo", "", "");
+                checkParts(LLURI("foo%3A"), "", "foo:", "", "");
         }
 
         template<> template<>
         void URITestObject::test<4>()
         {
                 // scheme w/o paths
-                checkParts("mailto:zero@ll.com", "mailto", "zero@ll.com", "", "", "");
-                checkParts("silly://abc/def?foo", "silly", "//abc/def?foo", "", "", "");
+                checkParts(LLURI("mailto:zero@ll.com"),
+                        "mailto", "zero@ll.com", "", "");
+                checkParts(LLURI("silly://abc/def?foo"),
+                        "silly", "//abc/def?foo", "", "");
         }
 
         template<> template<>
         void URITestObject::test<5>()
         {
                 // authority section
-                checkParts("http:///", "http", "///", "", "/", "");
-                checkParts("http://abc", "http", "//abc", "abc", "", "");
-                checkParts("http://a%2Fb/cd", "http", "//a/b/cd", "a/b", "/cd", "");
-                checkParts("http://host?", "http", "//host?", "host", "", "");
+                checkParts(LLURI("http:///"),
+                        "http", "///", "", "/");
+                        
+                checkParts(LLURI("http://abc"),
+                        "http", "//abc", "abc", "");
+                        
+                checkParts(LLURI("http://a%2Fb/cd"),
+                        "http", "//a/b/cd", "a/b", "/cd");
+                        
+                checkParts(LLURI("http://host?"),
+                        "http", "//host?", "host", "");
         }
 
         template<> template<>
         void URITestObject::test<6>()
         {               
                 // path section
-                checkParts("http://host/a/b/", "http", "//host/a/b/",
-                                "host", "/a/b/", "");
-                checkParts("http://host/a%3Fb/", "http", "//host/a?b/",
-                                "host", "/a?b/", "");
-                checkParts("http://host/a:b/", "http", "//host/a:b/",
-                                "host", "/a:b/", "");
+                checkParts(LLURI("http://host/a/b/"),
+                                "http", "//host/a/b/", "host", "/a/b/");
+                                
+                checkParts(LLURI("http://host/a%3Fb/"),
+                                "http", "//host/a?b/", "host", "/a?b/");
+                                
+                checkParts(LLURI("http://host/a:b/"),
+                                "http", "//host/a:b/", "host", "/a:b/");
         }
 
         template<> template<>
         void URITestObject::test<7>()
         {               
                 // query string
-                checkParts("http://host/?", "http", "//host/?",
-                                "host", "/", "");
-                checkParts("http://host/?x", "http", "//host/?x",
-                                "host", "/", "x");
-                checkParts("http://host/??", "http", "//host/??",
-                                "host", "/", "?");
-                checkParts("http://host/?%3F", "http", "//host/??",
-                                "host", "/", "?");
+                checkParts(LLURI("http://host/?"),
+                                "http", "//host/?", "host", "/", "");
+                                
+                checkParts(LLURI("http://host/?x"),
+                                "http", "//host/?x", "host", "/", "x");
+                                
+                checkParts(LLURI("http://host/??"),
+                                "http", "//host/??", "host", "/", "?");
+                                
+                checkParts(LLURI("http://host/?%3F"),
+                                "http", "//host/??", "host", "/", "?");
         }
 
         template<> template<>
@@ -175,11 +157,15 @@ namespace tut
                 LLSD path;
                 path.append("x");
                 path.append("123");
-                checkPartsHTTP("host", path, "//host/x/123", "//host", "/x/123");
+                checkParts(LLURI::buildHTTP("host", path),
+                        "http", "//host/x/123", "host", "/x/123");
+                
                 LLSD query;
                 query["123"] = "12";
                 query["abcd"] = "abc";
-                checkPartsHTTP("host", path, query, "//host/x/123?123=12&abcd=abc&", "//host", "/x/123", "123=12&abcd=abc&");
+                checkParts(LLURI::buildHTTP("host", path, query),
+                        "http", "//host/x/123?123=12&abcd=abc&",
+                        "host", "/x/123", "123=12&abcd=abc&");
         }
 
         template<> template<>
@@ -189,7 +175,8 @@ namespace tut
                 LLSD path;
                 path.append("x@*//*$&^");
                 path.append("123");
-                checkPartsHTTP("host", path, "//host/x@*//*$&^/123", "//host", "/x@*//*$&^/123");
+                checkParts(LLURI::buildHTTP("host", path),
+                        "http", "//host/x@*//*$&^/123", "host", "/x@*//*$&^/123");
         }
 
         template<> template<>
@@ -202,7 +189,9 @@ namespace tut
                 LLSD query;
                 query["123"] = "?&*#//";
                 query["**@&?//"] = "abc";
-                checkPartsHTTP("host", path, query, "//host/x/123?**@&?//=abc&123=?&*#//&", "//host", "/x/123", "**@&?//=abc&123=?&*#//&");
+                checkParts(LLURI::buildHTTP("host", path, query),
+                        "http", "//host/x/123?**@&?//=abc&123=?&*#//&",
+                        "host", "/x/123", "**@&?//=abc&123=?&*#//&");
         }
 
         template<> template<>
@@ -215,7 +204,67 @@ namespace tut
                 LLSD query;
                 query["123"] = "12";
                 query["abcd"] = "abc";
-                checkPartsHTTP("hi123*33--}{:portstuffs", path, query, "//hi123*33--}{:portstuffs/x/123?123=12&abcd=abc&", "//hi123*33--}{:portstuffs", "/x/123", "123=12&abcd=abc&");
+                checkParts(LLURI::buildHTTP("hi123*33--}{:portstuffs", path, query),
+                        "http", "//hi123*33--}{:portstuffs/x/123?123=12&abcd=abc&",
+                        "hi123*33--}{:portstuffs", "/x/123", "123=12&abcd=abc&");
+        }
+        
+        template<> template<>
+        void URITestObject::test<12>()
+        {
+                // test funky host_port values that are actually prefixes
+                
+                checkParts(LLURI::buildHTTP("http://example.com:8080", LLSD()),
+                        "http", "//example.com:8080",
+                        "example.com:8080", "");
+                        
+                checkParts(LLURI::buildHTTP("http://example.com:8080/", LLSD()),
+                        "http", "//example.com:8080/",
+                        "example.com:8080", "/");
+
+                checkParts(LLURI::buildHTTP("http://example.com:8080/a/b", LLSD()),
+                        "http", "//example.com:8080/a/b",
+                        "example.com:8080", "/a/b");
+        }
+
+        template<> template<>
+        void URITestObject::test<13>()
+        {
+                const std::string unreserved =   
+                        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+                        "0123456789"
+                        "-._~";
+                // test escape
+                ensure_equals("escaping", LLURI::escape("abcdefg", "abcdef"), "abcdef%67");
+                ensure_equals("escaping", LLURI::escape("|/&\\+-_!@", ""), "%7C%2F%26%5C%2B%2D%5F%21%40");
+                ensure_equals("escaping as query variable", 
+                                          LLURI::escape("http://10.0.1.4:12032/agent/god/agent-id/map/layer/?resume=http://station3.ll.com:12032/agent/203ad6df-b522-491d-ba48-4e24eb57aeff/send-postcard", unreserved + ":@!$'()*+,="), 
+                                          "http:%2F%2F10.0.1.4:12032%2Fagent%2Fgod%2Fagent-id%2Fmap%2Flayer%2F%3Fresume=http:%2F%2Fstation3.ll.com:12032%2Fagent%2F203ad6df-b522-491d-ba48-4e24eb57aeff%2Fsend-postcard");
+        }
+        
+        template<> template<>
+        void URITestObject::test<14>()
+        {
+                // test various build utilities
+                
+                LLUUID id("11111111-2222-3333-4444-5566778899aa");
+                
+                
+                checkParts(LLURI::buildAgentPresenceURI(id, NULL),
+                        "http", "//localhost:12040/agent/11111111-2222-3333-4444-5566778899aa/presence",
+                        "localhost:12040", "/agent/11111111-2222-3333-4444-5566778899aa/presence");
+                
+                checkParts(LLURI::buildBulkAgentPresenceURI(NULL),
+                        "http", "//localhost:12040/agent/presence",
+                        "localhost:12040", "/agent/presence");
+                
+                checkParts(LLURI::buildAgentSessionURI(id, NULL),
+                        "http", "//localhost:12040/agent/11111111-2222-3333-4444-5566778899aa/session",
+                        "localhost:12040", "/agent/11111111-2222-3333-4444-5566778899aa/session");
+
+                checkParts(LLURI::buildAgentLoginInfoURI(id, "datasever:12345"),
+                        "http", "//datasever:12345/agent/11111111-2222-3333-4444-5566778899aa/logininfo",
+                        "datasever:12345", "/agent/11111111-2222-3333-4444-5566778899aa/logininfo");
         }
 }
 
diff --git a/linden/indra/test/math.cpp b/linden/indra/test/math.cpp
index b14a798..be8a398 100644
--- a/linden/indra/test/math.cpp
+++ b/linden/indra/test/math.cpp
@@ -125,7 +125,7 @@ namespace tut
         void uuid_object::test<4>()
         {
                 id.generate();
-                LLString id_str = id.getString();
+                std::string id_str = id.asString();
                 LLUUID copy(id_str.c_str());
                 ensure_equals("string serialization", id, copy);
         }
diff --git a/linden/indra/test/test.cpp b/linden/indra/test/test.cpp
index d90bfdb..9eb1639 100644
--- a/linden/indra/test/test.cpp
+++ b/linden/indra/test/test.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "linden_common.h"
+#include "llerrorcontrol.h"
 #include "lltut.h"
 
 #include <apr-1/apr_pools.h>
@@ -178,8 +179,18 @@ void stream_groups(std::ostream& s, const char* app)
         }
 }
 
+void wouldHaveCrashed(const std::string& message)
+{
+        tut::fail("llerrs message: " + message);
+}
+
 int main(int argc, char **argv)
 {
+        LLError::initForApplication(".");
+        LLError::setFatalFunction(wouldHaveCrashed);
+        LLError::setDefaultLevel(LLError::LEVEL_ERROR);
+                // *FIX: should come from error config file
+        
 #ifdef CTYPE_WORKAROUND
         ctype_workaround();
 #endif
@@ -213,7 +224,7 @@ int main(int argc, char **argv)
                 if(APR_STATUS_IS_EOF(apr_err)) break;
                 if(apr_err)
                 {
-                        char buf[255];
+                        char buf[255];          /* Flawfinder: ignore */
                         std::cerr << "Error parsing options: "
                                           << apr_strerror(apr_err, buf, 255) << std::endl;
                         return 1;
diff --git a/linden/indra/test/test.vcproj b/linden/indra/test/test.vcproj
index f07d412..9255315 100644
--- a/linden/indra/test/test.vcproj
+++ b/linden/indra/test/test.vcproj
@@ -195,6 +195,9 @@
                         </File>
 
                         <File
+                                RelativePath=".\llerror_tut.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llhttpclient_tut.cpp">
                         </File>
                         <File
@@ -216,9 +219,18 @@
                                 RelativePath=".\llsdserialize_tut.cpp">
                         </File>
                         <File
+                                RelativePath=".\lltiming_tut.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\lltut.cpp">
                         </File>
                         <File
+                                RelativePath=".\lluri_tut.cpp">
+                        </File>
+                        <File
+                                RelativePath=".\lluserrelations_tut.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\math.cpp">
                         </File>
                         <File
@@ -233,6 +245,9 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
+                                RelativePath=".\llpipeutil.h">
+                        </File>
+                        <File
                                 RelativePath=".\lltut.h">
                         </File>
                 </Filter>
diff --git a/linden/indra/test/test_llmanifest.py b/linden/indra/test/test_llmanifest.py
new file mode 100644
index 0000000..b20b6c1
--- /dev/null
+++ b/linden/indra/test/test_llmanifest.py
@@ -0,0 +1,128 @@
+#!/usr/bin/python
+# @file test_llmanifest.py
+# @author Ryan Williams
+# @brief Test cases for LLManifest library.
+#
+# Copyright (c) 2006-2007, Linden Research, Inc.
+# 
+# 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.
+
+from indra import llmanifest
+import os.path
+import os
+import unittest
+
+class DemoManifest(llmanifest.LLManifest):
+    def construct(self):
+        super(DemoManifest, self).construct()
+        if self.prefix("dir_1"):
+            self.path("test_a")
+            self.path(src="test_b", dst="test_dst_b")
+            self.path("*.test")
+            self.path("*.tex", "*.jpg")
+            if self.prefix("nested", dst=""):
+                self.path("deep")
+                self.end_prefix()
+            self.end_prefix("dir_1")
+
+
+class Demo_ArchManifest(llmanifest.LLManifest):
+        pass
+
+class TestLLManifest(unittest.TestCase):
+    mode='static'
+    def setUp(self):
+        self.m = llmanifest.LLManifest("src", "dst", {'grid':'default', 'platform':'darwin', 'version':(1,2,3,4)})
+
+    def testproperwindowspath(self):
+        self.assertEqual(llmanifest.proper_windows_path("C:\Program Files", "cygwin"),"/cygdrive/c/Program Files")
+        self.assertEqual(llmanifest.proper_windows_path("C:\Program Files", "windows"), "C:\Program Files")
+        self.assertEqual(llmanifest.proper_windows_path("/cygdrive/c/Program Files/NSIS", "windows"), "C:\Program Files\NSIS")
+        self.assertEqual(llmanifest.proper_windows_path("/cygdrive/c/Program Files/NSIS", "cygwin"), "/cygdrive/c/Program Files/NSIS")
+
+    def testpathancestors(self):
+        self.assertEqual(["dir"], [p for p in llmanifest.path_ancestors("dir")])
+        self.assertEqual(["dir/sub", "dir"], [p for p in llmanifest.path_ancestors("dir/sub")])
+        self.assertEqual(["dir/sub", "dir"], [p for p in llmanifest.path_ancestors("dir/sub/")])
+        self.assertEqual(["dir/sub/two", "dir/sub", "dir"], [p for p in llmanifest.path_ancestors("dir/sub/two")])
+
+
+    def testforplatform(self):
+        self.assertEqual(llmanifest.LLManifest.for_platform('demo'), DemoManifest)
+        def tmp_test():
+            return llmanifest.LLManifest.for_platform('extant')
+        self.assertRaises(KeyError, tmp_test)
+        ExtantManifest = llmanifest.LLManifestRegistry('ExtantManifest', (llmanifest.LLManifest,), {})
+        self.assertEqual(llmanifest.LLManifest.for_platform('extant'), ExtantManifest)
+        self.assertEqual(llmanifest.LLManifest.for_platform('demo', 'Arch'), Demo_ArchManifest)
+
+
+    def testprefix(self):
+        self.assertEqual(self.m.get_src_prefix(), "src")
+        self.assertEqual(self.m.get_dst_prefix(), "dst")
+        self.m.prefix("level1")
+        self.assertEqual(self.m.get_src_prefix(), "src/level1")
+        self.assertEqual(self.m.get_dst_prefix(), "dst/level1")
+        self.m.end_prefix()
+        self.m.prefix(src="src", dst="dst")
+        self.assertEqual(self.m.get_src_prefix(), "src/src")
+        self.assertEqual(self.m.get_dst_prefix(), "dst/dst")
+        self.m.end_prefix()
+
+    def testendprefix(self):
+        self.assertEqual(self.m.get_src_prefix(), "src")
+        self.assertEqual(self.m.get_dst_prefix(), "dst")
+        self.m.prefix("levela")
+        self.m.end_prefix()
+        self.assertEqual(self.m.get_src_prefix(), "src")
+        self.assertEqual(self.m.get_dst_prefix(), "dst")
+        self.m.prefix("level1")
+        self.m.end_prefix("level1")
+        self.assertEqual(self.m.get_src_prefix(), "src")
+        self.assertEqual(self.m.get_dst_prefix(), "dst")
+        self.m.prefix("level1")
+        def tmp_test():
+            self.m.end_prefix("mismatch")
+        self.assertRaises(ValueError, tmp_test)
+
+    def testruncommand(self):
+        self.assertEqual("Hello\n", self.m.run_command("echo Hello"))
+        def tmp_test():
+            self.m.run_command("fff_garbage")
+        self.assertRaises(RuntimeError, tmp_test)
+
+    def testpathof(self):
+        self.assertEqual(self.m.src_path_of("a"), "src/a")
+        self.assertEqual(self.m.dst_path_of("a"), "dst/a")
+        self.m.prefix("tmp")
+        self.assertEqual(self.m.src_path_of("b/c"), "src/tmp/b/c")
+        self.assertEqual(self.m.dst_path_of("b/c"), "dst/tmp/b/c")
+
+    def testcmakedirs(self):
+        self.m.cmakedirs("test_dir_DELETE/nested/dir")
+        self.assert_(os.path.exists("test_dir_DELETE/nested/dir"))
+        self.assert_(os.path.isdir("test_dir_DELETE"))
+        self.assert_(os.path.isdir("test_dir_DELETE/nested"))
+        self.assert_(os.path.isdir("test_dir_DELETE/nested/dir"))
+        os.removedirs("test_dir_DELETE/nested/dir")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/linden/indra/test/test_vc8.vcproj b/linden/indra/test/test_vc8.vcproj
new file mode 100644
index 0000000..79af7f0
--- /dev/null
+++ b/linden/indra/test/test_vc8.vcproj
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="test"

+        ProjectGUID="{BBAA6588-CA96-4A87-A988-B02270B8D02B}"

+        RootNamespace="test"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="Debug"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmessage;..\llmath;..\..\libraries\include;..\llinventory;&quot;..\..\libraries\i686-win32\include&quot;;..\llxml;..\lldatabase"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="false"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                TreatWChar_tAsBuiltInType="false"

+                                RuntimeTypeInfo="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalOptions="/FORCE:MULTIPLE"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(OutDir)/test.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"

+                                IgnoreDefaultLibraryNames="libcmt.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/test.pdb"

+                                SubSystem="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="Release"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmessage;..\llmath;..\..\libraries\include;..\llinventory;&quot;..\..\libraries\i686-win32\include&quot;;..\llxml;..\lldatabase"

+                                PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"

+                                MinimalRebuild="false"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                RuntimeTypeInfo="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalOptions="/FORCE:MULTIPLE"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(OutDir)/test.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"

+                                IgnoreDefaultLibraryNames="libcmt.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/test.pdb"

+                                SubSystem="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                                CommandLine="$(TargetPath)"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="2"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmessage;..\llmath;..\..\libraries\include;..\llinventory;&quot;..\..\libraries\i686-win32\include&quot;;..\llxml;..\lldatabase"

+                                PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"

+                                MinimalRebuild="false"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                RuntimeTypeInfo="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"

+                                OutputFile="$(OutDir)/test.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"

+                                IgnoreDefaultLibraryNames="libcmt.lib"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/test.pdb"

+                                SubSystem="1"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                                CommandLine="$(TargetPath)"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\common.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\inventory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\io.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldatabase_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llerror_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhttpclient_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmime_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpipeutil.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrandom_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsd_message_system_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsd_new_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsdserialize_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltiming_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluri_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluserrelations_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\math.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\reflection_tut.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\test.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llpipeutil.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltut.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/win_crash_logger/win_crash_logger.cpp b/linden/indra/win_crash_logger/win_crash_logger.cpp
index effe56c..5849438 100644
--- a/linden/indra/win_crash_logger/win_crash_logger.cpp
+++ b/linden/indra/win_crash_logger/win_crash_logger.cpp
@@ -69,8 +69,8 @@ void write_debug(std::string& str);
 
 // Global Variables:
 HINSTANCE hInst= NULL;                                  // current instance
-TCHAR szTitle[MAX_LOADSTRING];                  // The title bar text
-TCHAR szWindowClass[MAX_LOADSTRING];    // The title bar text
+TCHAR szTitle[MAX_LOADSTRING];                          /* Flawfinder: ignore */                // The title bar text
+TCHAR szWindowClass[MAX_LOADSTRING];            /* Flawfinder: ignore */                // The title bar text
 
 LLString gUserText;                     // User's description of the problem
 time_t gStartTime = 0;
@@ -91,10 +91,10 @@ WCHAR gProductName[512];
 // Include product name in the window caption.
 void ProcessCaption(HWND hWnd)
 {
-        TCHAR templateText[1024];
-        TCHAR finalText[2048];
+        TCHAR templateText[1024];               /* Flawfinder: ignore */
+        TCHAR finalText[2048];          /* Flawfinder: ignore */
         GetWindowText(hWnd, templateText, sizeof(templateText));
-        swprintf(finalText, templateText, gProductName);
+        swprintf(finalText, templateText, gProductName);                /* Flawfinder: ignore */
         SetWindowText(hWnd, finalText);
 }
 
@@ -102,10 +102,10 @@ void ProcessCaption(HWND hWnd)
 // Include product name in the diaog item text.
 void ProcessDlgItemText(HWND hWnd, int nIDDlgItem)
 {
-        TCHAR templateText[1024];
-        TCHAR finalText[2048];
+        TCHAR templateText[1024];               /* Flawfinder: ignore */
+        TCHAR finalText[2048];          /* Flawfinder: ignore */
         GetDlgItemText(hWnd, nIDDlgItem, templateText, sizeof(templateText));
-        swprintf(finalText, templateText, gProductName);
+        swprintf(finalText, templateText, gProductName);                /* Flawfinder: ignore */
         SetDlgItemText(hWnd, nIDDlgItem, finalText);
 }
 
@@ -119,7 +119,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
         gDirUtilp->initAppDirs("SecondLife");
         
         // Default to the product name "Second Life" (this is overridden by the -name argument)
-        swprintf(gProductName, L"Second Life");
+        swprintf(gProductName, L"Second Life");         /* Flawfinder: ignore */
 
         gCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
                 "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)");
@@ -138,7 +138,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
         const S32       MAX_ARGS = 100;
         int argc = 0;
-        char *argv[MAX_ARGS];
+        char *argv[MAX_ARGS];           /* Flawfinder: ignore */
 
         char *token = NULL;
         if( cmd_line_including_exe_name[0] == '\"' )
@@ -158,7 +158,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
         {
                 argv[argc++] = token;
                 /* Get next token: */
-                if (*(token + strlen(token) + 1) == '\"')
+                if (*(token + strlen(token) + 1) == '\"')               /* Flawfinder: ignore */
                 {
                         token = strtok( NULL, "\"");
                 }
@@ -269,11 +269,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                 WCHAR header[2048];
                 if (gCrashInPreviousExec)
                 {
-                        swprintf(header, L"%s appears to have crashed or frozen the last time it ran.", gProductName);
+                        swprintf(header, L"%s appears to have crashed or frozen the last time it ran.", gProductName);          /* Flawfinder: ignore */
                 }
                 else
                 {
-                        swprintf(header, L"%s appears to have crashed.", gProductName);
+                        swprintf(header, L"%s appears to have crashed.", gProductName);         /* Flawfinder: ignore */
                 }
                 SetDlgItemText(gHwndReport, IDC_STATIC_HEADER, header);
                 ShowWindow(gHwndReport, SW_SHOW );
@@ -497,7 +497,7 @@ void send_crash_report()
 
         // Get the filename of the SecondLife.log file
         // *NOTE: This buffer size is hard coded into scanf() below.
-        char tmp_sl_name[256];
+        char tmp_sl_name[256];          /* Flawfinder: ignore */
         tmp_sl_name[0] = '\0';
 
         update_messages();
@@ -701,7 +701,7 @@ void send_crash_report()
         // Post data to web server
         const S32 BUFSIZE = 65536;
         HINTERNET hinet, hsession, hrequest;
-        char data[BUFSIZE];
+        char data[BUFSIZE];             /* Flawfinder: ignore */
         unsigned long bytes_read;
 
         llinfos << "Connecting to crash report server" << llendl;
@@ -809,7 +809,7 @@ LLFileEncoder::LLFileEncoder(const char *form_name, const char *filename)
         while (count < 5)
         {
                 buf_size = stat_data.st_size;
-                fp = LLFile::fopen(mFilename.c_str(), "rb");
+                fp = LLFile::fopen(mFilename.c_str(), "rb");            /* Flawfinder: ignore */
                 if (!fp)
                 {
                         llwarns << "Can't open file " << mFilename << ", wait for a second" << llendl;
@@ -897,14 +897,14 @@ void write_debug(const char *str)
         {
                 std::string debug_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"debug_info.log");
                 llinfos << "Opening debug file " << debug_filename << llendl;
-                gDebugFile = LLFile::fopen(debug_filename.c_str(), "a+");
+                gDebugFile = LLFile::fopen(debug_filename.c_str(), "a+");               /* Flawfinder: ignore */
         if (!gDebugFile)
         {
             fprintf(stderr, "Couldn't open %s: debug log to stderr instead.\n", debug_filename.c_str());
             gDebugFile = stderr;
         }
         }
-        fprintf(gDebugFile, str);
+        fprintf(gDebugFile, str);               /* Flawfinder: ignore */
         fflush(gDebugFile);
 }
 
diff --git a/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj b/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
new file mode 100644
index 0000000..78ae4e6
--- /dev/null
+++ b/linden/indra/win_crash_logger/win_crash_logger_vc8.vcproj
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="win_crash_logger"

+        ProjectGUID="{648685F3-8760-4CC5-BB2B-CAF9DECC25A4}"

+        RootNamespace="win_crash_logger"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="Debug"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib"

+                                OutputFile="win_crash_logger.exe"

+                                LinkIncremental="1"

+                                AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/win_crash_logger.pdb"

+                                SubSystem="2"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="Release"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib"

+                                OutputFile="win_crash_logger.exe"

+                                LinkIncremental="1"

+                                AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"

+                                GenerateDebugInformation="true"

+                                SubSystem="2"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llaudio;..\llmedia;..\llimage;..\llscene;..\llxml;..\llmessage;..\llprimitive;..\llrender;..\llwindow;..\llcharacter;..\llinventory;..\llui;..\lscript;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\;&quot;..\..\libraries\i686-win32\include\quicktime&quot;"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="apr-1.lib aprutil-1.lib ws2_32.lib advapi32.lib comdlg32.lib dxguid.lib gdi32.lib kernel32.lib libexpatMT.lib llcommon.lib llmath.lib llwindow.lib llvfs.lib llmessage.lib llxml.lib netapi32.lib ole32.lib oleaut32.lib shell32.lib user32.lib wininet.lib winspool.lib"

+                                OutputFile="win_crash_logger.exe"

+                                LinkIncremental="1"

+                                AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"

+                                GenerateDebugInformation="true"

+                                SubSystem="2"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\StdAfx.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\win_crash_logger.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\resource.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\StdAfx.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\win_crash_logger.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                        <File

+                                RelativePath=".\ll_icon.ico"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\win_crash_logger.rc"

+                                >

+                        </File>

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 20e41a8..e41ab00 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -33,6 +33,7 @@
 #include <wininet.h>
 
 #include <stdio.h>
+#include "llpreprocessor.h"
 #include "llfile.h"
 
 #define BUFSIZE 8192
@@ -81,7 +82,7 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
         *cancelled = FALSE;
 
         HINTERNET hinet, hdownload;
-        char data[BUFSIZE];
+        char data[BUFSIZE];             /* Flawfinder: ignore */
         unsigned long bytes_read;
 
 #if _DEBUG
@@ -89,7 +90,7 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
         fflush(logfile);
 #endif  
 
-        FILE *fp = fopen(path, "wb");
+        FILE* fp = fopen(path, "wb");           /* Flawfinder: ignore */
 
         if (!fp)
         {
@@ -132,7 +133,7 @@ int WINAPI get_url_into_file(WCHAR *uri, char *path, int *cancelled)
         {
 #if _DEBUG
                 DWORD err = GetLastError();
-                fprintf(logfile,"InternetQueryDataAvailable Failed: %d bytes\n",total_bytes);
+                fprintf(logfile,"InternetQueryDataAvailable Failed: %d bytes Err:%d\n",total_bytes,err);
                 fflush(logfile);
 #endif  
                 return success;
@@ -320,7 +321,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
 
         const int MAX_ARGS = 100;
         int argc = 0;
-        char *argv[MAX_ARGS];
+        char* argv[MAX_ARGS];           /* Flawfinder: ignore */
 
 #if _DEBUG
         logfile = _wfopen(TEXT("updater.log"),TEXT("wt"));
@@ -346,7 +347,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         {
                 argv[argc++] = token;
                 /* Get next token: */
-                if (*(token + strlen(token) + 1) == '\"')
+                if (*(token + strlen(token) + 1) == '\"')               /* Flawfinder: ignore */
                 {
                         token = strtok( NULL, "\"");
                 }
@@ -379,7 +380,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         if (gProductName)
         {
                 mbstowcs(window_title, gProductName, 2048);
-                wcscat(window_title, L" Updater");
+                wcscat(window_title, L" Updater");              /* Flawfinder: ignore */
         }
         else
         {
@@ -388,7 +389,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         
         WNDCLASSEX wndclassex = { 0 };
         DEVMODE dev_mode = { 0 };
-        char update_exec_path[MAX_PATH];
+        char update_exec_path[MAX_PATH];                /* Flawfinder: ignore */
         char *ptr;
         WCHAR update_uri[4096];
 
@@ -457,10 +458,10 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         *(ptr + 2) = 'x';
         *(ptr + 3) = 'e';
         *(ptr + 4) = 0;
-        wcscpy(update_uri, UPDATE_URIBASE);
+        wcscpy(update_uri, UPDATE_URIBASE);             /* Flawfinder: ignore */
         WCHAR wcmdline[2048];
         mbstowcs(wcmdline, gUserServer, 2048);
-        wcscat(update_uri, wcmdline);
+        wcscat(update_uri, wcmdline);           /* Flawfinder: ignore */
 
         int success;
         int cancelled;
@@ -503,18 +504,18 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         }
 
         // Construct some parameters.
-        char params[2048];
+        char params[2048];              /* Flawfinder: ignore */
         if (gIsSilent && gProgramName)
         {
-                sprintf(params, "/S /P=\"%s\"", gProgramName);
+                snprintf(params, sizeof(params), "/S /P=\"%s\"", gProgramName);         /* Flawfinder: ignore */
         }
         else if (gProgramName)
         {
-                sprintf(params, "/P=\"%s\"", gProgramName);
+                snprintf(params, sizeof(params), "/P=\"%s\"", gProgramName);            /* Flawfinder: ignore */
         }
         else if (gIsSilent)
         {
-                sprintf(params, "/S");
+                sprintf(params, "/S");          /* Flawfinder: ignore */
         }
         else
         {
diff --git a/linden/indra/win_updater/win_updater_vc8.vcproj b/linden/indra/win_updater/win_updater_vc8.vcproj
new file mode 100644
index 0000000..3368ac5
--- /dev/null
+++ b/linden/indra/win_updater/win_updater_vc8.vcproj
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="8.00"

+        Name="win_updater"

+        ProjectGUID="{E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}"

+        RootNamespace="win_updater"

+        Keyword="Win32Proj"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="Debug"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"

+                                PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"

+                                OutputFile="updater.exe"

+                                LinkIncremental="2"

+                                AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_debug"

+                                GenerateDebugInformation="true"

+                                ProgramDatabaseFile="$(OutDir)/win_updater.pdb"

+                                SubSystem="2"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="Release"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"

+                                OutputFile="updater.exe"

+                                LinkIncremental="1"

+                                AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"

+                                GenerateDebugInformation="true"

+                                SubSystem="2"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="$(ConfigurationName)"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="1"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llmessage;..\llwindow"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLinkerTool"

+                                AdditionalDependencies="advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib wininet.lib winspool.lib"

+                                OutputFile="updater.exe"

+                                LinkIncremental="1"

+                                AdditionalLibraryDirectories="../lib_$(ConfigurationName)/i686-win32;../../libraries/i686-win32/lib_release"

+                                GenerateDebugInformation="true"

+                                SubSystem="2"

+                                OptimizeReferences="2"

+                                EnableCOMDATFolding="2"

+                                TargetMachine="1"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCManifestTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCAppVerifierTool"

+                        />

+                        <Tool

+                                Name="VCWebDeploymentTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\updater.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>